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 3a6757b48..60a026e14 100644
--- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java
+++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java
@@ -9,35 +9,17 @@ import java.lang.annotation.Target;
@Target({ ElementType.METHOD })
public @interface TestGroup
{
- public static final String SANITY = "sanity";
- public static final String REGRESSION = "regression";
- public static final String ENTERPRISE = "enterprise";
-
-
+ // Used for TestRail test annotation
public static final String SEARCH = "search";
-
- public static final String CMIS = "cmis";
public static final String REST_API = "rest-api";
public static final String PREUPGRADE = "pre-upgrade";
public static final String POSTUPGRADE = "post-upgrade";
- // Search: Minimum Version Required
- public static final String ASS_1 = "ASS_1.0.0"; // Alfresco Search Services 1.0. Does not work with Solr4
- public static final String ASS_112 = "ASS_1.1.2"; // Alfresco Search Services 1.1.2
- public static final String ASS_12 = "ASS_1.2.0"; // Alfresco Search Services 1.2
- public static final String ASS_121 = "ASS_1.2.1"; // Alfresco Search Services 1.2.1
- public static final String ASS_13 = "ASS_1.3.0"; // Alfresco Search Services 1.3
- public static final String ASS_1302 = "ASS_1.3.0.2"; // Alfresco Search Services 1.3.0.2 (Fingerprint MNT)
- public static final String ASS_14 = "ASS_1.4.0"; // Alfresco Search Services 1.4
public static final String ASS_MASTER_SLAVE = "ASS_Master_Slave"; // Alfresco Search Services using master slave configurations
public static final String ASS_MASTER ="ASS_Master"; // Alfresco search services using master/stand alone mode
- public static final String INSIGHT_10 = "InsightEngine_1.0.0"; // Alfresco Insight Engine 1.0
- public static final String INSIGHT_11 = "InsightEngine_1.1.0"; // Alfresco Insight Engine 1.1
- public static final String INSIGHT_12 = "InsightEngine_1.2.0"; // Alfresco Insight Engine 1.2
public static final String NOT_INSIGHT_ENGINE = "Not_InsightEngine"; // When Alfresco Insight Engine 1.0 isn't running
- public static final String SOLR = "SOLR"; //To be used for tests for /solr/alfresco/* end-points
public static final String ACS_52n = "ACS_52n"; // Alfresco Content Services 5.2.n
public static final String ACS_60n = "ACS_60n"; // Alfresco Content Services 6.0 or above
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 db21b1bc8..30b02e731 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
@@ -128,8 +128,7 @@ public class SolrSearchByAspectTests extends AbstractCmisE2ETest
Utility.waitToLoopTime(getSolrWaitTimeInSeconds());
}
- @Test(groups = { TestGroup.CMIS },
- dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+ @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
@XMLDataConfig(file = "src/test/resources/testdata/search-by-aspect.xml")
public void executeSearchByAspect(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 6da2e7f8a..d10c31fa2 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
@@ -86,8 +86,7 @@ public class SolrSearchByIdTests extends AbstractCmisE2ETest
Utility.waitToLoopTime(getSolrWaitTimeInSeconds());
}
- @Test(groups = { TestGroup.CMIS },
- dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+ @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
@XMLDataConfig(file = "src/test/resources/testdata/search-by-id.xml")
public void executeSearchByAspect(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 de74c6438..0663d59fb 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
@@ -48,8 +48,7 @@ public class SolrSearchByPathTests extends AbstractCmisE2ETest
Utility.waitToLoopTime(getSolrWaitTimeInSeconds());
}
- @Test(groups = { TestGroup.CMIS },
- dependsOnMethods = "prepareDataForSearchByPath", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+ @Test(dependsOnMethods = "prepareDataForSearchByPath", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
@XMLDataConfig(file = "src/test/resources/testdata/search-by-path.xml")
public void executeSearchByPathQueries(QueryModel query) throws Exception
{
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java
index f3544b4cf..70894ac57 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java
@@ -105,7 +105,7 @@ public class SolrSearchByPropertyTests extends AbstractCmisE2ETest
Utility.waitToLoopTime(getSolrWaitTimeInSeconds());
}
- @Test(groups = { TestGroup.CMIS }, dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+ @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
@XMLDataConfig(file = "src/test/resources/testdata/search-by-property.xml")
public void executeSearchByProperty(QueryModel query) throws Exception
{
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInFolderTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInFolderTests.java
index 52f7c332a..5aebcb0f7 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInFolderTests.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInFolderTests.java
@@ -51,8 +51,7 @@ public class SolrSearchInFolderTests extends AbstractCmisE2ETest
dataContent.deleteSite(testSite);
}
- @Test(groups = { TestGroup.CMIS },
- dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+ @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
@XMLDataConfig(file = "src/test/resources/testdata/search-in-folder.xml")
public void executeCMISQuery(QueryModel query) throws Exception
{
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 5ce7461c0..125b3335e 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
@@ -55,8 +55,7 @@ public class SolrSearchInTreeTests extends AbstractCmisE2ETest
dataContent.deleteSite(testSite);
}
- @Test(groups = { TestGroup.CMIS },
- dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+ @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
@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/cmis/SolrSearchScoreQueryTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java
index 444e4939b..36ad1eabe 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java
@@ -2,10 +2,11 @@ package org.alfresco.test.search.functional.searchServices.cmis;
import java.math.BigDecimal;
+import org.alfresco.search.TestGroup;
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.model.TestGroup;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterClass;
@@ -61,7 +62,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest
* Verify that results are ordered
* @throws Exception
*/
- @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch")
+ @Test(dependsOnMethods = "prepareDataForScoreSearch")
public void scoreQueryOrdered() throws Exception
{
@@ -87,7 +88,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest
* Verify that results are inverse ordered
* @throws Exception
*/
- @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch")
+ @Test(dependsOnMethods = "prepareDataForScoreSearch")
public void scoreQueryOrderedDesc() throws Exception
{
@@ -112,7 +113,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest
* Verify that all SCORE results are between 0 and 1
* @throws Exception
*/
- @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch")
+ @Test(groups = { TestGroup.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch")
public void scoreQueryInRange() throws Exception
{
@@ -137,7 +138,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest
* Verify that all SCORE results are between 0 and 1
* @throws Exception
*/
- @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch")
+ @Test(groups = { TestGroup.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch")
public void scoreQueryAliasInRange() throws Exception
{
@@ -163,7 +164,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest
* Currently only supported with double quotes
* @throws Exception
*/
- @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch")
+ @Test(dependsOnMethods = "prepareDataForScoreSearch")
public void scoreQueryScoreAsAlias() throws Exception
{
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/sanity/SetupTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/sanity/SetupTest.java
index 70abfe3ae..b35d2db6d 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/sanity/SetupTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/sanity/SetupTest.java
@@ -51,7 +51,7 @@ public class SetupTest extends AbstractE2EFunctionalTest
}
// Test CMIS API works
- @Test(priority = 1, groups = { TestGroup.SANITY })
+ @Test(priority = 1)
public void testCMISFileCreation() throws Exception
{
// Create document in a folder in a collaboration site
@@ -60,7 +60,7 @@ public class SetupTest extends AbstractE2EFunctionalTest
}
// Test Custom Model: Music can be used
- @Test(priority = 2, groups = { TestGroup.SANITY })
+ @Test(priority = 2)
public void testModelMusicCanBeUsed() throws Exception
{
// Create document of custom type
@@ -78,7 +78,7 @@ public class SetupTest extends AbstractE2EFunctionalTest
}
// Test Custom Model: Finance can be used
- @Test(priority = 3, groups = { TestGroup.SANITY })
+ @Test(priority = 3)
public void testModelFinanceCanBeUsed() throws Exception
{
// Create document of custom type
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 a8b843d63..aa053aa30 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
waitForIndexing(htmlFile.getName(), true);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 })
+ @Test
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.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 })
+ @Test
public void testSearchWithFacetFieldsMinCountChecks() throws Exception
{
SearchRequest query = new SearchRequest();
@@ -182,7 +182,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest
bucket1.assertThat().field("display").is("Plain Text");
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 })
+ @Test
public void testSearchWithFacetFieldsNoFacetsWhenNoAccess() throws Exception
{
SearchRequest query = new SearchRequest();
@@ -206,7 +206,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest
Assert.assertNull(response.getContext().getFacetsFields());
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 })
+ @Test
public void testSearchWithFacetFieldsOnlyFacetsWhereAccess() throws Exception
{
SearchRequest query = new SearchRequest();
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetIntervalSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetIntervalSearchTest.java
index 0f6ab9a21..5639022ec 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetIntervalSearchTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetIntervalSearchTest.java
@@ -50,8 +50,8 @@ public class FacetIntervalSearchTest extends AbstractSearchServicesE2ETest
waitForContentIndexing(file4.getContent(), true);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION,
description = "Check facet intervals mandatory fields")
public void checkingFacetsMandatoryErrorMessages()throws Exception
{
@@ -104,8 +104,8 @@ public class FacetIntervalSearchTest extends AbstractSearchServicesE2ETest
.containsSummary("duplicate interval label [thesame=2]");
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Check basic facet intervals search api")
public void searchWithBasicInterval()throws Exception
{
@@ -147,8 +147,8 @@ public class FacetIntervalSearchTest extends AbstractSearchServicesE2ETest
bucket.getMetrics().get(0).assertThat().field("value").is("{count=0}");
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION,
description = "Check date facet intervals search api")
public void searchWithDates() throws Exception
{
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 7ebdc403c..4dfc0c2b9 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
@@ -78,8 +78,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest
waitForContentIndexing(file4.getContent(), true);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Check facet intervals mandatory fields")
public void checkingFacetsMandatoryErrorMessages()
{
@@ -123,8 +123,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest
facetRangeModel.setGap("100");
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Check basic facet range search api")
@SuppressWarnings("unchecked")
public void searchWithRange()
@@ -178,8 +178,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest
assertEquals(info.get("endInclusive"),"true");
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Check date facet intervals search api")
@SuppressWarnings("unchecked")
public void searchWithRangeHardend()
@@ -238,8 +238,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest
}
/** This test relies on a document created in 2015 existing, probably part of the sample site. */
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Check date facet intervals search api")
@SuppressWarnings("unchecked")
public void searchDateRange()
@@ -274,8 +274,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest
assertEquals(info.get("endInclusive"),"true");
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Check date facet intervals search api")
public void searchDateAndSizeRanges()
{
@@ -296,8 +296,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest
query.setRanges(ranges);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION,
description = "Check basic facet range search api")
@SuppressWarnings("unchecked")
public void searchWithRangeAndIncludeUpperBound()
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 48e440962..ce389980d 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,9 +102,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest
waitForContentIndexing(file4.getContent(), true);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = { TestGroup.REST_API, TestGroup.SEARCH,
- TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api")
+ @Test
+ @TestRail(section = { TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api")
public void searchWithQueryFaceting() throws Exception
{
SearchRequest query = new SearchRequest();
@@ -182,8 +181,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest
* }
* }}
*/
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH , TestGroup.ASS_1})
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH ,TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Checks facet queries for the Search api")
public void searchQueryFacetingWithGroup() throws Exception
{
@@ -247,8 +246,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest
* }
* }
*/
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH , TestGroup.ASS_1})
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH ,TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Checks facet queries for the Search api")
public void searchWithFactedFields() throws Exception
{
@@ -293,8 +292,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest
* "facetFormat":"V2"
* }
*/
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH , TestGroup.ASS_1})
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH ,TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Checks facet queries for the Search api")
public void searchWithFactedFieldsFacetFormatV2() throws Exception
{
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FingerPrintTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FingerPrintTest.java
index 19472582b..77ebc165f 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FingerPrintTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FingerPrintTest.java
@@ -75,7 +75,7 @@ public class FingerPrintTest extends AbstractE2EFunctionalTest
waitForIndexing("FINGERPRINT:" + file3.getNodeRefWithoutVersion(), true);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1302 })
+ @Test
@Bug(id = "MNT-20449")
public void makeSureFingerprintQueryWorksAfterMetadataUpdate() throws Exception
{
@@ -106,7 +106,7 @@ public class FingerPrintTest extends AbstractE2EFunctionalTest
* to the files loaded as part of this test.
* Note that for fingerprint to work it need a 5 word sequence.
*/
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
+ @Test
public void search()
{
String uuid = file1.getNodeRefWithoutVersion();
@@ -133,7 +133,7 @@ public class FingerPrintTest extends AbstractE2EFunctionalTest
}
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
+ @Test
public void searchSimilar()
{
String uuid = file2.getNodeRefWithoutVersion();
@@ -163,7 +163,7 @@ public class FingerPrintTest extends AbstractE2EFunctionalTest
}
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
+ @Test
public void searchSimilar67Percent()
{
String uuid = file2.getNodeRefWithoutVersion();
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 76cb247f9..c99a89ae4 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
@@ -57,8 +57,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest
waitForContentIndexing(file4.getContent(), true);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH },
executionType = ExecutionType.REGRESSION,
description = "Checks errors with pivot using Search api")
public void searchWithPivotingErrors()
@@ -90,8 +90,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest
.containsSummary("Pivot parameter none_like_this does not reference");
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH},
executionType = ExecutionType.REGRESSION,
description = "Checks with pivot using Search api")
public void searchWithPivoting()
@@ -119,8 +119,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest
assertPivotResponse(response, "creator", null);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH },
executionType = ExecutionType.REGRESSION,
description = "Checks nested pivot using Search api")
public void searchWithNestedPivoting()
@@ -176,8 +176,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest
creatorResponse.assertThat().field("label").is("creator");
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH},
executionType = ExecutionType.REGRESSION,
description = "Checks range pivots using Search api")
public void searchWithRangePivoting()
@@ -240,8 +240,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest
Assert.assertTrue(bucket.getMetrics().get(0).getValue().toString().contains("{count="));
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH},
executionType = ExecutionType.REGRESSION,
description = "Checks with pivot using Search api and a label as a key")
public void searchWithPivotingUsingLabel()
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 07ba186e5..33592222e 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.SEARCH, TestGroup.REST_API, TestGroup.ASS_1})
+ @Test
public void searchLevel0()
{
SearchRequest searchQuery = searchRequestWithAPATHFacet("name:*", "0");
@@ -105,7 +105,7 @@ public class SearchAPATHTest extends AbstractSearchServicesE2ETest
buckets.forEach(bucket -> bucket.assertThat().field("label").contains("0/"));
}
- @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_1})
+ @Test
public void searchLevel0andIncludeSubLevel1()
{
SearchRequest searchQuery = searchRequestWithAPATHFacet("name:*", "1/");
@@ -117,7 +117,7 @@ public class SearchAPATHTest extends AbstractSearchServicesE2ETest
getFirstBucket(response).assertThat().field("label").contains("1/");
}
- @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_1})
+ @Test
public void searchLevel2()
{
String queryString = "name:cars";
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java
index 8da1e9148..87073f439 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java
@@ -40,7 +40,7 @@ public class SearchHighLightTest extends AbstractSearchServicesE2ETest
searchServicesDataPreparation();
}
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API })
+ @Test
@Bug(id = "TAS-3220")
public void searchWithHighLight() throws Exception
{
@@ -63,7 +63,7 @@ public class SearchHighLightTest extends AbstractSearchServicesE2ETest
hl.assertThat().field("snippets").contains("The landrover discovery is not a sports ¿car?");
}
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API })
+ @Test
public void searchNonIndexedData() throws Exception
{
RestRequestQueryModel queryReq = new RestRequestQueryModel();
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java
index 7ca8b79a3..0f5678065 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java
@@ -72,7 +72,7 @@ public class SearchSpellCheckTest extends AbstractSearchServicesE2ETest
* "entries": [...]
* }
*/
- @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n}, priority=1)
+ @Test(groups={ TestGroup.ACS_60n}, priority=1)
public void testSearchMissSpelled() throws Exception
{
waitForContentIndexing(file4.getContent(), true);
@@ -127,7 +127,7 @@ public class SearchSpellCheckTest extends AbstractSearchServicesE2ETest
* "spellcheck": {"query": "alfrezco"}
* }
*/
- @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n}, priority=2)
+ @Test(groups={TestGroup.ACS_60n}, priority=2)
public void testSearchMissSpelledVersion2()
{
SearchRequest searchReq = new SearchRequest();
@@ -141,7 +141,7 @@ public class SearchSpellCheckTest extends AbstractSearchServicesE2ETest
assertResponse(query(searchReq));
}
- @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n}, priority=3)
+ @Test(groups={ TestGroup.ACS_60n}, priority=3)
public void testSearchWithSpellcheckerAndCorrectSpelling()
{
SearchRequest searchReq = new SearchRequest();
@@ -155,7 +155,7 @@ public class SearchSpellCheckTest extends AbstractSearchServicesE2ETest
res.assertThat().entriesListIsNotEmpty();
}
- @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n}, priority=4)
+ @Test(groups={TestGroup.ACS_60n}, priority=4)
public void testSpellCheckType() throws Exception
{
// Create a file with mis-spelt name, expect spellcheck type = didYouMean
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 1700d2287..b3771d4a8 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
@@ -63,7 +63,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest
waitForContentIndexing(file4.getContent(), true);
}
- @Test(groups={TestGroup.SEARCH, TestGroup.REST_API})
+ @Test
public void searchOnIndexedData() throws Exception
{
SearchResponse nodes = query("cm:content:" + unique_searchString);
@@ -76,7 +76,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest
Assert.assertEquals(entity.getName(),"pangram.txt");
}
- @Test(groups={TestGroup.SEARCH,TestGroup.REST_API})
+ @Test
public void searchNonIndexedData()
{
SearchResponse nodes = query("yeti");
@@ -84,8 +84,8 @@ public class SearchTest extends AbstractSearchServicesE2ETest
nodes.assertThat().entriesListIsEmpty();
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION,
description = "Checks its possible to include the original request in the response")
public void searchWithRequest()
{
@@ -101,8 +101,8 @@ public class SearchTest extends AbstractSearchServicesE2ETest
response.getContext().assertThat().field("request").isNotEmpty();
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Tests a search request containing a sort clause.")
public void searchWithOneSortClause()
{
@@ -148,8 +148,8 @@ 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.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION,
description = "Tests a search request containing a sort clause.")
public void searchWithTwoSortClauses()
{
@@ -192,7 +192,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest
.collect(Collectors.toList()));
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n, TestGroup.ASS_14 })
+ @Test(groups = { TestGroup.ACS_61n })
@TestRail(section = {
TestGroup.REST_API, TestGroup.SEARCH,
TestGroup.ACS_61n }, executionType = ExecutionType.REGRESSION, description = "Checks the \"include\" request parameter support the 'permissions' option")
@@ -217,7 +217,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest
restClient.onResponse().assertThat().body("list.entries[0].entry.permissions", nullValue());
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n, TestGroup.ASS_14 })
+ @Test(groups = { TestGroup.ACS_61n })
@TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n }, executionType = ExecutionType.REGRESSION,
description = "Checks the \"include\" request parameter support the 'isLocked' option")
public void searchQuery_includeIsLocked_shouldReturnNodeWithLockInformation() throws Exception {
@@ -251,7 +251,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest
restClient.onResponse().assertThat().body("list.entries[0].entry.isLocked", nullValue());
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n, TestGroup.ASS_14 })
+ @Test(groups = { TestGroup.ACS_61n })
@TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n }, executionType = ExecutionType.REGRESSION,
description = "Checks the \"include\" request parameter does not support the 'notValid' option")
public void searchQuery_includeInvalid_shouldReturnBadResponse()
@@ -270,7 +270,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest
}
// Test that when fields parameter is set, only restricted fields appear in the response
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
+ @Test
public void searchWithFields()
{
SearchRequest query = new SearchRequest();
@@ -293,7 +293,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest
restClient.onResponse().assertThat().body("list.entries.entry[0].id", Matchers.nullValue());
}
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API })
+ @Test
public void searchSpecialCharacters() throws Exception
{
// Create a file with Special Characters
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchWithCustomModelTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchWithCustomModelTest.java
index 72cc13614..7875f1680 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchWithCustomModelTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchWithCustomModelTest.java
@@ -114,7 +114,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest
}
// Search-1359: Search AFTS Query with Range
- @Test(priority = 1, groups = { TestGroup.ASS_14 })
+ @Test(priority = 1)
public void testRangeQueryTextField()
{
// Search Range Query
@@ -138,7 +138,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest
Assert.assertEquals(response.getPagination().getCount(), 2);
}
- @Test(priority = 2, groups = { TestGroup.ASS_14 })
+ @Test(priority = 2)
public void testRangeQueryTextFieldWhiteSpace()
{
SearchResponse response = queryAsUser(testUser, "finance:Emp:[* TO Daniel]");
@@ -159,7 +159,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest
Assert.assertEquals(response.getPagination().getCount(), 2);
}
- @Test(priority = 3, groups = { TestGroup.ASS_14 })
+ @Test(priority = 3)
public void testRangeQueryTextFieldNonFacetable()
{
// Search Range Query
@@ -186,7 +186,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest
Assert.assertEquals(response.getPagination().getCount(), 2);
}
- @Test(priority = 4, groups = { TestGroup.ASS_14 })
+ @Test(priority = 4)
public void testRangeQueryTextFieldNotTockenised()
{
SearchResponse response = queryAsUser(testUser, "finance:Desc:[* TO David]");
@@ -207,7 +207,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest
Assert.assertEquals(response.getPagination().getCount(), 2);
}
- @Test(priority = 5, groups = { TestGroup.ASS_14 })
+ @Test(priority = 5)
public void testRangeQueryDoubleField()
{
// Search Range Query
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java
index 6c1be26a4..74fbcf971 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java
@@ -40,7 +40,7 @@ import org.springframework.http.HttpStatus;
public class ShardInfoTest extends AbstractE2EFunctionalTest
{
/* The test that will be excluded when running master slave setup, excluding the ASS_MASTER test group. */
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n, TestGroup.ASS_MASTER })
+ @Test(groups = { TestGroup.ACS_60n, TestGroup.ASS_MASTER })
public void getShardInfoWithAdminAuthority() throws JsonProcessingException
{
RestShardInfoModelCollection info = restClient.authenticateUser(dataUser.getAdminUser()).withShardInfoAPI()
@@ -83,7 +83,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest
}
/* The test that will be run when in master slave setup by including the ASS_MASTER_SLAVE test group. */
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n, TestGroup.ASS_MASTER_SLAVE })
+ @Test(groups = {TestGroup.ACS_60n, TestGroup.ASS_MASTER_SLAVE })
public void getShardInfoWithAdminAuthorityMasterSlaveConfig() throws JsonProcessingException
{
RestShardInfoModelCollection info = restClient.authenticateUser(dataUser.getAdminUser()).withShardInfoAPI()
@@ -120,7 +120,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest
}
}
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n })
+ @Test(groups = { TestGroup.ACS_60n })
public void getShardInfoWithoutAdminAuthority() throws Exception
{
restClient.authenticateUser(dataUser.createRandomTestUser()).withShardInfoAPI().getInfo();
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SpecialCharacterSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SpecialCharacterSearchTest.java
index 9153da8ca..226e39b3c 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SpecialCharacterSearchTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SpecialCharacterSearchTest.java
@@ -40,7 +40,7 @@ public class SpecialCharacterSearchTest extends AbstractE2EFunctionalTest
* The goal is to check that the file is actually indexed in solr.
* @throws Exception
*/
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_52n, TestGroup.ACS_60n, TestGroup.ACS_61n })
+ @Test(groups = { TestGroup.ACS_52n, TestGroup.ACS_60n, TestGroup.ACS_61n })
@Bug(id = "MNT-20507")
public void testIndexDELChar() throws Exception
{
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 90adddf9b..fc48b425f 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
@@ -64,8 +64,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest
waitForContentIndexing(file2.getContent(), true);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH },
executionType = ExecutionType.REGRESSION,
description = "Checks errors with stats using Search api")
public void searchWithBasicStats()
@@ -148,8 +148,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest
assertTrue(percentiles.keySet().containsAll(Arrays.asList("1.0","75.0","99.0","99.9")));
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH},
executionType = ExecutionType.REGRESSION,
description = "Checks errors with stats labels using Search api")
public void searchWithStatsLabel()
@@ -168,8 +168,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest
assertStatsFacetedResponse(response, "DateChanged", 8);
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH },
executionType = ExecutionType.REGRESSION,
description = "Checks errors with stats fitlers using Search api")
public void searchWithStatsFilters()
@@ -203,8 +203,8 @@ 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.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH},
executionType = ExecutionType.REGRESSION,
description = "Checks errors with stats with Pivot using Search api")
public void searchWithStatsAndMutlilevelPivot()
@@ -266,8 +266,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest
}
- @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 })
- @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 },
+ @Test
+ @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH},
executionType = ExecutionType.REGRESSION,
description = "Checks errors with stats with Pivot using Search api")
public void searchWithStatsAndPivot()
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/rm/SearchServicesRME2ETest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/rm/SearchServicesRME2ETest.java
index d246bbf72..559441ca0 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/rm/SearchServicesRME2ETest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/rm/SearchServicesRME2ETest.java
@@ -23,7 +23,7 @@ import org.testng.annotations.Test;
public class SearchServicesRME2ETest extends AbstractRmE2ETest
{
- @Test(priority = 1, groups = { TestGroup.ASS_14 })
+ @Test(priority = 1)
public void testBasicSearch() throws Exception
{
FolderModel testFolder = dataContent.usingUser(testUser).usingSite(testSite).createFolder();
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java
index 728ac5a1c..b6f546016 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java
@@ -33,7 +33,7 @@ public class CascadingTrackerIntegrationTest extends AbstractE2EFunctionalTest
@Autowired
protected DataContent dataContent;
- @Test(priority = 1, groups = { TestGroup.ASS_13 })
+ @Test(priority = 1)
public void testChildPathWhenParentRenamed() throws Exception
{
// Create Parent folder
@@ -74,7 +74,7 @@ public class CascadingTrackerIntegrationTest extends AbstractE2EFunctionalTest
Assert.assertEquals(descendantCountOfOriginalName, 0, "Old path still has descendants: " + parentQuery);
}
- @Test(priority = 2, groups = { TestGroup.ASS_13 })
+ @Test(priority = 2)
public void testGrandChildPathWhenGrandParentRenamed() throws Exception
{
// Create grand parent folder
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/SearchSolrAPITest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/SearchSolrAPITest.java
index 2e54ee631..a52bab254 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/SearchSolrAPITest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/SearchSolrAPITest.java
@@ -34,7 +34,7 @@ import org.testng.annotations.Test;
*/
public class SearchSolrAPITest extends AbstractE2EFunctionalTest
{
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 1)
+ @Test(priority = 1)
public void testGetSolrConfig() throws Exception
{
RestTextResponse response = restClient.authenticateUser(adminUserModel).withSolrAPI().getConfig();
@@ -54,7 +54,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest
// restClient.onResponse().assertThat().body("config.requestHandler",Matchers.notNullValue());
}
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 2)
+ @Test(priority = 2)
public void testEditSolrConfig() throws Exception
{
String expectedError = "solrconfig editing is not enabled due to disable.configEdit";
@@ -86,7 +86,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest
// response.assertThat().body("error.msg", Matchers.contains(expectedError));
}
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 3)
+ @Test(priority = 3)
public void testGetSolrConfigOverlay() throws Exception
{
restClient.authenticateUser(adminUserModel).withSolrAPI().getConfigOverlay();
@@ -95,7 +95,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest
restClient.onResponse().assertThat().content(Matchers.containsString("overlay"));
}
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 4)
+ @Test(priority = 4)
public void testGetSolrConfigParams() throws Exception
{
restClient.authenticateUser(adminUserModel).withSolrAPI().getConfigParams();
@@ -104,7 +104,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest
restClient.onResponse().assertThat().content(Matchers.containsString("response"));
}
- @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 5)
+ @Test(priority = 5)
public void testGetSolrSelect() throws Exception
{
String queryParams = "{!xmlparser v=''}";
diff --git a/e2e-test/src/test/resources/SearchSuite.xml b/e2e-test/src/test/resources/SearchSuite.xml
index 6eaebef9c..2d5e701e9 100644
--- a/e2e-test/src/test/resources/SearchSuite.xml
+++ b/e2e-test/src/test/resources/SearchSuite.xml
@@ -8,27 +8,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index 03c8b485f..3f17d8591 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -23,7 +23,7 @@
8.43
- 2.9.9
+ 2.10.0.pr1
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index d4c641c1e..8860b0e06 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -55,8 +55,8 @@ mybatis-spring-1.2.5.jar http://www.mybatis.org/
chemistry-opencmis-server-support-1.0.0.jar http://chemistry.apache.org/
chemistry-opencmis-server-bindings-1.0.0.jar http://chemistry.apache.org/
quartz-2.3.1.jar http://quartz-scheduler.org/
-jackson-core-2.9.9.jar https://github.com/FasterXML/jackson
-jackson-annotations-2.9.9.jar https://github.com/FasterXML/jackson
+jackson-core-2.10.0.pr1.jar https://github.com/FasterXML/jackson
+jackson-annotations-2.10.0.pr1.jar https://github.com/FasterXML/jackson
commons-httpclient-3.1-HTTPCLIENT-1265.jar http://jakarta.apache.org/commons/
spring-aop-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
spring-beans-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/