QPID-107 : Changes based on code review.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@635602 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 13 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
index a643230bc2..62c54d86eb 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
@@ -45,12 +45,17 @@ public class SimpleACLTest extends TestCase implements ConnectionListener
         final String QpidExampleHome = System.getProperty("QPID_EXAMPLE_HOME");
         final File defaultaclConfigFile = new File(QpidExampleHome, "etc/acl.config.xml");
 
-        if (!defaultaclConfigFile.exists() || System.getProperty("QPID_HOME") == null)
+        if (!defaultaclConfigFile.exists())
         {
             System.err.println("Configuration file not found:" + defaultaclConfigFile);
             fail("Configuration file not found:" + defaultaclConfigFile);
         }
 
+        if (System.getProperty("QPID_HOME") == null)
+        {
+            fail("QPID_HOME not set");
+        }
+
         ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile);
 
         ApplicationRegistry.initialise(config, 1);
@@ -175,9 +180,9 @@ public class SimpleACLTest extends TestCase implements ConnectionListener
 
             conn.start();
 
-            //Create Temporary Queue
-            ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createTemporaryQueue(),
-                                             ((AMQSession) sesh).getProtocolHandler());
+            //Create Temporary Queue  - can't use the createTempQueue as QueueName is null.
+            ((AMQSession) sesh).createQueue(new AMQShortString("doesnt_matter_as_autodelete_means_tmp"),
+                                            true, false, false);
 
             conn.close();
         }
@@ -198,8 +203,7 @@ public class SimpleACLTest extends TestCase implements ConnectionListener
             conn.start();
 
             //Create a Named Queue
-            ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createQueue("IllegalQueue"),
-                                             ((AMQSession) sesh).getProtocolHandler());
+            ((AMQSession) sesh).createQueue(new AMQShortString("IllegalQueue"), false, false, false);
 
             fail("Test failed as Queue creation succeded.");
         }
@@ -391,8 +395,7 @@ public class SimpleACLTest extends TestCase implements ConnectionListener
             conn.start();
 
             //Create Temporary Queue
-            ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createQueue("example.RequestQueue"),
-                                             ((AMQSession) sesh).getProtocolHandler());
+            ((AMQSession) sesh).createQueue(new AMQShortString("example.RequestQueue"), false, false, false);
 
             conn.close();
         }
@@ -402,7 +405,7 @@ public class SimpleACLTest extends TestCase implements ConnectionListener
         }
     }
 
-    public void testServerCreateNamedQueueInValid() throws JMSException, URLSyntaxException, AMQException
+    public void testServerCreateNamedQueueInvalid() throws JMSException, URLSyntaxException, AMQException
     {
         try
         {
@@ -413,8 +416,7 @@ public class SimpleACLTest extends TestCase implements ConnectionListener
             conn.start();
 
             //Create a Named Queue
-            ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createQueue("IllegalQueue"),
-                                             ((AMQSession) sesh).getProtocolHandler());
+            ((AMQSession) sesh).createQueue(new AMQShortString("IllegalQueue"), false, false, false);
 
             fail("Test failed as creation succeded.");
         }
@@ -434,8 +436,8 @@ public class SimpleACLTest extends TestCase implements ConnectionListener
 
             conn.start();
 
-            ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createTemporaryQueue(),
-                                             ((AMQSession) sesh).getProtocolHandler());
+            ((AMQSession) sesh).createQueue(new AMQShortString("again_ensure_auto_delete_queue_for_temporary"),
+                                            true, false, false);
 
             fail("Test failed as creation succeded.");
         }