svn commit: r1156835 - in /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs: AMQ1687Test.java AMQ1917Test.java

[ta...@apache.org]

Author: tabish
Date: Thu Aug 11 21:17:24 2011
New Revision: 1156835

URL: http://svn.apache.org/viewvc?rev=1156835&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-2411

remove some of the dependencies on port 61616 in current tests.

Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1687Test.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1687Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1687Test.java?rev=1156835&r1=1156834&r2=1156835&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1687Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1687Test.java Thu Aug 11 21:17:24 2011
@@ -39,7 +39,8 @@ public class AMQ1687Test extends Embedde
     @Override
     protected ConnectionFactory createConnectionFactory() throws Exception {
         //prefetch change is not required, but test will not fail w/o it, only spew errors in the AMQ log.
-        return new ActiveMQConnectionFactory(this.bindAddress+"?jms.prefetchPolicy.all=5");
+        return new ActiveMQConnectionFactory(
+                broker.getTransportConnectors().get(0).getPublishableConnectString() +"?jms.prefetchPolicy.all=5");
     }
 
     public void testVirtualTopicCreation() throws Exception {
@@ -91,7 +92,7 @@ public class AMQ1687Test extends Embedde
     }
 
     protected void setUp() throws Exception {
-        this.bindAddress="tcp://localhost:61616";
+        this.bindAddress="tcp://localhost:0";
         super.setUp();
     }
     protected void tearDown() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java?rev=1156835&r1=1156834&r2=1156835&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java Thu Aug 11 21:17:24 2011
@@ -54,7 +54,7 @@ public class AMQ1917Test extends TestCas
         private CountDownLatch roundTripLatch = new CountDownLatch(NUM_MESSAGES);
         private CountDownLatch errorLatch = new CountDownLatch(1);
         private ThreadPoolExecutor tpe;
-        private final String BROKER_URL = "tcp://localhost:61616";
+        private final String BROKER_URL = "tcp://localhost:0";
         private String connectionUri;
         private BrokerService broker = null;
         private boolean working = true;