Repository: qpid-jms Updated Branches: refs/heads/master 4b01adf3a -> 22a517d76
QPIDJMS-214: fixup and re-enable tests for QPIDJMS-201 following the proton-j update Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/22a517d7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/22a517d7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/22a517d7 Branch: refs/heads/master Commit: 22a517d76f67dcae61318ff858781066d6855ed3 Parents: 4b01adf Author: Robert Gemmell <rob...@apache.org> Authored: Fri Oct 14 19:19:44 2016 +0100 Committer: Robert Gemmell <rob...@apache.org> Committed: Fri Oct 14 19:21:11 2016 +0100 ---------------------------------------------------------------------- .../apache/qpid/jms/integration/ConsumerIntegrationTest.java | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/22a517d7/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java index a8fcf2d..ff12293 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java @@ -63,7 +63,6 @@ import org.apache.qpid.jms.test.testpeer.matchers.sections.MessageHeaderSectionM import org.apache.qpid.jms.test.testpeer.matchers.sections.TransferPayloadCompositeMatcher; import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.UnsignedInteger; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -794,13 +793,11 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase { doDrainWithNoResponseOnNoMessageTestImpl(true, false); } - @Ignore // TODO - Needs PROTON-1290 to be fully stable @Test(timeout=30000) public void testDurableReceiveWithTimoutAndNoDrainResponseFailsAfterTimeout() throws IOException, Exception { doDrainWithNoResponseOnNoMessageTestImpl(false, true); } - @Ignore // TODO - Needs PROTON-1290 to be fully stable @Test(timeout=30000) public void testDurableReceiveNoWaitAndNoDrainResponseFailsAfterTimeout() throws IOException, Exception { doDrainWithNoResponseOnNoMessageTestImpl(true, true); @@ -832,8 +829,6 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase { // Consumer should close due to timed waiting for drain. if (durable) { - // TODO - Bug in Proton-J causes extra flow to be emitted on detach. - testPeer.expectLinkFlow(true, false, equalTo(UnsignedInteger.valueOf(JmsDefaultPrefetchPolicy.DEFAULT_TOPIC_PREFETCH))); testPeer.expectDetach(false, true, true); } else { testPeer.expectDetach(true, true, true); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
