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:35 UTC
svn commit: r1774133 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java
test-profiles/Java10UninvestigatedTestsExcludes
Author: kwall
Date: Wed Dec 14 08:38:35 2016
New Revision: 1774133
URL: http://svn.apache.org/viewvc?rev=1774133&view=rev
Log:
QPID-7546: Enable SynchReceiveTest on AMQP 1.0 system test profile
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java?rev=1774133&r1=1774132&r2=1774133&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SynchReceiveTest.java Wed Dec 14 08:38:35 2016
@@ -25,29 +25,25 @@ import javax.jms.MessageConsumer;
import javax.jms.Queue;
import javax.jms.Session;
-import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class SynchReceiveTest extends QpidBrokerTestCase
{
- private static final long AWAIT_MESSAGE_TIMEOUT = 2000;
- private static final long AWAIT_MESSAGE_TIMEOUT_NEGATIVE = 250;
private static final int MSG_COUNT = 10;
- private final String _testQueueName = getTestQueueName();
private Connection _consumerConnection;
- private Session _consumerSession;
private MessageConsumer _consumer;
private Queue _queue;
- protected void setUp() throws Exception
+ @Override
+ public void setUp() throws Exception
{
super.setUp();
_consumerConnection = getConnection();
_consumerConnection.start();
- _consumerSession = _consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- _queue = _consumerSession.createQueue(_testQueueName);
- _consumer = _consumerSession.createConsumer(_queue);
+ Session consumerSession = _consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ _queue = createTestQueue(consumerSession);
+ _consumer = consumerSession.createConsumer(_queue);
// Populate queue
Connection producerConnection = getConnection();
@@ -60,10 +56,10 @@ public class SynchReceiveTest extends Qp
{
for (int msg = 0; msg < MSG_COUNT; msg++)
{
- assertNotNull("Expected message number " + msg, _consumer.receive(AWAIT_MESSAGE_TIMEOUT));
+ assertNotNull("Expected message number " + msg, _consumer.receive(getReceiveTimeout()));
}
- assertNull("Received too many messages", _consumer.receive(500));
+ assertNull("Received too many messages", _consumer.receive(getShortReceiveTimeout()));
}
public void testReceiveNoWait() throws Exception
@@ -73,16 +69,14 @@ public class SynchReceiveTest extends Qp
assertNotNull("Expected message number " + msg, _consumer.receiveNoWait());
}
- assertNull("Received too many messages", _consumer.receive(500));
+ assertNull("Received too many messages", _consumer.receive(getShortReceiveTimeout()));
}
public void testTwoConsumersInterleaved() throws Exception
{
- //create a new connection with prefetch set to 1
_consumerConnection.close();
- setTestClientSystemProperty(ClientProperties.MAX_PREFETCH_PROP_NAME, new Integer(1).toString());
- _consumerConnection = getConnection();
+ _consumerConnection = getConnectionWithPrefetch(0);
_consumerConnection.start();
Session consumerSession1 = _consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer1 = consumerSession1.createConsumer(_queue);
@@ -95,12 +89,12 @@ public class SynchReceiveTest extends Qp
int loops = 0;
while(msg < MSG_COUNT && loops < maxLoops)
{
- if (consumer1.receive(AWAIT_MESSAGE_TIMEOUT) != null)
+ if (consumer1.receive(getReceiveTimeout()) != null)
{
msg++;
}
- if (consumer2.receive(AWAIT_MESSAGE_TIMEOUT) != null)
+ if (consumer2.receive(getReceiveTimeout()) != null)
{
msg++;
}
@@ -109,8 +103,8 @@ public class SynchReceiveTest extends Qp
}
assertEquals("Not all messages received.", MSG_COUNT, msg);
- assertNull("Received too many messages", consumer1.receive(AWAIT_MESSAGE_TIMEOUT_NEGATIVE));
- assertNull("Received too many messages", consumer2.receive(AWAIT_MESSAGE_TIMEOUT_NEGATIVE));
+ assertNull("Received too many messages", consumer1.receive(getShortReceiveTimeout()));
+ assertNull("Received too many messages", consumer2.receive(getShortReceiveTimeout()));
}
public void testIdleSecondConsumer() throws Exception
@@ -123,10 +117,10 @@ public class SynchReceiveTest extends Qp
for (int msg = 0; msg < MSG_COUNT; msg++)
{
- assertNotNull("Expected message number " + msg, _consumer.receive(AWAIT_MESSAGE_TIMEOUT));
+ assertNotNull("Expected message number " + msg, _consumer.receive(getReceiveTimeout()));
}
- assertNull("Received too many messages", _consumer.receive(AWAIT_MESSAGE_TIMEOUT_NEGATIVE));
+ assertNull("Received too many messages", _consumer.receive(getShortReceiveTimeout()));
}
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1774133&r1=1774132&r2=1774133&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Wed Dec 14 08:38:35 2016
@@ -27,7 +27,6 @@ org.apache.qpid.server.logging.QueueLogg
org.apache.qpid.server.logging.TransientQueueLoggingTest#*
org.apache.qpid.client.prefetch.PrefetchBehaviourTest#*
org.apache.qpid.client.redelivered.RedeliveredMessageTest#*
-org.apache.qpid.client.SynchReceiveTest#*
org.apache.qpid.server.security.acl.ExternalACLTest#*
org.apache.qpid.server.security.acl.ExhaustiveACLTest#*
org.apache.qpid.test.unit.topic.DurableSubscriptionTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org