From 7683bfd2a245a878639fedfccaab8c35d935967e Mon Sep 17 00:00:00 2001 From: Keerat Date: Mon, 11 Jan 2021 14:33:57 +0000 Subject: [PATCH 1/5] SEARCH 2280 Adding the tests run on the one pipeline into a test suite --- .../search/AbstractSearchServicesE2ETest.java | 8 +- .../search/SearchCasesTest.java | 360 ++++++++++++++++++ e2e-test/src/test/resources/PipelineSuite.xml | 16 + 3 files changed, 380 insertions(+), 4 deletions(-) create mode 100644 e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchCasesTest.java create mode 100644 e2e-test/src/test/resources/PipelineSuite.xml 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 4ebb66e9f..284aa506d 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 @@ -71,13 +71,13 @@ public abstract class AbstractSearchServicesE2ETest extends AbstractE2EFunctiona file = new FileModel("pangram.txt", "pangram" + title, description, FileType.TEXT_PLAIN, description + " The quick brown fox jumps over the lazy dog"); - file2 = new FileModel("cars.txt", "cars" + title, description, FileType.TEXT_PLAIN, - "The landrover discovery is not a sports car "); + file2 = new FileModel("cars.PDF", "cars", description, FileType.TEXT_PLAIN, + "The landrover discovery is not a sports cars"); - file3 = new FileModel("alfresco.txt", "alfresco", "alfresco", FileType.TEXT_PLAIN, + file3 = new FileModel("alfresco.docx", "alfresco", "alfresco", FileType.TEXT_PLAIN, "Alfresco text file for search "); - file4 = new FileModel(unique_searchString + ".txt", "uniquee" + title, description, FileType.TEXT_PLAIN, + file4 = new FileModel("unique.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/SearchCasesTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchCasesTest.java new file mode 100644 index 000000000..af6208822 --- /dev/null +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchCasesTest.java @@ -0,0 +1,360 @@ +/* + * #%L + * Alfresco Search Services E2E Test + * %% + * Copyright (C) 2005 - 2021 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ + +package org.alfresco.test.search.functional.searchServices.search; + +import org.alfresco.rest.search.FacetFieldBucket; +import org.alfresco.rest.search.RestRequestFacetFieldModel; +import org.alfresco.rest.search.RestRequestFacetFieldsModel; +import org.alfresco.rest.search.RestRequestQueryModel; +import org.alfresco.rest.search.RestResultBucketsModel; +import org.alfresco.rest.search.SearchRequest; +import org.alfresco.rest.search.SearchResponse; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; +import org.hamcrest.Matchers; +import org.springframework.http.HttpStatus; +import org.testng.Assert; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; + +public class SearchCasesTest extends AbstractSearchServicesE2ETest +{ + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws Exception + { + searchServicesDataPreparation(); + waitForContentIndexing(file4.getContent(), true); + } + + @Test(priority=1) + public void testSearchNameField() throws Exception + { + // Name + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:pangram"); + queryReq.setUserQuery("pangram"); + searchReq.setQuery(queryReq); + SearchResponse response = queryAsUser(testUser, "cm:name:pangram"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=2) + public void testSearchTitleField() throws Exception + { + // Title + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:title:cars"); + queryReq.setUserQuery("cars"); + searchReq.setQuery(queryReq); + SearchResponse response2 = queryAsUser(testUser, "cm:title:cars"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response2.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=3) + public void testSearchDescriptionField() throws Exception + { + // Description + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:description:alfresco"); + queryReq.setUserQuery("alfresco"); + searchReq.setQuery(queryReq); + SearchResponse response3 = queryAsUser(testUser, "cm:description:alfresco"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response3.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=4) + public void testSearchContentField() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:content:unique"); + queryReq.setUserQuery("unique"); + searchReq.setQuery(queryReq); + SearchResponse response4 = queryAsUser(testUser, "cm:content:unique"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response4.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=5) + public void testSearchUpdateContent() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:content:unique"); + queryReq.setUserQuery("unique"); + searchReq.setQuery(queryReq); + SearchResponse response4 = queryAsUser(testUser, "cm:content:unique"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response4.assertThat().entriesListIsNotEmpty(); + + file4 = new FileModel(unique_searchString + ".txt", "uniquee", "description", FileType.TEXT_PLAIN, + "The new content for the field"); + + waitForMetadataIndexing(file4.getName(), true); + + SearchResponse response5 = queryAsUser(testUser, "cm:content:new"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response5.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=6) + public void testSearchTextFile() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:pangram.txt"); + queryReq.setUserQuery("pangram.txt"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "cm:name:pangram.txt"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=7) + public void testSearchPDFFile() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:cars.PDF"); + queryReq.setUserQuery("cars.PDF"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "cm:name:cars.PDF"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=8) + public void testSearchDocxFile() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:alfresco.docx"); + queryReq.setUserQuery("alfresco.docx"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "cm:name:alfresco.docx"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=9) + public void testSearchODTFile() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:unique.ODT"); + queryReq.setUserQuery("unique.ODT"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "cm:name:unique.ODT"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + /** + * { + * "query": { + * "query": "*" + * }, + * "facetFields": { + * "facets": [{"field": "cm:mimetype"},{"field": "modifier"}] + * } + * } + */ + @Test(priority=10) + public void searchWithFactedFields() throws Exception + { + SearchRequest query = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:content:" + unique_searchString); + query.setQuery(queryReq); + + RestRequestFacetFieldsModel facetFields = new RestRequestFacetFieldsModel(); + List facets = new ArrayList<>(); + facets.add(new RestRequestFacetFieldModel("cm:mimetype")); + facets.add(new RestRequestFacetFieldModel("modifier")); + facetFields.setFacets(facets); + query.setFacetFields(facetFields); + + SearchResponse response = query(query); + + Assert.assertFalse(response.getContext().getFacetsFields().isEmpty()); + Assert.assertNull(response.getContext().getFacetQueries()); + Assert.assertNull(response.getContext().getFacets()); + + RestResultBucketsModel model = response.getContext().getFacetsFields().get(0); + Assert.assertEquals(model.getLabel(), "modifier"); + + model.assertThat().field("label").is("modifier"); + FacetFieldBucket bucket1 = model.getBuckets().get(0); + bucket1.assertThat().field("label").is(testUser.getUsername()); + bucket1.assertThat().field("display").is("FN-" + testUser.getUsername() + " LN-" + testUser.getUsername()); + bucket1.assertThat().field("filterQuery").is("modifier:\"" + testUser.getUsername() + "\""); + bucket1.assertThat().field("count").is(1); + } + +// @Test(priority=11) +// public void searchWithHighLight() throws Exception +// { +// waitForContentIndexing(file2.getContent(), true); +// +// RestRequestQueryModel queryReq = new RestRequestQueryModel(); +// queryReq.setQuery("cm:content:cars"); +// queryReq.setUserQuery("cars"); +// +// RestRequestHighlightModel highlight = new RestRequestHighlightModel(); +// highlight.setPrefix("¿"); +// highlight.setPostfix("?"); +// highlight.setMergeContiguous(true); +// List fields = new ArrayList<>(); +// fields.add(new RestRequestFieldsModel("cm:content")); +// highlight.setFields(fields); +// SearchResponse nodes = query(queryReq, highlight); +// nodes.assertThat().entriesListIsNotEmpty(); +// ResponseHighLightModel hl = nodes.getEntryByIndex(0).getSearch().getHighlight().get(0); +// hl.assertThat().field("snippets").contains("The landrover discovery is not a sports ¿car?"); +// } + + @Test(priority=12) + public void testSearchPhraseQueries() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:alfresco"); + queryReq.setUserQuery("alfresco"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "The quick brown fox jumps over the lazy dog"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=13) + public void testSearchExactTermQueries() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:alfresco"); + queryReq.setUserQuery("alfresco"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "=alfresco"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=14) + public void testSearchConjunctionQueries() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:unique"); + queryReq.setUserQuery("unique"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "unique AND search"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=15) + public void testSearchDisjunctionQueries() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:cars"); + queryReq.setUserQuery("cars"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "file OR discovery"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=16) + public void testSearchNegationQueries() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:pangram"); + queryReq.setUserQuery("pangram"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "pangram NOT pan"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=17) + public void testSearchWildcardQueries() throws Exception + { + // Content + SearchRequest searchReq = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("cm:name:alfresco"); + queryReq.setUserQuery("alfresco"); + searchReq.setQuery(queryReq); + SearchResponse response6 = queryAsUser(testUser, "al?res*"); + restClient.assertStatusCodeIs(HttpStatus.OK); + response6.assertThat().entriesListIsNotEmpty(); + } + + @Test(priority=18) + 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(testUser).usingSite(testSite).createContent(file); + + waitForIndexing(file.getName(), true); + + 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)); + } + + +} diff --git a/e2e-test/src/test/resources/PipelineSuite.xml b/e2e-test/src/test/resources/PipelineSuite.xml new file mode 100644 index 000000000..7e3dcdcb3 --- /dev/null +++ b/e2e-test/src/test/resources/PipelineSuite.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file From 57706002b2e33cd57e076e512ea9007bd8ae94cc Mon Sep 17 00:00:00 2001 From: Keerat Date: Mon, 11 Jan 2021 16:25:30 +0000 Subject: [PATCH 2/5] SEARCH 2280 Fixing review comments on tests --- .../search/SearchCasesTest.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchCasesTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchCasesTest.java index af6208822..07c1b9364 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchCasesTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchCasesTest.java @@ -56,7 +56,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=1) public void testSearchNameField() throws Exception { - // Name SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:pangram"); @@ -70,7 +69,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=2) public void testSearchTitleField() throws Exception { - // Title SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:title:cars"); @@ -84,7 +82,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=3) public void testSearchDescriptionField() throws Exception { - // Description SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:description:alfresco"); @@ -98,7 +95,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=4) public void testSearchContentField() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:content:unique"); @@ -112,7 +108,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=5) public void testSearchUpdateContent() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:content:unique"); @@ -135,7 +130,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=6) public void testSearchTextFile() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:pangram.txt"); @@ -149,7 +143,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=7) public void testSearchPDFFile() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:cars.PDF"); @@ -163,7 +156,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=8) public void testSearchDocxFile() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:alfresco.docx"); @@ -177,7 +169,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=9) public void testSearchODTFile() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:unique.ODT"); @@ -230,6 +221,7 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest bucket1.assertThat().field("count").is(1); } +// Test for highlighting that is part of the test cases but has been commented out as a different configuration is needed for highlighting // @Test(priority=11) // public void searchWithHighLight() throws Exception // { @@ -255,7 +247,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=12) public void testSearchPhraseQueries() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:alfresco"); @@ -269,7 +260,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=13) public void testSearchExactTermQueries() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:alfresco"); @@ -283,7 +273,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=14) public void testSearchConjunctionQueries() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:unique"); @@ -297,7 +286,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=15) public void testSearchDisjunctionQueries() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:cars"); @@ -311,7 +299,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=16) public void testSearchNegationQueries() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:pangram"); @@ -325,7 +312,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=17) public void testSearchWildcardQueries() throws Exception { - // Content SearchRequest searchReq = new SearchRequest(); RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery("cm:name:alfresco"); @@ -339,7 +325,6 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest @Test(priority=18) 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); @@ -355,6 +340,4 @@ public class SearchCasesTest extends AbstractSearchServicesE2ETest restClient.onResponse().assertThat().body("list.entries.entry[0].name", Matchers.equalToIgnoringCase(specialCharfileName)); } - - } From 5ce59dffa2345cebd994a739ab9de76a250f4d03 Mon Sep 17 00:00:00 2001 From: Keerat Date: Thu, 14 Jan 2021 12:12:51 +0000 Subject: [PATCH 3/5] SEARCH 2280 excluding packags in the Pipeline Suite --- .../test/search/functional/AbstractE2EFunctionalTest.java | 2 +- .../search/AbstractSearchServicesE2ETest.java | 2 +- .../functional/searchServices/search/SearchTest.java | 2 +- e2e-test/src/test/resources/PipelineSuite.xml | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java index 6f377f23a..957a2ba0d 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services E2E Test * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of 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 284aa506d..cddc5f8d2 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services E2E Test * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of 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 3ecf2d9e2..933b0f787 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 @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services E2E Test * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of diff --git a/e2e-test/src/test/resources/PipelineSuite.xml b/e2e-test/src/test/resources/PipelineSuite.xml index 7e3dcdcb3..e099533de 100644 --- a/e2e-test/src/test/resources/PipelineSuite.xml +++ b/e2e-test/src/test/resources/PipelineSuite.xml @@ -13,4 +13,12 @@ + + + + + + + + \ No newline at end of file From 6062b9deb8766ed6044756d5c06cfde8c6f82c71 Mon Sep 17 00:00:00 2001 From: Keerat Date: Thu, 14 Jan 2021 12:45:14 +0000 Subject: [PATCH 4/5] SEARCH 2280 excluding packags in the Pipeline Suite --- e2e-test/src/test/resources/PipelineSuite.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/e2e-test/src/test/resources/PipelineSuite.xml b/e2e-test/src/test/resources/PipelineSuite.xml index e099533de..7131c70ba 100644 --- a/e2e-test/src/test/resources/PipelineSuite.xml +++ b/e2e-test/src/test/resources/PipelineSuite.xml @@ -7,18 +7,20 @@ + + + + + + + + + + - - - - - - - - \ No newline at end of file From f7b3488f8ad72d5c4731fcd3eca70f698ec6e435 Mon Sep 17 00:00:00 2001 From: Keerat Date: Thu, 14 Jan 2021 12:52:13 +0000 Subject: [PATCH 5/5] SEARCH 2280 excluding packags in the Pipeline Suite --- e2e-test/src/test/resources/PipelineSuite.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/e2e-test/src/test/resources/PipelineSuite.xml b/e2e-test/src/test/resources/PipelineSuite.xml index 7131c70ba..72d6440b6 100644 --- a/e2e-test/src/test/resources/PipelineSuite.xml +++ b/e2e-test/src/test/resources/PipelineSuite.xml @@ -6,16 +6,6 @@ - - - - - - - - - -