From fe536eb7ca73b5cd8f57c3ebb1ee5f60c81c02ae Mon Sep 17 00:00:00 2001 From: Keerat Date: Mon, 18 Jan 2021 13:47:23 +0000 Subject: [PATCH 1/2] SEARCH2280 Fixing tests broken in the search suite --- .../search/AbstractSearchServicesE2ETest.java | 4 ++-- .../functional/searchServices/search/SearchTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java index cddc5f8d2..0d913db63 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java @@ -72,12 +72,12 @@ public abstract class AbstractSearchServicesE2ETest extends AbstractE2EFunctiona description + " The quick brown fox jumps over the lazy dog"); file2 = new FileModel("cars.PDF", "cars", description, FileType.TEXT_PLAIN, - "The landrover discovery is not a sports cars"); + "The landrover discovery is not a sports car"); file3 = new FileModel("alfresco.docx", "alfresco", "alfresco", FileType.TEXT_PLAIN, "Alfresco text file for search "); - file4 = new FileModel("unique.ODT", "uniquee" + title, description, FileType.TEXT_PLAIN, + file4 = new FileModel(unique_searchString + ".ODT", "uniquee" + title, description, FileType.TEXT_PLAIN, "Unique text file for search "); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java index 933b0f787..b2370ae4f 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java @@ -115,9 +115,9 @@ public class SearchTest extends AbstractSearchServicesE2ETest public void searchWithOneSortClause() { // Tests the ascending order first - List expectedOrder = asList("alfresco.txt", "cars.txt", "pangram.txt"); + List expectedOrder = asList("alfresco.docx", "cars.PDF", "pangram.txt"); - SearchRequest searchRequest = createQuery("cm_name:alfresco\\.txt cm_name:cars\\.txt cm_name:pangram\\.txt"); + SearchRequest searchRequest = createQuery("cm_name:alfresco\\.docx cm_name:cars\\.ODT cm_name:pangram\\.txt"); searchRequest.addSortClause("FIELD", "name", true); RestRequestFilterQueryModel filters = new RestRequestFilterQueryModel(); @@ -162,9 +162,9 @@ public class SearchTest extends AbstractSearchServicesE2ETest public void searchWithTwoSortClauses() { // Tests the ascending order first - List expectedOrder = asList("alfresco.txt", "cars.txt", "pangram.txt"); + List expectedOrder = asList("alfresco.docx", "cars.PDF", "pangram.txt"); - SearchRequest searchRequest = createQuery("cm_name:alfresco\\.txt cm_name:cars\\.txt cm_name:pangram\\.txt"); + SearchRequest searchRequest = createQuery("cm_name:alfresco\\.docx cm_name:cars\\.ODT cm_name:pangram\\.txt"); searchRequest.addSortClause("FIELD", "name", true); searchRequest.addSortClause("FIELD", "createdByUser.id", true); From a4c7f677864695c1c65a3263cfeafe9c3496f16c Mon Sep 17 00:00:00 2001 From: Keerat Date: Mon, 18 Jan 2021 14:48:15 +0000 Subject: [PATCH 2/2] SEARCH2280 Fixing file extension in one test --- .../search/functional/searchServices/search/SearchTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java index b2370ae4f..42521cabd 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java @@ -117,7 +117,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest // Tests the ascending order first List expectedOrder = asList("alfresco.docx", "cars.PDF", "pangram.txt"); - SearchRequest searchRequest = createQuery("cm_name:alfresco\\.docx cm_name:cars\\.ODT cm_name:pangram\\.txt"); + SearchRequest searchRequest = createQuery("cm_name:alfresco\\.docx cm_name:cars\\.PDF cm_name:pangram\\.txt"); searchRequest.addSortClause("FIELD", "name", true); RestRequestFilterQueryModel filters = new RestRequestFilterQueryModel(); @@ -164,7 +164,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest // Tests the ascending order first List expectedOrder = asList("alfresco.docx", "cars.PDF", "pangram.txt"); - SearchRequest searchRequest = createQuery("cm_name:alfresco\\.docx cm_name:cars\\.ODT cm_name:pangram\\.txt"); + SearchRequest searchRequest = createQuery("cm_name:alfresco\\.docx cm_name:cars\\.PDF cm_name:pangram\\.txt"); searchRequest.addSortClause("FIELD", "name", true); searchRequest.addSortClause("FIELD", "createdByUser.id", true);