fix formatting
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2931fbb1 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2931fbb1 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2931fbb1 Branch: refs/heads/master Commit: 2931fbb133f3c90ad9edc28d297cd76a9c413e9b Parents: 1f451b6 Author: Robert Gemmell <[email protected]> Authored: Fri Oct 3 12:27:37 2014 +0100 Committer: Robert Gemmell <[email protected]> Committed: Fri Oct 3 12:27:37 2014 +0100 ---------------------------------------------------------------------- .../BytesMessageIntegrationTest.java | 10 ++--- .../integration/MapMessageIntegrationTest.java | 6 +-- .../jms/integration/MessageIntegrationTest.java | 35 ++++++++-------- .../ObjectMessageIntegrationTest.java | 42 ++++++++------------ 4 files changed, 41 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2931fbb1/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 41a92dd..6f2726c 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 @@ -53,12 +53,12 @@ import org.apache.qpid.proton.amqp.Symbol; import org.junit.Test; public class BytesMessageIntegrationTest extends QpidJmsTestCase { - private final IntegrationTestFixture _testFixture = new IntegrationTestFixture(); + private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); @Test(timeout = 5000) public void testSendBasicBytesMessageWithContent() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); testPeer.expectBegin(true); testPeer.expectSenderAttach(); @@ -91,7 +91,7 @@ public class BytesMessageIntegrationTest extends QpidJmsTestCase { @Test(timeout = 5000) public void testReceiveBasicBytesMessageWithContentUsingDataSection() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -137,7 +137,7 @@ public class BytesMessageIntegrationTest extends QpidJmsTestCase { @Test(timeout = 5000) public void testReceiveBytesMessageAndResendAfterResetAndPartialRead() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -245,7 +245,7 @@ public class BytesMessageIntegrationTest extends QpidJmsTestCase { @Test(timeout = 5000) public void testReceiveBytesMessageWithAmqpValueAndResendResultsInData() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2931fbb1/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 91b5965..55b1106 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 @@ -51,7 +51,7 @@ import org.apache.qpid.proton.amqp.Symbol; import org.junit.Test; public class MapMessageIntegrationTest extends QpidJmsTestCase { - private final IntegrationTestFixture _testFixture = new IntegrationTestFixture(); + private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); /** * Test that a message received from the test peer with an AmqpValue section containing @@ -61,7 +61,7 @@ public class MapMessageIntegrationTest extends QpidJmsTestCase { @Test(timeout = 5000) public void testReceiveBasicMapMessage() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -150,7 +150,7 @@ public class MapMessageIntegrationTest extends QpidJmsTestCase { @Test(timeout = 5000) public void testSendBasicMapMessage() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); testPeer.expectBegin(true); testPeer.expectSenderAttach(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2931fbb1/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 2222a8b..f257ec3 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 @@ -58,7 +58,6 @@ import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedInteger; import org.apache.qpid.proton.amqp.UnsignedLong; -import org.junit.Ignore; import org.junit.Test; public class MessageIntegrationTest extends QpidJmsTestCase @@ -82,12 +81,12 @@ public class MessageIntegrationTest extends QpidJmsTestCase private static final String DOUBLE_PROP = "doubleProperty"; private static final double DOUBLE_PROP_VALUE = Double.MAX_VALUE; - private final IntegrationTestFixture _testFixture = new IntegrationTestFixture(); + private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); @Test(timeout = 2000) public void testSendMessageWithApplicationProperties() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); testPeer.expectBegin(true); testPeer.expectSenderAttach(); @@ -142,7 +141,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceiveMessageWithApplicationProperties() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -199,7 +198,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceiveMessageWithoutMessageId() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -229,7 +228,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceivedMessageFromQueueWithToTypeAnnotationForTopic() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -285,7 +284,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase public void receivedMessageFromQueueWithoutToResultsInUseOfConsumerDestinationImpl(boolean useQueue) throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -337,7 +336,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceivedMessageFromQueueWithReplyToTypeAnnotationForTopic() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -378,7 +377,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceivedMessageFromQueueWithReplyToWithoutTypeAnnotationResultsInUseOfConsumerDestinationType() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -416,7 +415,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceivedMessageFromQueueWithNoReplyToReturnsNull() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -449,7 +448,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceivedMessageFromQueueWithNoAbsoluteExpiryOrTtlReturnsJMSExpirationZero() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -482,7 +481,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceivedMessageFromQueueWithAbsoluteExpiryReturnsJMSExpirationNonZero() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -549,7 +548,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase private void receivedMessageWithMessageIdTestImpl(Object underlyingAmqpMessageId) throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -616,7 +615,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase private void receivedMessageWithCorrelationIdTestImpl(Object correlationIdForAmqpMessageClass, boolean appSpecific) throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -720,7 +719,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase private void sentMessageWithCorrelationIdTestImpl(String stringCorrelationId, Object correlationIdForAmqpMessageClass, boolean appSpecific) throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); testPeer.expectBegin(true); testPeer.expectSenderAttach(); @@ -803,7 +802,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase private void recieveMessageIdSendCorrelationIdTestImpl(Object idForAmqpMessageClass) throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -867,7 +866,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testReceivedMessageWithGroupRelatedPropertiesSet() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -911,7 +910,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase @Test(timeout = 2000) public void testSendMessageWithGroupRelatedPropertiesSet() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { - Connection connection = _testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer); testPeer.expectBegin(true); testPeer.expectSenderAttach(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2931fbb1/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 502c065..4e0ee9d 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 @@ -55,16 +55,14 @@ import org.junit.Test; public class ObjectMessageIntegrationTest extends QpidJmsTestCase { - private final IntegrationTestFixture _testFixture = new IntegrationTestFixture(); + private final IntegrationTestFixture testFixture = new IntegrationTestFixture(); //==== Java serialization encoding ==== @Test(timeout = 5000) - public void testSendBasicObjectMessageWithSerializedContent() throws Exception - { - try(TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) - { - Connection connection = _testFixture.establishConnecton(testPeer); + public void testSendBasicObjectMessageWithSerializedContent() throws Exception { + try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { + Connection connection = testFixture.establishConnecton(testPeer); testPeer.expectBegin(true); testPeer.expectSenderAttach(); @@ -104,11 +102,9 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase } @Test(timeout = 5000) - public void testReceiveBasicObjectMessageWithSerializedContent() throws Exception - { - try(TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) - { - Connection connection = _testFixture.establishConnecton(testPeer); + public void testReceiveBasicObjectMessageWithSerializedContent() throws Exception { + try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -152,11 +148,9 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase } @Test(timeout = 5000) - public void testReceiveAndThenResendBasicObjectMessageWithSerializedContent() throws Exception - { - try(TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) - { - Connection connection = _testFixture.establishConnecton(testPeer); + public void testReceiveAndThenResendBasicObjectMessageWithSerializedContent() throws Exception { + try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); @@ -216,11 +210,9 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase //==== AMQP type system encoding ==== @Test(timeout = 5000) - public void testSendBasicObjectMessageWithAmqpTypedContent() throws Exception - { - try(TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) - { - Connection connection = _testFixture.establishConnecton(testPeer); + public void testSendBasicObjectMessageWithAmqpTypedContent() throws Exception { + try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { + Connection connection = testFixture.establishConnecton(testPeer); testPeer.expectBegin(true); testPeer.expectSenderAttach(); @@ -254,11 +246,9 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase } @Test(timeout = 5000) - public void testRecieveBasicObjectMessageWithAmqpTypedContentAndJMSMessageTypeAnnotation() throws Exception - { - try(TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) - { - Connection connection = _testFixture.establishConnecton(testPeer); + public void testRecieveBasicObjectMessageWithAmqpTypedContentAndJMSMessageTypeAnnotation() throws Exception { + try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { + Connection connection = testFixture.establishConnecton(testPeer); connection.start(); testPeer.expectBegin(true); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
