From 21005244d6a800e747c13f7947946ccf6035694f Mon Sep 17 00:00:00 2001 From: Meenal Bhave Date: Fri, 23 Nov 2018 10:14:00 +0000 Subject: [PATCH] Corrected formatting and Test priority --- .../sql/CustoModelGroupByFacetableTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/service/search/e2e/insightEngine/sql/CustoModelGroupByFacetableTest.java b/e2e-test/src/test/java/org/alfresco/service/search/e2e/insightEngine/sql/CustoModelGroupByFacetableTest.java index bcc7acd38..96408bab2 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/e2e/insightEngine/sql/CustoModelGroupByFacetableTest.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/e2e/insightEngine/sql/CustoModelGroupByFacetableTest.java @@ -21,7 +21,7 @@ public class CustoModelGroupByFacetableTest extends AbstractSearchServiceE2E protected SiteModel testSite; private UserModel testUser; private FolderModel testFolder; - + private String filename1; private String filename2; private String filename3; @@ -41,9 +41,8 @@ public class CustoModelGroupByFacetableTest extends AbstractSearchServiceE2E private int quantity2; private int quantity3; - @BeforeClass(alwaysRun = true) - public void initDataModel() throws Exception + public void setupEnvironment() throws Exception { serverHealth.assertServerIsOnline(); @@ -107,7 +106,6 @@ public class CustoModelGroupByFacetableTest extends AbstractSearchServiceE2E cmisApi.authenticateUser(testUser).usingResource(customFile2).updateProperty("csm:quantity", quantity2); cmisApi.authenticateUser(testUser).usingResource(customFile2).updateProperty("csm:exists", exists); - FileModel customFile3 = new FileModel(filename3, FileType.TEXT_PLAIN, filecontent3); properties = new HashMap(); properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:document"); @@ -123,8 +121,6 @@ public class CustoModelGroupByFacetableTest extends AbstractSearchServiceE2E cmisApi.authenticateUser(testUser).usingResource(customFile3).updateProperty("csm:quantity", quantity2); cmisApi.authenticateUser(testUser).usingResource(customFile3).updateProperty("csm:exists", exists); - - FileModel customFile4 = new FileModel(filename4, FileType.TEXT_PLAIN, filecontent4); properties = new HashMap(); properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:document"); @@ -185,7 +181,7 @@ public class CustoModelGroupByFacetableTest extends AbstractSearchServiceE2E } - @Test(priority = 1, groups = { TestGroup.INSIGHT_11 }) + @Test(priority = 2, groups = { TestGroup.INSIGHT_11 }) public void testGroupByTextInteger() throws Exception { SearchSqlRequest sqlRequest = new SearchSqlRequest(); @@ -207,7 +203,7 @@ public class CustoModelGroupByFacetableTest extends AbstractSearchServiceE2E } - @Test(priority = 1, groups = { TestGroup.INSIGHT_11 }) + @Test(priority = 3, groups = { TestGroup.INSIGHT_11 }) public void testGroupByBoolAggregation() throws Exception { SearchSqlRequest sqlRequest = new SearchSqlRequest();