You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/28 11:06:23 UTC
svn commit: r1771709 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
test-profiles/Java10Excludes test-profiles/Java10UninvestigatedTestsExcludes
Author: rgodfrey
Date: Mon Nov 28 11:06:22 2016
New Revision: 1771709
URL: http://svn.apache.org/viewvc?rev=1771709&view=rev
Log:
QPID-7546 : NodeAutoCreationPolicyTest
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
qpid/java/trunk/test-profiles/Java10Excludes
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java?rev=1771709&r1=1771708&r2=1771709&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java Mon Nov 28 11:06:22 2016
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.Map;
import javax.jms.Connection;
+import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -152,12 +153,12 @@ public class NodeAutoCreationPolicyTest
public void testSendingToQueuePattern() throws Exception
{
- final Queue queue = _session.createQueue("ADDR: fooQueue ; { assert: never, node: { type: queue } }");
+ final Queue queue = _session.createQueue(isBroker10() ? "fooQueue" : "ADDR: fooQueue ; { assert: never, node: { type: queue } }");
final MessageProducer producer = _session.createProducer(queue);
producer.send(_session.createTextMessage("Hello world!"));
final MessageConsumer consumer = _session.createConsumer(queue);
- Message received = consumer.receive(2000l);
+ Message received = consumer.receive(getReceiveTimeout());
assertNotNull(received);
assertTrue(received instanceof TextMessage);
assertEquals("Hello world!", ((TextMessage)received).getText());
@@ -166,7 +167,7 @@ public class NodeAutoCreationPolicyTest
public void testSendingToNonMatchingQueuePattern() throws Exception
{
- final Queue queue = _session.createQueue("ADDR: foQueue ; { assert: never, node: { type: queue } }");
+ final Queue queue = _session.createQueue(isBroker10() ? "foQueue" : "ADDR: foQueue ; { assert: never, node: { type: queue } }");
try
{
final MessageProducer producer = _session.createProducer(queue);
@@ -174,26 +175,32 @@ public class NodeAutoCreationPolicyTest
}
catch(JMSException e)
{
- assertNotNull(e.getLinkedException());
-
- assertEquals("The name 'foQueue' supplied in the address doesn't resolve to an exchange or a queue",
- e.getLinkedException().getMessage());
+ if(isBroker10())
+ {
+ assertTrue(e instanceof InvalidDestinationException);
+ }
+ else
+ {
+ assertNotNull(e.getLinkedException());
+ assertEquals("The name 'foQueue' supplied in the address doesn't resolve to an exchange or a queue",
+ e.getLinkedException().getMessage());
+ }
}
}
public void testSendingToExchangePattern() throws Exception
{
- final Topic topic = _session.createTopic("ADDR: barExchange/foo ; { assert: never, node: { type: topic } }");
+ final Topic topic = _session.createTopic(isBroker10() ? "barExchange/foo" : "ADDR: barExchange/foo ; { assert: never, node: { type: topic } }");
final MessageProducer producer = _session.createProducer(topic);
producer.send(_session.createTextMessage("Hello world!"));
final MessageConsumer consumer = _session.createConsumer(topic);
- Message received = consumer.receive(1000l);
+ Message received = consumer.receive(getShortReceiveTimeout());
assertNull(received);
producer.send(_session.createTextMessage("Hello world2!"));
- received = consumer.receive(1000l);
+ received = consumer.receive(getReceiveTimeout());
assertNotNull(received);
@@ -204,7 +211,7 @@ public class NodeAutoCreationPolicyTest
public void testSendingToNonMatchingTopicPattern() throws Exception
{
- final Topic topic = _session.createTopic("ADDR: baa ; { assert: never, node: { type: topic } }");
+ final Topic topic = _session.createTopic(isBroker10() ? "baa" : "ADDR: baa ; { assert: never, node: { type: topic } }");
try
{
final MessageProducer producer = _session.createProducer(topic);
@@ -212,10 +219,16 @@ public class NodeAutoCreationPolicyTest
}
catch(JMSException e)
{
- assertNotNull(e.getLinkedException());
-
- assertEquals("The name 'baa' supplied in the address doesn't resolve to an exchange or a queue",
- e.getLinkedException().getMessage());
+ if(isBroker10())
+ {
+ assertTrue(e instanceof InvalidDestinationException);
+ }
+ else
+ {
+ assertNotNull(e.getLinkedException());
+ assertEquals("The name 'baa' supplied in the address doesn't resolve to an exchange or a queue",
+ e.getLinkedException().getMessage());
+ }
}
}
@@ -227,7 +240,7 @@ public class NodeAutoCreationPolicyTest
producer.send(_session.createTextMessage("Hello world!"));
final MessageConsumer consumer = _session.createConsumer(queue);
- Message received = consumer.receive(2000l);
+ Message received = consumer.receive(getReceiveTimeout());
assertNotNull(received);
assertTrue(received instanceof TextMessage);
assertEquals("Hello world!", ((TextMessage)received).getText());
Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1771709&r1=1771708&r2=1771709&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Mon Nov 28 11:06:22 2016
@@ -123,6 +123,10 @@ org.apache.qpid.server.queue.QueueBindTe
org.apache.qpid.test.unit.basic.InvalidDestinationTest#testInvalidDestinationOnMessageProducer
org.apache.qpid.test.unit.basic.InvalidDestinationTest#testInvalidDestinationOnMessageProducerURL
+org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#testSendingToQueuePatternBURL
+org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#testSendingToNonMatchingQueuePatternBURL
+
+
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771709&r1=1771708&r2=1771709&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Mon Nov 28 11:06:22 2016
@@ -25,7 +25,6 @@ org.apache.qpid.server.logging.ConsumerL
org.apache.qpid.server.logging.DurableQueueLoggingTest#*
org.apache.qpid.server.logging.QueueLoggingTest#*
org.apache.qpid.server.logging.TransientQueueLoggingTest#*
-org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#*
org.apache.qpid.server.security.auth.manager.ExternalAuthenticationTest#*
org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#*
org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org