Merge branch 'master' of git.alfresco.com:search_discovery/insightengine into fix/SEARCH-1960

e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/.env

@@ -1,15 +1,15 @@
 ALFRESCO_TAG=latest
-SHARE_TAG=6.1.0-RC3
-POSTGRES_TAG=10.9
-TRANSFORM_ROUTER_TAG=1.1.0-EA2
-PDF_RENDERER_TAG=2.1.0-EA4
-IMAGE_MAGICK_TAG=2.1.0-EA4
-LIBREOFFICE_TAG=2.1.0-EA4
-TIKA_TAG=2.1.0-EA4
-TRANSFORM_MISC_TAG=2.1.0-EA4
+SHARE_TAG=6.2.0
+POSTGRES_TAG=11.4
+TRANSFORM_ROUTER_TAG=1.1.0
+PDF_RENDERER_TAG=2.1.0
+IMAGE_MAGICK_TAG=2.1.0
+LIBREOFFICE_TAG=2.1.0
+TIKA_TAG=2.1.0
+TRANSFORM_MISC_TAG=2.1.0
 SHARED_FILE_STORE_TAG=0.5.3
 ACTIVE_MQ_TAG=5.15.8
-DIGITAL_WORKSPACE_TAG=1.1.0
+DIGITAL_WORKSPACE_TAG=1.3.0
 ACS_NGINX_TAG=3.0.1
 ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=latest

e2e-test/pom.xml

@@ -11,9 +11,9 @@
    <name>Search Analytics E2E Tests</name>
    <description>Test Project to test Search Service and Analytics Features on a complete setup of Alfresco, Share</description>
    <properties>
-      <tas.rest.api.version>6.0.1.2</tas.rest.api.version>
-      <tas.cmis.api.version>6.0.0.4</tas.cmis.api.version>
-      <tas.utility.version>3.0.14</tas.utility.version>
+      <tas.rest.api.version>1.18</tas.rest.api.version>
+      <tas.cmis.api.version>1.10</tas.cmis.api.version>
+      <tas.utility.version>3.0.15</tas.utility.version>
       <rm.version>3.2.0</rm.version>
       <suiteXmlFile>src/test/resources/SearchSuite.xml</suiteXmlFile>
       <test.exclude></test.exclude>
@@ -44,7 +44,7 @@
       </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
-         <artifactId>restapi-test</artifactId>
+         <artifactId>restapi</artifactId>
          <version>${tas.rest.api.version}</version>
          <scope>test</scope>
          <exclusions>
@@ -56,7 +56,7 @@
       </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
-         <artifactId>cmis-test</artifactId>
+         <artifactId>cmis</artifactId>
          <version>${tas.cmis.api.version}</version>
          <scope>test</scope>
          <exclusions>

e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java

@@ -1,5 +1,8 @@
 package org.alfresco.test.search.functional.searchServices.cmis;
 
+import java.util.List;
+import java.util.Set;
+
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.data.CustomObjectTypeProperties;
 import org.alfresco.utility.data.provider.XMLDataConfig;
@@ -15,7 +18,7 @@ public class SolrSearchByPropertyTests extends AbstractCmisE2ETest
     private FolderModel guestf, tesf, restf, testtttf, testf, testf1, testf2, testf3, testf4;
     private FileModel guestc, restc, tesc, testtttc, testc, testc1, testc2, testc3;
 
-    @BeforeClass(alwaysRun = true)
+    @BeforeClass (alwaysRun = true)
     public void dataPreparation() throws Exception
     {
         dataContent.usingAdmin().deployContentModel("model/tas-model.xml");
@@ -46,68 +49,464 @@ public class SolrSearchByPropertyTests extends AbstractCmisE2ETest
         // Sites
         dataContent.usingUser(testUser).usingSite(testSite).createCustomContent(guestf, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "guestf text")
-                        .addProperty("tas:IntPropertyF", 222));
+                                                .addProperty("tas:IntPropertyF", 222));
         dataContent.usingUser(testUser).usingSite(testSite).createCustomContent(tesf, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "tesf text")
-                        .addProperty("tas:IntPropertyF", 224));
+                                                .addProperty("tas:IntPropertyF", 224));
 
         // Sites >> Folders
         dataContent.usingUser(testUser).usingResource(guestf).createCustomContent(restf, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "restf text")
