From ae36a252b2772a94d3c8ae6b93e2a342156f75d5 Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Sun, 24 Nov 2019 10:15:02 +0200 Subject: remove CREATE_INSTANCE_TEST feature flag Issue-ID: VID-721 Change-Id: Id956a0b5b840c5e76cc1f6f7ea33a7d00f5670c3 Signed-off-by: Eylon Malin --- .../src/main/java/vid/automation/test/infra/Features.java | 1 - .../vid/automation/test/test/CreateNewInstanceTest.java | 14 +++----------- ...validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json | 3 +-- vid-automation/src/test/resources/features.properties | 1 - 4 files changed, 4 insertions(+), 15 deletions(-) (limited to 'vid-automation') diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index a2892e5ea..5a3026a01 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -5,7 +5,6 @@ import org.togglz.core.context.FeatureContext; public enum Features implements Feature { - CREATE_INSTANCE_TEST, EMPTY_DRAWING_BOARD_TEST, FLAG_ADD_MSO_TESTAPI_FIELD, FLAG_SERVICE_MODEL_CACHE, diff --git a/vid-automation/src/main/java/vid/automation/test/test/CreateNewInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/CreateNewInstanceTest.java index b57d18789..be96e6992 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/CreateNewInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/CreateNewInstanceTest.java @@ -1,11 +1,12 @@ package vid.automation.test.test; +import java.io.IOException; +import java.util.List; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.testng.Assert; import org.testng.annotations.Test; import vid.automation.test.Constants; -import vid.automation.test.infra.Features; import vid.automation.test.infra.Get; import vid.automation.test.infra.SelectOption; import vid.automation.test.model.Service; @@ -16,24 +17,15 @@ import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; -import java.io.IOException; -import java.util.List; - public class CreateNewInstanceTest extends CreateInstanceDialogBaseTest { private ServicesService servicesService = new ServicesService(); public CreateNewInstanceTest() throws IOException { } - @Test + @Test(groups = { "underDevelopment" }) private void testCreateNewServiceInstance() throws Exception { - if (!Features.CREATE_INSTANCE_TEST.isActive()) { - - // time bomb, as it fails on pipeline and I don't know how to fix it - return; - } - SimulatorApi.clearAll(); BulkRegistration.createNewServiceInstance("SILVIA ROBBINS"); diff --git a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json index 25725db8e..0a8e09fc4 100644 --- a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json +++ b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json @@ -11,7 +11,6 @@ "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true, "FLAG_ASYNC_ALACARTE_VNF": true, "FLAG_SERVICE_MODEL_CACHE": true, - "CREATE_INSTANCE_TEST": false, "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true, "FLAG_SUPPLEMENTARY_FILE": true, "EMPTY_DRAWING_BOARD_TEST": false, @@ -3249,4 +3248,4 @@ }, "type": "[LCP_REGIONS_AND_TENANTS] Update" } -} \ No newline at end of file +} diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties index 1324403c6..f3ed49122 100644 --- a/vid-automation/src/test/resources/features.properties +++ b/vid-automation/src/test/resources/features.properties @@ -1,4 +1,3 @@ -CREATE_INSTANCE_TEST = false EMPTY_DRAWING_BOARD_TEST = false FLAG_ADD_MSO_TESTAPI_FIELD = true FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false -- cgit 1.2.3-korg