inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated search query to use new DSL of results count assertion

Browse Source
This commit is contained in:
Paul Brodner
2017-02-14 15:01:59 +02:00
parent 69eb5ce73b
commit 5bab6d5525
7 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByAspectTests.java
+1 -1
View File
@@ -46,6 +46,6 @@ public class SolrSearchByAspectTests extends CmisTest
public void executeSearchByAspect(QueryModel query) throws Exception
{
cmisApi.withQuery(query.getValue())
.applyNodeRefsFrom(testData).assertResultsCountIs(query.getResults());
.applyNodeRefsFrom(testData).assertResultsCount().equals(query.getResults());
}
}
e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIdTests.java
+1 -1
View File
@@ -46,6 +46,6 @@ public class SolrSearchByIdTests extends CmisTest
public void executeSortedSearchByID(QueryModel query) throws Exception
{
cmisApi.withQuery(query.getValue())
.applyNodeRefsFrom(testData).assertResultsCountIs(query.getResults());
.applyNodeRefsFrom(testData).assertResultsCount().equals(query.getResults());
}
}
e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPathTests.java
+1 -1
View File
@@ -43,6 +43,6 @@ public class SolrSearchByPathTests extends CmisTest
@XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-path.xml")
public void executeSearchByPathQueries(QueryModel query) throws Exception
{
cmisApi.withQuery(query.getValue()).assertResultsCountIs(query.getResults());
cmisApi.withQuery(query.getValue()).assertResultsCount().equals(query.getResults());
}
}
e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java
+1 -1
View File
@@ -46,6 +46,6 @@ public class SolrSearchByPropertyTests extends CmisTest
public void executeSortedSearchByID(QueryModel query) throws Exception
{
cmisApi.withQuery(query.getValue())
.applyNodeRefsFrom(testData).assertResultsCountIs(query.getResults());
.applyNodeRefsFrom(testData).assertResultsCount().equals(query.getResults());
}
}
e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInFolderTests.java
+2 -2
View File
@@ -63,9 +63,9 @@ public class SolrSearchInFolderTests extends CmisTest
@Test(groups = { TestGroup.CMIS, TestGroup.QUERIES },
dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
@XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-in-folder.xml")
public void executeCMISQuery(QueryModel query)
public void executeCMISQuery(QueryModel query) throws Exception
{
String currentQuery = String.format(query.getValue(), parentFolder.getNodeRef());
cmisApi.withQuery(currentQuery).assertResultsCountIs(query.getResults());
cmisApi.withQuery(currentQuery).assertResultsCount().equals(query.getResults());
}
}
e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInTreeTests.java
+2 -2
View File
@@ -67,10 +67,10 @@ public class SolrSearchInTreeTests extends CmisTest
@Test(groups = { TestGroup.CMIS, TestGroup.QUERIES },
dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
@XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-in-tree.xml")
public void executeCMISQuery(QueryModel query)
public void executeCMISQuery(QueryModel query) throws Exception
{
String currentQuery = String.format(query.getValue(), parentFolder.getNodeRef());
cmisApi.withQuery(currentQuery)
.assertResultsCountIs(query.getResults());
.assertResultsCount().equals(query.getResults());
}
}
e2e-test/src/test/java/org/alfresco/cmis/search/SorlSearchSimpleQueryTests.java
+14
View File
@@ -0,0 +1,14 @@
package org.alfresco.cmis.search;
import org.alfresco.cmis.CmisTest;
import org.testng.annotations.Test;
public class SorlSearchSimpleQueryTests extends CmisTest
{
@Test
public void simpleQueryOnFolderDesc() throws Exception
{
cmisApi.authenticateUser(dataUser.getAdminUser())
.withQuery("SELECT * FROM cmis:folder ORDER BY cmis:createdBy DESC").assertResultsCount().isLowerThan(101);
}
}