-                        .addProperty("tas:IntPropertyF", 223));
+                                                .addProperty("tas:IntPropertyF", 223));
         dataContent.usingUser(testUser).usingResource(guestf).createCustomContent(testtttf, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "testtttf text")
-                        .addProperty("tas:IntPropertyF", 225));
+                                                .addProperty("tas:IntPropertyF", 225));
         dataContent.usingUser(testUser).usingResource(guestf).createCustomContent(testf, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "testf text")
-                        .addProperty("tas:IntPropertyF", 226));
+                                                .addProperty("tas:IntPropertyF", 226));
         dataContent.usingUser(testUser).usingResource(guestf).createCustomContent(testf1, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "testf1 text")
-                        .addProperty("tas:IntPropertyF", 2221));
+                                                .addProperty("tas:IntPropertyF", 2221));
         dataContent.usingUser(testUser).usingResource(guestf).createCustomContent(testf2, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "testf2 text")
-                        .addProperty("tas:IntPropertyF", 2222));
+                                                .addProperty("tas:IntPropertyF", 2222));
         dataContent.usingUser(testUser).usingResource(guestf).createCustomContent(testf3, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "testf3 text")
-                        .addProperty("tas:IntPropertyF", 2223));
+                                                .addProperty("tas:IntPropertyF", 2223));
         dataContent.usingUser(testUser).usingResource(guestf).createCustomContent(testf4, "F:tas:folder",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyF", "testf4 text")
-                        .addProperty("tas:IntPropertyF", 2224));
+                                                .addProperty("tas:IntPropertyF", 2224));
 
         // Sites >> Files
         dataContent.usingUser(testUser).usingResource(tesf).createCustomContent(guestc, "D:tas:document",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyC", "guestc text")
-                        .addProperty("tas:IntPropertyC", 222));
+                                                .addProperty("tas:IntPropertyC", 222));
         dataContent.usingUser(testUser).usingResource(tesf).createCustomContent(restc, "D:tas:document",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyC", "restc text")
-                        .addProperty("tas:IntPropertyC", 223));
+                                                .addProperty("tas:IntPropertyC", 223));
         dataContent.usingUser(testUser).usingResource(tesf).createCustomContent(tesc, "D:tas:document",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyC", "tesc text")
-                        .addProperty("tas:IntPropertyC", 224));
+                                                .addProperty("tas:IntPropertyC", 224));
         dataContent.usingUser(testUser).usingResource(tesf).createCustomContent(testtttc, "D:tas:document",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyC", "testtttc text")
-                        .addProperty("tas:IntPropertyC", 225));
+                                                .addProperty("tas:IntPropertyC", 225));
         dataContent.usingUser(testUser).usingResource(tesf).createCustomContent(testc, "D:tas:document",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyC", "testc text")
-                        .addProperty("tas:IntPropertyC", 226));
+                                                .addProperty("tas:IntPropertyC", 226));
         dataContent.usingUser(testUser).usingResource(tesf).createCustomContent(testc1, "D:tas:document",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyC", "testc1 text")
-                        .addProperty("tas:IntPropertyC", 2221));
+                                                .addProperty("tas:IntPropertyC", 2221));
         dataContent.usingUser(testUser).usingResource(tesf).createCustomContent(testc2, "D:tas:document",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyC", "testc2 text")
-                        .addProperty("tas:IntPropertyC", 2222));
+                                                .addProperty("tas:IntPropertyC", 2222));
         dataContent.usingUser(testUser).usingResource(tesf).createCustomContent(testc3, "D:tas:document",
                 new CustomObjectTypeProperties().addProperty("tas:TextPropertyC", "testc3 text")
-                        .addProperty("tas:IntPropertyC", 2223));
+                                                .addProperty("tas:IntPropertyC", 2223));
 
         // wait for solr index
         Utility.waitToLoopTime(getSolrWaitTimeInSeconds());
     }
 
