diff --git a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java index f08879c17..5155b8bd5 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -34,7 +34,7 @@ public class TestGroup public static final String CONFIG_SHARDING_EXPLICIT ="CONFIG_Sharding_EXPLICIT"; // Alfresco search services using sharded environment and explicit routing public static final String CONFIG_SHARDING_DB_ID_RANGE = "CONFIG_Sharding_DB_ID_RANGE"; // Alfresco Search Services using Sharding with DB_ID_RANGE - public static final String CONFIG_DISABLE_CASCADE_TRACKER ="Config_Disable_Cascade_Tracker"; // Alfresco search services does not index fields related to cascaded updates + public static final String CONFIG_ENABLED_CASCADE_TRACKER ="Config_Enabled_Cascade_Tracker"; // Alfresco search services does not index fields related to cascaded updates public static final String NOT_INSIGHT_ENGINE = "Not_InsightEngine"; // When Alfresco Insight Engine 1.0 isn't running diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByAspectTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByAspectTests.java index 91ab34efb..0fe47d474 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByAspectTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByAspectTests.java @@ -141,7 +141,7 @@ public class SolrSearchByAspectTests extends AbstractCmisE2ETest Assert.assertTrue(waitForIndexing(currentQuery, query.getResults()), String.format("Result count not as expected for query: %s", currentQuery)); } - @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @XMLDataConfig(file = "src/test/resources/testdata/search-by-aspect-in-tree.xml") public void executeSearchByAspectInTree(QueryModel query) throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByIdTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByIdTests.java index bb5299211..3a52c75dd 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByIdTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByIdTests.java @@ -102,7 +102,7 @@ public class SolrSearchByIdTests extends AbstractCmisE2ETest Assert.assertTrue(waitForIndexing(currentQuery, query.getResults()), String.format("Result count not as expected for query: %s", currentQuery)); } - @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @XMLDataConfig(file = "src/test/resources/testdata/search-by-id-in-tree.xml") public void executeSearchByIdInTree(QueryModel query) throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPathTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPathTests.java index c81373894..a9dc4e4a7 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPathTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPathTests.java @@ -49,7 +49,7 @@ public class SolrSearchByPathTests extends AbstractCmisE2ETest Utility.waitToLoopTime(getSolrWaitTimeInSeconds()); } - @Test(dependsOnMethods = "prepareDataForSearchByPath", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(dependsOnMethods = "prepareDataForSearchByPath", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @XMLDataConfig(file = "src/test/resources/testdata/search-by-path.xml") public void executeSearchByPathQueries(QueryModel query) { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInTreeTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInTreeTests.java index c279ef57d..1be2a268e 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInTreeTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInTreeTests.java @@ -56,7 +56,7 @@ public class SolrSearchInTreeTests extends AbstractCmisE2ETest dataContent.deleteSite(testSite); } - @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @XMLDataConfig(file = "src/test/resources/testdata/search-in-tree.xml") public void executeCMISQuery(QueryModel query) throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java index 597722227..f6bf50849 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java @@ -95,7 +95,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest waitForContentIndexing(htmlFile.getContent(), true); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void testSearchFacetFieldsBucketExcludedWhenMinCount2() throws Exception { // Create Query with FacetFields: Site and Content MimeType @@ -131,7 +131,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void testSearchWithFacetFieldsMinCountChecks() throws Exception { SearchRequest query = new SearchRequest(); @@ -206,7 +206,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest Assert.assertNull(response.getContext().getFacetsFields()); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void testSearchWithFacetFieldsOnlyFacetsWhereAccess() throws Exception { SearchRequest query = new SearchRequest(); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetRangeSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetRangeSearchTest.java index a44644c43..8614deb4d 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetRangeSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetRangeSearchTest.java @@ -109,7 +109,7 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest .containsSummary(String.format(RestErrorModel.MANDATORY_PARAM, "gap")); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Check basic facet range search api") @SuppressWarnings("unchecked") @@ -159,7 +159,7 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest assertEquals(info.get("endInclusive"), "true"); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Check date facet intervals search api") @SuppressWarnings("unchecked") @@ -257,7 +257,7 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest query.setRanges(ranges); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Check basic facet range search api") @SuppressWarnings("unchecked") diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java index 650be58a9..0da2b5ebc 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java @@ -102,7 +102,7 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest waitForContentIndexing(file4.getContent(), true); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @TestRail(section = { TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api") public void searchWithQueryFaceting() throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/PivotFacetedSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/PivotFacetedSearchTest.java index 21963b825..8bba9f7b0 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/PivotFacetedSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/PivotFacetedSearchTest.java @@ -119,7 +119,7 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest assertPivotResponse(response, "creator", null); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks nested pivot using Search api") diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAFTSInFieldTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAFTSInFieldTest.java index ff89543fb..61ec2fdf3 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAFTSInFieldTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAFTSInFieldTest.java @@ -155,7 +155,7 @@ public class SearchAFTSInFieldTest extends AbstractE2EFunctionalTest }); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void testSearchInFieldSITE() { String query = "SITE:" + testSite.getId(); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAPATHTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAPATHTest.java index 93c67af45..95df381d7 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAPATHTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAPATHTest.java @@ -93,7 +93,7 @@ public class SearchAPATHTest extends AbstractSearchServicesE2ETest *}} * */ - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void searchLevel0() { SearchRequest searchQuery = searchRequestWithAPATHFacet("name:*", "0"); @@ -109,7 +109,7 @@ public class SearchAPATHTest extends AbstractSearchServicesE2ETest * Test to test that the facet buckets are returned correctly for sub-level 1/ * Test to search for a searchString, that's unique to the test run and hence stable for any environment */ - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void searchLevel0andIncludeSubLevel1() { SearchRequest searchQuery = searchRequestWithAPATHFacet("name:" + unique_searchString, "1/"); @@ -121,7 +121,7 @@ public class SearchAPATHTest extends AbstractSearchServicesE2ETest getFirstBucket(response).assertThat().field("label").contains("1/"); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void searchLevel2() { String queryString = "name:cars"; diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSecondaryAssociationTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSecondaryAssociationTest.java index 58f3e4fbd..c9e0e0dcf 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSecondaryAssociationTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSecondaryAssociationTest.java @@ -53,7 +53,7 @@ public class SearchSecondaryAssociationTest extends AbstractE2EFunctionalTest waitForMetadataIndexing(file1.getName(), true); } - @Test(priority = 1, groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(priority = 1, groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void testSearchPathForSecondaryAssociation() throws Exception { String queryPathFolder1 = "PATH:\"/app:company_home/st:sites/cm:" + testSite.getTitle() + 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 f1f8935d5..72c6ab684 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 @@ -101,7 +101,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest response.getContext().assertThat().field("request").isNotEmpty(); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Tests a search request containing a sort clause.") public void searchWithOneSortClause() @@ -148,7 +148,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest * The first clause has always the same value for all matches so the test makes sure the request is correctly * processed and the returned order is determined by the second clause. */ - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Tests a search request containing a sort clause.") public void searchWithTwoSortClauses() diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java index 7ba363b80..0236fb1ed 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java @@ -203,7 +203,7 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest assertTrue((Integer)metricCount.get("countValues") > count, "With the exclude filter there will be more documents than returned"); } - @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks errors with stats with Pivot using Search api") diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java index abd65e6bb..84570427f 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java @@ -76,7 +76,7 @@ public class CascadingIntegrationTest extends AbstractE2EFunctionalTest "failing while removing sharding model"); } - @Test(priority = 1, groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(priority = 1, groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void testChildPathWhenParentRenamed() throws Exception { // Create Parent folder @@ -119,7 +119,7 @@ public class CascadingIntegrationTest extends AbstractE2EFunctionalTest Assert.assertEquals(descendantCountOfOriginalName, 0, "Old path still has descendants: " + parentQuery); } - @Test(priority = 2, groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @Test(priority = 2, groups={TestGroup.CONFIG_ENABLED_CASCADE_TRACKER}) public void testGrandChildPathWhenGrandParentRenamed() throws Exception { // Create grand parent folder