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 2014/10/20 13:09:50 UTC

[3/4] git commit: streamline test, other elements have their own specific tests

streamline test, other elements have their own specific tests


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/03d3ff37
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/03d3ff37
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/03d3ff37

Branch: refs/heads/master
Commit: 03d3ff37bfe9271ea0de1d97dff29b8c362b4390
Parents: 473e881
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 20 11:15:36 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 20 11:15:36 2014 +0100

----------------------------------------------------------------------
 .../jms/integration/SenderIntegrationTest.java     | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/03d3ff37/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java
index 108b36c..dd3318e 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java
@@ -137,11 +137,10 @@ public class SenderIntegrationTest extends QpidJmsTestCase {
     }
 
     /**
-     * Test that when a message is sent the JMSDestination header is set to the Destination used by the
-     * producer, and the emitted AMQP message has the relevant value set in the 'to' field of properties,
-     * with associated message annotation value to indicate the Destination type.
+     * Test that when a message is sent the JMSDestination header is set to
+     * the Destination used by the producer.
      */
-    @Test(timeout = 10000)
+    @Test(timeout = 5000)
     public void testSendingMessageSetsJMSDestination() throws Exception {
         try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) {
             Connection connection = testFixture.establishConnecton(testPeer);
@@ -154,13 +153,9 @@ public class SenderIntegrationTest extends QpidJmsTestCase {
             MessageProducer producer = session.createProducer(queue);
 
             String text = "myMessage";
-            MessageHeaderSectionMatcher headersMatcher = new MessageHeaderSectionMatcher(true)
-                    .withDurable(equalTo(true));
-            MessageAnnotationsSectionMatcher msgAnnotationsMatcher = new MessageAnnotationsSectionMatcher(true)
-                    .withEntry(Symbol.valueOf(AmqpMessageSupport.AMQP_TO_ANNOTATION),
-                            equalTo(AmqpMessageSupport.QUEUE_ATTRIBUTES));
-            MessagePropertiesSectionMatcher propsMatcher = new MessagePropertiesSectionMatcher(true)
-                    .withTo(equalTo(queueName));
+            MessageHeaderSectionMatcher headersMatcher = new MessageHeaderSectionMatcher(true);
+            MessageAnnotationsSectionMatcher msgAnnotationsMatcher = new MessageAnnotationsSectionMatcher(true);
+            MessagePropertiesSectionMatcher propsMatcher = new MessagePropertiesSectionMatcher(true);
             TransferPayloadCompositeMatcher messageMatcher = new TransferPayloadCompositeMatcher();
             messageMatcher.setHeadersMatcher(headersMatcher);
             messageMatcher.setMessageAnnotationsMatcher(msgAnnotationsMatcher);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org