qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lqu...@apache.org
Subject [1/5] qpid-broker-j git commit: NO-JIRA: [Java Broker] fix test for java-json profile
Date Tue, 06 Jun 2017 08:47:36 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 5a872b431 -> 688939757


NO-JIRA: [Java Broker] fix test for java-json profile


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/2a09db6c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/2a09db6c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/2a09db6c

Branch: refs/heads/master
Commit: 2a09db6ccf57a488ae81fe71aeb4d8d4475e41a2
Parents: b17141d
Author: Lorenz Quack <lquack@apache.org>
Authored: Mon Jun 5 15:15:50 2017 +0100
Committer: Lorenz Quack <lquack@apache.org>
Committed: Tue Jun 6 09:13:03 2017 +0100

----------------------------------------------------------------------
 .../qpid/systest/rest/ExportImportMessagesRestTest.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2a09db6c/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
b/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
index a2634ae..6b4c920 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
@@ -19,6 +19,9 @@
  */
 package org.apache.qpid.systest.rest;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -90,10 +93,8 @@ public class ExportImportMessagesRestTest extends QpidRestTestCase
 
     public void testExtractImportEndToEnd() throws Exception
     {
-        if (!isBrokerStorePersistent())
-        {
-            return;
-        }
+        assumeThat(isBrokerStorePersistent(), is(true));
+
         changeVirtualHostState(_virtualHostNodeName, _virtualHostName, "STOPPED");
 
         byte[] extractedBytes = getRestTestHelper().getBytes(_extractOpUrl);
@@ -151,7 +152,8 @@ public class ExportImportMessagesRestTest extends QpidRestTestCase
     {
         String type = getTestProfileVirtualHostNodeType();
 
-        Map<String, Object> virtualHostAttributes = Collections.<String, Object>singletonMap(VirtualHost.NAME,
virtualHostName);
+        final Map virtualHostAttributes = new ObjectMapper().readValue(getTestProfileVirtualHostNodeBlueprint(),
Map.class);
+        virtualHostAttributes.put(VirtualHost.NAME, virtualHostName);
 
         Map<String, Object> nodeAttributes = new HashMap<>();
         nodeAttributes.put(VirtualHostNode.NAME, virtualHostNodeName);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message