diff options
Diffstat (limited to 'java')
3 files changed, 11 insertions, 10 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 13bc9a0eec..dad656bd50 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -206,9 +206,9 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic */ protected static final boolean DEFAULT_MANDATORY = Boolean.parseBoolean(System.getProperty("qpid.default_mandatory", "true")); - protected static final boolean DECLARE_QUEUES = + protected final boolean DECLARE_QUEUES = Boolean.parseBoolean(System.getProperty("qpid.declare_queues", "true")); - protected static final boolean DECLARE_EXCHANGES = + protected final boolean DECLARE_EXCHANGES = Boolean.parseBoolean(System.getProperty("qpid.declare_exchanges", "true")); /** System property to enable strict AMQP compliance. */ diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java index 1e37673592..9f12117c7e 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java @@ -46,8 +46,11 @@ public class DynamicQueueExchangeCreateTest extends QpidTestCase fail("JMSException should be thrown as the queue does not exist"); } catch (JMSException e) - { - assertTrue(e.getMessage().contains("does not exist")); + { + assertTrue("Exception should be that the queue does not exist :" + + e.getMessage(), + e.getMessage().contains("does not exist")); + } } @@ -60,7 +63,7 @@ public class DynamicQueueExchangeCreateTest extends QpidTestCase Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); String EXCHANGE_TYPE = "test.direct"; - Queue queue = session.createQueue("new.direct://" + EXCHANGE_TYPE + "/queue/queue"); + Queue queue = session.createQueue("direct://" + EXCHANGE_TYPE + "/queue/queue"); try { @@ -69,9 +72,9 @@ public class DynamicQueueExchangeCreateTest extends QpidTestCase } catch (JMSException e) { - System.err.println(e.getMessage()); - - assertTrue(e.getMessage().contains("Exchange " + EXCHANGE_TYPE + " does not exist")); + assertTrue("Exception should be that the exchange does not exist :" + + e.getMessage(), + e.getMessage().contains("Exchange " + EXCHANGE_TYPE + " does not exist")); } } diff --git a/java/test-profiles/Excludes b/java/test-profiles/Excludes index ff7382b056..7ef2a15e51 100644 --- a/java/test-profiles/Excludes +++ b/java/test-profiles/Excludes @@ -15,5 +15,3 @@ org.apache.qpid.server.logging.VirtualHostLoggingTest#testVirtualhostClosure org.apache.qpid.server.logging.MemoryMessageStoreLoggingTest#testMessageStoreClose org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#testMessageStoreClose -// QPID-2081 - the connection close here needs more work -org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#testExchangeDeclare |