From 7d8bf95dd051698ce1c2369903a32dd0e68624d3 Mon Sep 17 00:00:00 2001 From: Meenal Bhave Date: Wed, 8 Aug 2018 16:18:04 +0100 Subject: [PATCH 1/4] Added missing step to repeat search --- e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java index c8463c0ac..bf6fc30f7 100644 --- a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java @@ -182,6 +182,9 @@ public class AbstractSearchTest extends RestTest { // Wait for the solr indexing. Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing"); + + // Repeat Search + response = query(searchRequest); } if (restClient.getStatusCode().matches(expectedStatusCode)) From bc349c128dbf67d7d7664c914fdd9fa585afd2ef Mon Sep 17 00:00:00 2001 From: Meenal Bhave Date: Thu, 9 Aug 2018 16:01:08 +0100 Subject: [PATCH 2/4] Search-999 Simplified waitForIndexing --- .../rest/search/AbstractSearchTest.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java index bf6fc30f7..e8a0f955c 100644 --- a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java @@ -166,26 +166,17 @@ public class AbstractSearchTest extends RestTest * @return true (indexing is finished) if search returns appropriate results * @throws Exception */ - public boolean waitForIndexing(String userQuery, Boolean expectedInResults) throws Exception + public boolean waitForIndexing(String userQuery, boolean expectedInResults) throws Exception { - Boolean found = false; - Boolean resultAsExpected = false; + boolean found = false; + boolean resultAsExpected = false; String expectedStatusCode = HttpStatus.OK.toString(); - SearchRequest searchRequest = createQuery(userQuery); - SearchResponse response = query(searchRequest); - // Repeat search until the query results are as expected or Search Retry count is hit for (int searchCount = 1; searchCount <= 3; searchCount++) { - if (searchCount > 1) - { - // Wait for the solr indexing. - Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing"); - - // Repeat Search - response = query(searchRequest); - } + SearchRequest searchRequest = createQuery(userQuery); + SearchResponse response = query(searchRequest); if (restClient.getStatusCode().matches(expectedStatusCode)) { @@ -199,11 +190,16 @@ public class AbstractSearchTest extends RestTest } // Loop again if result is not as expected: To cater for solr lag: eventual consistency - resultAsExpected = (expectedInResults.equals(found)); + resultAsExpected = (expectedInResults == found); if (resultAsExpected) { break; } + else + { + // Wait for the solr indexing. + Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing"); + } } else { From 3043409ec776538f1f552274a39f529d44494c09 Mon Sep 17 00:00:00 2001 From: Meenal Bhave Date: Fri, 9 Nov 2018 17:36:44 +0000 Subject: [PATCH 3/4] MNT-19537 Test Added for Content with Special characters --- .../org/alfresco/rest/search/SearchTest.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/e2e-test/java/org/alfresco/rest/search/SearchTest.java b/e2e-test/java/org/alfresco/rest/search/SearchTest.java index 8d6d97a28..438f25a19 100644 --- a/e2e-test/java/org/alfresco/rest/search/SearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/SearchTest.java @@ -20,6 +20,8 @@ package org.alfresco.rest.search; import junit.framework.Assert; import org.alfresco.rest.model.body.RestNodeLockBodyModel; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.testrail.ExecutionType; import org.alfresco.utility.testrail.annotation.TestRail; @@ -180,4 +182,24 @@ public class SearchTest extends AbstractSearchTest restClient.onResponse().assertThat().body("list.entries.entry[0].name", Matchers.nullValue()); restClient.onResponse().assertThat().body("list.entries.entry[0].id", Matchers.nullValue()); } + + @Test(groups={TestGroup.SEARCH,TestGroup.REST_API}) + public void searchSpecialCharacters() throws Exception + { + // Create a file with Special Characters + String specialCharfileName = "è¥äæ§ç§-åæ.pdf"; + FileModel file = new FileModel(specialCharfileName, "è¥äæ§ç§-å欯¸" + "è¥äæ§ç§-å欯¸", "è¥äæ§ç§-å欯¸", FileType.TEXT_PLAIN, "Text file with Special Characters: " + specialCharfileName); + dataContent.usingUser(userModel).usingSite(siteModel).createContent(file); + + waitForIndexing(file.getName(), true); + + // Search + SearchRequest searchReq = createQuery("name:'" + specialCharfileName + "'"); + SearchResponse nodes = query(searchReq); + + restClient.assertStatusCodeIs(HttpStatus.OK); + nodes.assertThat().entriesListIsNotEmpty(); + + restClient.onResponse().assertThat().body("list.entries.entry[0].name", Matchers.equalToIgnoringCase(specialCharfileName)); + } } From 383c18e27927166fcaad029003aae1ecfc236bfd Mon Sep 17 00:00:00 2001 From: Meenal Bhave Date: Fri, 9 Nov 2018 17:38:43 +0000 Subject: [PATCH 4/4] Formatting fixes --- .../java/org/alfresco/rest/search/SearchTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/search/SearchTest.java b/e2e-test/java/org/alfresco/rest/search/SearchTest.java index 438f25a19..5f902ff40 100644 --- a/e2e-test/java/org/alfresco/rest/search/SearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/SearchTest.java @@ -183,20 +183,21 @@ public class SearchTest extends AbstractSearchTest restClient.onResponse().assertThat().body("list.entries.entry[0].id", Matchers.nullValue()); } - @Test(groups={TestGroup.SEARCH,TestGroup.REST_API}) + @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API }) public void searchSpecialCharacters() throws Exception - { + { // Create a file with Special Characters String specialCharfileName = "è¥äæ§ç§-åæ.pdf"; - FileModel file = new FileModel(specialCharfileName, "è¥äæ§ç§-å欯¸" + "è¥äæ§ç§-å欯¸", "è¥äæ§ç§-å欯¸", FileType.TEXT_PLAIN, "Text file with Special Characters: " + specialCharfileName); + FileModel file = new FileModel(specialCharfileName, "è¥äæ§ç§-å欯¸" + "è¥äæ§ç§-å欯¸", "è¥äæ§ç§-å欯¸", FileType.TEXT_PLAIN, + "Text file with Special Characters: " + specialCharfileName); dataContent.usingUser(userModel).usingSite(siteModel).createContent(file); waitForIndexing(file.getName(), true); - + // Search SearchRequest searchReq = createQuery("name:'" + specialCharfileName + "'"); SearchResponse nodes = query(searchReq); - + restClient.assertStatusCodeIs(HttpStatus.OK); nodes.assertThat().entriesListIsNotEmpty();