QPID-2632 : Ensure additional broker unit tests extend IBBC

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@951157 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 15 deletions

diff --git a/java/broker-plugins/simple-xml/build.xml b/java/broker-plugins/simple-xml/build.xml
index 2c26c9129a..8780bc42b7 100644
--- a/java/broker-plugins/simple-xml/build.xml
+++ b/java/broker-plugins/simple-xml/build.xml
@@ -17,8 +17,8 @@
  - under the License.
  -->
 <project name="Qpid Broker-Plugins Simple XML" default="build">
-    <property name="module.depends" value="common management/common broker broker-plugins" />
-    <property name="module.test.depends" value="junit-toolkit broker/test common/test" />
+    <property name="module.depends" value="common broker broker-plugins" />
+    <property name="module.test.depends" value="test broker/test common/test management/common" />
     
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
diff --git a/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java b/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
index 3cbad83369..e5942c73c2 100644
--- a/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
+++ b/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
@@ -32,8 +32,9 @@ import org.apache.qpid.server.security.Result;
 import org.apache.qpid.server.security.access.config.PrincipalPermissions;
 import org.apache.qpid.server.security.access.config.PrincipalPermissions.Permission;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.util.InternalBrokerBaseCase;
 
-public class PrincipalPermissionsTest extends TestCase
+public class PrincipalPermissionsTest extends InternalBrokerBaseCase
 {
     private String _user = "user";
     private PrincipalPermissions _perms;
@@ -49,21 +50,18 @@ public class PrincipalPermissionsTest extends TestCase
     private boolean _autoDelete = false;
     private AMQShortString _exchangeType = new AMQShortString("direct");
     private DirectExchange _exchange;
-    private VirtualHost _virtualHost;
     private AMQShortString _owner = new AMQShortString(this.getClass().getName() + "owner");
     private Boolean _temporary = false;
     private Boolean _ownQueue = false;
 
     @Override
-    public void setUp()
+    public void setUp() throws Exception
     {
-        //Highlight that this test will cause a new AR to be created
-        ApplicationRegistry.getInstance();
+        super.setUp();
 
         _perms = new PrincipalPermissions(_user);
         try
         {
-            _virtualHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
             _exchange = DirectExchange.TYPE.newInstance(_virtualHost, _exchangeName, _durable, _ticket, _autoDelete);
             AMQQueueFactory.createAMQQueueImpl(_queueName, false, _owner , false, false, _virtualHost, _arguments);
             AMQQueueFactory.createAMQQueueImpl(_tempQueueName, false, _owner , true, false, _virtualHost, _arguments);
@@ -74,13 +72,6 @@ public class PrincipalPermissionsTest extends TestCase
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception
-    {
-        //Ensure we close the opened Registry
-        ApplicationRegistry.remove();
-    }
-
 
     public void testPrincipalPermissions()
     {