You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/06/22 18:32:13 UTC
[1/7] qpid-jms git commit: QPIDJMS-75: update frame validation to log
and store assertion errors,
make peer close throw the first. Enables tests to fail fast and provide error
info in many more situations
Repository: qpid-jms
Updated Branches:
refs/heads/master 748bcdadf -> 205c976ce
QPIDJMS-75: update frame validation to log and store assertion errors, make peer close throw the first. Enables tests to fail fast and provide error info in many more situations
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5694dae8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5694dae8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5694dae8
Branch: refs/heads/master
Commit: 5694dae8addf230f6dbc7aefd07852b49cee89af
Parents: 748bcda
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Jun 22 12:59:39 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Jun 22 17:27:36 2015 +0100
----------------------------------------------------------------------
.../AbstractFieldAndDescriptorMatcher.java | 2 +-
...ractFrameFieldAndPayloadMatchingHandler.java | 37 +++++++++++++-------
.../FrameWithNoPayloadMatchingHandler.java | 4 +--
.../FrameWithPayloadMatchingHandler.java | 2 +-
.../jms/test/testpeer/HeaderHandlerImpl.java | 2 +-
.../qpid/jms/test/testpeer/TestAmqpPeer.java | 20 +++++++++++
6 files changed, 49 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5694dae8/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java
index c981d97..79cc4f6 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java
@@ -84,7 +84,7 @@ public abstract class AbstractFieldAndDescriptorMatcher {
* @param described the list of fields from the described type.
* @throws AssertionError if a registered matcher assertion is not met.
*/
- public void verifyFields(List<Object> described) throws AssertionError {
+ public final void verifyFields(List<Object> described) throws AssertionError {
int fieldNumber = 0;
HashMap<Enum<?>, Object> valueMap = new LinkedHashMap<>();
for (Object value : described) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5694dae8/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
index e1b1615..e3aeeb1 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
@@ -54,21 +54,11 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
_onSuccessAction = onSuccessAction;
}
- /**
- * Handle the supplied frame and its payload, e.g. by checking that it matches what we expect
- * @throws RuntimeException or a subclass thereof if the frame does not match what we expect
- */
- protected void verifyFrame(List<Object> described, Binary payload)
- {
- verifyFields(described);
- verifyPayload(payload);
- }
-
- protected abstract void verifyPayload(Binary payload);
+ protected abstract void verifyPayload(Binary payload) throws AssertionError;
@SuppressWarnings("unchecked")
@Override
- public void frame(int type, int ch, DescribedType dt, Binary payload, TestAmqpPeer peer)
+ public final void frame(int type, int ch, DescribedType dt, Binary payload, TestAmqpPeer peer)
{
if(type == _frameType.ordinal()
&& (_expectedChannel == ANY_CHANNEL || _expectedChannel == ch)
@@ -76,7 +66,28 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
&& (dt.getDescribed() instanceof List))
{
_actualChannel = ch;
- verifyFrame((List<Object>)dt.getDescribed(),payload);
+
+ try
+ {
+ verifyFields((List<Object>)dt.getDescribed());
+ }
+ catch(AssertionError ae)
+ {
+ LOGGER.error("Failure when verifying frame fields", ae);
+ peer.assertionFailed(ae);
+ }
+
+ try
+ {
+ verifyPayload(payload);
+ }
+ catch(AssertionError ae)
+ {
+ LOGGER.error("Failure when verifying frame payload", ae);
+ peer.assertionFailed(ae);
+ }
+
+ //TODO: rename 'completed'
succeeded();
}
else
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5694dae8/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
index 1db1774..63cc2dd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
@@ -35,12 +35,12 @@ public class FrameWithNoPayloadMatchingHandler extends AbstractFrameFieldAndPayl
}
@Override
- protected void verifyPayload(Binary payload)
+ protected final void verifyPayload(Binary payload)
{
_logger.debug("About to check that there is no payload");
if(payload != null && payload.getLength() > 0)
{
- throw new IllegalArgumentException("Expected no payload but received payload of length: " + payload.getLength());
+ throw new AssertionError("Expected no payload but received payload of length: " + payload.getLength());
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5694dae8/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
index b2e3afd..0369aec 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
@@ -45,7 +45,7 @@ public class FrameWithPayloadMatchingHandler extends AbstractFrameFieldAndPayloa
}
@Override
- protected void verifyPayload(Binary payload)
+ protected final void verifyPayload(Binary payload) throws AssertionError
{
_logger.debug("About to check the payload" + "\n Received: {}", payload);
if(_payloadMatcher != null)
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5694dae8/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
index 847904d..86661c7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
@@ -53,7 +53,7 @@ class HeaderHandlerImpl implements HeaderHandler
}
@Override
- public void header(byte[] header, TestAmqpPeer peer)
+ public void header(byte[] header, TestAmqpPeer peer) throws AssertionError
{
LOGGER.debug("About to check received header {}", new Binary(header));
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5694dae8/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
index 88a59a5..b274880 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
@@ -104,6 +104,7 @@ public class TestAmqpPeer implements AutoCloseable
private static final UnsignedByte SASL_FAIL_AUTH = UnsignedByte.valueOf((byte)1);
private static final int CONNECTION_CHANNEL = 0;
+ private volatile AssertionError _firstAssertionError = null;
private final TestAmqpPeerRunner _driverRunnable;
private final Thread _driverThread;
@@ -156,6 +157,18 @@ public class TestAmqpPeer implements AutoCloseable
}
finally
{
+ AssertionError ae = _firstAssertionError;
+ if(ae != null)
+ {
+ String message = "Assertion failure during test run";
+ if(ae.getMessage() != null)
+ {
+ message += ": " + ae.getMessage();
+ }
+
+ throw new AssertionError(message, _firstAssertionError);
+ }
+
Throwable throwable = getThrowable();
if(throwable == null)
{
@@ -1518,4 +1531,11 @@ public class TestAmqpPeer implements AutoCloseable
comp.add(action);
}
}
+
+ void assertionFailed(AssertionError ae) {
+ if(_firstAssertionError == null)
+ {
+ _firstAssertionError = ae;
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[6/7] qpid-jms git commit: 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
Posted by ro...@apache.org.
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TextMessageIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TextMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TextMessageIntegrationTest.java
index 96f0924..20163a5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TextMessageIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TextMessageIntegrationTest.java
@@ -53,7 +53,7 @@ import org.junit.Test;
public class TextMessageIntegrationTest extends QpidJmsTestCase {
private final IntegrationTestFixture testFixture = new IntegrationTestFixture();
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testSendTextMessage() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer);
@@ -82,7 +82,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testReceiveTextMessageWithContentAmqpValue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer);
@@ -110,7 +110,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testSendTextMessageWithoutContent() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer);
@@ -138,7 +138,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testReceiveTextMessageWithAmqpValueNullBodyAndNoMsgTypeAnnotation() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer);
@@ -165,7 +165,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
}
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testReceiveTextMessageUsingDataSectionWithContentTypeTextPlainNoTypeAnnotation() throws Exception {
String expectedString = "expectedContent";
final byte[] sentBytes = expectedString.getBytes("UTF-8");
@@ -173,7 +173,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
doReceiveTextMessageUsingDataSectionTestImpl("text/plain", sentBytes, expectedString);
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testReceiveTextMessageUsingDataSectionWithContentTypeTextPlainCharsetUtf8NoTypeAnnotation() throws Exception {
String expectedString = "expectedContent";
final byte[] sentBytes = expectedString.getBytes("UTF-8");
@@ -181,7 +181,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
doReceiveTextMessageUsingDataSectionTestImpl("text/plain;charset=utf-8", sentBytes, expectedString);
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testReceiveTextMessageUsingDataSectionWithContentTypeTextPlainCharsetUtf16NoTypeAnnotation() throws Exception {
String expectedString = "expectedContent";
final byte[] sentBytes = expectedString.getBytes("UTF-16");
@@ -189,7 +189,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
doReceiveTextMessageUsingDataSectionTestImpl("text/plain;charset=utf-16", sentBytes, expectedString);
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testReceiveTextMessageUsingDataSectionWithContentTypeTextOtherNoTypeAnnotation() throws Exception {
String expectedString = "expectedContent";
final byte[] sentBytes = expectedString.getBytes("UTF-8");
@@ -197,7 +197,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
doReceiveTextMessageUsingDataSectionTestImpl("text/other", sentBytes, expectedString);
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testReceiveTextMessageUsingDataSectionWithContentTypeApplicationJsonNoTypeAnnotation() throws Exception {
String expectedString = "expectedContent";
final byte[] sentBytes = expectedString.getBytes("UTF-8");
@@ -205,7 +205,7 @@ public class TextMessageIntegrationTest extends QpidJmsTestCase {
doReceiveTextMessageUsingDataSectionTestImpl("application/json", sentBytes, expectedString);
}
- @Test(timeout = 5000)
+ @Test(timeout = 20000)
public void testReceiveTextMessageUsingDataSectionWithContentTypeApplicationXmlNoTypeAnnotation() throws Exception {
String expectedString = "expectedContent";
final byte[] sentBytes = expectedString.getBytes("UTF-8");
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java
index 8ec53fd..c68559e 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java
@@ -54,26 +54,26 @@ public class AmqpProviderFactoryTest extends QpidJmsTestCase {
}
}
- @Test(timeout = 10000)
+ @Test(timeout = 20000)
public void testGetName() throws IOException, Exception {
AmqpProviderFactory factory = new AmqpProviderFactory();
assertEquals("AMQP", factory.getName());
}
- @Test(timeout = 10000)
+ @Test(timeout = 20000)
public void testCreateProvider() throws IOException, Exception {
Provider provider = AmqpProviderFactory.create(peerURI);
assertNotNull(provider);
assertTrue(provider instanceof AmqpProvider);
}
- @Test(timeout = 10000, expected=IllegalArgumentException.class)
+ @Test(timeout = 20000, expected=IllegalArgumentException.class)
public void testCreateProviderFailsWithBadOption() throws IOException, Exception {
URI badOptionsURI = new URI(peerURI.toString() + "?amqp.badOption=true");
AmqpProviderFactory.create(badOptionsURI);
}
- @Test(timeout = 10000)
+ @Test(timeout = 20000)
public void testCreateProviderHasDefaultIdleTimeoutValue() throws IOException, Exception {
Provider provider = AmqpProviderFactory.create(new URI(peerURI.toString()));
assertNotNull(provider);
@@ -83,7 +83,7 @@ public class AmqpProviderFactoryTest extends QpidJmsTestCase {
assertTrue("No default idle timeout", amqpProvider.getIdleTimeout() > 0);
}
- @Test(timeout = 10000)
+ @Test(timeout = 20000)
public void testCreateProviderAppliesIdleTimeoutURIOption() throws IOException, Exception {
int timeout = 54321;
Provider provider = AmqpProviderFactory.create(new URI(peerURI.toString() + "?amqp.idleTimeout=" + timeout));
@@ -94,7 +94,7 @@ public class AmqpProviderFactoryTest extends QpidJmsTestCase {
assertEquals("idle timeout option was not applied", timeout, amqpProvider.getIdleTimeout());
}
- @Test(timeout = 10000)
+ @Test(timeout = 20000)
public void testCreateProviderAppliesOptions() throws IOException, Exception {
URI configuredURI = new URI(peerURI.toString() +
"?amqp.presettleConsumers=true" +
@@ -115,7 +115,7 @@ public class AmqpProviderFactoryTest extends QpidJmsTestCase {
assertEquals(32, amqpProvider.getChannelMax());
}
- @Test(timeout = 10000)
+ @Test(timeout = 20000)
public void testCreateProviderAppliesPresettleOption() throws IOException, Exception {
URI configuredURI = new URI(peerURI.toString() + "?amqp.presettle=true");
Provider provider = AmqpProviderFactory.create(configuredURI);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/205c976c/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
index b339ad9..dea89e9 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
@@ -71,19 +71,19 @@ public class AmqpProviderTest extends QpidJmsTestCase {
}
}
- @Test(timeout=10000)
+ @Test(timeout=20000)
public void testCreate() {
provider = new AmqpProvider(peerURI);
assertFalse(provider.isPresettleConsumers());
}
- @Test(timeout=10000, expected=RuntimeException.class)
+ @Test(timeout=20000, expected=RuntimeException.class)
public void testGetMessageFactoryTrowsWhenNotConnected() {
provider = new AmqpProvider(peerURI);
provider.getMessageFactory();
}
- @Test(timeout=10000)
+ @Test(timeout=20000)
public void testConnectWithUnknownProtocol() throws Exception {
provider = new AmqpProvider(peerURI);
provider.setTransportType("ftp");
@@ -94,7 +94,7 @@ public class AmqpProviderTest extends QpidJmsTestCase {
}
}
- @Test(timeout=10000)
+ @Test(timeout=20000)
public void testConnectThrowsWhenNoPeer() throws Exception {
provider = new AmqpProvider(peerURI);
testPeer.close();
@@ -105,7 +105,7 @@ public class AmqpProviderTest extends QpidJmsTestCase {
}
}
- @Test(timeout=10000)
+ @Test(timeout=20000)
public void testStartThrowsIfNoListenerSet() throws Exception {
provider = new AmqpProvider(peerURI);
provider.connect();
@@ -117,7 +117,7 @@ public class AmqpProviderTest extends QpidJmsTestCase {
}
}
- @Test(timeout=10000)
+ @Test(timeout=20000)
public void testToString() throws IOException {
provider = new AmqpProvider(peerURI);
provider.connect();
@@ -125,7 +125,7 @@ public class AmqpProviderTest extends QpidJmsTestCase {
assertTrue(provider.toString().contains(String.valueOf(peerURI.getPort())));
}
- @Test(timeout=10000)
+ @Test(timeout=20000)
public void testClosedProviderThrowsIOException() throws IOException {
provider = new AmqpProvider(peerURI);
provider.connect();
@@ -148,7 +148,7 @@ public class AmqpProviderTest extends QpidJmsTestCase {
} catch (IOException ex) {}
}
- @Test(timeout=10000)
+ @Test(timeout=20000)
public void testTimeoutsSetFromConnectionInfo() throws IOException, JMSException {
final long CONNECT_TIMEOUT = TimeUnit.SECONDS.toMillis(4);
final long CLOSE_TIMEOUT = TimeUnit.SECONDS.toMillis(5);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[5/7] qpid-jms git commit: QPIDJMS-75: remove unused constructor arg
Posted by ro...@apache.org.
QPIDJMS-75: remove unused constructor arg
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/033f0a28
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/033f0a28
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/033f0a28
Branch: refs/heads/master
Commit: 033f0a2869cbd962e2a593d149eac37032c57553
Parents: 78b8ea7
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Jun 22 15:23:57 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Jun 22 17:28:15 2015 +0100
----------------------------------------------------------------------
.../testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java | 4 +---
.../jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java | 5 ++---
.../qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java | 5 ++---
.../apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java | 3 +--
.../apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java | 3 +--
.../apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java | 3 +--
.../apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java | 3 +--
.../qpid/jms/test/testpeer/matchers/DispositionMatcher.java | 3 +--
.../org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java | 3 +--
.../org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java | 3 +--
.../org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java | 3 +--
.../qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java | 3 +--
.../apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java | 3 +--
.../qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java | 3 +--
.../qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java | 3 +--
.../qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java | 3 +--
.../apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java | 3 +--
.../qpid/jms/test/testpeer/matchers/generate-matchers.xsl | 3 +--
18 files changed, 20 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
index 2b512ed..ec1c2c9 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
@@ -44,13 +44,11 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
protected AbstractFrameFieldAndPayloadMatchingHandler(FrameType frameType,
int channel,
UnsignedLong numericDescriptor,
- Symbol symbolicDescriptor,
- AmqpPeerRunnable onCompletion)
+ Symbol symbolicDescriptor)
{
super(numericDescriptor, symbolicDescriptor);
_frameType = frameType;
_expectedChannel = channel;
- _onCompletion = onCompletion;
}
protected abstract void verifyPayload(Binary payload) throws AssertionError;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
index 63cc2dd..1d2feb1 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
@@ -28,10 +28,9 @@ public class FrameWithNoPayloadMatchingHandler extends AbstractFrameFieldAndPayl
protected FrameWithNoPayloadMatchingHandler(FrameType frameType,
int channel,
UnsignedLong numericDescriptor,
- Symbol symbolicDescriptor,
- AmqpPeerRunnable onSuccess)
+ Symbol symbolicDescriptor)
{
- super(frameType, channel, numericDescriptor, symbolicDescriptor, onSuccess);
+ super(frameType, channel, numericDescriptor, symbolicDescriptor);
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
index d9ac6af..fcfbc33 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
@@ -33,10 +33,9 @@ public class FrameWithPayloadMatchingHandler extends AbstractFrameFieldAndPayloa
protected FrameWithPayloadMatchingHandler(FrameType frameType,
int channel,
UnsignedLong numericDescriptor,
- Symbol symbolicDescriptor,
- AmqpPeerRunnable onCompletion)
+ Symbol symbolicDescriptor)
{
- super(frameType, channel, numericDescriptor, symbolicDescriptor, onCompletion);
+ super(frameType, channel, numericDescriptor, symbolicDescriptor);
}
public void setPayloadMatcher(Matcher<Binary> payloadMatcher)
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
index e4695a8..0809a44 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
@@ -56,8 +56,7 @@ public class AttachMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000012L),
- Symbol.valueOf("amqp:attach:list"),
- null);
+ Symbol.valueOf("amqp:attach:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
index fffbbb8..b660f63 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
@@ -50,8 +50,7 @@ public class BeginMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000011L),
- Symbol.valueOf("amqp:begin:list"),
- null);
+ Symbol.valueOf("amqp:begin:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
index d162ba1..0442232 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
@@ -43,8 +43,7 @@ public class CloseMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000018L),
- Symbol.valueOf("amqp:close:list"),
- null);
+ Symbol.valueOf("amqp:close:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
index 4d49d57..0254c32 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
@@ -45,8 +45,7 @@ public class DetachMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000016L),
- Symbol.valueOf("amqp:detach:list"),
- null);
+ Symbol.valueOf("amqp:detach:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
index d18ea96..a95a027 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
@@ -48,8 +48,7 @@ public class DispositionMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000015L),
- Symbol.valueOf("amqp:disposition:list"),
- null);
+ Symbol.valueOf("amqp:disposition:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
index 34cb6d7..076fd70 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
@@ -43,8 +43,7 @@ public class EndMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000017L),
- Symbol.valueOf("amqp:end:list"),
- null);
+ Symbol.valueOf("amqp:end:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
index 145d447..c7667a8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
@@ -53,8 +53,7 @@ public class FlowMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000013L),
- Symbol.valueOf("amqp:flow:list"),
- null);
+ Symbol.valueOf("amqp:flow:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
index 4d1693d..aaed6a0 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
@@ -52,8 +52,7 @@ public class OpenMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000010L),
- Symbol.valueOf("amqp:open:list"),
- null);
+ Symbol.valueOf("amqp:open:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
index ae5280d..99bf0c4 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
@@ -43,8 +43,7 @@ public class SaslChallengeMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.SASL,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000042L),
- Symbol.valueOf("amqp:sasl-challenge:list"),
- null);
+ Symbol.valueOf("amqp:sasl-challenge:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
index 373d579..c777a66 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
@@ -45,8 +45,7 @@ public class SaslInitMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.SASL,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000041L),
- Symbol.valueOf("amqp:sasl-init:list"),
- null);
+ Symbol.valueOf("amqp:sasl-init:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
index 7dbaabd..482c19f 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
@@ -43,8 +43,7 @@ public class SaslMechanismsMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.SASL,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000040L),
- Symbol.valueOf("amqp:sasl-mechanisms:list"),
- null);
+ Symbol.valueOf("amqp:sasl-mechanisms:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
index da4280c..4fb0ee8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
@@ -44,8 +44,7 @@ public class SaslOutcomeMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.SASL,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000044L),
- Symbol.valueOf("amqp:sasl-outcome:list"),
- null);
+ Symbol.valueOf("amqp:sasl-outcome:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
index 050a9e5..28184a8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
@@ -43,8 +43,7 @@ public class SaslResponseMatcher extends FrameWithNoPayloadMatchingHandler
super(FrameType.SASL,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000043L),
- Symbol.valueOf("amqp:sasl-response:list"),
- null);
+ Symbol.valueOf("amqp:sasl-response:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
index 9fb02bd..17e3eb3 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
@@ -53,8 +53,7 @@ public class TransferMatcher extends FrameWithPayloadMatchingHandler
super(FrameType.AMQP,
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000014L),
- Symbol.valueOf("amqp:transfer:list"),
- null);
+ Symbol.valueOf("amqp:transfer:list"));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/033f0a28/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
index 18a1b97..ceb6f70 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
@@ -92,8 +92,7 @@ public class <xsl:value-of select="$classname"/> extends <xsl:value-of select="$
super(FrameType.<xsl:choose><xsl:when test="@provides='sasl-frame'">SASL</xsl:when><xsl:otherwise>AMQP</xsl:otherwise></xsl:choose>,
ANY_CHANNEL,
UnsignedLong.valueOf(<xsl:value-of select="concat(substring(descendant::node()[name()='descriptor']/@code,1,10),substring(descendant::node()[name()='descriptor']/@code,14))"/>L),
- Symbol.valueOf("<xsl:value-of select="descendant::node()[name()='descriptor']/@name"/>"),
- null);
+ Symbol.valueOf("<xsl:value-of select="descendant::node()[name()='descriptor']/@name"/>"));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/7] qpid-jms git commit: QPIDJMS-75: update header handler to treat
assertion errors in line with frame handlers
Posted by ro...@apache.org.
QPIDJMS-75: update header handler to treat assertion errors in line with frame handlers
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/78b8ea75
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/78b8ea75
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/78b8ea75
Branch: refs/heads/master
Commit: 78b8ea7586dcbba5914600f427ca8590b17736d5
Parents: db79364
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Jun 22 15:12:03 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Jun 22 17:28:07 2015 +0100
----------------------------------------------------------------------
.../qpid/jms/test/testpeer/HeaderHandlerImpl.java | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/78b8ea75/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
index f981b34..66cabf8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
@@ -50,12 +50,27 @@ class HeaderHandlerImpl implements HeaderHandler
{
LOGGER.debug("About to check received header {}", new Binary(header));
- assertThat("Header should match", header, equalTo(_expectedHeader));
+ try
+ {
+ assertThat("Header should match", header, equalTo(_expectedHeader));
+ }
+ catch(AssertionError ae)
+ {
+ LOGGER.error("Failure when verifying header", ae);
+ peer.assertionFailed(ae);
+ }
+
+ LOGGER.debug("Sending header response.");
peer.sendHeader(_response);
+
if(_onCompletion != null)
{
_onCompletion.run();
}
+ else
+ {
+ LOGGER.debug("No onCompletion action, doing nothing.");
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[7/7] qpid-jms git commit: 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
Posted by ro...@apache.org.
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 <ro...@apache.org>
Authored: Mon Jun 22 16:48:34 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/7] qpid-jms git commit: QPIDJMS-75: update handling to remove need
for 'isComplete', rename post-matcher action to 'onCompletion'
Posted by ro...@apache.org.
QPIDJMS-75: update handling to remove need for 'isComplete', rename post-matcher action to 'onCompletion'
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/b1ed3972
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/b1ed3972
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/b1ed3972
Branch: refs/heads/master
Commit: b1ed3972ed1e8ff9a66e15715b47f1c1ac22a1e2
Parents: 5694dae
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Jun 22 15:01:03 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Jun 22 17:27:54 2015 +0100
----------------------------------------------------------------------
...ractFrameFieldAndPayloadMatchingHandler.java | 45 +++++++-------------
.../FrameWithPayloadMatchingHandler.java | 4 +-
.../apache/qpid/jms/test/testpeer/Handler.java | 6 +--
.../jms/test/testpeer/HeaderHandlerImpl.java | 26 ++++-------
.../qpid/jms/test/testpeer/TestAmqpPeer.java | 40 ++++++++---------
.../test/testpeer/matchers/AttachMatcher.java | 4 +-
.../test/testpeer/matchers/BeginMatcher.java | 4 +-
.../test/testpeer/matchers/CloseMatcher.java | 4 +-
.../test/testpeer/matchers/DetachMatcher.java | 4 +-
.../testpeer/matchers/DispositionMatcher.java | 4 +-
.../jms/test/testpeer/matchers/EndMatcher.java | 4 +-
.../jms/test/testpeer/matchers/FlowMatcher.java | 4 +-
.../jms/test/testpeer/matchers/OpenMatcher.java | 4 +-
.../testpeer/matchers/SaslChallengeMatcher.java | 4 +-
.../test/testpeer/matchers/SaslInitMatcher.java | 4 +-
.../matchers/SaslMechanismsMatcher.java | 4 +-
.../testpeer/matchers/SaslOutcomeMatcher.java | 4 +-
.../testpeer/matchers/SaslResponseMatcher.java | 4 +-
.../test/testpeer/matchers/TransferMatcher.java | 4 +-
.../testpeer/matchers/generate-matchers.xsl | 4 +-
20 files changed, 75 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
index e3aeeb1..2b512ed 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
@@ -39,19 +39,18 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
private int _expectedChannel;
private int _actualChannel;
- private AmqpPeerRunnable _onSuccessAction;
- private volatile boolean _isComplete;
+ private AmqpPeerRunnable _onCompletion;
protected AbstractFrameFieldAndPayloadMatchingHandler(FrameType frameType,
int channel,
UnsignedLong numericDescriptor,
Symbol symbolicDescriptor,
- AmqpPeerRunnable onSuccessAction)
+ AmqpPeerRunnable onCompletion)
{
super(numericDescriptor, symbolicDescriptor);
_frameType = frameType;
_expectedChannel = channel;
- _onSuccessAction = onSuccessAction;
+ _onCompletion = onCompletion;
}
protected abstract void verifyPayload(Binary payload) throws AssertionError;
@@ -87,8 +86,14 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
peer.assertionFailed(ae);
}
- //TODO: rename 'completed'
- succeeded();
+ if(_onCompletion != null)
+ {
+ _onCompletion.run();
+ }
+ else
+ {
+ LOGGER.debug("No onCompletion action, doing nothing.");
+ }
}
else
{
@@ -106,28 +111,14 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
return _expectedChannel == ANY_CHANNEL ? "<any>" : String.valueOf(_expectedChannel);
}
- private void succeeded()
+ public AmqpPeerRunnable getOnCompletionAction()
{
- if(_onSuccessAction != null)
- {
- _onSuccessAction.run();
- }
- else
- {
- LOGGER.debug("No onSuccess action, doing nothing.");
- }
-
- _isComplete = true;
- }
-
- public AmqpPeerRunnable getOnSuccessAction()
- {
- return _onSuccessAction;
+ return _onCompletion;
}
- public AbstractFrameFieldAndPayloadMatchingHandler onSuccess(AmqpPeerRunnable onSuccessAction)
+ public AbstractFrameFieldAndPayloadMatchingHandler onCompletion(AmqpPeerRunnable onSuccessAction)
{
- _onSuccessAction = onSuccessAction;
+ _onCompletion = onSuccessAction;
return this;
}
@@ -143,12 +134,6 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
}
@Override
- public boolean isComplete()
- {
- return _isComplete;
- }
-
- @Override
public String toString()
{
return "AbstractFrameFieldAndPayloadMatchingHandler [_symbolicDescriptor=" + getSymbolicDescriptor()
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
index 0369aec..3279ab6 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
@@ -34,9 +34,9 @@ public class FrameWithPayloadMatchingHandler extends AbstractFrameFieldAndPayloa
int channel,
UnsignedLong numericDescriptor,
Symbol symbolicDescriptor,
- AmqpPeerRunnable onSuccess)
+ AmqpPeerRunnable onCompletion)
{
- super(frameType, channel, numericDescriptor, symbolicDescriptor, onSuccess);
+ super(frameType, channel, numericDescriptor, symbolicDescriptor, onCompletion);
}
public void setPayloadMatcher(Matcher<Binary> payloadMatcher)
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java
index fb7e815..9523102 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java
@@ -24,9 +24,7 @@ package org.apache.qpid.jms.test.testpeer;
*/
interface Handler
{
- boolean isComplete();
+ AmqpPeerRunnable getOnCompletionAction();
- AmqpPeerRunnable getOnSuccessAction();
-
- Handler onSuccess(AmqpPeerRunnable onSuccessAction);
+ Handler onCompletion(AmqpPeerRunnable onCompletion);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
index 86661c7..f981b34 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
@@ -31,25 +31,18 @@ class HeaderHandlerImpl implements HeaderHandler
private final byte[] _expectedHeader;
private final byte[] _response;
- private AmqpPeerRunnable _onSuccess;
- private boolean _isComplete;
+ private AmqpPeerRunnable _onCompletion;
HeaderHandlerImpl(byte[] expectedHeader, byte[] response)
{
this(expectedHeader, response, null);
}
- public HeaderHandlerImpl(byte[] header, byte[] response, AmqpPeerRunnable onSuccess)
+ public HeaderHandlerImpl(byte[] header, byte[] response, AmqpPeerRunnable onCompletion)
{
_expectedHeader = header;
_response = response;
- _onSuccess = onSuccess;
- }
-
- @Override
- public boolean isComplete()
- {
- return _isComplete;
+ _onCompletion = onCompletion;
}
@Override
@@ -59,11 +52,10 @@ class HeaderHandlerImpl implements HeaderHandler
assertThat("Header should match", header, equalTo(_expectedHeader));
peer.sendHeader(_response);
- if(_onSuccess !=null)
+ if(_onCompletion != null)
{
- _onSuccess.run();
+ _onCompletion.run();
}
- _isComplete = true;
}
@Override
@@ -73,15 +65,15 @@ class HeaderHandlerImpl implements HeaderHandler
}
@Override
- public AmqpPeerRunnable getOnSuccessAction()
+ public AmqpPeerRunnable getOnCompletionAction()
{
- return _onSuccess;
+ return _onCompletion;
}
@Override
- public Handler onSuccess(AmqpPeerRunnable onSuccessAction)
+ public Handler onCompletion(AmqpPeerRunnable onCompletion)
{
- _onSuccess = onSuccessAction;
+ _onCompletion = onCompletion;
return this;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
index b274880..a587851 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
@@ -225,10 +225,7 @@ public class TestAmqpPeer implements AutoCloseable
if(handler instanceof HeaderHandler)
{
((HeaderHandler)handler).header(header,this);
- if(handler.isComplete())
- {
- removeFirstHandler();
- }
+ removeFirstHandler();
}
else
{
@@ -242,10 +239,7 @@ public class TestAmqpPeer implements AutoCloseable
if(handler instanceof FrameHandler)
{
((FrameHandler)handler).frame(type, channel, describedType, payload, this);
- if(handler.isComplete())
- {
- removeFirstHandler();
- }
+ removeFirstHandler();
}
else
{
@@ -394,7 +388,7 @@ public class TestAmqpPeer implements AutoCloseable
SaslInitMatcher saslInitMatcher = new SaslInitMatcher()
.withMechanism(equalTo(mechanism))
.withInitialResponse(initialResponseMatcher)
- .onSuccess(new AmqpPeerRunnable()
+ .onCompletion(new AmqpPeerRunnable()
{
@Override
public void run()
@@ -433,7 +427,7 @@ public class TestAmqpPeer implements AutoCloseable
OpenMatcher openMatcher = new OpenMatcher()
.withContainerId(notNullValue(String.class))
- .onSuccess(new FrameSender(
+ .onCompletion(new FrameSender(
this, FrameType.AMQP, 0,
open,
null));
@@ -516,7 +510,7 @@ public class TestAmqpPeer implements AutoCloseable
saslMechanismsFrame, null)));
SaslInitMatcher saslInitMatcher = new SaslInitMatcher().withMechanism(equalTo(clientSelectedMech));
- saslInitMatcher.onSuccess(new AmqpPeerRunnable()
+ saslInitMatcher.onCompletion(new AmqpPeerRunnable()
{
@Override
public void run()
@@ -545,7 +539,7 @@ public class TestAmqpPeer implements AutoCloseable
OpenMatcher openMatcher = new OpenMatcher()
.withContainerId(notNullValue(String.class))
- .onSuccess(new FrameSender(
+ .onCompletion(new FrameSender(
this, FrameType.AMQP, 0,
openFrame,
null));
@@ -587,7 +581,7 @@ public class TestAmqpPeer implements AutoCloseable
{
CloseMatcher closeMatcher = new CloseMatcher().withError(errorMatcher);
if(sendReply) {
- closeMatcher.onSuccess(new FrameSender(this, FrameType.AMQP, 0,
+ closeMatcher.onCompletion(new FrameSender(this, FrameType.AMQP, 0,
new CloseFrame(),
null));
}
@@ -625,7 +619,7 @@ public class TestAmqpPeer implements AutoCloseable
_lastInitiatedChannel = actualChannel;
}
});
- beginMatcher.onSuccess(beginResponseSender);
+ beginMatcher.onCompletion(beginResponseSender);
addHandler(beginMatcher);
@@ -657,7 +651,7 @@ public class TestAmqpPeer implements AutoCloseable
frameSender.setChannel(endMatcher.getActualChannel());
}
});
- endMatcher.onSuccess(frameSender);
+ endMatcher.onCompletion(frameSender);
}
addHandler(endMatcher);
@@ -789,7 +783,7 @@ public class TestAmqpPeer implements AutoCloseable
composite.add(detachResonseSender);
}
- attachMatcher.onSuccess(composite);
+ attachMatcher.onCompletion(composite);
addHandler(attachMatcher);
}
@@ -903,7 +897,7 @@ public class TestAmqpPeer implements AutoCloseable
composite.add(flowFrameSender);
}
- attachMatcher.onSuccess(composite);
+ attachMatcher.onCompletion(composite);
addHandler(attachMatcher);
}
@@ -996,7 +990,7 @@ public class TestAmqpPeer implements AutoCloseable
composite.add(detachResonseSender);
}
- attachMatcher.onSuccess(composite);
+ attachMatcher.onCompletion(composite);
addHandler(attachMatcher);
}
@@ -1052,7 +1046,7 @@ public class TestAmqpPeer implements AutoCloseable
}
});
- detachMatcher.onSuccess(detachResponseSender);
+ detachMatcher.onCompletion(detachResponseSender);
}
addHandler(detachMatcher);
@@ -1203,7 +1197,7 @@ public class TestAmqpPeer implements AutoCloseable
}
if(addComposite) {
- flowMatcher.onSuccess(composite);
+ flowMatcher.onCompletion(composite);
}
addHandler(flowMatcher);
@@ -1298,7 +1292,7 @@ public class TestAmqpPeer implements AutoCloseable
dispositionResponse.setFirst(transferMatcher.getReceivedDeliveryId());
}
});
- transferMatcher.onSuccess(dispositionFrameSender);
+ transferMatcher.onCompletion(dispositionFrameSender);
addHandler(transferMatcher);
}
@@ -1483,11 +1477,11 @@ public class TestAmqpPeer implements AutoCloseable
private CompositeAmqpPeerRunnable insertCompsiteActionForLastHandler() {
CompositeAmqpPeerRunnable comp = new CompositeAmqpPeerRunnable();
Handler h = getLastHandler();
- AmqpPeerRunnable orig = h.getOnSuccessAction();
+ AmqpPeerRunnable orig = h.getOnCompletionAction();
if (orig != null) {
comp.add(orig);
}
- h.onSuccess(comp);
+ h.onCompletion(comp);
return comp;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
index a974902..e4695a8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
@@ -61,9 +61,9 @@ public class AttachMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public AttachMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public AttachMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
index af20399..fffbbb8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
@@ -55,9 +55,9 @@ public class BeginMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public BeginMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public BeginMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
index 55c7830..d162ba1 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
@@ -48,9 +48,9 @@ public class CloseMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public CloseMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public CloseMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
index 7ccb7be..4d49d57 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
@@ -50,9 +50,9 @@ public class DetachMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public DetachMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public DetachMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
index 9163d0a..d18ea96 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
@@ -53,9 +53,9 @@ public class DispositionMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public DispositionMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public DispositionMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
index 939f211..34cb6d7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
@@ -48,9 +48,9 @@ public class EndMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public EndMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public EndMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
index fd4dbda..145d447 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
@@ -58,9 +58,9 @@ public class FlowMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public FlowMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public FlowMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
index 67ea017..4d1693d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
@@ -57,9 +57,9 @@ public class OpenMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public OpenMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public OpenMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
index ad18e3d..ae5280d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
@@ -48,9 +48,9 @@ public class SaslChallengeMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslChallengeMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslChallengeMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
index 322efd2..373d579 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
@@ -50,9 +50,9 @@ public class SaslInitMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslInitMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslInitMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
index 7eec5c1..7dbaabd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
@@ -48,9 +48,9 @@ public class SaslMechanismsMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslMechanismsMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslMechanismsMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
index 7f3919c..da4280c 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
@@ -49,9 +49,9 @@ public class SaslOutcomeMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslOutcomeMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslOutcomeMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
index 00ec547..050a9e5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
@@ -48,9 +48,9 @@ public class SaslResponseMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslResponseMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslResponseMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
index 642b5fe..9fb02bd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
@@ -58,9 +58,9 @@ public class TransferMatcher extends FrameWithPayloadMatchingHandler
}
@Override
- public TransferMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public TransferMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
index 13a2d9d..18a1b97 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
@@ -97,9 +97,9 @@ public class <xsl:value-of select="$classname"/> extends <xsl:value-of select="$
}
@Override
- public <xsl:value-of select="$classname"/> onSuccess(AmqpPeerRunnable onSuccessAction)
+ public <xsl:value-of select="$classname"/> onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
<xsl:for-each select="descendant::node()[name()='field']">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/7] qpid-jms git commit: QPIDJMS-75: update payload reference
before running matcher against it
Posted by ro...@apache.org.
QPIDJMS-75: update payload reference before running matcher against it
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/db793649
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/db793649
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/db793649
Branch: refs/heads/master
Commit: db79364957031972db053814d62e9824153a92fa
Parents: b1ed397
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Jun 22 15:06:07 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Jun 22 17:28:01 2015 +0100
----------------------------------------------------------------------
.../qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/db793649/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
index 3279ab6..d9ac6af 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
@@ -48,11 +48,11 @@ public class FrameWithPayloadMatchingHandler extends AbstractFrameFieldAndPayloa
protected final void verifyPayload(Binary payload) throws AssertionError
{
_logger.debug("About to check the payload" + "\n Received: {}", payload);
+ _receivedPayload = payload;
if(_payloadMatcher != null)
{
assertThat("Payload should match", payload, _payloadMatcher);
}
- _receivedPayload = payload;
}
public Binary getReceivedPayload()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org