Author: orudyy
Date: Mon Jun 1 13:06:07 2015
New Revision: 1682893
URL: http://svn.apache.org/r1682893
Log:
NO-JIRA: Use synchronous publishing in test
EnsureNondestructiveConsumersTest#testEnsureNondestructiveConsumers in order to
prevent its sporadic failures due to attempt to recieve message which has not
got into the broker
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SyncPublishTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1682893&r1=1682892&r2=1682893&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Mon Jun 1 13:06:07 2015
@@ -911,6 +911,13 @@ public class QpidBrokerTestCase extends
return getConnection(GUEST_USERNAME, GUEST_PASSWORD);
}
+ protected Connection getConnectionWithSyncPublishing() throws
URLSyntaxException, NamingException, JMSException
+ {
+ Map<String, String> options = new HashMap<>();
+ options.put(ConnectionURL.OPTIONS_SYNC_PUBLISH, "all");
+ return getConnectionWithOptions(options);
+ }
+
public Connection getConnectionWithOptions(Map<String, String> options)
throws URLSyntaxException, NamingException, JMSException
{
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SyncPublishTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SyncPublishTest.java?rev=1682893&r1=1682892&r2=1682893&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SyncPublishTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/SyncPublishTest.java
Mon Jun 1 13:06:07 2015
@@ -28,9 +28,11 @@ import javax.jms.JMSException;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TemporaryQueue;
+import javax.naming.NamingException;
import org.apache.qpid.jms.ConnectionURL;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.url.URLSyntaxException;
public class SyncPublishTest extends QpidBrokerTestCase
{
@@ -41,9 +43,7 @@ public class SyncPublishTest extends Qpi
{
super.setUp();
- Map<String, String> options = new HashMap<>();
- options.put(ConnectionURL.OPTIONS_SYNC_PUBLISH, "all");
- _connection = getConnectionWithOptions(options);
+ _connection = getConnectionWithSyncPublishing();
}
@Override
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java?rev=1682893&r1=1682892&r2=1682893&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
Mon Jun 1 13:06:07 2015
@@ -51,7 +51,7 @@ public class EnsureNondestructiveConsume
super.setUp();
_queueName = getTestQueueName();
- _connection = getConnection();
+ _connection = getConnectionWithSyncPublishing();
_session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
_connection.start();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
