You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2017/08/09 10:40:52 UTC

activemq git commit: [AMQ-6643][AMQ-5594] fix test regression to reflect match strategy

Repository: activemq
Updated Branches:
  refs/heads/master 8646bb101 -> 068b7946c


[AMQ-6643][AMQ-5594] fix test regression to reflect match strategy


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/068b7946
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/068b7946
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/068b7946

Branch: refs/heads/master
Commit: 068b7946ce14a8b9d02fa49bd05b8f4113a8ad88
Parents: 8646bb1
Author: gtully <ga...@gmail.com>
Authored: Wed Aug 9 11:40:15 2017 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed Aug 9 11:40:39 2017 +0100

----------------------------------------------------------------------
 ...erVirtualDestinationsWithWildcardLevelDBTest.java | 15 +++------------
 ...gleBrokerVirtualDestinationsWithWildcardTest.java |  4 ++--
 2 files changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/068b7946/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java
index 543f83f..55d6e8f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java
@@ -16,20 +16,11 @@
  */
 package org.apache.activemq.usecases;
 
-import org.apache.activemq.JmsMultipleBrokersTestSupport;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.region.DestinationInterceptor;
-import org.apache.activemq.broker.region.virtual.VirtualDestination;
-import org.apache.activemq.broker.region.virtual.VirtualDestinationInterceptor;
-import org.apache.activemq.broker.region.virtual.VirtualTopic;
-import org.apache.activemq.leveldb.LevelDBStore;
-import org.apache.activemq.store.kahadb.KahaDBStore;
-import org.apache.activemq.util.MessageIdList;
-
-import javax.jms.MessageConsumer;
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStore;
 
 public class SingleBrokerVirtualDestinationsWithWildcardLevelDBTest extends SingleBrokerVirtualDestinationsWithWildcardTest {
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/068b7946/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.java
index 7c078b5..eaee733 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.java
@@ -64,10 +64,10 @@ public class SingleBrokerVirtualDestinationsWithWildcardTest extends JmsMultiple
         startAllBrokers();
 
         sendReceive("local.test.1", true, "Consumer.a.local.test.1", false, 1, 1);
-        sendReceive("local.test.1", true, "Consumer.a.local.test.>", false, 1, 1);
+        sendReceive("local.test.1", true, "Consumer.a.local.test.>", false, 1, 2);
         sendReceive("local.test.1.2", true, "Consumer.a.local.test.>", false, 1, 1);
         sendReceive("global.test.1", true, "Consumer.a.global.test.1", false, 1, 1);
-        sendReceive("global.test.1", true, "Consumer.a.global.test.>", false, 1, 1);
+        sendReceive("global.test.1", true, "Consumer.a.global.test.>", false, 1, 2);
         sendReceive("global.test.1.2", true, "Consumer.a.global.test.>", false, 1, 1);
 
         destroyAllBrokers();