QPIDJMS-75: increase test timeouts to be more forgiving of sporadic slowdown on shared CI systems, now that they aren't mainly used to bound run time after 'expected' assertion failure
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/205c976c Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/205c976c Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/205c976c Branch: refs/heads/master Commit: 205c976ce53cdc2f99aab75f70a685ebdd327f65 Parents: 033f0a2 Author: Robert Gemmell <[email protected]> Authored: Mon Jun 22 16:48:34 2015 +0100 Committer: Robert Gemmell <[email protected]> Committed: Mon Jun 22 17:28:23 2015 +0100 ---------------------------------------------------------------------- .../BytesMessageIntegrationTest.java | 14 +-- .../ConnectionFactoryIntegrationTest.java | 6 +- .../integration/ConnectionIntegrationTest.java | 24 ++--- .../integration/ConsumerIntegrationTest.java | 6 +- .../FailedConnectionsIntegrationTest.java | 8 +- .../ForeignMessageIntegrationTest.java | 2 +- .../integration/IdleTimeoutIntegrationTest.java | 12 +-- .../integration/MapMessageIntegrationTest.java | 4 +- .../jms/integration/MessageIntegrationTest.java | 100 +++++++++---------- .../ObjectMessageIntegrationTest.java | 14 +-- .../integration/ProducerIntegrationTest.java | 30 +++--- .../jms/integration/SaslIntegrationTest.java | 26 ++--- .../jms/integration/SessionIntegrationTest.java | 100 +++++++++---------- .../jms/integration/SslIntegrationTest.java | 10 +- .../StreamMessageIntegrationTest.java | 4 +- .../integration/TextMessageIntegrationTest.java | 20 ++-- .../provider/amqp/AmqpProviderFactoryTest.java | 14 +-- .../jms/provider/amqp/AmqpProviderTest.java | 16 +-- 18 files changed, 205 insertions(+), 205 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java index 71fe052..a0a8d05 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java @@ -57,7 +57,7 @@ import org.junit.Test; public class BytesMessageIntegrationTest extends QpidJmsTestCase { private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendBasicBytesMessageWithContent() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -90,22 +90,22 @@ public class BytesMessageIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBytesMessageUsingDataSectionWithContentTypeOctectStream() throws Exception { doReceiveBasicBytesMessageUsingDataSectionTestImpl(AmqpMessageSupport.OCTET_STREAM_CONTENT_TYPE, true); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBytesMessageUsingDataSectionWithContentTypeOctectStreamNoTypeAnnotation() throws Exception { doReceiveBasicBytesMessageUsingDataSectionTestImpl(AmqpMessageSupport.OCTET_STREAM_CONTENT_TYPE, false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBasicBytesMessageUsingDataSectionWithContentTypeEmptyNoTypeAnnotation() throws Exception { doReceiveBasicBytesMessageUsingDataSectionTestImpl("", false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBasicBytesMessageUsingDataSectionWithContentTypeUnknownNoTypeAnnotation() throws Exception { doReceiveBasicBytesMessageUsingDataSectionTestImpl("type/unknown", false); } @@ -158,7 +158,7 @@ public class BytesMessageIntegrationTest extends QpidJmsTestCase { * resent that it results in the expected AMQP data body section and properties content type * being received by the test peer. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBytesMessageAndResendAfterResetAndPartialRead() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -266,7 +266,7 @@ public class BytesMessageIntegrationTest extends QpidJmsTestCase { * AMQP message containing a data body section and content type of * {@link AmqpMessageSupport#OCTET_STREAM_CONTENT_TYPE} */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBytesMessageWithAmqpValueAndResendResultsInData() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionFactoryIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionFactoryIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionFactoryIntegrationTest.java index d81a5c3..8fb6e9a 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionFactoryIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionFactoryIntegrationTest.java @@ -35,7 +35,7 @@ import org.junit.Test; public class ConnectionFactoryIntegrationTest extends QpidJmsTestCase { - @Test(timeout=5000) + @Test(timeout=20000) public void testCreateConnectionGoodProviderURI() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { // DONT create a test fixture, we will drive everything directly. @@ -46,7 +46,7 @@ public class ConnectionFactoryIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testCreateConnectionGoodProviderString() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { // DONT create a test fixture, we will drive everything directly. @@ -57,7 +57,7 @@ public class ConnectionFactoryIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testUriOptionsAppliedToConnection() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { // DONT create a test fixture, we will drive everything directly. http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java index c0dea10..772f89d 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java @@ -70,7 +70,7 @@ import org.junit.Test; public class ConnectionIntegrationTest extends QpidJmsTestCase { private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAndCloseConnection() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -79,7 +79,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConnectionWithClientId() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer, false, null, null, null, true); @@ -88,7 +88,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAutoAckSession() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -98,7 +98,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateTransactedSession() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -115,7 +115,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testConnectionMetaDataVersion() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -127,7 +127,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testConnectionPropertiesContainExpectedMetaData() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { @@ -149,18 +149,18 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testAmqpHostnameSetByDefault() throws Exception { doAmqpHostnameTestImpl("localhost", false, equalTo("localhost")); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testAmqpHostnameSetByVhostOption() throws Exception { String vhost = "myAmqpHost"; doAmqpHostnameTestImpl(vhost, true, equalTo(vhost)); } - @Test(timeout = 500000) + @Test(timeout = 20000) public void testAmqpHostnameNotSetWithEmptyVhostOption() throws Exception { doAmqpHostnameTestImpl("", true, nullValue()); } @@ -189,7 +189,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testRemotelyEndConnectionListenerInvoked() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { final CountDownLatch done = new CountDownLatch(1); @@ -218,7 +218,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testRemotelyEndConnectionWithRedirect() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { final CountDownLatch done = new CountDownLatch(1); @@ -266,7 +266,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testRemotelyEndConnectionWithSessionWithConsumer() throws Exception { final String BREAD_CRUMB = "ErrorMessage"; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/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 2d0cbaf..cf6e987 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 @@ -39,7 +39,7 @@ import org.junit.Test; public class ConsumerIntegrationTest extends QpidJmsTestCase { private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCloseConsumer() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -58,7 +58,7 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testRemotelyCloseConsumer() throws Exception { final String BREAD_CRUMB = "ErrorMessage"; @@ -106,7 +106,7 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase { * Test that a message is received when calling recieve with a timeout * of 0, which means wait indefinitely. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveMessageWithRecieveZeroTimeout() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/FailedConnectionsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/FailedConnectionsIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/FailedConnectionsIntegrationTest.java index 9e9ea80..202e5b5 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/FailedConnectionsIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/FailedConnectionsIntegrationTest.java @@ -48,7 +48,7 @@ import org.junit.Test; */ public class FailedConnectionsIntegrationTest extends QpidJmsTestCase { - @Test(timeout = 5000) + @Test(timeout = 20000) public void testConnectWithInvalidClientIdThrowsJMSEWhenInvalidContainerHintNotPresent() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { testPeer.rejectConnect(AmqpError.INVALID_FIELD, "Client ID already in use", null); @@ -65,7 +65,7 @@ public class FailedConnectionsIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testConnectWithInvalidClientIdThrowsICIDEWhenInvalidContainerHintPresent() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { final String remoteURI = "amqp://localhost:" + testPeer.getServerPort(); @@ -89,7 +89,7 @@ public class FailedConnectionsIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testConnectSecurityViolation() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { testPeer.rejectConnect(AmqpError.UNAUTHORIZED_ACCESS, "Anonymous connections not allowed", null); @@ -105,7 +105,7 @@ public class FailedConnectionsIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testConnectWithRedirect() throws Exception { Map<Symbol, Object> redirectInfo = new HashMap<Symbol, Object>(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java index d8fc116..77c2b05 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java @@ -41,7 +41,7 @@ import org.junit.Test; public class ForeignMessageIntegrationTest extends QpidJmsTestCase { private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendForeignBytesMessageWithContent() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java index b796226..b70c08d 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java @@ -49,7 +49,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { public static final Logger LOGGER = LoggerFactory.getLogger(IdleTimeoutIntegrationTest.class); - @Test(timeout = 5000) + @Test(timeout = 20000) public void testIdleTimeoutIsAdvertisedByDefault() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { testPeer.expectSaslAnonymousConnect(greaterThan(UnsignedInteger.valueOf(0)), null); @@ -69,7 +69,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testAdvertisedIdleTimeoutIsHalfOfActualTimeoutValue() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { int configuredTimeout = 54320; @@ -92,7 +92,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testClientSendsEmptyFramesWhenPeerAdvertisesIdleTimeout() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { int period = 20; @@ -128,7 +128,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { //TODO: Could use JUnit categories to make this slowish test skipable? // If so, make it slower still and more granular. - @Test(timeout = 5000) + @Test(timeout = 20000) public void testClientSendsEmptyFramesWithExpectedFrequency() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { int period = 250; @@ -163,7 +163,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testConnectionSetFailedWhenPeerNeglectsToSendEmptyFrames() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { int configuredTimeout = 200; @@ -194,7 +194,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testConnectionNotMarkedFailedWhenPeerSendsEmptyFrames() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { int configuredTimeout = 1000; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java index 0351ab8..a31b37a 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java @@ -58,7 +58,7 @@ public class MapMessageIntegrationTest extends QpidJmsTestCase { * a map which holds entries of the various supported entry types is returned as a * {@link MapMessage}, and verify the values can all be retrieved as expected. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBasicMapMessage() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -147,7 +147,7 @@ public class MapMessageIntegrationTest extends QpidJmsTestCase { * This doesn't happen in the above test as the reversed roles mean it is protons DecoderImpl doing the decoding * and it does a similarly ugly cast on the integer value to char before output. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendBasicMapMessage() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java index 1a1c426..8206d72 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java @@ -101,7 +101,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase //==== Application Properties Section ==== //======================================== - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSendMessageWithApplicationProperties() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -156,7 +156,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase } } - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceiveMessageWithApplicationProperties() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -213,12 +213,12 @@ public class MessageIntegrationTest extends QpidJmsTestCase } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveMessageWithInvalidPropertyName() throws Exception { doReceiveMessageWithInvalidPropertyNameTestImpl(false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveMessageWithInvalidPropertyNameAndWithValidationDisabled() throws Exception { doReceiveMessageWithInvalidPropertyNameTestImpl(true); } @@ -265,12 +265,12 @@ public class MessageIntegrationTest extends QpidJmsTestCase } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendMessageWithInvalidPropertyName() throws Exception { doSendMessageWithInvalidPropertyNameTestImpl(false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendMessageWithInvalidPropertyNameAndWithValidationDisabled() throws Exception { doSendMessageWithInvalidPropertyNameTestImpl(true); } @@ -331,7 +331,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * one sent by a non-JMS client) is handled by making the JMSDestination method simply * return the Queue Destination used to create the consumer that received the message. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageFromQueueWithoutToResultsInUseOfConsumerDestinationQueue() throws Exception { receivedMessageFromQueueWithoutToResultsInUseOfConsumerDestinationImpl(true); } @@ -341,7 +341,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * one sent by a non-JMS client) is handled by making the JMSDestination method simply * return the Topic Destination used to create the consumer that received the message. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageFromQueueWithoutToResultsInUseOfConsumerDestinationTopic() throws Exception { receivedMessageFromQueueWithoutToResultsInUseOfConsumerDestinationImpl(false); } @@ -396,7 +396,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that lack of the reply-to set on a message results in it returning null for JMSReplyTo * and not the consumer destination as happens for JMSDestination. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageFromQueueWithNoReplyToReturnsNull() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -431,7 +431,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the a connection with a 'topic prefix' set on it strips the * prefix from the content of the to/reply-to fields for incoming messages. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithTopicDestinationsOnConnectionWithTopicPrefix() throws Exception { Class<? extends Destination> destType = Topic.class; String destPrefix = "t12321-"; @@ -454,7 +454,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * prefix from the content of the to/reply-to fields for incoming messages * if they don't have the 'destination type annotation' set. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithNoTypeAnnotationAndTopicDestinationsOnConnectionWithTopicPrefix() throws Exception { Class<? extends Destination> destType = Topic.class; String destPrefix = "t12321-"; @@ -476,7 +476,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the a connection with a 'queue prefix' set on it strips the * prefix from the content of the to/reply-to fields for incoming messages. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithQueueDestinationsOnConnectionWithQueuePrefix() throws Exception { Class<? extends Destination> destType = Queue.class; String destPrefix = "q12321-"; @@ -499,7 +499,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * prefix from the content of the to/reply-to fields for incoming messages * if they don't have the 'destination type annotation' set. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithNoTypeAnnotationAndQueueDestinationsOnConnectionWithQueuePrefix() throws Exception { Class<? extends Destination> destType = Queue.class; String destPrefix = "q12321-"; @@ -521,7 +521,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that a connection with a 'prefixes' set on its does not alter the * address for a temporary queue in the to/reply-to fields for incoming messages. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithTemporaryQueueDestinationsOnConnectionWithPrefixes() throws Exception { Class<? extends Destination> destType = TemporaryQueue.class; String destPrefix = "q12321-"; @@ -543,7 +543,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that a connection with a 'prefixes' set on its does not alter the * address for a temporary queue in the to/reply-to fields for incoming messages. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithTemporaryTopicDestinationsOnConnectionWithPrefixes() throws Exception { Class<? extends Destination> destType = TemporaryTopic.class; String destPrefix = "q12321-"; @@ -670,7 +670,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the a connection with a 'topic prefix' set on it adds the * prefix to the content of the to/reply-to fields for outgoing messages. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSendMessageWithTopicDestinationsOnConnectionWithTopicPrefix() throws Exception { Class<? extends Destination> destType = Topic.class; String destPrefix = "t12321-"; @@ -685,7 +685,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the a connection with a 'queue prefix' set on it adds the * prefix to the content of the to/reply-to fields for outgoing messages. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSendMessageWithQueueDestinationsOnConnectionWithQueuePrefix() throws Exception { Class<? extends Destination> destType = Queue.class; String destPrefix = "q12321-"; @@ -700,7 +700,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the a connection with 'destination prefixes' set on it does not add * the prefix to the content of the to/reply-to fields for TemporaryQueues. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSendMessageWithTemporaryQueueDestinationsOnConnectionWithDestinationPrefixes() throws Exception { Class<? extends Destination> destType = TemporaryQueue.class; String destPrefix = "q12321-"; @@ -715,7 +715,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the a connection with 'destination prefixes' set on it does not add * the prefix to the content of the to/reply-to fields for TemporaryTopics. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSendMessageWithTemporaryTopicDestinationsOnConnectionWithDestinationPrefixes() throws Exception { Class<? extends Destination> destType = TemporaryTopic.class; String destPrefix = "q12321-"; @@ -806,7 +806,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that a connection with 'prefixes' set on it via broker-provided connection properties * strips the prefix from the to/reply-to fields for incoming messages with Topic destinations. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithTopicDestinationsOnConnectionWithBrokerDefinedPrefixProperties() throws Exception { Class<? extends Destination> destType = Topic.class; String destPrefix = "t-broker-provided-prefix-"; @@ -828,7 +828,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that a connection with 'prefixes' set on it via broker-provided connection properties * strips the prefix from the to/reply-to fields for incoming messages with Queue destinations. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithQueueDestinationsOnConnectionWithBrokerDefinedPrefixProperties() throws Exception { Class<? extends Destination> destType = Queue.class; String destPrefix = "q-broker-provided-prefix-"; @@ -935,7 +935,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the a connection with a 'queue prefix' set on it via broker-provided connection * properties adds the prefix to the content of the to/reply-to fields for outgoing messages. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSendMessageWithQueueDestinationsOnConnectionWithBrokerDefinedPrefixProperties() throws Exception { Class<? extends Destination> destType = Queue.class; String destPrefix = "q-broker-provided-prefix-"; @@ -950,7 +950,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the a connection with a 'topic prefix' set on it via broker-provided connection * properties adds the prefix to the content of the to/reply-to fields for outgoing messages. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSendMessageWithTopicDestinationsOnConnectionWithBrokerDefinedPrefixProperties() throws Exception { Class<? extends Destination> destType = Topic.class; String destPrefix = "t-broker-provided-prefix-"; @@ -1032,7 +1032,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * on a message to indicate type of its 'reply-to' address results in it * being classed as the same type as the consumer destination. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageFromTopicWithReplyToWithoutTypeAnnotationResultsInUseOfConsumerDestinationType() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1073,7 +1073,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the {@link AmqpDestinationHelper#JMS_DEST_TYPE_MSG_ANNOTATION_SYMBOL_NAME} is set as a byte on * a sent message to indicate its 'to' address represents a Topic JMSDestination. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSentMessageContainsToTypeAnnotationByte() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1110,7 +1110,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that the {@link AmqpDestinationHelper#JMS_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME} is set as a byte on * a sent message to indicate its 'reply-to' address represents a Topic JMSDestination. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSentMessageContainsReplyToTypeAnnotationByte() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1155,7 +1155,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * indicate its 'to' address represents a Topic results in the JMSDestination object being a * Topic. Ensure the consumers destination is not used by consuming from a Queue. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageFromQueueWithToLegacyTypeAnnotationForTopic() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1197,7 +1197,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * indicate its 'reply-to' address represents a Topic results in the JMSReplyTo object being a * Topic. Ensure the consumers destination is not used by consuming from a Queue. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageFromQueueWithLegacyReplyToTypeAnnotationForTopic() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1240,7 +1240,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that lack of the absolute-expiry-time and ttl fields on a message results * in it returning 0 for for JMSExpiration */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageFromQueueWithNoAbsoluteExpiryOrTtlReturnsJMSExpirationZero() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1273,7 +1273,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that setting a non-zero value in the absolute-expiry-time field on a * message results in it returning this value for JMSExpiration */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageFromQueueWithAbsoluteExpiryReturnsJMSExpirationNonZero() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1308,7 +1308,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase //==== MessageID and CorrelationID Handling ==== //============================================== - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceiveMessageWithoutMessageId() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1337,7 +1337,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that receiving a message with a string typed message-id results in returning the * expected value for JMSMessageId where the JMS "ID:" prefix has been added. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithStringMessageIdReturnsExpectedJMSMessageID() throws Exception { receivedMessageWithMessageIdTestImpl("myTestMessageIdString"); } @@ -1346,7 +1346,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that receiving a message with a UUID typed message-id results in returning the * expected value for JMSMessageId where the JMS "ID:" prefix has been added to the UUID.tostring() */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithUUIDMessageIdReturnsExpectedJMSMessageID() throws Exception { receivedMessageWithMessageIdTestImpl(UUID.randomUUID()); } @@ -1355,7 +1355,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that receiving a message with a ulong typed message-id results in returning the * expected value for JMSMessageId where the JMS "ID:" prefix has been added to the UnsignedLong.tostring() */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithUnsignedLongMessageIdReturnsExpectedJMSMessageID() throws Exception { receivedMessageWithMessageIdTestImpl(UnsignedLong.valueOf(123456789L)); } @@ -1364,7 +1364,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that receiving a message with a binary typed message-id results in returning the * expected value for JMSMessageId where the JMS "ID:" prefix has been added to the hex representation of the binary. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithBinaryMessageIdReturnsExpectedJMSMessageID() throws Exception { receivedMessageWithMessageIdTestImpl(new Binary(new byte[]{(byte)0x02, (byte)0x20, (byte) 0xAE, (byte) 0x00})); } @@ -1403,7 +1403,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that receiving a message with a string typed correlation-id results in returning the * expected value for JMSCorrelationID where the JMS "ID:" prefix has been added. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithStringCorrelationIdReturnsExpectedJMSCorrelationID() throws Exception { receivedMessageWithCorrelationIdTestImpl("myTestCorrelationIdString", false); } @@ -1413,7 +1413,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * application-specific value, results in returning the expected value for JMSCorrelationID * where the JMS "ID:" prefix has NOT been added. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithAppSpecificStringCorrelationIdReturnsExpectedJMSCorrelationID() throws Exception { receivedMessageWithCorrelationIdTestImpl("myTestCorrelationIdString", true); } @@ -1422,7 +1422,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that receiving a message with a UUID typed correlation-id results in returning the * expected value for JMSCorrelationID where the JMS "ID:" prefix has been added to the UUID.tostring() */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithUUIDCorrelationIdReturnsExpectedJMSCorrelationID() throws Exception { receivedMessageWithCorrelationIdTestImpl(UUID.randomUUID(), false); } @@ -1431,7 +1431,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * Tests that receiving a message with a UUID typed correlation-id results in returning the * expected value for JMSCorrelationID where the JMS "ID:" prefix has been added to the UUID.tostring() */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithLongCorrelationIdReturnsExpectedJMSCorrelationID() throws Exception { receivedMessageWithCorrelationIdTestImpl(UnsignedLong.valueOf(123456789L), false); } @@ -1482,7 +1482,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * where the type is uuid, the "ID:" prefix of the JMSCorrelationID value is (obviously) not present, and there is * no presence of the message annotation to indicate an app-specific correlation-id. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSentMessageWithUUIDCorrelationId() throws Exception { UUID uuid = UUID.randomUUID(); String stringCorrelationId = AmqpMessageIdHelper.JMS_ID_PREFIX + AmqpMessageIdHelper.AMQP_UUID_PREFIX + uuid.toString(); @@ -1495,7 +1495,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * where the type is binary, the "ID:" prefix of the JMSCorrelationID value is (obviously) not present, and there is * no presence of the message annotation to indicate an app-specific correlation-id. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSentMessageWithBinaryCorrelationId() throws Exception { Binary bin = new Binary(new byte[]{(byte)0x01, (byte)0x23, (byte) 0xAF, (byte) 0x00}); @@ -1509,7 +1509,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * where the type is ulong, the "ID:" prefix of the JMSCorrelationID value is (obviously) not present, and there is * no presence of the message annotation to indicate an app-specific correlation-id. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSentMessageWithUlongCorrelationId() throws Exception { UnsignedLong ulong = UnsignedLong.valueOf(Long.MAX_VALUE); String stringCorrelationId = AmqpMessageIdHelper.JMS_ID_PREFIX + AmqpMessageIdHelper.AMQP_ULONG_PREFIX + ulong.toString(); @@ -1522,7 +1522,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * where the "ID:" prefix of the JMSCorrelationID value is not present, and there is * no presence of the message annotation to indicate an app-specific correlation-id. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSentMessageWithStringCorrelationId() throws Exception { String stringCorrelationId = "ID:myTestMessageIdString"; String underlyingCorrelationId = "myTestMessageIdString"; @@ -1534,7 +1534,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * app-specific results in an AMQP message with the expected encoding of the correlation-id, * and the presence of the message annotation to indicate an app-specific correlation-id. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSentMessageWithAppSpecificStringCorrelationId() throws Exception { String stringCorrelationId = "myTestAppSpecificString"; sentMessageWithCorrelationIdTestImpl(stringCorrelationId, stringCorrelationId, true); @@ -1588,7 +1588,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * uses the result of calling getJMSMessageID as the value for setJMSCorrelationId results in * transmission of the expected AMQP message content. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithStringMessageIdAndSendValueAsCorrelationId() throws Exception { recieveMessageIdSendCorrelationIdTestImpl("myStringMessageId"); } @@ -1598,7 +1598,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * uses the result of calling getJMSMessageID as the value for setJMSCorrelationId results in * transmission of the expected AMQP message content. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithUUIDMessageIdAndSendValueAsCorrelationId() throws Exception { recieveMessageIdSendCorrelationIdTestImpl(UUID.randomUUID()); } @@ -1608,7 +1608,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * uses the result of calling getJMSMessageID as the value for setJMSCorrelationId results in * transmission of the expected AMQP message content. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithUlongMessageIdAndSendValueAsCorrelationId() throws Exception { recieveMessageIdSendCorrelationIdTestImpl(UnsignedLong.valueOf(123456789L)); } @@ -1618,7 +1618,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * uses the result of calling getJMSMessageID as the value for setJMSCorrelationId results in * transmission of the expected AMQP message content. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithBinaryMessageIdAndSendValueAsCorrelationId() throws Exception { recieveMessageIdSendCorrelationIdTestImpl(new Binary(new byte[]{(byte)0x00, (byte)0xCD, (byte) 0xEF, (byte) 0x01})); } @@ -1689,7 +1689,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * fields of the AMQP properties section set, that the expected JMSX or JMS_AMQP properties * are present, and the expected values are returned when retrieved from the JMS message. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testReceivedMessageWithGroupRelatedPropertiesSet() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1764,7 +1764,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase * properties of the JMS message set, that the expected values are included in the fields of * the AMQP message emitted. */ - @Test(timeout = 2000) + @Test(timeout = 20000) public void testSendMessageWithGroupRelatedPropertiesSet() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java index cc3b29f..b31ad06 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java @@ -62,17 +62,17 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase //==== Java serialization encoding ==== - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendBasicObjectMessageWithSerializedContent() throws Exception { doSendBasicObjectMessageWithSerializedContentTestImpl("myObjectString", false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendBasicObjectMessageWithSerializedContentExplicitNull() throws Exception { doSendBasicObjectMessageWithSerializedContentTestImpl(null, true); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendBasicObjectMessageWithSerializedContentImplicitNull() throws Exception { doSendBasicObjectMessageWithSerializedContentTestImpl(null, false); } @@ -118,7 +118,7 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBasicObjectMessageWithSerializedContent() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -164,7 +164,7 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveAndThenResendBasicObjectMessageWithSerializedContent() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -226,7 +226,7 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase //==== AMQP type system encoding ==== - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendBasicObjectMessageWithAmqpTypedContent() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -263,7 +263,7 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testRecieveBasicObjectMessageWithAmqpTypedContentAndJMSMessageTypeAnnotation() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java index 885c5e9..1d3994d 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java @@ -57,7 +57,7 @@ import org.junit.Test; public class ProducerIntegrationTest extends QpidJmsTestCase { private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); - @Test(timeout = 10000) + @Test(timeout = 20000) public void testCloseSender() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -75,7 +75,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testDefaultDeliveryModeProducesDurableMessages() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -104,7 +104,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testProducerOverridesMessageDeliveryMode() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -142,7 +142,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { * Test that when a message is sent the JMSDestination header is set to * the Destination used by the producer. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendingMessageSetsJMSDestination() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -177,7 +177,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testSendingMessageSetsJMSTimestamp() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -221,7 +221,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { * Test that after sending a message with the disableMessageTimestamp hint set, the * message object has a 0 JMSTimestamp value, and no creation-time field value was set. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendingMessageWithDisableMessageTimestampHint() throws Exception { try(TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -258,7 +258,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testSendingMessageSetsJMSExpirationRelatedAbsoluteExpiryAndTtlFields() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -274,7 +274,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { long ttl = 100_000; Date expirationLower = new Date(currentTime + ttl); - Date expirationUpper = new Date(currentTime + ttl + 3000); + Date expirationUpper = new Date(currentTime + ttl + 5000); // Create matcher to expect the absolute-expiry-time field of the properties section to // be set to a value greater than 'now'+ttl, within a delta. @@ -302,12 +302,12 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testSendingMessageWithJMS_AMQP_TTLSetPositive() throws Exception { sendingMessageWithJMS_AMQP_TTLSetTestImpl(100_000, 20_000); } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testSendingMessageWithJMS_AMQP_TTLSetZero() throws Exception { sendingMessageWithJMS_AMQP_TTLSetTestImpl(50_000, 0); } @@ -363,7 +363,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { * Test that when a message is sent with default priority of 4, the emitted AMQP message has no value in the header * priority field, since the default for that field is already 4. */ - @Test(timeout = 10000) + @Test(timeout = 20000) public void testDefaultPriorityProducesMessagesWithoutPriorityField() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -399,7 +399,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { * Test that when a message is sent with a non-default priority, the emitted AMQP message has that value in the * header priority field, and the JMS message has had JMSPriority set. */ - @Test(timeout = 10000) + @Test(timeout = 20000) public void testNonDefaultPriorityProducesMessagesWithPriorityFieldAndSetsJMSPriority() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -437,7 +437,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { * Test that upon sending a message, the sender sets the JMSMessageID on the Message object, * and that the value is included in the AMQP message sent by the client. */ - @Test(timeout = 10000) + @Test(timeout = 20000) public void testSendingMessageSetsJMSMessageID() throws Exception { try(TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -483,7 +483,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { * Test that after sending a message with the disableMessageID hint set, the message * object has a null JMSMessageID value, and no message-id field value was set. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendingMessageWithDisableMessageIDHint() throws Exception { try(TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -520,7 +520,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testRemotelyCloseProducer() throws Exception { final String BREAD_CRUMB = "ErrorMessage"; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java index a18f2d2..db5d85a 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java @@ -50,7 +50,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase { private static final String CLIENT_JKS_TRUSTSTORE = "src/test/resources/client-jks.truststore"; private static final String PASSWORD = "password"; - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSaslExternalConnection() throws Exception { TransportSslOptions sslOptions = new TransportSslOptions(); sslOptions.setKeyStoreLocation(BROKER_JKS_KEYSTORE); @@ -85,7 +85,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSaslPlainConnection() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { @@ -110,7 +110,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSaslAnonymousConnection() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { // Expect an ANOYMOUS connection @@ -135,22 +135,22 @@ public class SaslIntegrationTest extends QpidJmsTestCase { * Add a small delay after the SASL process fails, test peer will throw if * any unexpected frames arrive, such as erroneous open+close. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testWaitForUnexpectedFramesAfterSaslFailure() throws Exception { doMechanismSelectedTestImpl(null, null, ANONYMOUS, new Symbol[] {ANONYMOUS}, true); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testAnonymousSelectedWhenNoCredentialsWereSupplied() throws Exception { doMechanismSelectedTestImpl(null, null, ANONYMOUS, new Symbol[] {CRAM_MD5, PLAIN, ANONYMOUS}, false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testAnonymousSelectedWhenNoPasswordWasSupplied() throws Exception { doMechanismSelectedTestImpl("username", null, ANONYMOUS, new Symbol[] {CRAM_MD5, PLAIN, ANONYMOUS}, false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCramMd5SelectedWhenCredentialsPresent() throws Exception { doMechanismSelectedTestImpl("username", "password", CRAM_MD5, new Symbol[] {CRAM_MD5, PLAIN, ANONYMOUS}, false); } @@ -178,12 +178,12 @@ public class SaslIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testExternalSelectedWhenLocalPrincipalPresent() throws Exception { doMechanismSelectedExternalTestImpl(true, EXTERNAL, new Symbol[] {EXTERNAL, ANONYMOUS}); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testExternalNotSelectedWhenLocalPrincipalMissing() throws Exception { doMechanismSelectedExternalTestImpl(false, ANONYMOUS, new Symbol[] {EXTERNAL, ANONYMOUS}); } @@ -223,7 +223,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSaslLayerDisabledConnection() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { // Expect a connection with no SASL layer. @@ -244,7 +244,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testRestrictSaslMechanismsWithSingleMech() throws Exception { // Check PLAIN gets picked when we don't specify a restriction doMechanismSelectionRestrictedTestImpl("username", "password", PLAIN, new Symbol[] { PLAIN, ANONYMOUS}, null); @@ -253,7 +253,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase { doMechanismSelectionRestrictedTestImpl("username", "password", ANONYMOUS, new Symbol[] { PLAIN, ANONYMOUS}, "ANONYMOUS"); } - @Test(timeout = 10000) + @Test(timeout = 20000) public void testRestrictSaslMechanismsWithMultipleMechs() throws Exception { // Check CRAM-MD5 gets picked when we dont specify a restriction doMechanismSelectionRestrictedTestImpl("username", "password", CRAM_MD5, new Symbol[] {CRAM_MD5, PLAIN, ANONYMOUS}, null); @@ -262,7 +262,7 @@ public class SaslIntegrationTest extends QpidJmsTestCase { doMechanismSelectionRestrictedTestImpl("username", "password", PLAIN, new Symbol[] { CRAM_MD5, PLAIN, ANONYMOUS}, "PLAIN,ANONYMOUS"); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testRestrictSaslMechanismsWithMultipleMechsNoPassword() throws Exception { // Check ANONYMOUS gets picked when we specify a restriction with multiple mechs but don't give a password doMechanismSelectionRestrictedTestImpl("username", null, ANONYMOUS, new Symbol[] { CRAM_MD5, PLAIN, ANONYMOUS}, "PLAIN,ANONYMOUS"); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java index e87c34d..803d1c4 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java @@ -86,7 +86,7 @@ import org.junit.Test; public class SessionIntegrationTest extends QpidJmsTestCase { private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCloseSession() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -98,7 +98,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateProducer() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -113,7 +113,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateProducerLinkSupportsAcceptedAndRejectedOutcomes() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -139,7 +139,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConsumer() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -159,12 +159,12 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConsumerFailsWhenLinkRefusedAndAttachResponseWriteIsNotDeferred() throws Exception { doCreateConsumerFailsWhenLinkRefusedTestImpl(false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConsumerFailsWhenLinkRefusedAndAttachResponseWriteIsDeferred() throws Exception { doCreateConsumerFailsWhenLinkRefusedTestImpl(true); } @@ -202,22 +202,22 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateTemporaryQueueFailsWhenLinkRefusedAndAttachResponseWriteIsNotDeferred() throws Exception { doCreateTemporaryDestinationFailsWhenLinkRefusedTestImpl(false, false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateTemporaryQueueFailsWhenLinkRefusedAndAttachResponseWriteIsDeferred() throws Exception { doCreateTemporaryDestinationFailsWhenLinkRefusedTestImpl(false, true); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateTemporaryTopicFailsWhenLinkRefusedAndAttachResponseWriteIsNotDeferred() throws Exception { doCreateTemporaryDestinationFailsWhenLinkRefusedTestImpl(true, false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateTemporaryTopicFailsWhenLinkRefusedAndAttachResponseWriteIsDeferred() throws Exception { doCreateTemporaryDestinationFailsWhenLinkRefusedTestImpl(true, true); } @@ -253,7 +253,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateTemporaryQueue() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -274,7 +274,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAndDeleteTemporaryQueue() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -295,7 +295,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateTemporaryTopic() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -316,7 +316,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAndDeleteTemporaryTopic() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -337,22 +337,22 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConsumerSourceContainsQueueCapability() throws Exception { doCreateConsumerSourceContainsCapabilityTestImpl(Queue.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConsumerSourceContainsTopicCapability() throws Exception { doCreateConsumerSourceContainsCapabilityTestImpl(Topic.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConsumerSourceContainsTempQueueCapability() throws Exception { doCreateConsumerSourceContainsCapabilityTestImpl(TemporaryQueue.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConsumerSourceContainsTempTopicCapability() throws Exception { doCreateConsumerSourceContainsCapabilityTestImpl(TemporaryTopic.class); } @@ -398,22 +398,22 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateProducerTargetContainsQueueCapability() throws Exception { doCreateProducerTargetContainsCapabilityTestImpl(Queue.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateProducerTargetContainsTopicCapability() throws Exception { doCreateProducerTargetContainsCapabilityTestImpl(Topic.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateProducerTargetContainsTempQueueCapability() throws Exception { doCreateProducerTargetContainsCapabilityTestImpl(TemporaryQueue.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateProducerTargetContainsTempTopicCapability() throws Exception { doCreateProducerTargetContainsCapabilityTestImpl(TemporaryTopic.class); } @@ -456,7 +456,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerTargetContainsNoTypeCapabilityWhenAnonymousRelayNodeIsSupported() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { @@ -486,22 +486,22 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerTargetContainsQueueCapabilityWhenAnonymousRelayNodeIsNotSupported() throws Exception { doCreateAnonymousProducerTargetContainsCapabilityWhenAnonymousRelayNodeIsNotSupportedTestImpl(Queue.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerTargetContainsTopicCapabilityWhenAnonymousRelayNodeIsNotSupported() throws Exception { doCreateAnonymousProducerTargetContainsCapabilityWhenAnonymousRelayNodeIsNotSupportedTestImpl(Topic.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerTargetContainsTempQueueCapabilityWhenAnonymousRelayNodeIsNotSupported() throws Exception { doCreateAnonymousProducerTargetContainsCapabilityWhenAnonymousRelayNodeIsNotSupportedTestImpl(TemporaryQueue.class); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerTargetContainsTempTopicCapabilityWhenAnonymousRelayNodeIsNotSupported() throws Exception { doCreateAnonymousProducerTargetContainsCapabilityWhenAnonymousRelayNodeIsNotSupportedTestImpl(TemporaryQueue.class); } @@ -571,7 +571,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateDurableTopicSubscriber() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -596,7 +596,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateDurableTopicSubscriberFailsIfConnectionDoesntHaveExplicitClientID() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { // Create a connection without an explicit clientId @@ -622,7 +622,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCloseDurableTopicSubscriberDetachesWithCloseFalse() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -647,7 +647,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerWhenAnonymousRelayNodeIsSupported() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { //Add capability to indicate support for ANONYMOUS-RELAY @@ -695,12 +695,12 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerFailsWhenAnonymousRelayNodeIsSupportedButLinkRefusedAndAttachResponseWriteIsNotDeferred() throws Exception { doCreateAnonymousProducerFailsWhenAnonymousRelayNodeIsSupportedButLinkRefusedTestImpl(false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerFailsWhenAnonymousRelayNodeIsSupportedButLinkRefusedAndAttachResponseWriteIsDeferred() throws Exception { doCreateAnonymousProducerFailsWhenAnonymousRelayNodeIsSupportedButLinkRefusedTestImpl(true); } @@ -737,12 +737,12 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateProducerFailsWhenLinkRefusedAndAttachResponseWriteIsNotDeferred() throws Exception { doCreateProducerFailsWhenLinkRefusedTestImpl(false); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateProducerFailsWhenLinkRefusedAndAttachResponseWriteIsDeferred() throws Exception { doCreateProducerFailsWhenLinkRefusedTestImpl(true); } @@ -780,7 +780,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAnonymousProducerWhenAnonymousRelayNodeIsNotSupported() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { @@ -833,12 +833,12 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testCommitTransactedSessionWithConsumerReceivingAllMessages() throws Exception { doCommitTransactedSessionWithConsumerTestImpl(1, 1); } - @Test(timeout=5000) + @Test(timeout=20000) public void testCommitTransactedSessionWithConsumerReceivingSomeMessages() throws Exception { doCommitTransactedSessionWithConsumerTestImpl(5, 2); } @@ -898,7 +898,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testIncomingMessageExceedsMaxRedeliveries() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { final int COUNT = 5; @@ -933,7 +933,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testProducedMessagesOnTransactedSessionCarryTxnId() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -980,12 +980,12 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testRollbackTransactedSessionWithConsumerReceivingAllMessages() throws Exception { doRollbackTransactedSessionWithConsumerTestImpl(1, 1); } - @Test(timeout=5000) + @Test(timeout=20000) public void testRollbackTransactedSessionWithConsumerReceivingSomeMessages() throws Exception { doRollbackTransactedSessionWithConsumerTestImpl(5, 2); } @@ -1057,7 +1057,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testRollbackTransactedSessionWithPrefetchFullBeforeStoppingConsumer() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1131,7 +1131,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testRollbackTransactedSessionWithPrefetchFullyUtilisedByDrainWhenStoppingConsumer() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1210,7 +1210,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testDefaultOutcomeIsModifiedForConsumerSourceOnTransactedSession() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1240,7 +1240,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout=5000) + @Test(timeout=20000) public void testPrefetchPolicyInfluencesCreditFlow() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1262,7 +1262,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testRemotelyEndSessionWithProducer() throws Exception { final String BREAD_CRUMB = "ErrorMessage"; @@ -1317,7 +1317,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testRemotelyEndSessionWithConsumer() throws Exception { final String BREAD_CRUMB = "ErrorMessage"; @@ -1371,7 +1371,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCloseSessionWithConsumerThatRemoteDetaches() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -1397,7 +1397,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCloseSessionWithConsumerThatRemoteDetachesWithUnackedMessages() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java index 9ace420..19464e9 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java @@ -62,7 +62,7 @@ public class SslIntegrationTest extends QpidJmsTestCase { private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAndCloseSslConnection() throws Exception { TransportSslOptions sslOptions = new TransportSslOptions(); sslOptions.setKeyStoreLocation(BROKER_JKS_KEYSTORE); @@ -84,7 +84,7 @@ public class SslIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAndCloseSslConnectionWithClientAuth() throws Exception { TransportSslOptions sslOptions = new TransportSslOptions(); sslOptions.setKeyStoreLocation(BROKER_JKS_KEYSTORE); @@ -111,7 +111,7 @@ public class SslIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateAndCloseSslConnectionWithAlias() throws Exception { doConnectionWithAliasTestImpl(CLIENT_KEY_ALIAS, CLIENT_DN); doConnectionWithAliasTestImpl(CLIENT2_KEY_ALIAS, CLIENT2_DN); @@ -152,12 +152,12 @@ public class SslIntegrationTest extends QpidJmsTestCase { } } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConnectionWithAliasThatDoesNotExist() throws Exception { doCreateConnectionWithInvalidAliasTestImpl(ALIAS_DOES_NOT_EXIST); } - @Test(timeout = 5000) + @Test(timeout = 20000) public void testCreateConnectionWithAliasThatDoesNotRepresentKeyEntry() throws Exception { doCreateConnectionWithInvalidAliasTestImpl(ALIAS_CA_CERT); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java index 29bb7da..822d4e9 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java @@ -58,7 +58,7 @@ public class StreamMessageIntegrationTest extends QpidJmsTestCase { * a list which holds entries of the various supported entry types is returned as a * {@link StreamMessage}, and verify the values can all be retrieved as expected. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testReceiveBasicMapMessage() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); @@ -143,7 +143,7 @@ public class StreamMessageIntegrationTest extends QpidJmsTestCase { * an AmqpValue section containing a list which holds entries of the various supported entry * types with the expected values. */ - @Test(timeout = 5000) + @Test(timeout = 20000) public void testSendBasicMapMessage() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { Connection connection = testFixture.establishConnecton(testPeer); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
