You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2016/05/02 18:20:27 UTC
[1/2] qpid-jms git commit:
https://issues.apache.org/jira/browse/QPIDJMS-131
Repository: qpid-jms
Updated Branches:
refs/heads/master bac662d54 -> 176640f1d
https://issues.apache.org/jira/browse/QPIDJMS-131
Test cleanup
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/006cdf85
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/006cdf85
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/006cdf85
Branch: refs/heads/master
Commit: 006cdf855fbca09961f169ba7069991e15580885
Parents: bac662d
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon May 2 10:56:50 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon May 2 10:56:50 2016 -0400
----------------------------------------------------------------------
.../PresettledProducerIntegrationTest.java | 140 ++++++++++---------
1 file changed, 71 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/006cdf85/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
index e7b70ef..e1286c7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
@@ -20,12 +20,17 @@ import static org.apache.qpid.jms.provider.amqp.AmqpSupport.ANONYMOUS_RELAY;
import static org.hamcrest.Matchers.arrayContaining;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.fail;
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.Message;
import javax.jms.MessageProducer;
+import javax.jms.Queue;
import javax.jms.Session;
+import javax.jms.TemporaryQueue;
+import javax.jms.TemporaryTopic;
+import javax.jms.Topic;
import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.apache.qpid.jms.test.testpeer.ListDescribedType;
@@ -58,7 +63,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleAllSendToTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, Topic.class);
}
}
@@ -66,7 +71,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleAllSendToQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, Queue.class);
}
}
@@ -74,7 +79,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleAllSendToTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryTopic.class);
}
}
@@ -82,7 +87,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleAllSendToTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryQueue.class);
}
}
@@ -90,7 +95,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleAllAnonymousSendToTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Topic.class);
}
}
@@ -98,7 +103,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleAllAnonymousSendToQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Queue.class);
}
}
@@ -106,7 +111,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleAllAnonymousSendToTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryTopic.class);
}
}
@@ -114,7 +119,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleAllAnonymousSendToTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryQueue.class);
}
}
@@ -124,7 +129,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testPresettledProducersConfigurationAppliedToTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, Topic.class);
}
}
@@ -132,7 +137,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testPresettledProducersConfigurationAppliedToQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, Queue.class);
}
}
@@ -140,7 +145,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testPresettledProducersConfigurationAppliedToTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryTopic.class);
}
}
@@ -148,7 +153,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testPresettledProducersConfigurationAppliedToTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryQueue.class);
}
}
@@ -156,7 +161,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testPresettledProducersConfigurationAppliedAnonymousSendToTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Topic.class);
}
}
@@ -164,7 +169,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testPresettledProducersConfigurationAppliedAnonymousSendToQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Queue.class);
}
}
@@ -172,7 +177,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testPresettledProducersConfigurationAppliedAnonymousSendToTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryTopic.class);
}
}
@@ -180,7 +185,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testPresettledProducersConfigurationAppliedAnonymousSendToTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryQueue.class);
}
}
@@ -190,7 +195,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleProducersTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, Topic.class);
}
}
@@ -198,7 +203,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleProducersQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, Queue.class);
}
}
@@ -206,7 +211,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleProducersTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryTopic.class);
}
}
@@ -214,7 +219,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleProducersTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryQueue.class);
}
}
@@ -222,7 +227,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleProducersAnonymousTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Topic.class);
}
}
@@ -230,7 +235,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleProducersAnonymousQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Queue.class);
}
}
@@ -238,7 +243,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleProducersAnonymousTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryTopic.class);
}
}
@@ -246,7 +251,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleProducersAnonymousTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryQueue.class);
}
}
@@ -256,7 +261,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTopicProducersTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, Topic.class);
}
}
@@ -264,7 +269,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTopicProducersQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, false, Queue.class);
}
}
@@ -272,7 +277,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTopicProducersTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryTopic.class);
}
}
@@ -280,7 +285,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTopicProducersTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, false, TemporaryQueue.class);
}
}
@@ -288,7 +293,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTopicProducersAnonymousTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, Topic.class);
}
}
@@ -296,7 +301,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTopicProducersAnonymousQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, Queue.class);
}
}
@@ -304,7 +309,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTopicProducersAnonymousTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, TemporaryTopic.class);
}
}
@@ -312,7 +317,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTopicProducersAnonymousTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, TemporaryQueue.class);
}
}
@@ -322,7 +327,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleQueueProducersTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, false, Topic.class);
}
}
@@ -330,7 +335,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleQueueProducersQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, Queue.class);
}
}
@@ -338,7 +343,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleQueueProducersTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, false, TemporaryTopic.class);
}
}
@@ -346,7 +351,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleQueueProducersTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryQueue.class);
}
}
@@ -354,7 +359,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleQueueProducersAnonymousTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, Topic.class);
}
}
@@ -362,7 +367,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleQueueProducersAnonymousQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, Queue.class);
}
}
@@ -370,7 +375,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleQueueProducersAnonymousTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, TemporaryTopic.class);
}
}
@@ -378,7 +383,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleQueueProducersAnonymousTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, TemporaryQueue.class);
}
}
@@ -388,7 +393,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTransactedProducersTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, Topic.class);
}
}
@@ -396,7 +401,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTransactedProducersQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, Queue.class);
}
}
@@ -404,7 +409,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTransactedProducersTempTopic() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, TemporaryTopic.class);
}
}
@@ -412,7 +417,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTransactedProducersTempQueue() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, TemporaryQueue.class);
}
}
@@ -420,7 +425,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTransactedProducersTopicNoTX() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, true, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, Topic.class);
}
}
@@ -428,7 +433,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTransactedProducersQueueNoTX() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, false, false);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, Queue.class);
}
}
@@ -436,7 +441,7 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTransactedProducersTempTopicNoTX() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, true, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, TemporaryTopic.class);
}
}
@@ -444,21 +449,21 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
public void testJmsPresettlePolicyPresettleTransactedProducersTempQueueNoTX() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, false, true);
+ doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, TemporaryQueue.class);
}
}
//----- Test Method implementation ---------------------------------------//
- private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean senderSettled, boolean transferSettled, boolean topic, boolean temporary) throws Exception {
- doTestProducerWithPresettleOptions(testPeer, connection, false, senderSettled, transferSettled, topic, temporary);
+ private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean senderSettled, boolean transferSettled, Class<? extends Destination> destType) throws Exception {
+ doTestProducerWithPresettleOptions(testPeer, connection, false, senderSettled, transferSettled, destType);
}
- private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean transacted, boolean senderSettled, boolean transferSettled, boolean topic, boolean temporary) throws Exception {
- doTestProducerWithPresettleOptions(testPeer, connection, transacted, false, senderSettled, transferSettled, topic, temporary);
+ private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean transacted, boolean senderSettled, boolean transferSettled, Class<? extends Destination> destType) throws Exception {
+ doTestProducerWithPresettleOptions(testPeer, connection, transacted, false, senderSettled, transferSettled, destType);
}
- private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean transacted, boolean anonymous, boolean senderSettled, boolean transferSettled, boolean topic, boolean temporary) throws Exception {
+ private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean transacted, boolean anonymous, boolean senderSettled, boolean transferSettled, Class<? extends Destination> destType) throws Exception {
testPeer.expectBegin();
Session session = null;
@@ -482,23 +487,20 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
}
Destination destination = null;
- if (topic) {
- if (temporary) {
- String dynamicAddress = "myTempTopicAddress";
- testPeer.expectTempTopicCreationAttach(dynamicAddress);
- destination = session.createTemporaryTopic();
- } else {
- destination = session.createTopic("myTopic");
- }
+ if (destType == Queue.class) {
+ destination = session.createQueue("MyQueue");
+ } else if (destType == Topic.class) {
+ destination = session.createTopic("MyTopis");
+ } else if (destType == TemporaryQueue.class) {
+ String dynamicAddress = "myTempQueueAddress";
+ testPeer.expectTempQueueCreationAttach(dynamicAddress);
+ destination = session.createTemporaryQueue();
+ } else if (destType == TemporaryTopic.class) {
+ String dynamicAddress = "myTempTopicAddress";
+ testPeer.expectTempTopicCreationAttach(dynamicAddress);
+ destination = session.createTemporaryTopic();
} else {
- if (temporary) {
- String dynamicAddress = "myTempQueueAddress";
- testPeer.expectTempQueueCreationAttach(dynamicAddress);
- destination = session.createTemporaryQueue();
- } else {
- destination = session.createQueue("myTopic");
- }
- destination = session.createQueue("myQueue");
+ fail("unexpected type");
}
if (senderSettled) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms git commit:
https://issues.apache.org/jira/browse/QPIDJMS-131
Posted by ta...@apache.org.
https://issues.apache.org/jira/browse/QPIDJMS-131
Further clean up tests, gets the tests for no anonymous relay support
working as well.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/176640f1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/176640f1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/176640f1
Branch: refs/heads/master
Commit: 176640f1def1ca1607ce9df0fbe73af35fe80c83
Parents: 006cdf8
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon May 2 12:20:05 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon May 2 12:20:05 2016 -0400
----------------------------------------------------------------------
.../PresettledProducerIntegrationTest.java | 525 ++++++++-----------
1 file changed, 228 insertions(+), 297 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/176640f1/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
index e1286c7..85a395d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
@@ -61,505 +61,436 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleAllSendToTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleAll=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleAllSendToQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleAll=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleAllSendToTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleAll=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleAllSendToTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleAll=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryQueue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleAllAnonymousSendToTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleAll=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleAllAnonymousSendToQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleAll=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleAllAnonymousSendToTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleAll=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleAllAnonymousSendToTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleAll=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleAll=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryQueue.class);
}
//----- Test the amqp.presettleProducers option --------------------------//
@Test(timeout = 20000)
public void testPresettledProducersConfigurationAppliedToTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, Topic.class);
- }
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Topic.class);
}
@Test(timeout = 20000)
public void testPresettledProducersConfigurationAppliedToQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, Queue.class);
- }
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Queue.class);
}
@Test(timeout = 20000)
public void testPresettledProducersConfigurationAppliedToTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testPresettledProducersConfigurationAppliedToTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryQueue.class);
}
@Test(timeout = 20000)
public void testPresettledProducersConfigurationAppliedAnonymousSendToTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Topic.class);
- }
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, Topic.class);
}
@Test(timeout = 20000)
public void testPresettledProducersConfigurationAppliedAnonymousSendToQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Queue.class);
- }
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, Queue.class);
}
@Test(timeout = 20000)
public void testPresettledProducersConfigurationAppliedAnonymousSendToTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testPresettledProducersConfigurationAppliedAnonymousSendToTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?amqp.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryQueue.class);
+ }
+
+ @Test(timeout = 20000)
+ public void testPresettledProducersConfigurationAppliedAnonymousSendToTopicNoRelaySupport() throws Exception {
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, true, Topic.class);
+ }
+
+ @Test(timeout = 20000)
+ public void testPresettledProducersConfigurationAppliedAnonymousSendToQueueNoRelaySupport() throws Exception {
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, true, Queue.class);
+ }
+
+ @Test(timeout = 20000)
+ public void testPresettledProducersConfigurationAppliedAnonymousSendToTempTopicNoRelaySupport() throws Exception {
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, true, TemporaryTopic.class);
+ }
+
+ @Test(timeout = 20000)
+ public void testPresettledProducersConfigurationAppliedAnonymousSendToTempQueueNoRelaySupport() throws Exception {
+ String presettleConfig = "?amqp.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, true, TemporaryQueue.class);
}
//----- Test the jms.presettleProducers option ---------------------------------//
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleProducersTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleProducersQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleProducersTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleProducersTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryQueue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleProducersAnonymousTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleProducersAnonymousQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleProducersAnonymousTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleProducersAnonymousTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, true, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryQueue.class);
}
//----- Test the jms.presettleTopicProducers option ---------------------------------//
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTopicProducersTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTopicProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTopicProducersQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTopicProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, false, false, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTopicProducersTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTopicProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTopicProducersTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTopicProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, false, false, TemporaryQueue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTopicProducersAnonymousTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTopicProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTopicProducersAnonymousQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTopicProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, false, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTopicProducersAnonymousTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTopicProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTopicProducersAnonymousTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTopicProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTopicProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, false, TemporaryQueue.class);
}
//----- Test the jms.presettleQueueProducers option ---------------------------------//
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleQueueProducersTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleQueueProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, false, false, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleQueueProducersQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleQueueProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleQueueProducersTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleQueueProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, false, false, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleQueueProducersTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleQueueProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryQueue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleQueueProducersAnonymousTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleQueueProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, false, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleQueueProducersAnonymousQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleQueueProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleQueueProducersAnonymousTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, false, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleQueueProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, false, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleQueueProducersAnonymousTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleQueueProducers=true", serverCapabilities, null);
- doTestProducerWithPresettleOptions(testPeer, connection, false, true, false, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleQueueProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, TemporaryQueue.class);
}
//----- Test the jms.presettleTransactedProducers option ---------------------------------//
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTransactedProducersTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTransactedProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, true, false, true, true, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTransactedProducersQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTransactedProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, true, false, true, true, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTransactedProducersTempTopic() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTransactedProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, true, false, true, true, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTransactedProducersTempQueue() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, true, true, true, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTransactedProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, true, false, true, true, TemporaryQueue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTransactedProducersTopicNoTX() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, Topic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTransactedProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, false, false, Topic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTransactedProducersQueueNoTX() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, Queue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTransactedProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, false, false, Queue.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTransactedProducersTempTopicNoTX() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, TemporaryTopic.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTransactedProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, false, false, TemporaryTopic.class);
}
@Test(timeout = 20000)
public void testJmsPresettlePolicyPresettleTransactedProducersTempQueueNoTX() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer, "?jms.presettlePolicy.presettleTransactedProducers=true");
- doTestProducerWithPresettleOptions(testPeer, connection, false, false, false, TemporaryQueue.class);
- }
+ String presettleConfig = "?jms.presettlePolicy.presettleTransactedProducers=true";
+ doTestProducerWithPresettleOptions(presettleConfig, false, false, false, false, TemporaryQueue.class);
}
//----- Test Method implementation ---------------------------------------//
- private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean senderSettled, boolean transferSettled, Class<? extends Destination> destType) throws Exception {
- doTestProducerWithPresettleOptions(testPeer, connection, false, senderSettled, transferSettled, destType);
- }
-
- private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean transacted, boolean senderSettled, boolean transferSettled, Class<? extends Destination> destType) throws Exception {
- doTestProducerWithPresettleOptions(testPeer, connection, transacted, false, senderSettled, transferSettled, destType);
- }
-
- private void doTestProducerWithPresettleOptions(TestAmqpPeer testPeer, Connection connection, boolean transacted, boolean anonymous, boolean senderSettled, boolean transferSettled, Class<? extends Destination> destType) throws Exception {
- testPeer.expectBegin();
-
- Session session = null;
- Binary txnId = null;
-
- if (transacted) {
- // Expect the session, with an immediate link to the transaction coordinator
- // using a target with the expected capabilities only.
- CoordinatorMatcher txCoordinatorMatcher = new CoordinatorMatcher();
- txCoordinatorMatcher.withCapabilities(arrayContaining(TxnCapability.LOCAL_TXN));
- testPeer.expectSenderAttach(txCoordinatorMatcher, false, false);
-
- // First expect an unsettled 'declare' transfer to the txn coordinator, and
- // reply with a declared disposition state containing the txnId.
- txnId = new Binary(new byte[]{ (byte) 1, (byte) 2, (byte) 3, (byte) 4});
- testPeer.expectDeclare(txnId);
-
- session = connection.createSession(true, Session.SESSION_TRANSACTED);
- } else {
- session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- }
-
- Destination destination = null;
- if (destType == Queue.class) {
- destination = session.createQueue("MyQueue");
- } else if (destType == Topic.class) {
- destination = session.createTopic("MyTopis");
- } else if (destType == TemporaryQueue.class) {
- String dynamicAddress = "myTempQueueAddress";
- testPeer.expectTempQueueCreationAttach(dynamicAddress);
- destination = session.createTemporaryQueue();
- } else if (destType == TemporaryTopic.class) {
- String dynamicAddress = "myTempTopicAddress";
- testPeer.expectTempTopicCreationAttach(dynamicAddress);
- destination = session.createTemporaryTopic();
- } else {
- fail("unexpected type");
- }
-
- if (senderSettled) {
- testPeer.expectSettledSenderAttach();
- } else {
- testPeer.expectSenderAttach();
- }
-
- MessageProducer producer = null;
- if (anonymous) {
- producer = session.createProducer(null);
- } else {
- producer = session.createProducer(destination);
- }
-
- // Create and transfer a new message
- MessageHeaderSectionMatcher headersMatcher = new MessageHeaderSectionMatcher(true);
- headersMatcher.withDurable(equalTo(true));
- MessageAnnotationsSectionMatcher msgAnnotationsMatcher = new MessageAnnotationsSectionMatcher(true);
- TransferPayloadCompositeMatcher messageMatcher = new TransferPayloadCompositeMatcher();
- messageMatcher.setHeadersMatcher(headersMatcher);
- messageMatcher.setMessageAnnotationsMatcher(msgAnnotationsMatcher);
-
- Matcher<?> stateMatcher = nullValue();
- if (transacted) {
- stateMatcher = new TransactionalStateMatcher();
- ((TransactionalStateMatcher) stateMatcher).withTxnId(equalTo(txnId));
- ((TransactionalStateMatcher) stateMatcher).withOutcome(nullValue());
- }
-
- ListDescribedType responseState = new Accepted();
- if (transacted) {
- TransactionalState txState = new TransactionalState();
- txState.setTxnId(txnId);
- txState.setOutcome(new Accepted());
- }
-
- if (transferSettled) {
- testPeer.expectTransfer(messageMatcher, stateMatcher, true, false, responseState, false);
- } else {
- testPeer.expectTransfer(messageMatcher, stateMatcher, false, true, responseState, true);
+ private void doTestProducerWithPresettleOptions(String uriOptions, boolean transacted, boolean anonymous, boolean senderSettled, boolean transferSettled, Class<? extends Destination> destType) throws Exception {
+ doTestProducerWithPresettleOptions(uriOptions, transacted, anonymous, true, senderSettled, transferSettled, destType);
+ }
+
+ private void doTestProducerWithPresettleOptions(String uriOptions, boolean transacted, boolean anonymous, boolean relaySupported, boolean senderSettled, boolean transferSettled, Class<? extends Destination> destType) throws Exception {
+ try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
+ Connection connection = testFixture.establishConnecton(testPeer, uriOptions, relaySupported ? serverCapabilities : null, null);
+ testPeer.expectBegin();
+
+ Session session = null;
+ Binary txnId = null;
+
+ if (transacted) {
+ // Expect the session, with an immediate link to the transaction coordinator
+ // using a target with the expected capabilities only.
+ CoordinatorMatcher txCoordinatorMatcher = new CoordinatorMatcher();
+ txCoordinatorMatcher.withCapabilities(arrayContaining(TxnCapability.LOCAL_TXN));
+ testPeer.expectSenderAttach(txCoordinatorMatcher, false, false);
+
+ // First expect an unsettled 'declare' transfer to the txn coordinator, and
+ // reply with a declared disposition state containing the txnId.
+ txnId = new Binary(new byte[]{ (byte) 1, (byte) 2, (byte) 3, (byte) 4});
+ testPeer.expectDeclare(txnId);
+
+ session = connection.createSession(true, Session.SESSION_TRANSACTED);
+ } else {
+ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ }
+
+ Destination destination = null;
+ if (destType == Queue.class) {
+ destination = session.createQueue("MyQueue");
+ } else if (destType == Topic.class) {
+ destination = session.createTopic("MyTopis");
+ } else if (destType == TemporaryQueue.class) {
+ String dynamicAddress = "myTempQueueAddress";
+ testPeer.expectTempQueueCreationAttach(dynamicAddress);
+ destination = session.createTemporaryQueue();
+ } else if (destType == TemporaryTopic.class) {
+ String dynamicAddress = "myTempTopicAddress";
+ testPeer.expectTempTopicCreationAttach(dynamicAddress);
+ destination = session.createTemporaryTopic();
+ } else {
+ fail("unexpected type");
+ }
+
+ if (senderSettled) {
+ testPeer.expectSettledSenderAttach();
+ } else {
+ testPeer.expectSenderAttach();
+ }
+
+ MessageProducer producer = null;
+ if (anonymous) {
+ producer = session.createProducer(null);
+ } else {
+ producer = session.createProducer(destination);
+ }
+
+ // Create and transfer a new message
+ MessageHeaderSectionMatcher headersMatcher = new MessageHeaderSectionMatcher(true);
+ headersMatcher.withDurable(equalTo(true));
+ MessageAnnotationsSectionMatcher msgAnnotationsMatcher = new MessageAnnotationsSectionMatcher(true);
+ TransferPayloadCompositeMatcher messageMatcher = new TransferPayloadCompositeMatcher();
+ messageMatcher.setHeadersMatcher(headersMatcher);
+ messageMatcher.setMessageAnnotationsMatcher(msgAnnotationsMatcher);
+
+ Matcher<?> stateMatcher = nullValue();
+ if (transacted) {
+ stateMatcher = new TransactionalStateMatcher();
+ ((TransactionalStateMatcher) stateMatcher).withTxnId(equalTo(txnId));
+ ((TransactionalStateMatcher) stateMatcher).withOutcome(nullValue());
+ }
+
+ ListDescribedType responseState = new Accepted();
+ if (transacted) {
+ TransactionalState txState = new TransactionalState();
+ txState.setTxnId(txnId);
+ txState.setOutcome(new Accepted());
+ }
+
+ if (transferSettled) {
+ testPeer.expectTransfer(messageMatcher, stateMatcher, true, false, responseState, false);
+ } else {
+ testPeer.expectTransfer(messageMatcher, stateMatcher, false, true, responseState, true);
+ }
+
+ if (anonymous && !relaySupported) {
+ testPeer.expectDetach(true, true, true);
+ }
+
+ Message message = session.createTextMessage();
+
+ if (anonymous) {
+ producer.send(destination, message);
+ } else {
+ producer.send(message);
+ }
+
+ if (transacted) {
+ testPeer.expectDischarge(txnId, true);
+ }
+
+ testPeer.expectClose();
+
+ connection.close();
+
+ testPeer.waitForAllHandlersToComplete(1000);
}
-
- Message message = session.createTextMessage();
-
- if (anonymous) {
- producer.send(destination, message);
- } else {
- producer.send(message);
- }
-
- if (transacted) {
- testPeer.expectDischarge(txnId, true);
- }
-
- testPeer.expectClose();
-
- connection.close();
-
- testPeer.waitForAllHandlersToComplete(1000);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org