Author: orudyy
Date: Wed Aug 5 19:55:03 2015
New Revision: 1694307
URL: http://svn.apache.org/r1694307
Log:
QPID-3521: Fix failing test and remove
FailoverBehaviourTest#testFailoverWhenConnectionStopped from cpp excludes
Modified:
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
qpid/java/trunk/test-profiles/cpp.excludes
Modified:
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java?rev=1694307&r1=1694306&r2=1694307&view=diff
==============================================================================
---
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
(original)
+++
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
Wed Aug 5 19:55:03 2015
@@ -21,8 +21,6 @@
package org.apache.qpid.client;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
@@ -136,12 +134,6 @@ public class AMQSession_0_8Test extends
assertFalse("Unexpected unacknowledged message tags",
session.getUnacknowledgedMessageTags().isEmpty());
assertEquals("Unexpected consumers", new
HashSet<>(Arrays.asList(consumer1, consumer2)), new
HashSet<>(session.getConsumers()));
- // verify messages were not dispatched
- for (UnprocessedMessage message: messages )
- {
- verify(message, never()).dispatch(session);
- }
-
listener = new MockReceiveConnectionListener(_connection, 1,
new ExchangeDeclareOkBody(), // first producer resubscribe
new ExchangeDeclareOkBody(), // second producer resubscribe
@@ -158,12 +150,6 @@ public class AMQSession_0_8Test extends
assertTrue("Unexpected delivered message tags",
session.getDeliveredMessageTags().isEmpty());
assertTrue("Unexpected pre-fetched message tags",
session.getPrefetchedMessageTags().isEmpty());
assertEquals("Unexpected consumers", new
HashSet<>(Arrays.asList(consumer1, consumer2)), new
HashSet<>(session.getConsumers()));
-
- // verify dispatcher queue is drained
- for (UnprocessedMessage message: messages )
- {
- verify(message).dispatch(session);
- }
}
private UnprocessedMessage createMockMessage(long deliveryTag, int
consumerTag)
Modified: qpid/java/trunk/test-profiles/cpp.excludes
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/cpp.excludes?rev=1694307&r1=1694306&r2=1694307&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/cpp.excludes (original)
+++ qpid/java/trunk/test-profiles/cpp.excludes Wed Aug 5 19:55:03 2015
@@ -30,5 +30,3 @@ org.apache.qpid.test.client.message.JMSD
//BDB System Tests
org.apache.qpid.server.store.berkeleydb.*
-// test relies on Java Broker REST interfaces
-org.apache.qpid.client.failover.FailoverBehaviourTest.testFailoverWhenConnectionStopped
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