-    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
-    @XMLDataConfig(file = "src/test/resources/testdata/search-by-property.xml")
-    public void executeSearchByProperty(QueryModel query) throws Exception
+    @Test
+    public void testFileNameEquality()
     {
-        cmisApi.authenticateUser(testUser).withQuery(query.getValue()).assertResultsCount().equals(query.getResults());
+        String query = "SELECT * FROM tas:document where cmis:name = 'testc.txt'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testc.txt"));
+    }
+
+    @Test
+    public void testFileNameInequality()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name <> 'testc.txt'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt", "restc.txt", "tesc.txt", "testtttc.txt", "testc1.txt", "testc2.txt", "testc3.txt"));
+    }
+
+    @Test
+    public void testFileNameIn()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name IN('testc.txt', 'guestc.txt', 'restc.txt')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testc.txt", "guestc.txt", "restc.txt"));
+    }
+
+    @Test
+    public void testFileNameNotIn()
+    {
+        // Nb. "gustc" is missing an "e".
+        String query = "SELECT * FROM tas:document where cmis:name NOT IN('testc.txt', 'gustc.txt', 'restc.txt')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt", "tesc.txt", "testtttc.txt", "testc1.txt", "testc2.txt", "testc3.txt"));
+    }
+
+    @Test
+    public void testFileNameLike()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name LIKE '%testc%'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testc.txt", "testc1.txt", "testc2.txt", "testc3.txt"));
+    }
+
+    @Test
+    public void testFileNameLikeExact()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name LIKE 'testc.txt'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testc.txt"));
+    }
+
+    @Test
+    public void testFileNamePrefixSuffix()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name LIKE 't%tc.txt'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testc.txt", "testtttc.txt"));
+    }
+
+    @Test
+    public void testFileNameUnderscore()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name LIKE 't__tc.txt'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testc.txt"));
+    }
+
+    @Test
+    public void testFolderNameEquality()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name = 'testf'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testf"));
+    }
+
+    @Test
+    public void testFolderNameInequality()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name <> 'testf'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf", "tesf", "restf", "testtttf", "testf1", "testf2", "testf3", "testf4"));
+    }
+
+    @Test
+    public void testFolderNameIn()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name IN('testf', 'guestf', 'restf')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testf", "guestf", "restf"));
+    }
+
+    @Test
+    public void testFolderNameNotIn()
+    {
+        // Nb. "gustc" is missing an "e".
+        String query = "SELECT * FROM tas:folder where cmis:name NOT IN('testf', 'gustf', 'restf')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf", "tesf", "testtttf", "testf1", "testf2", "testf3", "testf4"));
+    }
+
+    @Test
+    public void testFolderNameLike()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name LIKE '%testf%'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testf", "testf1", "testf2", "testf3", "testf4"));
+    }
+
+    @Test
+    public void testFolderNameLikeExact()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name LIKE 'testf'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testf"));
+    }
+
+    @Test
+    public void testFolderNamePrefixSuffix()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name LIKE 't%tf'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testtttf", "testf"));
+    }
+
+    @Test
+    public void testFolderNameUnderscore()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name LIKE 't__tf'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testf"));
+    }
+
+    @Test
+    public void testFileNameOrderAsc()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name LIKE '%testc%' ORDER BY cmis:name ASC";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningOrderedValues("cmis:name",
+                List.of("testc1.txt", "testc2.txt", "testc3.txt", "testc.txt"));
+    }
+
+    @Test
+    public void testFileNameOrderDesc()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name LIKE '%testc%' ORDER BY cmis:name DESC";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningOrderedValues("cmis:name",
+                List.of("testc.txt", "testc3.txt", "testc2.txt", "testc1.txt"));
+    }
+
+    @Test
+    public void testFileOrderNameDescDateAsc()
+    {
+        String query = "SELECT * FROM tas:document where cmis:name LIKE '%testc%' ORDER BY cmis:name DESC, cmis:creationDate ASC";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningOrderedValues("cmis:name",
+                List.of("testc.txt", "testc3.txt", "testc2.txt", "testc1.txt"));
+    }
+
+    @Test
+    public void testFolderNameOrderAsc()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name LIKE '%testf%' ORDER BY cmis:name ASC";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningOrderedValues("cmis:name",
+                List.of("testf", "testf1", "testf2", "testf3", "testf4"));
+    }
+
+    @Test
+    public void testFolderNameOrderDesc()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name LIKE '%testf%' ORDER BY cmis:name DESC";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningOrderedValues("cmis:name",
+                List.of("testf4", "testf3", "testf2", "testf1", "testf"));
+    }
+
+    @Test
+    public void testFolderOrderNameDescDateAsc()
+    {
+        String query = "SELECT * FROM tas:folder where cmis:name LIKE '%testf%' ORDER BY cmis:name DESC, cmis:creationDate ASC";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningOrderedValues("cmis:name",
+                List.of("testf4", "testf3", "testf2", "testf1", "testf"));
+    }
+
+    @Test
+    public void testFileCustomPropertyEquality()
+    {
+        String query = "SELECT * FROM tas:document where tas:TextPropertyC = 'restc text'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("restc.txt"));
+    }
+
+    @Test
+    public void testFileCustomPropertyInequality()
+    {
+        String query = "SELECT * FROM tas:document where tas:TextPropertyC <> 'testc1 text'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt", "restc.txt", "tesc.txt", "testtttc.txt", "testc.txt", "testc2.txt", "testc3.txt"));
+    }
+
+    @Test
+    public void testFileCustomPropertyIn()
+    {
+        String query = "SELECT * FROM tas:document where tas:TextPropertyC IN('restc text', 'testc2 text', 'testc3 text')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("restc.txt", "testc2.txt", "testc3.txt"));
+    }
+
+
+    @Test
+    public void testFileCustomPropertyNotIn()
+    {
+        String query = "SELECT * FROM tas:document where tas:TextPropertyC NOT IN('restc text', 'testc2 text', 'testc3 text')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt", "tesc.txt", "testtttc.txt", "testc.txt", "testc1.txt"));
+    }
+
+    @Test
+    public void testFileCustomPropertyLike()
+    {
+        String query = "SELECT * FROM tas:document where tas:TextPropertyC LIKE '%restc%'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("restc.txt"));
+    }
+
+    @Test
+    public void testFileCustomPropertyUnderscore()
+    {
+        String query = "SELECT * FROM tas:document where tas:TextPropertyC LIKE 't__tc text'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testc.txt"));
+    }
+
+    @Test
+    public void testFolderCustomPropertyEquality()
+    {
+        String query = "SELECT * FROM tas:folder where tas:TextPropertyF = 'restf text'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("restf"));
+    }
+
+    @Test
+    public void testFolderCustomPropertyInequality()
+    {
+        String query = "SELECT * FROM tas:folder where tas:TextPropertyF <> 'testf1 text'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf", "tesf", "restf", "testtttf", "testf", "testf2", "testf3", "testf4"));
+    }
+
+    @Test
+    public void testFolderCustomPropertyIn()
+    {
+        String query = "SELECT * FROM tas:folder where tas:TextPropertyF IN('restf text', 'testf2 text', 'testf3 text')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("restf", "testf2", "testf3"));
+    }
+
+    @Test
+    public void testFolderCustomPropertyNotIn()
+    {
+        String query = "SELECT * FROM tas:folder where tas:TextPropertyF NOT IN('restf text', 'testf2 text', 'testf3 text')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf", "tesf", "testtttf", "testf", "testf1", "testf4"));
+    }
+
+    @Test
+    public void testFolderCustomPropertyLike()
+    {
+        String query = "SELECT * FROM tas:folder where tas:TextPropertyF LIKE '%restf%'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("restf"));
+    }
+
+    @Test
+    public void testFolderCustomPropertyUnderscore()
+    {
+        String query = "SELECT * FROM tas:folder where tas:TextPropertyF LIKE 't__tf text'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testf"));
+    }
+
+    @Test
+    public void testFileIntEquality()
+    {
+        String query = "SELECT * FROM tas:document where tas:IntPropertyC = '222'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt"));
+    }
+
+    @Test
+    public void testFileIntInequality()
+    {
+        String query = "SELECT * FROM tas:document where tas:IntPropertyC <> '223'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt", "tesc.txt", "testtttc.txt", "testc.txt", "testc1.txt", "testc2.txt", "testc3.txt"));
+    }
+
+    @Test
+    public void testFileIntLessThen()
+    {
+        String query = "SELECT * FROM tas:document where tas:IntPropertyC < '223'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt"));
+    }
+
+    @Test
+    public void testFileIntLessThanOrEqual()
+    {
+        String query = "SELECT * FROM tas:document where tas:IntPropertyC <= '224'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt", "restc.txt", "tesc.txt"));
+    }
+
+    @Test
+    public void testFileIntGreaterThanOrEqual()
+    {
+        String query = "SELECT * FROM tas:document where tas:IntPropertyC >= '224'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("tesc.txt", "testtttc.txt", "testc.txt", "testc1.txt", "testc2.txt", "testc3.txt"));
+    }
+
+    @Test
+    public void testFileIntGreaterThan()
+    {
+        String query = "SELECT * FROM tas:document where tas:IntPropertyC > '224'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testtttc.txt", "testc.txt", "testc1.txt", "testc2.txt", "testc3.txt"));
+    }
+
+    @Test
+    public void testFileIntIn()
+    {
+        String query = "SELECT * FROM tas:document where tas:IntPropertyC IN('222', '223', '224', '225')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestc.txt", "restc.txt", "tesc.txt", "testtttc.txt"));
+    }
+
+    @Test
+    public void testFileIntNotIn()
+    {
+        String query = "SELECT * FROM tas:document where tas:IntPropertyC NOT IN('222', '223', '224')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testtttc.txt", "testc.txt", "testc1.txt", "testc2.txt", "testc3.txt"));
+    }
+
+    @Test
+    public void testFolderIntEquality()
+    {
+        String query = "SELECT * FROM tas:folder where tas:IntPropertyF = '222'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf"));
+    }
+
+    @Test
+    public void testFolderIntInequality()
+    {
+        String query = "SELECT * FROM tas:folder where tas:IntPropertyF <> '223'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf", "tesf", "testtttf", "testf", "testf1", "testf2", "testf3", "testf4"));
+    }
+
+    @Test
+    public void testFolderIntLessThan()
+    {
+        String query = "SELECT * FROM tas:folder where tas:IntPropertyF < '223'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf"));
+    }
+
+    @Test
+    public void testFolderIntLessThanOrEqual()
+    {
+        String query = "SELECT * FROM tas:folder where tas:IntPropertyF <= '224'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf", "tesf", "restf"));
+    }
+
+    @Test
+    public void testFolderIntGreaterThanOrEqual()
+    {
+        String query = "SELECT * FROM tas:folder where tas:IntPropertyF >= '224'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("tesf", "testtttf", "testf", "testf1", "testf2", "testf3", "testf4"));
+    }
+
+    @Test
+    public void testFolderIntGreaterThan()
+    {
+        String query = "SELECT * FROM tas:folder where tas:IntPropertyF > '224'";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testtttf", "testf", "testf1", "testf2", "testf3", "testf4"));
+    }
+
+    @Test
+    public void testFolderIntIn()
+    {
+        String query = "SELECT * FROM tas:folder where tas:IntPropertyF IN('222', '223', '224', '225')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("guestf", "tesf", "restf", "testtttf"));
+    }
+
+    @Test
+    public void testFolderIntNotIn()
+    {
+        String query = "SELECT * FROM tas:folder where tas:IntPropertyF NOT IN('222', '223', '224')";
+        cmisApi.authenticateUser(testUser).withQuery(query).assertValues().isReturningValues("cmis:name",
+                Set.of("testtttf", "testf", "testf1", "testf2", "testf3", "testf4"));
     }
 }

