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 2017/01/24 11:16:59 UTC
svn commit: r1780064 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
test-profiles/Java10Excludes
Author: kwall
Date: Tue Jan 24 11:16:59 2017
New Revision: 1780064
URL: http://svn.apache.org/viewvc?rev=1780064&view=rev
Log:
QPID-7546: [System Tests] Enable ExportImportMessagesRestTest on AMQP 1.0 persistent profile
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
qpid/java/trunk/test-profiles/Java10Excludes
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java?rev=1780064&r1=1780063&r2=1780064&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java Tue Jan 24 11:16:59 2017
@@ -45,16 +45,12 @@ import org.apache.qpid.util.DataUrlUtils
public class ExportImportMessagesRestTest extends QpidRestTestCase
{
- private static final String CONNECTION_URL_TEMPLATE =
- "amqp://guest:guest@clientid/%s?brokerlist='localhost:%d?failover='false''";
-
private String _virtualHostNodeName;
private String _virtualHostName;
private String _queueName;
private String _extractOpUrl;
private String _importOpUrl;
- private Destination _queue;
private Destination _jmsQueue;
private List<Message> _expectedMessages;
@@ -73,7 +69,7 @@ public class ExportImportMessagesRestTes
Connection connection = createConnection(_virtualHostName);
Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
- _jmsQueue = session.createQueue(String.format("direct:////%s", _queueName));
+ _jmsQueue = session.createQueue(isBroker10() ? _queueName : String.format("direct:////%s", _queueName));
_expectedMessages = sendMessage(session, _jmsQueue, 1);
connection.close();
@@ -176,6 +172,6 @@ public class ExportImportMessagesRestTes
private Connection createConnection(final String virtualHostName) throws Exception
{
- return getConnection(String.format(CONNECTION_URL_TEMPLATE, virtualHostName, getDefaultAmqpPort()));
+ return getConnectionForVHost(virtualHostName);
}
}
Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1780064&r1=1780063&r2=1780064&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Tue Jan 24 11:16:59 2017
@@ -194,7 +194,6 @@ org.apache.qpid.client.ssl.SSLTest#testS
org.apache.qpid.client.ssl.SSLTest#testMultipleCertsInSingleStore
// Tests assume BURL and/or Connection URL formats
-org.apache.qpid.systest.rest.ExportImportMessagesRestTest#testExtractImportEndToEnd
org.apache.qpid.server.store.berkeleydb.replication.MultiNodeTest#*
org.apache.qpid.server.store.berkeleydb.replication.TwoNodeTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org