Repository: qpid-jms Updated Branches: refs/heads/master 86594f612 -> 71abd4b00
NO-JIRA enable test for durable subscription noLocal change. The more recent releases of ActiveMQ can recover and change a subscription based on NoLocal changes, that was ignored and can be enabled now, requires setting keepDurablSubsActive to false in the tests. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/71abd4b0 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/71abd4b0 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/71abd4b0 Branch: refs/heads/master Commit: 71abd4b00ba7b9f43e41f408b7f74770bb5ed4f3 Parents: 86594f6 Author: Timothy Bish <[email protected]> Authored: Mon Aug 8 11:54:12 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Mon Aug 8 11:54:12 2016 -0400 ---------------------------------------------------------------------- .../org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java | 2 -- .../test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71abd4b0/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java index 52f8dc6..81ab8b7 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java @@ -39,7 +39,6 @@ import org.apache.activemq.broker.jmx.BrokerViewMBean; import org.apache.activemq.broker.jmx.TopicViewMBean; import org.apache.qpid.jms.support.AmqpTestSupport; import org.apache.qpid.jms.support.Wait; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -237,7 +236,6 @@ public class JmsDurableSubscriberTest extends AmqpTestSupport { assertTrue("Only recieved messages: " + messages.getCount(), messages.await(30, TimeUnit.SECONDS)); } - @Ignore("Fails currently as ActiveMQ doesn't update the recovered subscription") @Test public void testDurableResubscribeWithNewNoLocalValue() throws Exception { connection = createAmqpConnection(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71abd4b0/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java index c710107..d311c62 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java @@ -175,6 +175,8 @@ public class QpidJmsTestSupport { brokerService.setUseJmx(true); brokerService.getManagementContext().setCreateConnector(false); brokerService.setDataDirectory("target/" + name); + brokerService.setKeepDurableSubsActive(false); + if (isPersistent()) { KahaDBStore kaha = new KahaDBStore(); kaha.setDirectory(new File(KAHADB_DIRECTORY + "/" + name)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
