From 7c06d8d683290e9ebda0312993236b0895b68172 Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Thu, 22 Oct 2015 10:17:41 -0400 Subject: [PATCH] NO-JIRA Allow validation points to use asserts, adds a new test in idle test. --- .../transport/amqp/client/AmqpConnection.java | 12 +++++++-- .../transport/amqp/client/AmqpReceiver.java | 18 ++++++++++--- .../transport/amqp/client/AmqpSender.java | 18 ++++++++++--- .../transport/amqp/client/AmqpSession.java | 12 +++++++-- .../AmqpBrokerReuqestedHearbeatsTest.java | 26 ++++++++++++++++++- 5 files changed, 75 insertions(+), 11 deletions(-) diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java index 9c13e74334..f922af9c06 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java @@ -507,12 +507,20 @@ public class AmqpConnection extends AmqpAbstractResource implements @Override protected void doOpenInspection() { - getStateInspector().inspectOpenedResource(getConnection()); + try { + getStateInspector().inspectOpenedResource(getConnection()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } @Override protected void doClosedInspection() { - getStateInspector().inspectClosedResource(getConnection()); + try { + getStateInspector().inspectClosedResource(getConnection()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } protected void fireClientException(Throwable ex) { diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java index 98241cd947..a40b10c575 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java @@ -512,17 +512,29 @@ public class AmqpReceiver extends AmqpAbstractResource { @Override protected void doOpenInspection() { - getStateInspector().inspectOpenedResource(getReceiver()); + try { + getStateInspector().inspectOpenedResource(getReceiver()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } @Override protected void doClosedInspection() { - getStateInspector().inspectClosedResource(getReceiver()); + try { + getStateInspector().inspectClosedResource(getReceiver()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } @Override protected void doDetachedInspection() { - getStateInspector().inspectDetachedResource(getReceiver()); + try { + getStateInspector().inspectDetachedResource(getReceiver()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } protected void configureSource(Source source) { diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSender.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSender.java index 303c7b2284..cfaaa4c8b4 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSender.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSender.java @@ -278,17 +278,29 @@ public class AmqpSender extends AmqpAbstractResource { @Override protected void doOpenInspection() { - getStateInspector().inspectOpenedResource(getSender()); + try { + getStateInspector().inspectOpenedResource(getSender()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } @Override protected void doClosedInspection() { - getStateInspector().inspectClosedResource(getSender()); + try { + getStateInspector().inspectClosedResource(getSender()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } @Override protected void doDetachedInspection() { - getStateInspector().inspectDetachedResource(getSender()); + try { + getStateInspector().inspectDetachedResource(getSender()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } @Override diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java index b934f95bcf..62414bfc4e 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpSession.java @@ -381,12 +381,20 @@ public class AmqpSession extends AmqpAbstractResource { @Override protected void doOpenInspection() { - getStateInspector().inspectOpenedResource(getSession()); + try { + getStateInspector().inspectOpenedResource(getSession()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } @Override protected void doClosedInspection() { - getStateInspector().inspectClosedResource(getSession()); + try { + getStateInspector().inspectClosedResource(getSession()); + } catch (Throwable error) { + getStateInspector().markAsInvalid(error.getMessage()); + } } private String getNextSenderId() { diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpBrokerReuqestedHearbeatsTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpBrokerReuqestedHearbeatsTest.java index d33a2173d1..75e30f9e60 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpBrokerReuqestedHearbeatsTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpBrokerReuqestedHearbeatsTest.java @@ -54,7 +54,8 @@ public class AmqpBrokerReuqestedHearbeatsTest extends AmqpClientTestSupport { @Override public void inspectOpenedResource(Connection connection) { - assertEquals(TEST_IDLE_TIMEOUT / 2, connection.getTransport().getRemoteIdleTimeout()); + assertEquals("Broker did not send half the idle timeout", + TEST_IDLE_TIMEOUT / 2, connection.getTransport().getRemoteIdleTimeout()); } }); @@ -65,6 +66,29 @@ public class AmqpBrokerReuqestedHearbeatsTest extends AmqpClientTestSupport { connection.close(); } + @Test(timeout = 60000) + public void testBrokerSendsHalfConfiguredIdleTimeoutWhenClientSendsTimeout() throws Exception { + AmqpClient client = createAmqpClient(); + assertNotNull(client); + + client.setValidator(new AmqpValidator() { + + @Override + public void inspectOpenedResource(Connection connection) { + assertEquals("Broker did not send half the idle timeout", + TEST_IDLE_TIMEOUT / 2, connection.getTransport().getRemoteIdleTimeout()); + } + }); + + AmqpConnection connection = client.createConnection(); + connection.setIdleTimeout(TEST_IDLE_TIMEOUT * 4); + assertNotNull(connection); + + connection.connect(); + connection.getStateInspector().assertValid(); + connection.close(); + } + @Test(timeout = 60000) public void testClientWithoutHeartbeatsGetsDropped() throws Exception {