diff options
Diffstat (limited to 'vid-automation')
5 files changed, 22 insertions, 12 deletions
diff --git a/vid-automation/TestNg-UI-half.xml b/vid-automation/TestNg-UI-half.xml index d76aa6fde..fe192da6e 100644 --- a/vid-automation/TestNg-UI-half.xml +++ b/vid-automation/TestNg-UI-half.xml @@ -43,6 +43,16 @@ if (selectPart == 0) return true; + for (groupName: groups.keySet()) { + // There's a non-obvious case here: + // If there's a "partialGroup" group, and it is *not* for current `selectPart` then + // don't run the test -- even if it is in a Class which does belong to the `selectPart` + // classes list + if (groupName.startsWith("partialGroup_")) { + return groupName.equals("partialGroup_" + selectPart); + } + } + methodClass = method.getDeclaringClass().toString(); for (c: classes2) { if (methodClass.contains(c)) return selectPart==2; diff --git a/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java b/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java index 4819b813f..48ca526c3 100644 --- a/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java +++ b/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java @@ -52,7 +52,7 @@ public class BaseApiTest { protected Random random; protected final RestTemplate restTemplate = InsecureHttpsClient.newRestTemplate(); - protected final UsersService usersService = new UsersService(); + protected static final UsersService usersService = new UsersService(); protected final RestTemplate restTemplateErrorAgnostic = InsecureHttpsClient.newRestTemplate(); @BeforeClass diff --git a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java index f151e1185..07fd37826 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java @@ -225,7 +225,7 @@ public class NewServiceInstanceTest extends ModernUITestBase { assertModelDataCorrect(NewServicePopup.SERVICE_MODEL_FIELD_TO_DATA_TESTS_ID, prefix, service); } - @Test + @Test(groups = "partialGroup_5") public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingFalse() { ServiceData serviceData = new ServiceData( @@ -266,7 +266,7 @@ public class NewServiceInstanceTest extends ModernUITestBase { createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse_FLESH("DEV", 5, reduxForStep, "mCaNk"); } - @Test + @Test(groups = "partialGroup_5") public void createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse() { createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse_FLESH("RUNTIME", 0, null, randomAlphabetic(5)); } @@ -348,7 +348,7 @@ public class NewServiceInstanceTest extends ModernUITestBase { }); } - @Test + @Test(groups = "partialGroup_5") @FeatureTogglingTest(FLAG_1908_INFRASTRUCTURE_VPN) public void createNewServiceInstance_infraStructureVpn() { String requestId = uuid(); @@ -388,7 +388,7 @@ public class NewServiceInstanceTest extends ModernUITestBase { drawingBoardPage.verifyServiceCompletedOnTime(serviceInstanceName, "Service "+serviceInstanceName); } - @Test + @Test(groups = "partialGroup_5") @FeatureTogglingTest(FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI) public void createNewServiceInstance_collectionResource() { prepareServicePreset(collectionResourceService, false); @@ -538,7 +538,7 @@ public class NewServiceInstanceTest extends ModernUITestBase { clickToCloseModal(VNF_SET_BUTTON_TEST_ID); } - @Test + @Test(groups = "partialGroup_5") public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingServiceFalseVnfTrue_vgNameFalse() { ServiceData serviceData = new ServiceData( macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails.modelVersionId, @@ -555,7 +555,7 @@ public class NewServiceInstanceTest extends ModernUITestBase { } - @Test + @Test(groups = "partialGroup_5") public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingServiceFalseVnfFalse_vgNameFalse() { ServiceData serviceData = new ServiceData( macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse.modelVersionId, @@ -572,7 +572,7 @@ public class NewServiceInstanceTest extends ModernUITestBase { } - @Test + @Test(groups = "partialGroup_5") public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingServiceFalseVnfFalse_vgNameTrue() throws Exception { ServiceData serviceData = new ServiceData( macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse.modelVersionId, @@ -771,7 +771,7 @@ public class NewServiceInstanceTest extends ModernUITestBase { browseASDCPage.goToIframe(); } - @Test + @Test(groups = "partialGroup_5") public void createNewServiceInstance_macro_validPopupDataAndUI() { List<String> serviceDynamicFields = Arrays.asList("2017488 pasqualevpe0 asn:"); diff --git a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java index 842142751..bdc6df871 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java +++ b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java @@ -101,8 +101,8 @@ import vid.automation.test.utils.TestHelper; @Listeners(ReportPortalListenerDelegator.class) public class VidBaseTestCase extends SetupCDTest{ - protected final UsersService usersService = new UsersService(); - protected final CategoryParamsService categoryParamsService = new CategoryParamsService(); + protected static final UsersService usersService = new UsersService(); + protected static final CategoryParamsService categoryParamsService = new CategoryParamsService(); protected final RestTemplate restTemplate = InsecureHttpsClient.newRestTemplate(); protected final URI uri; protected final URI envUrI; diff --git a/vid-automation/src/test/java/org/onap/vid/api/BaseApiAaiTest.java b/vid-automation/src/test/java/org/onap/vid/api/BaseApiAaiTest.java index 32586afac..d9ac22891 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/BaseApiAaiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/BaseApiAaiTest.java @@ -22,7 +22,7 @@ import vid.automation.test.services.SimulatorApi; public class BaseApiAaiTest extends BaseApiTest { - protected final CategoryParamsService categoryParamsService = new CategoryParamsService(); + protected static final CategoryParamsService categoryParamsService = new CategoryParamsService(); @BeforeClass public void login() { |