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/24 22:37:22 UTC
svn commit: r1771237 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/test/client/
systests/src/test/java/org/apache/qpid/test/unit/topic/ test-profiles/
Author: rgodfrey
Date: Thu Nov 24 22:37:22 2016
New Revision: 1771237
URL: http://svn.apache.org/viewvc?rev=1771237&view=rev
Log:
QPID-7546 : Make some more tests run under AMQP 1.0
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/DupsOkTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java
qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes
qpid/java/trunk/test-profiles/Java10Excludes
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/DupsOkTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/DupsOkTest.java?rev=1771237&r1=1771236&r2=1771237&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/DupsOkTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/DupsOkTest.java Thu Nov 24 22:37:22 2016
@@ -20,9 +20,8 @@
*/
package org.apache.qpid.test.client;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import javax.jms.Connection;
import javax.jms.JMSException;
@@ -33,8 +32,10 @@ import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class DupsOkTest extends QpidBrokerTestCase
@@ -48,12 +49,11 @@ public class DupsOkTest extends QpidBrok
{
super.setUp();
- _queue = (Queue) getInitialContext().lookup("queue");
-
-
//Declare the queue
Connection consumerConnection = getConnection();
- consumerConnection.createSession(false,Session.AUTO_ACKNOWLEDGE).createConsumer(_queue).close();
+ Session session = consumerConnection.createSession(false,Session.AUTO_ACKNOWLEDGE);
+ _queue = createTestQueue(session);
+ session.close();
//Create Producer put some messages on the queue
Connection producerConnection = getConnection();
@@ -90,7 +90,12 @@ public class DupsOkTest extends QpidBrok
MessageConsumer consumer = clientSession.createConsumer(_queue);
- assertEquals("The queue should have msgs at start", MSG_COUNT, ((AMQSession) clientSession).getQueueDepth((AMQDestination) _queue));
+ if(!isBroker10())
+ {
+ assertEquals("The queue should have msgs at start",
+ MSG_COUNT,
+ ((AMQSession) clientSession).getQueueDepth((AMQDestination) _queue));
+ }
clientConnection.start();
@@ -158,9 +163,12 @@ public class DupsOkTest extends QpidBrok
clientSession.close();
final Session clientSession2 = clientConnection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
-
- assertEquals("The queue should have 0 msgs left", 0, ((AMQSession) clientSession2).getQueueDepth((AMQDestination) _queue));
-
+ if(!isBroker10())
+ {
+ assertEquals("The queue should have 0 msgs left",
+ 0,
+ ((AMQSession) clientSession2).getQueueDepth((AMQDestination) _queue));
+ }
clientConnection.close();
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java?rev=1771237&r1=1771236&r2=1771237&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TemporaryTopicTest.java Thu Nov 24 22:37:22 2016
@@ -20,8 +20,6 @@
*/
package org.apache.qpid.test.unit.topic;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
@@ -30,6 +28,8 @@ import javax.jms.Session;
import javax.jms.TemporaryTopic;
import javax.jms.TextMessage;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+
/**
* Tests the behaviour of {@link TemporaryTopic}.
@@ -69,7 +69,7 @@ public class TemporaryTopicTest extends
* Note: Under < 0-10 {@link TemporaryTopic#delete()} only marks the queue as deleted
* on the client. 0-10 causes the topic to be deleted from the Broker.
*/
- public void testExplictTemporaryTopicDeletion() throws Exception
+ public void testExplicitTemporaryTopicDeletion() throws Exception
{
final Connection conn = getConnection();
@@ -86,7 +86,6 @@ public class TemporaryTopicTest extends
catch (JMSException je)
{
//pass
- assertEquals("Temporary Topic has consumers so cannot be deleted", je.getMessage());
}
consumer.close();
@@ -102,7 +101,6 @@ public class TemporaryTopicTest extends
catch (JMSException je)
{
//pass
- assertEquals("Cannot consume from a deleted destination", je.getMessage());
}
}
@@ -125,7 +123,7 @@ public class TemporaryTopicTest extends
catch (JMSException je)
{
// pass
- assertEquals("Cannot consume from a temporary destination created on another connection", je.getMessage());
+
}
}
Modified: qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes?rev=1771237&r1=1771236&r2=1771237&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes Thu Nov 24 22:37:22 2016
@@ -68,3 +68,11 @@ org.apache.qpid.test.client.QueueBrowser
org.apache.qpid.test.client.QueueBrowserTransactedTest#testBrowsingWithSelector
org.apache.qpid.test.client.QueueBrowserTransactedTest#testMultipleOverlappingGetEnum
+
+// No exception is thrown when attempting to consume from a deleted temp topic
+org.apache.qpid.test.unit.topic.TemporaryTopicTest#testExplicitTemporaryTopicDeletion
+// the temporary topic does not display topic like behaviour (only one consumer receives the message)
+org.apache.qpid.test.unit.topic.TemporaryTopicTest#testMessageDeliveryUsingTemporaryTopic
+// No exception is thrown when attempting to make a durable subscription to the temporary topic
+org.apache.qpid.test.unit.topic.TemporaryTopicTest#testDurableSubscriptionProhibited
+
Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1771237&r1=1771236&r2=1771237&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Thu Nov 24 22:37:22 2016
@@ -52,5 +52,8 @@ org.apache.qpid.test.unit.basic.FieldTab
org.apache.qpid.test.client.QueueBrowserNoAckTest#*
org.apache.qpid.test.client.QueueBrowserPreAckTest#*
+// The new client does not (and should not) support our custom MD5 HEXED / HASHED mechanisms
+org.apache.qpid.server.security.auth.manager.MD5AuthenticationManagerTest#*
+
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771237&r1=1771236&r2=1771237&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Thu Nov 24 22:37:22 2016
@@ -14,14 +14,10 @@ org.apache.qpid.server.logging.QueueLogg
org.apache.qpid.server.logging.TransientQueueLoggingTest#*
org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#*
org.apache.qpid.server.security.auth.manager.ExternalAuthenticationTest#*
-org.apache.qpid.server.security.auth.manager.MD5AuthenticationManagerTest#*
-org.apache.qpid.server.security.auth.manager.ScramSha1AuthenticationManagerTest#*
-org.apache.qpid.server.security.auth.manager.ScramSha256AuthenticationManagerTest#*
org.apache.qpid.test.unit.basic.LargeMessageTest#*
org.apache.qpid.test.unit.client.connection.ConnectionStartTest#*
org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#*
org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#*
-org.apache.qpid.test.unit.topic.TemporaryTopicTest#*
org.apache.qpid.client.prefetch.PrefetchBehaviourTest#*
org.apache.qpid.client.redelivered.RedeliveredMessageTest#*
org.apache.qpid.client.SynchReceiveTest#*
@@ -30,7 +26,7 @@ org.apache.qpid.client.session.ExchangeD
org.apache.qpid.client.session.QueueDeclareTest#*
org.apache.qpid.client.session.QueueDeleteTest#*
org.apache.qpid.test.client.failover.FailoverTest#*
-org.apache.qpid.test.client.DupsOkTest#*
+//org.apache.qpid.test.client.DupsOkTest#*
org.apache.qpid.systest.prefetch.ZeroPrefetchTest#*
org.apache.qpid.systest.messageencryption.MessageEncryptionTest#*
org.apache.qpid.systest.MessageCompressionTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org