Repository: qpid-jms Updated Branches: refs/heads/master 7bdd5361a -> 197d12273
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java index 48686da..2ebff2b 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java @@ -75,6 +75,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE} * annotation set to {@value AmqpMessageSupport#JMS_MESSAGE} is * treated as a generic {@link JmsMessage} with {@link AmqpJmsMessageFacade} + * + * @throws Exception if an error occurs during the test. */ @Test(expected = IOException.class) public void testCreateMessageFromUnknownMessageTypeAnnotationValueThrows() throws Exception { @@ -93,6 +95,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE} * annotation set to {@value AmqpMessageSupport#JMS_MESSAGE} is * treated as a generic {@link JmsMessage} with {@link AmqpJmsMessageFacade} + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateGenericMessageFromMessageTypeAnnotation() throws Exception { @@ -117,6 +121,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE} * annotation set to {@value AmqpMessageSupport#JMS_BYTES_MESSAGE} is * treated as a {@link JmsBytesMessage} with {@link AmqpJmsBytesMessageFacade} + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateBytesMessageFromMessageTypeAnnotation() throws Exception { @@ -141,6 +147,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE} * annotation set to {@value AmqpMessageSupport#JMS_BYTES_MESSAGE} is * treated as a {@link JmsTextMessage} with {@link AmqpJmsTextMessageFacade} + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateTextMessageFromMessageTypeAnnotation() throws Exception { @@ -167,6 +175,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * content-type set to {@value AmqpMessageSupport#OCTET_STREAM_CONTENT_TYPE} is * treated as a {@link JmsObjectMessage} with {@link AmqpJmsObjectMessageFacade} * containing a {@link AmqpSerializedObjectDelegate}. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateObjectMessageFromMessageTypeAnnotation() throws Exception { @@ -178,6 +188,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * annotation set to {@value AmqpMessageSupport#JMS_OBJECT_MESSAGE} and * content-type not set is treated as a {@link JmsObjectMessage} with * {@link AmqpJmsObjectMessageFacade} containing a {@link AmqpTypedObjectDelegate}. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateObjectMessageFromMessageTypeAnnotationAnd() throws Exception { @@ -217,6 +229,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE} * annotation set to {@value AmqpMessageSupport#JMS_STREAM_MESSAGE} is * treated as a {@link JmsStreamMessage} with {@link AmqpJmsStreamMessageFacade} + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateStreamMessageFromMessageTypeAnnotation() throws Exception { @@ -246,6 +260,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with no body section, but with the content type set to * {@value AmqpMessageSupport#OCTET_STREAM_CONTENT_TYPE} results in a BytesMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateBytesMessageFromNoBodySectionAndContentType() throws Exception { @@ -264,6 +280,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { /** * Test that a message with no body section, and no content-type results in a BytesMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateBytesMessageFromNoBodySectionAndNoContentType() throws Exception { @@ -284,6 +302,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with no body section, but with the content type set to * {@value AmqpMessageSupport#SERIALIZED_JAVA_OBJECT_CONTENT_TYPE} results in an ObjectMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateObjectMessageFromNoBodySectionAndContentType() throws Exception { @@ -320,6 +340,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with no body section, and with the content type set to * an unknown value results in a plain Message when not otherwise annotated to * indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ public void testCreateGenericMessageFromNoBodySectionAndUnknownContentType() throws Exception { Message message = Proton.message(); @@ -340,6 +362,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a data body containing nothing, but with the content type set to * {@value AmqpMessageSupport#OCTET_STREAM_CONTENT_TYPE} results in a BytesMessage when not * otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateBytesMessageFromDataWithEmptyBinaryAndContentType() throws Exception { @@ -361,6 +385,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a message with an empty data body section, and with the content type * set to an unknown value results in a BytesMessage when not otherwise annotated * to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ public void testCreateBytesMessageFromDataWithUnknownContentType() throws Exception { Message message = Proton.message(); @@ -381,6 +407,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that a receiving a data body containing nothing and no content type being set * results in a BytesMessage when not otherwise annotated to indicate the type of * JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateBytesMessageFromDataWithEmptyBinaryAndNoContentType() throws Exception { @@ -403,6 +431,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that receiving a data body containing nothing, but with the content type set to * {@value AmqpMessageSupport#SERIALIZED_JAVA_OBJECT_CONTENT_TYPE} results in an ObjectMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateObjectMessageFromDataWithContentTypeAndEmptyBinary() throws Exception { @@ -427,6 +457,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { * Test that receiving a Data body section with the content type set to * 'text/plain' results in a TextMessage when not otherwise annotated to * indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateTextMessageFromDataWithContentTypeTextPlain() throws Exception { @@ -539,6 +571,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { /** * Test that an amqp-value body containing a string results in a TextMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateTextMessageFromAmqpValueWithString() throws Exception { @@ -557,6 +591,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { /** * Test that an amqp-value body containing a null results in an TextMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateTextMessageFromAmqpValueWithNull() throws Exception { @@ -575,6 +611,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { /** * Test that an amqp-value body containing a map results in an ObjectMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateAmqpObjectMessageFromAmqpValueWithMap() throws Exception { @@ -597,6 +635,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { /** * Test that an amqp-value body containing a list results in an ObjectMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateAmqpObjectMessageFromAmqpValueWithList() throws Exception { @@ -619,6 +659,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { /** * Test that an amqp-value body containing a binary value results in BytesMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateAmqpBytesMessageFromAmqpValueWithBinary() throws Exception { @@ -638,6 +680,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { /** * Test that an amqp-value body containing a value which can't be categorised results in * an ObjectMessage when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateObjectMessageFromAmqpValueWithUncategorisedContent() throws Exception { @@ -661,6 +705,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase { /** * Test that an amqp-sequence body containing a binary value results in an ObjectMessage * when not otherwise annotated to indicate the type of JMS message it is. + * + * @throws Exception if an error occurs during the test. */ @Test public void testCreateObjectMessageMessageFromAmqpSequence() throws Exception http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java index 690e407..0cd1d50 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java @@ -525,6 +525,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase { * Check that setting GroupId null on a new message does not cause creation of the underlying properties * section. New messages lack the properties section section, * as tested by {@link #testNewMessageHasNoUnderlyingPropertiesSection()}. + * + * @throws Exception if an error occurs during the test. */ @Test public void testSetGroupIdNullOnNewMessageDoesNotCreatePropertiesSection() throws Exception { @@ -539,6 +541,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase { * Check that setting GroupId on the message causes creation of the underlying properties * section with the expected value. New messages lack the properties section section, * as tested by {@link #testNewMessageHasNoUnderlyingPropertiesSection()}. + * + * @throws Exception if an error occurs during the test. */ @Test public void testSetGroupIdOnNewMessage() throws Exception { @@ -555,6 +559,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase { /** * Check that setting UserId null on the message causes any existing value to be cleared + * + * @throws Exception if an error occurs during the test. */ @Test public void testSetGroupIdNullOnMessageWithExistingGroupId() throws Exception { @@ -598,6 +604,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase { * Check that setting ReplyToGroupId null on a new message does not cause creation of the * underlying properties section. New messages lack the properties section, * as tested by {@link #testNewMessageHasNoUnderlyingPropertiesSection()}. + * + * @throws Exception if an error occurs during the test. */ @Test public void testSetReplyToGroupIdNullOnNewMessageDoesNotCreatePropertiesSection() throws Exception { @@ -1388,6 +1396,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase { * Check that setting UserId on the message causes creation of the underlying properties * section with the expected value. New messages lack the properties section section, * as tested by {@link #testNewMessageHasNoUnderlyingPropertiesSection()}. + * + * @throws Exception if an error occurs during the test. */ @Test public void testSetUserIdOnNewMessage() throws Exception { @@ -1404,6 +1414,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase { /** * Check that setting UserId null on the message causes any existing value to be cleared + * + * @throws Exception if an error occurs during the test. */ @Test public void testSetUserIdNullOnMessageWithExistingUserId() throws Exception { @@ -1603,6 +1615,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase { /** * Test that {@link AmqpJmsMessageFacade#getType()} returns the expected value * for a message received with the message Subject set. + * + * @throws Exception if an error occurs during the test. */ @Test public void testGetJMSTypeWithReceivedMessage() throws Exception { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java index 439957e..b4a5161 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java @@ -113,6 +113,8 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase /** * Test that setting an object on a new message results in the expected * content in the body section of the underlying message. + * + * @throws Exception if an error occurs during the test. */ @Test public void testSetObjectOnNewMessage() throws Exception { @@ -140,6 +142,8 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase /** * Test that setting an object on a new message results in the expected * content in the body section of the underlying message. + * + * @throws Exception if an error occurs during the test. */ @Test public void testSetObjectOnNewAmqpTypedMessage() throws Exception { @@ -158,9 +162,11 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase } /** - * Test that setting a null object on a message results in the underlying body - * section being set with the null object body, ensuring getObject returns null. - */ + * Test that setting a null object on a message results in the underlying body + * section being set with the null object body, ensuring getObject returns null. + * + * @throws Exception if an error occurs during the test. + */ @Test public void testSetObjectWithNullClearsExistingBodySection() throws Exception { Message protonMessage = Message.Factory.create(); @@ -176,9 +182,11 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase } /** - * Test that clearing the body on a message results in the underlying body - * section being set with the null object body, ensuring getObject returns null. - */ + * Test that clearing the body on a message results in the underlying body + * section being set with the null object body, ensuring getObject returns null. + * + * @throws Exception if an error occurs during the test. + */ @Test public void testClearBodyWithExistingSerializedBodySection() throws Exception { Message protonMessage = Message.Factory.create(); @@ -194,9 +202,11 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase } /** - * Test that setting an object on a new message and later getting the value, returns an - * equal but different object that does not pick up intermediate changes to the set object. - */ + * Test that setting an object on a new message and later getting the value, returns an + * equal but different object that does not pick up intermediate changes to the set object. + * + * @throws Exception if an error occurs during the test. + */ @Test public void testSetThenGetObjectOnSerializedMessageReturnsSnapshot() throws Exception { HashMap<String, String> origMap = new HashMap<String, String>(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java index ecb0eff..d9648a9 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java @@ -20,12 +20,16 @@ */ package org.apache.qpid.jms.provider.amqp.message; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.UUID; import org.apache.qpid.jms.exceptions.IdConversionException; -import org.apache.qpid.jms.provider.amqp.message.AmqpMessageIdHelper; import org.apache.qpid.jms.test.QpidJmsTestCase; import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -287,6 +291,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase { /** * Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns an * UnsignedLong when given a string indicating an encoded AMQP ulong id. + * + * @throws Exception if an error occurs during the test. */ @Test public void testToIdObjectWithEncodedUlong() throws Exception { @@ -301,6 +307,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase { /** * Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns a Binary * when given a string indicating an encoded AMQP binary id, using upper case hex characters + * + * @throws Exception if an error occurs during the test. */ @Test public void testToIdObjectWithEncodedBinaryUppercaseHexString() throws Exception { @@ -317,6 +325,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase { /** * Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns null * when given null. + * + * @throws Exception if an error occurs during the test. */ @Test public void testToIdObjectWithNull() throws Exception { @@ -326,6 +336,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase { /** * Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns a Binary * when given a string indicating an encoded AMQP binary id, using lower case hex characters. + * + * @throws Exception if an error occurs during the test. */ @Test public void testToIdObjectWithEncodedBinaryLowercaseHexString() throws Exception { @@ -342,6 +354,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase { /** * Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns a UUID * when given a string indicating an encoded AMQP uuid id. + * + * @throws Exception if an error occurs during the test. */ @Test public void testToIdObjectWithEncodedUuid() throws Exception { @@ -356,6 +370,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase { /** * Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns a string * when given a string without any type encoding prefix. + * + * @throws Exception if an error occurs during the test. */ @Test public void testToIdObjectWithStringContainingNoEncodingPrefix() throws Exception { @@ -369,6 +385,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase { /** * Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns the remainder of the * provided string after removing the {@link AmqpMessageIdHelper#AMQP_STRING_PREFIX} prefix. + * + * @throws Exception if an error occurs during the test. */ @Test public void testToIdObjectWithStringContainingStringEncodingPrefix() throws Exception { @@ -385,6 +403,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase { * and then additionally the {@link AmqpMessageIdHelper#AMQP_UUID_PREFIX}, the * {@link AmqpMessageIdHelper#toIdObject(String)} method returns the remainder of the provided string * after removing the {@link AmqpMessageIdHelper#AMQP_STRING_PREFIX} prefix. + * + * @throws Exception if an error occurs during the test. */ @Test public void testToIdObjectWithStringContainingStringEncodingPrefixAndThenUuidPrefix() throws Exception { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java index 1fd2afc..3c7db87 100755 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java @@ -20,7 +20,6 @@ import java.util.HashMap; import junit.framework.TestCase; -import org.apache.qpid.jms.selector.SelectorParser; import org.apache.qpid.jms.selector.filter.BooleanExpression; import org.apache.qpid.jms.selector.filter.ComparisonExpression; import org.apache.qpid.jms.selector.filter.Expression; @@ -235,6 +234,8 @@ public class SelectorParserTest extends TestCase { /** * Test cases from Mats Henricson + * + * @throws Exception if an error occurs during the test. */ public void testMatsHenricsonUseCases() throws Exception { MockMessage message = createMessage(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java index de9998c..d7c5bfb 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java @@ -121,6 +121,8 @@ public class JmsQueueSessionTest extends JmsConnectionTestSupport { * (see JMS 1.1 specs, table 4-1). * * @since JMS 1.1 + * + * @throws JMSException if an error occurs during the test. */ @Test(timeout = 30000, expected=IllegalStateException.class) public void testCreateDurableSubscriberOnQueueSession() throws JMSException { @@ -139,6 +141,8 @@ public class JmsQueueSessionTest extends JmsConnectionTestSupport { * (see JMS 1.1 specs, table 4-1). * * @since JMS 1.1 + * + * @throws JMSException if an error occurs during the test. */ @Test(timeout = 30000, expected=IllegalStateException.class) public void testCreateTemporaryTopicOnQueueSession() throws JMSException { @@ -152,6 +156,8 @@ public class JmsQueueSessionTest extends JmsConnectionTestSupport { * (see JMS 1.1 specs, table 4-1). * * @since JMS 1.1 + * + * @throws JMSException if an error occurs during the test. */ @Test(timeout = 30000, expected=IllegalStateException.class) public void testCreateTopicOnQueueSession() throws JMSException { @@ -165,6 +171,8 @@ public class JmsQueueSessionTest extends JmsConnectionTestSupport { * (see JMS 1.1 specs, table 4-1). * * @since JMS 1.1 + * + * @throws JMSException if an error occurs during the test. */ @Test(timeout = 30000, expected=IllegalStateException.class) public void testUnsubscribeOnQueueSession() throws JMSException { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java index 11940e4..2ace0e9 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java @@ -57,6 +57,8 @@ public class JmsTopicSessionTest extends JmsConnectionTestSupport { * (see JMS 1.1 specs, table 4-1). * * @since JMS 1.1 + * + * @throws JMSException if an error occurs during the test. */ @Test(timeout = 30000, expected=IllegalStateException.class) public void testCreateBrowserOnTopicSession() throws JMSException { @@ -115,6 +117,8 @@ public class JmsTopicSessionTest extends JmsConnectionTestSupport { * (see JMS 1.1 specs, table 4-1). * * @since JMS 1.1 + * + * @throws JMSException if an error occurs during the test. */ @Test(timeout = 30000, expected=IllegalStateException.class) public void testCreateQueueOnTopicSession() throws JMSException { @@ -128,6 +132,8 @@ public class JmsTopicSessionTest extends JmsConnectionTestSupport { * (see JMS 1.1 specs, table 4-1). * * @since JMS 1.1 + * + * @throws JMSException if an error occurs during the test. */ @Test(timeout = 30000, expected=IllegalStateException.class) public void testCreateTemporaryQueueOnTopicSession() throws JMSException { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/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 45c840c..40bab4e 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 @@ -548,6 +548,9 @@ public class TestAmqpPeer implements AutoCloseable * Expect a connection that does not use a SASL layer, but proceeds straight * to the AMQP connection (useful to skip a stage for connections that don't * require SASL, e.g. because of anonymous or client certificate authentication). + * + * @param maxFrameSizeMatcher + * The Matcher used to validate the maxFrameSize setting. */ public void expectSaslLayerDisabledConnect(Matcher<?> maxFrameSizeMatcher) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java index 133a452..42161f7 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java @@ -66,7 +66,11 @@ public abstract class AbstractMessageSectionMatcher } /** + * @param receivedBinary + * The received Binary value that should be validated. + * * @return the number of bytes consumed from the provided Binary + * * @throws RuntimeException if the provided Binary does not match expectation in some way */ public int verify(Binary receivedBinary) throws RuntimeException http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java ---------------------------------------------------------------------- diff --git a/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java b/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java index d0f678a..c6b6ba9 100644 --- a/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java +++ b/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java @@ -52,7 +52,9 @@ public class DiscoveryProvider extends ProviderWrapper<FailoverProvider> impleme * connections to the discovered peers. * * @param discoveryUri + * The URI that configures the discovery provider. * @param next + * The FailoverProvider that will be used to manage connections. */ public DiscoveryProvider(URI discoveryUri, FailoverProvider next) { super(next); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java index a82edb0..480f02b 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java @@ -38,9 +38,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * - */ public class JmsAutoAckTest extends AmqpTestSupport { protected static final Logger LOG = LoggerFactory.getLogger(JmsAutoAckTest.class); @@ -113,7 +110,7 @@ public class JmsAutoAckTest extends AmqpTestSupport { * message and expect to see it again, ensure the third message is not seen * until after this. * - * @throws Exception + * @throws Exception on error during test. */ @Test(timeout = 60000) public void testRecoverInOnMessage() throws Exception { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java index 58b29dd..3b16306 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java @@ -449,7 +449,7 @@ public class JmsClientAckTest extends AmqpTestSupport { * message and expect to see both again, ensure the third message is not seen * until after this. * - * @throws Exception + * @throws Exception on error during test */ @Test(timeout = 60000) public void testRecoverInOnMessage() throws Exception { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java index 6c38a20..b5fbe83 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java @@ -35,9 +35,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * - */ public class JmsDupsOkTest extends AmqpTestSupport { protected static final Logger LOG = LoggerFactory.getLogger(JmsDupsOkTest.class); @@ -52,7 +49,7 @@ public class JmsDupsOkTest extends AmqpTestSupport { * message and expect to see it again, ensure the third message is not seen * until after this. * - * @throws Exception + * @throws Exception on error during test. */ @Test(timeout = 60000) public void testRecoverInOnMessage() throws Exception { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java index 06d9307..257c113 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java @@ -178,7 +178,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport { * want to test the short poll and retry case here since that's not what we are * testing. * - * @throws Exception + * @throws Exception on error found during test run. */ @Test(timeout=60000) public void testConsumerReceiveBeforeMessageDispatched() throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
