From d2ab9a7998719b8cc5e120f020d459bed762b7b4 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Fri, 29 Nov 2019 16:27:05 +0000 Subject: [PATCH] SEARCH-1989 Allow checking ordered values returned in a column. (#6) --- .../java/org/alfresco/cmis/dsl/QueryExecutor.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/QueryExecutor.java b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/QueryExecutor.java index dd1d434bf0..b253d1bd15 100644 --- a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/QueryExecutor.java +++ b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/QueryExecutor.java @@ -1,5 +1,6 @@ package org.alfresco.cmis.dsl; +import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static org.alfresco.utility.Utility.checkObjectIsInitialized; @@ -237,6 +238,16 @@ public class QueryExecutor return this; } + public QueryResultAssertion isReturningOrderedValues(String queryName, List values) + { + STEP(String.format("Verify that query: '%s' returns the values from %s for column %s", currentQuery, values, queryName)); + List resultList = Streams.stream(results).map(r -> (T) r.getPropertyValueByQueryName(queryName)).collect(toList()); + // Include both lists in assertion message as TestNG does not provide this information. + Assert.assertEquals(resultList, values, "Values did not match expected " + values + " but found " + resultList); + + return this; + } + private String showErrorMessage() { return String.format("Returned results count of Query [%s] is not the expected one:", currentQuery);