inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-1989 Allow checking values returned in a column. (#1)

Browse Source
This commit is contained in:
Tom Page
2019-11-29 14:50:05 +00:00
committed by GitHub
parent 98bc091adc
commit 7da7544c37
1 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/QueryExecutor.java
View File

@@ -1,5 +1,7 @@
package org.alfresco.cmis.dsl; package org.alfresco.cmis.dsl;
import static java.util.stream.Collectors.toSet;
import static org.alfresco.utility.Utility.checkObjectIsInitialized; import static org.alfresco.utility.Utility.checkObjectIsInitialized;
import static org.alfresco.utility.report.log.Step.STEP; import static org.alfresco.utility.report.log.Step.STEP;
@@ -7,8 +9,11 @@ import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.google.common.collect.Streams;
import org.alfresco.cmis.CmisWrapper; import org.alfresco.cmis.CmisWrapper;
import org.alfresco.utility.LogFactory; import org.alfresco.utility.LogFactory;
import org.alfresco.utility.data.provider.XMLTestData; import org.alfresco.utility.data.provider.XMLTestData;
@@ -47,17 +52,23 @@ public class QueryExecutor
returnedResults = executeQuery(currentQuery).getPageNumItems(); returnedResults = executeQuery(currentQuery).getPageNumItems();
return new QueryResultAssertion(); return new QueryResultAssertion();
} }
public QueryResultAssertion assertColumnIsOrdered() public QueryResultAssertion assertColumnIsOrdered()
{ {
results = executeQuery(currentQuery); results = executeQuery(currentQuery);
return new QueryResultAssertion(); return new QueryResultAssertion();
} }
public QueryResultAssertion assertColumnValuesRange() public QueryResultAssertion assertColumnValuesRange()
{ {
results = executeQuery(currentQuery); results = executeQuery(currentQuery);
return new QueryResultAssertion(); return new QueryResultAssertion();
}
public QueryResultAssertion assertValues()
{
results = executeQuery(currentQuery);
return new QueryResultAssertion();
} }
private ItemIterable<QueryResult> executeQuery(String query) private ItemIterable<QueryResult> executeQuery(String query)
@@ -70,7 +81,7 @@ public class QueryExecutor
/** /**
* Call getNodeRef on each test data item used in test and replace that with NODE_REF keywords in your Query * Call getNodeRef on each test data item used in test and replace that with NODE_REF keywords in your Query
* *
* @param testData * @param testData
* @return * @return
*/ */
@@ -118,7 +129,7 @@ public class QueryExecutor
/** /**
* if you have in your search 'SELECT * from cmis:document where workspace://SpacesStore/NODE_REF[site1] or workspace://SpacesStore/NODE_REF[site2]' * if you have in your search 'SELECT * from cmis:document where workspace://SpacesStore/NODE_REF[site1] or workspace://SpacesStore/NODE_REF[site2]'
* and pass key="NODE_REF" this method will get "site1" and "site2" as values * and pass key="NODE_REF" this method will get "site1" and "site2" as values
* *
* @param key * @param key
* @return * @return
* @throws TestConfigurationException * @throws TestConfigurationException
@@ -163,7 +174,7 @@ public class QueryExecutor
return this; return this;
} }
public QueryResultAssertion isLowerThan(long expectedValue) public QueryResultAssertion isLowerThan(long expectedValue)
{ {
STEP(String.format("Verify that query: '%s' has more than %d results count returned", currentQuery, expectedValue)); STEP(String.format("Verify that query: '%s' has more than %d results count returned", currentQuery, expectedValue));
@@ -172,52 +183,60 @@ public class QueryExecutor
return this; return this;
} }
public QueryResultAssertion isOrderedAsc(String queryName) public QueryResultAssertion isOrderedAsc(String queryName)
{ {
STEP(String.format("Verify that query: '%s' is returning ascending ordered values for column %s", currentQuery, queryName)); STEP(String.format("Verify that query: '%s' is returning ascending ordered values for column %s", currentQuery, queryName));
List<Object> columnValues = new ArrayList<>(); List<Object> columnValues = new ArrayList<>();
results.forEach((r)->{ results.forEach((r) -> {
columnValues.add(r.getPropertyValueByQueryName(queryName)); columnValues.add(r.getPropertyValueByQueryName(queryName));
}); });
List<Object> orderedColumnValues = columnValues.stream().sorted().collect(Collectors.toList()); List<Object> orderedColumnValues = columnValues.stream().sorted().collect(Collectors.toList());
Assert.assertEquals(columnValues, orderedColumnValues, Assert.assertEquals(columnValues, orderedColumnValues,
String.format("%s column values expected to be in ascendent order, but found %s", queryName, columnValues.toString())); String.format("%s column values expected to be in ascendent order, but found %s", queryName, columnValues.toString()));
return this; return this;
} }
public QueryResultAssertion isOrderedDesc(String queryName) public QueryResultAssertion isOrderedDesc(String queryName)
{ {
STEP(String.format("Verify that query: '%s' is returning descending ordered values for column %s", currentQuery, queryName)); STEP(String.format("Verify that query: '%s' is returning descending ordered values for column %s", currentQuery, queryName));
List<Object> columnValues = new ArrayList<>(); List<Object> columnValues = new ArrayList<>();
results.forEach((r)->{ results.forEach((r) -> {
columnValues.add(r.getPropertyValueByQueryName(queryName)); columnValues.add(r.getPropertyValueByQueryName(queryName));
}); });
List<Object> reverseOrderedColumnValues = columnValues.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList()); List<Object> reverseOrderedColumnValues = columnValues.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList());
Assert.assertEquals(columnValues, reverseOrderedColumnValues, Assert.assertEquals(columnValues, reverseOrderedColumnValues,
String.format("%s column values expected to be in descendent order, but found %s", queryName, columnValues.toString())); String.format("%s column values expected to be in descendent order, but found %s", queryName, columnValues.toString()));
return this; return this;
} }
public QueryResultAssertion isReturningValuesInRange(String queryName, BigDecimal minValue, BigDecimal maxValue) public QueryResultAssertion isReturningValuesInRange(String queryName, BigDecimal minValue, BigDecimal maxValue)
{ {
STEP(String.format("Verify that query: '%s' is returning values for column %s in range from %.4f to %.4f", currentQuery, queryName, minValue, maxValue)); STEP(String.format("Verify that query: '%s' is returning values for column %s in range from %.4f to %.4f", currentQuery, queryName, minValue, maxValue));
results.forEach((r)->{ results.forEach((r) -> {
BigDecimal value = (BigDecimal) r.getPropertyValueByQueryName(queryName); BigDecimal value = (BigDecimal) r.getPropertyValueByQueryName(queryName);
if (value.compareTo(minValue) < 0 || value.compareTo(maxValue) > 0) if (value.compareTo(minValue) < 0 || value.compareTo(maxValue) > 0)
{ {
Assert.fail(String.format("%s column values expected to be in range from %.4f to %.4f, but found %.4f", queryName, minValue, maxValue, value)); Assert.fail(String.format("%s column values expected to be in range from %.4f to %.4f, but found %.4f", queryName, minValue, maxValue, value));
} }
}); });
return this; return this;
} }
public <T> QueryResultAssertion isReturningValues(String queryName, Set<T> values)
{
STEP(String.format("Verify that query: '%s' returns the values from %s for column %s", currentQuery, values, queryName));
Set<T> resultSet = Streams.stream(results).map(r -> (T) r.getPropertyValueByQueryName(queryName)).collect(toSet());
Assert.assertEquals(resultSet, values, "Values did not match");
return this;
}
private String showErrorMessage() private String showErrorMessage()
{ {
return String.format("Returned results count of Query [%s] is not the expected one:", currentQuery); return String.format("Returned results count of Query [%s] is not the expected one:", currentQuery);