svn commit: r1771816 - in /qpid/java/trunk: systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java test-profiles/Java10UninvestigatedTestsExcludes

[rgodfrey]

Author: rgodfrey
Date: Mon Nov 28 21:18:50 2016
New Revision: 1771816

URL: http://svn.apache.org/viewvc?rev=1771816&view=rev
Log:
QPID-7546 : MessageConsumerCloseTest

Modified:
    
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java
    qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes

Modified: 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java?rev=1771816&r1=1771815&r2=1771816&view=diff
==============================================================================
--- 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java
 (original)
+++ 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/MessageConsumerCloseTest.java
 Mon Nov 28 21:18:50 2016
@@ -47,7 +47,7 @@ public class MessageConsumerCloseTest  e
         Connection connection = getConnection();
         connection.start();
         final Session session = connection.createSession(true, 
Session.SESSION_TRANSACTED);
-        Destination destination = getTestQueue();
+        Destination destination = createTestQueue(session);
         MessageConsumer consumer1 = session.createConsumer(destination);
         sendMessage(session, destination, 2);
 
@@ -74,7 +74,7 @@ public class MessageConsumerCloseTest  e
         Connection connection = getConnection();
         final CountDownLatch receiveLatch = new CountDownLatch(1);
         final Session session = connection.createSession(true, 
Session.SESSION_TRANSACTED);
-        Destination destination = getTestQueue();
+        Destination destination = createTestQueue(session);
         MessageConsumer consumer = session.createConsumer(destination);
         sendMessage(session, destination, 2);
         connection.start();
@@ -101,10 +101,16 @@ public class MessageConsumerCloseTest  e
         assertTrue("Message is not received", messageReceived);
 
         consumer = session.createConsumer(destination);
-        Message message1 = consumer.receive(1000l);
-        assertNotNull("message1 is not received", message1);
-        Message message2 = consumer.receive(1000l);
-        assertNotNull("message2 is not received", message2);
+        final CountDownLatch receiveLatch2 = new CountDownLatch(2);
+        consumer.setMessageListener(new MessageListener()
+        {
+            @Override
+            public void onMessage(Message message)
+            {
+                receiveLatch2.countDown();
+            }
+        });
+        assertTrue( receiveLatch2.await(1l, TimeUnit.SECONDS));
     }
 
     public void testPrefetchedMessagesReleasedOnConsumerClose() throws 
Exception
@@ -112,7 +118,7 @@ public class MessageConsumerCloseTest  e
         Connection connection = getConnection();
         final Session session = connection.createSession(true, 
Session.SESSION_TRANSACTED);
 
-        Destination destination = getTestQueue();
+        Destination destination = createTestQueue(session);
         MessageConsumer consumer = session.createConsumer(destination);
 
         sendMessage(session, destination, 3);
@@ -146,7 +152,7 @@ public class MessageConsumerCloseTest  e
         Connection connection = getConnection();
         final Session session = connection.createSession(true, 
Session.SESSION_TRANSACTED);
 
-        Destination destination = getTestQueue();
+        Destination destination = createTestQueue(session);
         MessageConsumer consumer = session.createConsumer(destination);
 
         int messageNumber = 4;

Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771816&r1=1771815&r2=1771816&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Mon Nov 28 
21:18:50 2016
@@ -41,7 +41,6 @@ org.apache.qpid.server.queue.LiveQueueOp
 org.apache.qpid.server.queue.ConsumerPriorityTest#*
 org.apache.qpid.server.queue.ArrivalTimeFilterTest#*
 org.apache.qpid.test.unit.topic.DurableSubscriptionTest#*
-org.apache.qpid.test.unit.close.MessageConsumerCloseTest#*
 org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
 org.apache.qpid.test.unit.client.MaxDeliveryCountTest#*
 org.apache.qpid.test.unit.client.connection.BrokerClosesClientConnectionTest#*



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org