You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/11/23 17:43:41 UTC

[40/48] activemq-artemis git commit: Fix TemporaryQueueClusterTest

Fix TemporaryQueueClusterTest


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

Branch: refs/heads/ARTEMIS-780
Commit: ef8848246125d825aaa6c79430218edf484305c3
Parents: 2244463
Author: jbertram <jb...@apache.com>
Authored: Mon Nov 21 17:09:00 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Wed Nov 23 09:04:36 2016 -0600

----------------------------------------------------------------------
 .../tests/integration/jms/cluster/TemporaryQueueClusterTest.java  | 3 +--
 .../apache/activemq/artemis/tests/util/JMSClusteredTestBase.java  | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ef884824/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
index c26cb85..ae3a93a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
@@ -28,8 +28,7 @@ import org.junit.Test;
 
 public class TemporaryQueueClusterTest extends JMSClusteredTestBase {
 
-   // TODO had to prefix this with "jms." to deal with cluster connection address match
-   public static final String QUEUE_NAME = "jms.target";
+   public static final String QUEUE_NAME = "target";
 
    // Constants -----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ef884824/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
index 30fdfd4..ac52d02 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
@@ -175,8 +175,6 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
                                                                    .addConnectorConfiguration(destinationLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(destination)))
                                                                    .addConnectorConfiguration(sourceLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(source)))
                                                                    .addClusterConfiguration(new ClusterConnectionConfiguration().setName(destinationLabel)
-                                                                                                                                // TODO should this be changed?
-                                                                                                                                .setAddress("jms")
                                                                                                                                 .setConnectorName(sourceLabel)
                                                                                                                                 .setRetryInterval(250)
                                                                                                                                 .setMaxHops(MAX_HOPS)