e2e-test/src/test/resources/testdata/search-by-property.xml

@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xsi:noNamespaceSchemaLocation="https://gitlab.alfresco.com/tas/tas-namespaces/raw/master/input-test-data.xsd">
-
-	<queries>
-		<query
-			value="SELECT * FROM tas:document where cmis:name = 'testc.txt'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name &lt;&gt; 'testc.txt'"
-			expectedResults="7" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name &lt; 'testc.txt'"
-			expectedResults="3" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name &lt;= 'testc.txt'"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name &gt; 'testc.txt'"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name &gt;= 'testc.txt'"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name IN('testc.txt', 'guestc.txt', 'restc.txt')"
-			expectedResults="3" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name NOT IN('testc.txt', 'gustc.txt', 'restc.txt')"
-			expectedResults="6" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name LIKE '%testc%'"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name LIKE 'testc.txt'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name LIKE 't%tc.txt'"
-			expectedResults="2" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name LIKE 't__tc.txt'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name = 'testf'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name &lt;&gt; 'testf'"
-			expectedResults="8" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name &lt; 'testf'"
-			expectedResults="3" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name &lt;= 'testf'"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name &gt; 'testf'"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name &gt;= 'testf'"
-			expectedResults="6" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name IN('testf', 'guestf', 'restf')"
-			expectedResults="3" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name NOT IN('testf', 'gustf', 'restf')"
-			expectedResults="7" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name LIKE '%testf%'"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name LIKE 'testf'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name LIKE 't%tf'"
-			expectedResults="2" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name LIKE 't__tf'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name LIKE '%testc%' ORDER BY cmis:name ASC"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name LIKE '%testc%' ORDER BY cmis:name DESC"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:document where cmis:name LIKE '%testc%' ORDER BY cmis:name DESC, cmis:creationDate ASC"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name LIKE '%testf%' ORDER BY cmis:name ASC"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name LIKE '%testf%' ORDER BY cmis:name DESC"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:folder where cmis:name LIKE '%testf%' ORDER BY cmis:name DESC, cmis:creationDate ASC"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:document where tas:TextPropertyC = 'restc text'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:document where tas:TextPropertyC &lt;&gt; 'testc1 text'"
-			expectedResults="7" />
-		<query
-			value="SELECT * FROM tas:document where tas:TextPropertyC IN('restc text', 'testc2 text', 'testc3 text')"
-			expectedResults="3" />
-		<query
-			value="SELECT * FROM tas:document where tas:TextPropertyC NOT IN('restc text', 'testc2 text', 'testc3 text')"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:document where tas:TextPropertyC LIKE '%restc%'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:document where tas:TextPropertyC &gt;= 'testc'"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:document where tas:TextPropertyC LIKE 't__tc text'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:folder where tas:TextPropertyF = 'restf text'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:folder where tas:TextPropertyF &lt;&gt; 'testf1 text'"
-			expectedResults="8" />
-		<query
-			value="SELECT * FROM tas:folder where tas:TextPropertyF IN('restf text', 'testf2 text', 'testf3 text')"
-			expectedResults="3" />
-		<query
-			value="SELECT * FROM tas:folder where tas:TextPropertyF NOT IN('restf text', 'testf2 text', 'testf3 text')"
-			expectedResults="6" />
-		<query
-			value="SELECT * FROM tas:folder where tas:TextPropertyF LIKE '%restf%'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:folder where tas:TextPropertyF &gt;= 'testf text'"
-			expectedResults="6" />
-		<query
-			value="SELECT * FROM tas:folder where tas:TextPropertyF LIKE 't__tf text'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:document where tas:IntPropertyC = '222'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:document where tas:IntPropertyC &lt;&gt; '223'"
-			expectedResults="7" />
-		<query
-			value="SELECT * FROM tas:document where tas:IntPropertyC &lt; '223'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:document where tas:IntPropertyC &lt;= '224'"
-			expectedResults="3" />
-		<query
-			value="SELECT * FROM tas:document where tas:IntPropertyC &gt;= '224'"
-			expectedResults="6" />
-		<query
-			value="SELECT * FROM tas:document where tas:IntPropertyC &gt; '224'"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:document where tas:IntPropertyC IN('222', '223', '224', '225')"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:document where tas:IntPropertyC NOT IN('222', '223', '224')"
-			expectedResults="5" />
-		<query
-			value="SELECT * FROM tas:folder where tas:IntPropertyF = '222'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:folder where tas:IntPropertyF &lt;&gt; '223'"
-			expectedResults="8" />
-		<query
-			value="SELECT * FROM tas:folder where tas:IntPropertyF &lt; '223'"
-			expectedResults="1" />
-		<query
-			value="SELECT * FROM tas:folder where tas:IntPropertyF &lt;= '224'"
-			expectedResults="3" />
-		<query
-			value="SELECT * FROM tas:folder where tas:IntPropertyF &gt;= '224'"
-			expectedResults="7" />
-		<query
-			value="SELECT * FROM tas:folder where tas:IntPropertyF &gt; '224'"
-			expectedResults="6" />
-		<query
-			value="SELECT * FROM tas:folder where tas:IntPropertyF IN('222', '223', '224', '225')"
-			expectedResults="4" />
-		<query
-			value="SELECT * FROM tas:folder where tas:IntPropertyF NOT IN('222', '223', '224')"
-			expectedResults="6" />
-	</queries>
-</testData> 

search-services/alfresco-search/pom.xml

@@ -158,7 +158,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.0</version>
             <scope>test</scope>
         </dependency>
 

search-services/alfresco-solrclient-lib/pom.xml

@@ -22,7 +22,7 @@
     </distributionManagement>
 
     <properties>
-        <dependency.alfresco-data-model.version>8.55</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>8.57</dependency.alfresco-data-model.version>
         <dependency.jackson.version>2.10.1</dependency.jackson.version>
     </properties>
 
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

search-services/packaging/src/main/resources/licenses/notice.txt

@@ -64,7 +64,6 @@ spring-context-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
 spring-context-support-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
 spring-core-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
 spring-expression-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-jcl-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
 spring-jdbc-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
 spring-orm-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
 spring-tx-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/