From 2c73c3df8cf0cb02188952c01503b1c0a4dc14c5 Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Mon, 19 Oct 2009 15:28:29 +0000
Subject: [PATCH] resolve some timing issues with slow tests and potential jmx
 port clash

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@826700 13f79535-47bb-0310-9956-ffa450edef68
---
 .../activemq/QueueConsumerPriorityTest.java   |  4 ++--
 .../org/apache/activemq/bugs/AMQ2021Test.java |  2 +-
 .../activemq/security/SecurityJMXTest.java    | 20 +++++++++----------
 .../activemq/security/simple-auth-broker.xml  |  6 +++++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/activemq-core/src/test/java/org/apache/activemq/QueueConsumerPriorityTest.java b/activemq-core/src/test/java/org/apache/activemq/QueueConsumerPriorityTest.java
index 847a72c723..0154f0ebe9 100644
--- a/activemq-core/src/test/java/org/apache/activemq/QueueConsumerPriorityTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/QueueConsumerPriorityTest.java
@@ -79,9 +79,9 @@ public class QueueConsumerPriorityTest extends TestCase {
             Message msg = senderSession.createTextMessage("test");
             for (int i =0; i< 10000;i++) {
                 producer.send(msg);
-                Assert.assertNotNull("null on iteration: " + i, highConsumer.receive(200));
+                Assert.assertNotNull("null on iteration: " + i, highConsumer.receive(500));
             }
-            Assert.assertNull( lowConsumer.receive(500));
+            Assert.assertNull(lowConsumer.receive(2000));
             
            
         } finally {
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
index a89dba5696..ad1b0c6c8a 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
@@ -102,7 +102,7 @@ public class AMQ2021Test extends TestCase implements ExceptionListener, Uncaught
             c1.start();
         }
         
-        assertTrue(started.await(5, TimeUnit.SECONDS));
+        assertTrue(started.await(10, TimeUnit.SECONDS));
         
         Thread producer = new Thread() {
             @Override
diff --git a/activemq-core/src/test/java/org/apache/activemq/security/SecurityJMXTest.java b/activemq-core/src/test/java/org/apache/activemq/security/SecurityJMXTest.java
index 22c02883db..2bc781d8aa 100644
--- a/activemq-core/src/test/java/org/apache/activemq/security/SecurityJMXTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/security/SecurityJMXTest.java
@@ -48,16 +48,16 @@ public class SecurityJMXTest extends TestCase {
 	public void tearDown() throws Exception {
 	}
 
-	public void testMoveMessages() throws Exception {
-		JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi");
-		JMXConnector connector = JMXConnectorFactory.connect(url, null);
-		connector.connect();
-		MBeanServerConnection connection = connector.getMBeanServerConnection();
-		ObjectName name = new ObjectName("org.apache.activemq:BrokerName=localhost,Type=Queue,Destination=TEST.Q");
-		QueueViewMBean queueMbean = (QueueViewMBean) MBeanServerInvocationHandler.newProxyInstance(connection, name, QueueViewMBean.class, true);
-		String msgId = queueMbean.sendTextMessage("test", "system", "manager");
-		queueMbean.moveMessageTo(msgId, "TEST1.Q");
-	}
+    public void testMoveMessages() throws Exception {
+        JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:1199/jmxrmi");
+        JMXConnector connector = JMXConnectorFactory.connect(url, null);
+        connector.connect();
+        MBeanServerConnection connection = connector.getMBeanServerConnection();
+        ObjectName name = new ObjectName("org.apache.activemq:BrokerName=localhost,Type=Queue,Destination=TEST.Q");
+        QueueViewMBean queueMbean = (QueueViewMBean) MBeanServerInvocationHandler.newProxyInstance(connection, name, QueueViewMBean.class, true);
+        String msgId = queueMbean.sendTextMessage("test", "system", "manager");
+        queueMbean.moveMessageTo(msgId, "TEST1.Q");
+    }
 	
     protected BrokerService createBroker() throws Exception {
         return createBroker("org/apache/activemq/security/simple-auth-broker.xml");
diff --git a/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml b/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
index acba6cc0ac..54bf334a09 100644
--- a/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
@@ -22,6 +22,10 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">
+    <!-- Use a non-default port in case the default port is in use -->
+    <managementContext>
+      <managementContext connectorPort="1199"/>
+    </managementContext>
 
     <destinations>
       <queue physicalName="TEST.Q" />      
@@ -62,4 +66,4 @@
     </plugins>
   </broker>
 
-</beans>
\ No newline at end of file
+</beans>