From ffaef02a310e573d71ee759406598cf9deabe9ff Mon Sep 17 00:00:00 2001
From: bogdanbocancea <bogdan.bocancea@ness.com>
Date: Wed, 2 Nov 2016 14:37:31 +0200
Subject: [PATCH] TAS-1651: add search by property tests

---
 .../testdata/search-by-id.xml                 |   6 +-
 .../testdata/search-by-property.xml           | 223 ++++++++++++++++++
 ...ByIDTest.java => SolrSearchByIdTests.java} |   2 +-
 ...ByPath.java => SolrSearchByPathTests.java} |   2 +-
 .../search/SolrSearchByPropertyTests.java     |  48 ++++
 ...lder.java => SolrSearchInFolderTests.java} |   2 +-
 ...InTree.java => SolrSearchInTreeTests.java} |   2 +-
 7 files changed, 280 insertions(+), 5 deletions(-)
 create mode 100644 e2e-test/src/main/resources/shared-resources/testdata/search-by-property.xml
 rename e2e-test/src/test/java/org/alfresco/cmis/search/{SolrSearchByIDTest.java => SolrSearchByIdTests.java} (97%)
 rename e2e-test/src/test/java/org/alfresco/cmis/search/{SolrSearchByPath.java => SolrSearchByPathTests.java} (97%)
 create mode 100644 e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java
 rename e2e-test/src/test/java/org/alfresco/cmis/search/{SolrSearchInFolder.java => SolrSearchInFolderTests.java} (98%)
 rename e2e-test/src/test/java/org/alfresco/cmis/search/{SolrSearchInTree.java => SolrSearchInTreeTests.java} (98%)

diff --git a/e2e-test/src/main/resources/shared-resources/testdata/search-by-id.xml b/e2e-test/src/main/resources/shared-resources/testdata/search-by-id.xml
index 14f229aaa..82f3ec051 100644
--- a/e2e-test/src/main/resources/shared-resources/testdata/search-by-id.xml
+++ b/e2e-test/src/main/resources/shared-resources/testdata/search-by-id.xml
@@ -5,7 +5,7 @@
 	</users>
 
 	<sites>
-		<site id="siteId" name="siteSearchById1" createdBy="userSearchId" visibility="PUBLIC">
+		<site id="siteId" name="siteSearchById" createdBy="userSearchId" visibility="PUBLIC">
 			<folders>
 				<folder id="f1" name="tas-folder1" createdBy="userSearchId">
 				<custom-model name="F:tas:folder" />
@@ -116,5 +116,9 @@
 		<query value="SELECT * FROM tas:folder WHERE cmis:baseTypeId NOT IN('cmis:folder') ORDER BY cmis:creationDate ASC" expectedResults="0" />
 		<query value="SELECT * FROM tas:folder WHERE IN_FOLDER('NODE_REF[f1]')" expectedResults="1" />
 		<query value="SELECT * FROM cmis:folder WHERE IN_FOLDER('NODE_REF[f1]')" expectedResults="2" />
+		<query value="SELECT * FROM tas:folder WHERE cmis:objectId IS NOT NULL" expectedResults="3" />
+		<query value="SELECT * FROM tas:folder WHERE cmis:objectId IS NULL" expectedResults="0" />
+		<query value="SELECT * FROM tas:document WHERE cmis:objectId IS NOT NULL" expectedResults="4" />
+		<query value="SELECT * FROM tas:document WHERE cmis:objectId IS NULL" expectedResults="0" />
 	</queries>
 </testData> 
