diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-04-20 14:03:33 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-04-20 14:03:33 +0000 |
| commit | b570e13cea804b90e925ddcd81322c1928b781c8 (patch) | |
| tree | eab1f13446372a274be3b24ccd121ff366e56c2f | |
| parent | 703054a805aaa32c1cf5403cd2870a4f67d5d19e (diff) | |
| download | qpid-python-b570e13cea804b90e925ddcd81322c1928b781c8.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@935927 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java index 078b8f43ce..a1f8295c9b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java @@ -138,7 +138,7 @@ public class ModelTest extends QpidTestCase String owner = null; boolean durable = false; - createViaJMXandValidateViaJMX(name, owner, durable, durable); + createViaJMXandValidateViaJMX(name, owner, durable); } /** @@ -153,7 +153,7 @@ public class ModelTest extends QpidTestCase 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 QpidTestCase 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 QpidTestCase * @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); } /** |