You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/04/20 16:03:33 UTC

svn commit: r935927 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java

Author: robbie
Date: Tue Apr 20 14:03:33 2010
New Revision: 935927

URL: http://svn.apache.org/viewvc?rev=935927&view=rev
Log:
QPID-2097: fix issues with ModelTest to allow it to pass normally: it isnt possible to create autoDelete queues with the JMX interface, and owner should not be expected to be null based on autodelete status.

Modified:
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java?rev=935927&r1=935926&r2=935927&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java Tue Apr 20 14:03:33 2010
@@ -138,7 +138,7 @@ public class ModelTest extends QpidTestC
         String owner = null;
         boolean durable = false;
 
-        createViaJMXandValidateViaJMX(name, owner, durable, durable);
+        createViaJMXandValidateViaJMX(name, owner, durable);
     }
 
     /**
@@ -153,7 +153,7 @@ public class ModelTest extends QpidTestC
         String owner = null;
         boolean durable = true;
 
-        createViaJMXandValidateViaJMX(name, owner, durable, durable);
+        createViaJMXandValidateViaJMX(name, owner, durable);
 
         // Clean up
         ManagedBroker managedBroker =
@@ -246,8 +246,7 @@ public class ModelTest extends QpidTestC
         session.createQueue(new AMQShortString(queueName),
                             autoDelete, durable, exclusive);
 
-        validateQueueViaJMX(queueName, exclusive ? ((AMQConnection) connection).
-                getUsername() : null, durable, autoDelete);
+        validateQueueViaJMX(queueName, ((AMQConnection) connection).getUsername(), durable, autoDelete);
     }
 
     /**
@@ -263,12 +262,12 @@ public class ModelTest extends QpidTestC
      * @throws IOException if there is a problem with the JMX connection
      */
     private void createViaJMXandValidateViaJMX(String queueName, String owner,
-                                               boolean durable, boolean autoDelete)
+                                               boolean durable)
             throws JMException, IOException
     {
         _jmxUtils.createQueue(VIRTUALHOST_NAME, queueName, owner, durable);
 
-        validateQueueViaJMX(queueName, owner, durable, autoDelete);
+        validateQueueViaJMX(queueName, owner, durable, false);
     }
 
     /**



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org