From be6b4830ecf96e68d0523615b378b4a5c3f99ff8 Mon Sep 17 00:00:00 2001
From: Timothy Bish <tabish121@gmai.com>
Date: Tue, 11 Feb 2014 10:17:49 -0500
Subject: [PATCH] AMQ-5041 fix mistaken change of test to the nio port and
 revert ignored tests.

---
 .../apache/activemq/transport/amqp/JMSClientTest.java  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
index 2e80e23aae..2d4df4fc9f 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
@@ -95,7 +95,6 @@ public class JMSClientTest extends AmqpTestSupport {
         connection.close();
     }
 
-    @Ignore("AMQ-5041")
     @Test
     public void testTransactedConsumer() throws Exception {
         ActiveMQAdmin.enableJMSFrameTracing();
@@ -127,7 +126,6 @@ public class JMSClientTest extends AmqpTestSupport {
         connection.close();
     }
 
-    @Ignore("AMQ-5041")
     @Test
     public void testRollbackRececeivedMessage() throws Exception {
 
@@ -172,7 +170,6 @@ public class JMSClientTest extends AmqpTestSupport {
         connection.close();
     }
 
-    @Ignore("AMQ-5041")
     @Test
     public void testTXConsumerAndLargeNumberOfMessages() throws Exception {
 
@@ -342,7 +339,6 @@ public class JMSClientTest extends AmqpTestSupport {
         }
     }
 
-    @Ignore("AMQ-5041")
     @Test(timeout=30000)
     public void testConsumerReceiveNoWaitThrowsWhenBrokerStops() throws Exception {
 
@@ -375,7 +371,6 @@ public class JMSClientTest extends AmqpTestSupport {
         }
     }
 
-    @Ignore("AMQ-5041")
     @Test(timeout=30000)
     public void testConsumerReceiveTimedThrowsWhenBrokerStops() throws Exception {
 
@@ -436,7 +431,6 @@ public class JMSClientTest extends AmqpTestSupport {
         }
     }
 
-    @Ignore("AMQ-5041")
     @Test(timeout=30000)
     public void testBrokerRestartWontHangConnectionClose() throws Exception {
 
@@ -461,7 +455,6 @@ public class JMSClientTest extends AmqpTestSupport {
         }
     }
 
-    @Ignore("AMQ-5041")
     @Test(timeout=120000)
     public void testProduceAndConsumeLargeNumbersOfMessages() throws JMSException {
 
@@ -712,7 +705,6 @@ public class JMSClientTest extends AmqpTestSupport {
         assertTrue("No exception listener event fired.", called.await(15, TimeUnit.SECONDS));
     }
 
-    @Ignore("AMQ-5041")
     @Test(timeout=30000)
     public void testSessionTransactedCommit() throws JMSException, InterruptedException {
         ActiveMQAdmin.enableJMSFrameTracing();
@@ -762,7 +754,7 @@ public class JMSClientTest extends AmqpTestSupport {
 
     private Connection createConnection(String clientId, boolean syncPublish) throws JMSException {
 
-        final ConnectionFactoryImpl factory = new ConnectionFactoryImpl("localhost", nioPort, "admin", "password");
+        final ConnectionFactoryImpl factory = new ConnectionFactoryImpl("localhost", port, "admin", "password");
 
         factory.setSyncPublish(syncPublish);
         factory.setTopicPrefix("topic://");