You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/12/14 08:38:51 UTC
svn commit: r1774135 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
test-profiles/Java10Excludes test-profiles/Java10UninvestigatedTestsExcludes
Author: kwall
Date: Wed Dec 14 08:38:51 2016
New Revision: 1774135
URL: http://svn.apache.org/viewvc?rev=1774135&view=rev
Log:
QPID-7546: Enable parts of ConsumerLoggingTest relating to point to point queues on the AMQP 1.0 test profile
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.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/logging/ConsumerLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java?rev=1774135&r1=1774134&r2=1774135&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java Wed Dec 14 08:38:51 2016
@@ -31,7 +31,6 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.Topic;
-import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.server.model.Consumer;
/**
@@ -59,15 +58,18 @@ public class ConsumerLoggingTest extends
{
setSystemProperty(Consumer.SUSPEND_NOTIFICATION_PERIOD, "100");
super.setUp();
- //Remove broker startup logging messages
- _monitor.markDiscardPoint();
_connection = getConnection();
_session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- _queue = _session.createQueue(getTestQueueName() + "Queue");
- _topic = _session.createTopic(getTestQueueName() + "Topic");
+ final String queueName = getTestQueueName() + "Queue";
+ final String topicName = getTestQueueName() + "Topic";
+ _queue = createTestQueue(_session, queueName);
+ _topic = createTopic(_connection, topicName);
+
+ //Remove broker startup logging messages
+ _monitor.markDiscardPoint();
}
/**
@@ -296,12 +298,11 @@ public class ConsumerLoggingTest extends
public void testSubscriptionSuspend() throws Exception, IOException
{
//Close session with large prefetch
- _session.close();
-
+ _connection.close();
int PREFETCH = 15;
+ _connection = getConnectionWithPrefetch(PREFETCH);
+ _session = _connection.createSession(true, Session.SESSION_TRANSACTED);
- //Create new session with small prefetch
- _session = ((AMQConnection) _connection).createSession(true, Session.SESSION_TRANSACTED, PREFETCH);
MessageConsumer consumer = _session.createConsumer(_queue);
Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1774135&r1=1774134&r2=1774135&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Wed Dec 14 08:38:51 2016
@@ -172,8 +172,9 @@ org.apache.qpid.test.client.message.JMSD
// test of 0-x client threading / exception handling
org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
-
-
+// Durable topic subscriptions will be reimplemented with the shared topic subscriptions (QPID-7569)
+org.apache.qpid.server.logging.ConsumerLoggingTest#testSubscriptionCreateDurable
+org.apache.qpid.server.logging.ConsumerLoggingTest#testSubscriptionCreateDurableWithArguments
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1774135&r1=1774134&r2=1774135&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Wed Dec 14 08:38:51 2016
@@ -20,7 +20,6 @@
// This file should eventually be removed as all the systests are moved to either
// working, defined as broken, or excluded as they test version specific functionality
-org.apache.qpid.server.logging.ConsumerLoggingTest#*
org.apache.qpid.server.logging.DurableQueueLoggingTest#*
org.apache.qpid.server.logging.QueueLoggingTest#*
org.apache.qpid.server.logging.TransientQueueLoggingTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org