diff --git a/e2e-test/src/main/resources/shared-resources/testdata/search-by-property.xml b/e2e-test/src/main/resources/shared-resources/testdata/search-by-property.xml
new file mode 100644
index 000000000..4cb1d3c17
--- /dev/null
+++ b/e2e-test/src/main/resources/shared-resources/testdata/search-by-property.xml
@@ -0,0 +1,223 @@
+<?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">
+	<users>
+		<user name="userSearchProperties" password="password" />
+	</users>
+
+	<sites>
+		<site name="siteSearchByProperty" createdBy="userSearchProperties" visibility="PUBLIC">
+			<folders>
+				<folder name="guestf" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="guestf text" />
+							<property name="tas:IntPropertyF" value="222" />
+						</properties>
+					</custom-model>
+				</folder>
+				<folder name="restf" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="restf text" />
+							<property name="tas:IntPropertyF" value="223" />
+						</properties>
+					</custom-model>
+				</folder>
+				<folder name="tesf" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="tesf text" />
+							<property name="tas:IntPropertyF" value="224" />
+						</properties>
+					</custom-model>
+					<files>
+						<file name="guestc" createdBy="userSearchProperties">
+							<content>content guestc</content>
+							<custom-model name="D:tas:document">
+								<properties>
+									<property name="tas:TextPropertyC" value="guestc text" />
+									<property name="tas:IntPropertyC" value="222" />
+								</properties> 
+							</custom-model>
+						</file>
+						<file name="restc" createdBy="userSearchProperties">
+							<content>content restc</content>
+							<custom-model name="D:tas:document">
+								<properties>
+									<property name="tas:TextPropertyC" value="restc text" />
+									<property name="tas:IntPropertyC" value="223" />
+								</properties> 
+							</custom-model>
+						</file>
+						<file name="tesc" createdBy="userSearchProperties">
+							<content>content tesc</content>
+							<custom-model name="D:tas:document">
+								<properties>
+									<property name="tas:TextPropertyC" value="tesc text" />
+									<property name="tas:IntPropertyC" value="224" />
+								</properties> 
+							</custom-model>
+						</file>
+						<file name="testtttc" createdBy="userSearchProperties">
+							<content>content testtttc</content>
+							<custom-model name="D:tas:document">
+								<properties>
+									<property name="tas:TextPropertyC" value="testtttc text" />
+									<property name="tas:IntPropertyC" value="225" />
+								</properties> 
+							</custom-model>
+						</file>
+						<file name="testc" createdBy="userSearchProperties">
+							<content>content testc</content>
+							<custom-model name="D:tas:document">
+								<properties>
+									<property name="tas:TextPropertyC" value="testc text" />
+									<property name="tas:IntPropertyC" value="226" />
+								</properties> 
+							</custom-model>
+						</file>
+						<file name="testc1" createdBy="userSearchProperties">
+							<content>content testc1</content>
+							<custom-model name="D:tas:document">
+								<properties>
+									<property name="tas:TextPropertyC" value="testc1 text" />
+									<property name="tas:IntPropertyC" value="2221" />
+								</properties> 
+							</custom-model>
+						</file>
+						<file name="testc2" createdBy="userSearchProperties">
+							<content>content testc2</content>
+							<custom-model name="D:tas:document">
+								<properties>
+									<property name="tas:TextPropertyC" value="testc2 text" />
+									<property name="tas:IntPropertyC" value="2222" />
+								</properties> 
+							</custom-model>
+						</file>
+						<file name="testc3" createdBy="userSearchProperties">
+							<content>content testc3</content>
+							<custom-model name="D:tas:document">
+								<properties>
+									<property name="tas:TextPropertyC" value="testc3 text" />
+									<property name="tas:IntPropertyC" value="2223" />
+								</properties> 
+							</custom-model>
+						</file>
+					</files>
+				</folder>
+				<folder name="testtttf" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="testtttf text" />
+							<property name="tas:IntPropertyF" value="225" />
+						</properties>
+					</custom-model>
+				</folder>
+				<folder name="testf" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="testf text" />
+							<property name="tas:IntPropertyF" value="226" />
+						</properties>
+					</custom-model>
+				</folder>
+				<folder name="testf1" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="testf1 text" />
+							<property name="tas:IntPropertyF" value="2221" />
+						</properties>
+					</custom-model>
+				</folder>
+				<folder name="testf2" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="testf2 text" />
+							<property name="tas:IntPropertyF" value="2222" />
+						</properties>
+					</custom-model>
+				</folder>
+				<folder name="testf3" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="testf3 text" />
+							<property name="tas:IntPropertyF" value="2223" />
+						</properties>
+					</custom-model>
+				</folder>
+				<folder name="testf4" createdBy="userSearchProperties">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="testf4 text" />
+							<property name="tas:IntPropertyF" value="2224" />
+						</properties>
+					</custom-model>
+				</folder>
+			</folders>
+			
+		</site>
+	</sites>
+	
+	<queries>
+		<query value="SELECT * FROM tas:document where cmis:name = 'testc'" expectedResults="1" />
+		<query value="SELECT * FROM tas:document where cmis:name &lt;&gt; 'testc'" expectedResults="7" />
+		<query value="SELECT * FROM tas:document where cmis:name &lt; 'testc'" expectedResults="3" />
+		<query value="SELECT * FROM tas:document where cmis:name &lt;= 'testc'" expectedResults="4" />
+		<query value="SELECT * FROM tas:document where cmis:name &gt; 'testc'" expectedResults="4" />
+		<query value="SELECT * FROM tas:document where cmis:name &gt;= 'testc'" expectedResults="5" />
+		<query value="SELECT * FROM tas:document where cmis:name IN('testc', 'guestc', 'restc')" expectedResults="3" />
+		<query value="SELECT * FROM tas:document where cmis:name NOT IN('testc', 'gustc', 'restc')" 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'" expectedResults="1" />
+		<query value="SELECT * FROM tas:document where cmis:name LIKE 't%tc'" expectedResults="2" />
+		<query value="SELECT * FROM tas:document where cmis:name LIKE 't__tc'" 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> 
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIDTest.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIdTests.java
similarity index 97%
rename from e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIDTest.java
rename to e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIdTests.java
index 038f159a1..b1905586d 100644
--- a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIDTest.java
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIdTests.java
@@ -12,7 +12,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES })
-public class SolrSearchByIDTest extends CmisTest
+public class SolrSearchByIdTests extends CmisTest
 {
     XMLTestData testData;
 
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPath.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPathTests.java
similarity index 97%
rename from e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPath.java
rename to e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPathTests.java
index 8266f57b7..23ec8e715 100644
--- a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPath.java
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPathTests.java
@@ -12,7 +12,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES })
-public class SolrSearchByPath extends CmisTest
+public class SolrSearchByPathTests extends CmisTest
 {
     XMLTestData testData;
 
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java
new file mode 100644
index 000000000..aff244292
--- /dev/null
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java
@@ -0,0 +1,48 @@
+package org.alfresco.cmis.search;
+
+import org.alfresco.cmis.CmisTest;
+import org.alfresco.utility.data.provider.XMLDataConfig;
+import org.alfresco.utility.data.provider.XMLTestData;
+import org.alfresco.utility.data.provider.XMLTestDataProvider;
+import org.alfresco.utility.exception.TestConfigurationException;
+import org.alfresco.utility.model.QueryModel;
+import org.alfresco.utility.model.TestGroup;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+@Test(groups = { TestGroup.CMIS, TestGroup.QUERIES })
+public class SolrSearchByPropertyTests extends CmisTest
+{
+    XMLTestData testData;
+
+    @BeforeClass(alwaysRun = true)
+    public void deployCustomModel() throws TestConfigurationException
+    {
+        dataContent.deployContentModel("shared-resources/model/tas-model.xml");
+        cmisApi.authenticateUser(dataUser.getAdminUser());
+    }
+    
+    @AfterClass(alwaysRun = true)
+    public void cleanupEnvironment() throws Exception
+    {
+        testData.cleanup(dataContent);
+    }
+
+    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData")
+    @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-property.xml")
+    public void prepareDataForSolrSearch(XMLTestData testData) throws Exception
+    {
+        this.testData = testData;
+        this.testData.createUsers(dataUser);
+        this.testData.createSitesStructure(dataSite, dataContent, dataUser);
+    }
+
+    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForSolrSearch")
+    @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-property.xml")
+    public void executeSortedSearchByID(QueryModel query) throws Exception
+    {
+        cmisApi.withQuery(query.getValue())
+            .applyNodeRefsFrom(testData).assertResultsCountIs(query.getResults());
+    }
+}
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInFolder.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInFolderTests.java
similarity index 98%
rename from e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInFolder.java
rename to e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInFolderTests.java
index 209bd3437..1fc4f36d3 100644
--- a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInFolder.java
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInFolderTests.java
@@ -17,7 +17,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES })
-public class SolrSearchInFolder extends CmisTest
+public class SolrSearchInFolderTests extends CmisTest
 {
     UserModel testUser;
     SiteModel testSite;
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInTree.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInTreeTests.java
similarity index 98%
rename from e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInTree.java
rename to e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInTreeTests.java
index 7bae5b628..576109f4e 100644
--- a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInTree.java
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchInTreeTests.java
@@ -17,7 +17,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES })
-public class SolrSearchInTree extends CmisTest
+public class SolrSearchInTreeTests extends CmisTest
 {
     UserModel testUser;
     SiteModel testSite;