QPID-2632 : Applied patch from Andrew Kennedy. To convert RST and PPT to QTCs not IBBCs

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

4 files changed, 8 insertions, 18 deletions

diff --git a/qpid/java/broker-plugins/access-control/build.xml b/qpid/java/broker-plugins/access-control/build.xml
index 690f2fb22c..f3f7e4de74 100644
--- a/qpid/java/broker-plugins/access-control/build.xml
+++ b/qpid/java/broker-plugins/access-control/build.xml
@@ -18,7 +18,7 @@
  -->
 <project name="Qpid Broker-Plugins Access Control" default="build">
     <property name="module.depends" value="common broker broker-plugins" />
-    <property name="module.test.depends" value="test common/test broker/test management/common" />
+    <property name="module.test.depends" value="test common/test broker/test management/common systests" />
 
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
index ef541dd0a8..aad7290557 100644
--- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
@@ -21,7 +21,6 @@
 
 package org.apache.qpid.server.security.access.plugins;
 
-
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.security.Result;
 import org.apache.qpid.server.security.access.ObjectProperties;
@@ -29,7 +28,7 @@ import org.apache.qpid.server.security.access.ObjectType;
 import org.apache.qpid.server.security.access.Operation;
 import org.apache.qpid.server.security.access.Permission;
 import org.apache.qpid.server.security.access.config.RuleSet;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
+import org.apache.qpid.test.utils.QpidTestCase;
 
 /**
  * This test checks that the {@link RuleSet} object which forms the core of the access control plugin performs correctly.
@@ -39,7 +38,7 @@ import org.apache.qpid.server.util.InternalBrokerBaseCase;
  * access control mechanism is validated by checking whether operations would be authorised by calling the
  * {@link RuleSet#check(String, Operation, ObjectType, ObjectProperties)} method.
  */
-public class RuleSetTest extends InternalBrokerBaseCase
+public class RuleSetTest extends QpidTestCase
 {
     private RuleSet _ruleSet;
 
@@ -52,6 +51,7 @@ public class RuleSetTest extends InternalBrokerBaseCase
     public void setUp() throws Exception
     {
         super.setUp();
+
         _ruleSet = new RuleSet();
         _ruleSet.configure(RuleSet.TRANSITIVE, Boolean.FALSE);
     }
diff --git a/qpid/java/broker-plugins/simple-xml/build.xml b/qpid/java/broker-plugins/simple-xml/build.xml
index 8780bc42b7..d3cd451648 100644
--- a/qpid/java/broker-plugins/simple-xml/build.xml
+++ b/qpid/java/broker-plugins/simple-xml/build.xml
@@ -18,7 +18,7 @@
  -->
 <project name="Qpid Broker-Plugins Simple XML" default="build">
     <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.test.depends" value="test broker/test common/test management/common systests" />
     
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
diff --git a/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java b/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
index 055dee06a0..65ab12a095 100644
--- a/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
+++ b/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
@@ -18,24 +18,16 @@
  * under the License.
  *
  */
-
 package org.apache.qpid.server.security.access;
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.exchange.DirectExchange;
-import org.apache.qpid.server.queue.AMQQueueFactory;
-import org.apache.qpid.server.registry.ApplicationRegistry;
 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;
+import org.apache.qpid.test.utils.QpidTestCase;
 
-public class PrincipalPermissionsTest extends InternalBrokerBaseCase
+public class PrincipalPermissionsTest extends QpidTestCase
 {
     private String _user = "user";
     private PrincipalPermissions _perms;
@@ -120,10 +112,8 @@ public class PrincipalPermissionsTest extends InternalBrokerBaseCase
 
     public void testPublish() throws AMQException
     {
-        DirectExchange exchange = DirectExchange.TYPE.newInstance(_virtualHost, _exchangeName, false, 1, _autoDelete);    
-
         String[] authArgs = new String[]{_exchangeName.asString(), _routingKey.asString()};
-        Object[] grantArgs = new Object[]{exchange.getNameShortString(), _routingKey};
+        Object[] grantArgs = new Object[]{_exchangeName, _routingKey};
 
         assertEquals(Result.DENIED, _perms.authorise(Permission.PUBLISH, authArgs));
         _perms.grant(Permission.PUBLISH, grantArgs);