SCB-1597 Support checking the table without order

apache · Nov 18, 2019 · df9b46f · df9b46f
1 parent 6ae83b9
commit df9b46f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...emo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/DubboDemoStepdefs.java b/...emo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/DubboDemoStepdefs.java
@@ -90,7 +90,7 @@ public DubboDemoStepdefs() {
         }
       };
 
-      dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events", dataTable, sortAndColumnStrippingConsumer);
+      dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events", dataTable, sortAndColumnStrippingConsumer, false);
     });
 
     And("^(service[a-c]+) success update status$", (String serviceName, DataTable dataTable) -> {
@@ -101,7 +101,7 @@ public DubboDemoStepdefs() {
       };
 
       dataMatches(System.getProperty(SERVICEA_ADDRESS) + "/serviceInfo/" + serviceName, dataTable,
-          columnStrippingConsumer);
+          columnStrippingConsumer, false);
     });
   }
 

diff --git a/...ests/acceptance-test-common/src/test/java/org/apache/servicecomb/pack/StepDefSupport.java b/...ests/acceptance-test-common/src/test/java/org/apache/servicecomb/pack/StepDefSupport.java
@@ -50,6 +50,10 @@ public class StepDefSupport implements En {
   };
 
   protected void dataMatches(String address, DataTable dataTable, Consumer<Map<String, String>[]> dataProcessor) {
+    dataMatches(address, dataTable, dataProcessor, true);
+  }
+
+  protected void dataMatches(String address, DataTable dataTable, Consumer<Map<String, String>[]> dataProcessor, boolean checkOrder) {
     List<Map<String, String>> expectedMaps = dataTable.asMaps(String.class, String.class);
     List<Map<String, String>> actualMaps = new ArrayList<>();
 
@@ -69,7 +73,11 @@ protected void dataMatches(String address, DataTable dataTable, Consumer<Map<Str
     }
 
     LOG.info("Retrieved data {} from service", actualMaps);
-    dataTable.diff(DataTable.create(actualMaps));
+    if (checkOrder) {
+      dataTable.diff(DataTable.create(actualMaps));
+    } else {
+      dataTable.unorderedDiff(DataTable.create(actualMaps));
+    }
   }
 
   @SuppressWarnings("unchecked")