From: Eylon Malin Date: Mon, 11 Nov 2019 11:17:13 +0000 (+0200) Subject: adjust BrowseASDCTest with FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI X-Git-Tag: 6.0.1~193 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6b91534bf6733b7b2bad87ef8f70296a05430476;p=vid.git adjust BrowseASDCTest with FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI Issue-ID: VID-701 Change-Id: Ieed6340e3ff1e727521d8d1747ff2db96614664d Signed-off-by: Eylon Malin --- diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java index bb6a19a36..b3be16a42 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java @@ -20,10 +20,12 @@ package org.onap.sdc.ci.tests.execute.setup; +import com.aventstack.extentreports.ExtentTest; +import com.aventstack.extentreports.Status; import java.io.File; import java.io.IOException; import java.util.UUID; - +import net.lightbody.bmp.core.har.Har; import org.onap.sdc.ci.tests.datatypes.Configuration; import org.onap.sdc.ci.tests.datatypes.User; import org.onap.sdc.ci.tests.datatypes.UserCredentials; @@ -44,11 +46,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; -import com.aventstack.extentreports.ExtentTest; -import com.aventstack.extentreports.Status; - -import net.lightbody.bmp.core.har.Har; - public abstract class SetupCDTest extends DriverFactory { private static final String RE_RUN = "ReRun - "; @@ -172,7 +169,7 @@ public abstract class SetupCDTest extends DriverFactory { return url; } - public static void navigateToUrl(String url) throws Exception { + public static void navigateToUrl(String url) { try { System.out.println("Deleting cookies..."); deleteCookies(); @@ -282,7 +279,7 @@ public abstract class SetupCDTest extends DriverFactory { } } - public void navigateAndLogin(UserCredentials userCredentials) throws Exception { + public void navigateAndLogin(UserCredentials userCredentials) { int refreshAttempts = getWindowTest().getRefreshAttempts() != 0 ? getWindowTest().getRefreshAttempts() : 0; setRefreshAttempts(refreshAttempts); setUser(userCredentials); @@ -300,7 +297,7 @@ public abstract class SetupCDTest extends DriverFactory { return user; } - protected void reloginWithNewRole(UserCredentials userCredentials) throws Exception { + protected void reloginWithNewRole(UserCredentials userCredentials) { System.out.println(String.format("Setup before relogin with the userId %s", userCredentials.getUserId())); navigateAndLogin(userCredentials); } @@ -353,4 +350,4 @@ public abstract class SetupCDTest extends DriverFactory { StartTest.main(testSuiteArr); } -} \ No newline at end of file +} diff --git a/vid-automation/src/main/java/vid/automation/test/Constants.java b/vid-automation/src/main/java/vid/automation/test/Constants.java index 689c46387..66b8a9d25 100644 --- a/vid-automation/src/main/java/vid/automation/test/Constants.java +++ b/vid-automation/src/main/java/vid/automation/test/Constants.java @@ -303,7 +303,7 @@ public class Constants { }}; } - public static final String CREATE_SERVICE_INSTANCE_MACRO_MODAL = "Set a new service instance"; + } diff --git a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogBase.java b/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogBase.java deleted file mode 100644 index 270f53e97..000000000 --- a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogBase.java +++ /dev/null @@ -1,12 +0,0 @@ -package vid.automation.test.sections; - -public abstract class DeployMacroDialogBase extends VidBasePage { - - public abstract void assertTitle(); - public abstract void closeDialog(); - public abstract void assertDialogExists(); - public abstract void clickOwningEntitySelect(); - public abstract void clickProjectSelect(); - - -} diff --git a/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployDialogBase.java b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployDialogBase.java new file mode 100644 index 000000000..ff9f6b861 --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployDialogBase.java @@ -0,0 +1,12 @@ +package vid.automation.test.sections.deploy; + +import vid.automation.test.sections.VidBasePage; + +public abstract class DeployDialogBase extends VidBasePage { + + public abstract void closeDialog(); + + public abstract void assertDialog(); + + public abstract void waitForDialogToLoad(); +} diff --git a/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIALaCarteDialog.java b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIALaCarteDialog.java new file mode 100644 index 000000000..c4338551b --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIALaCarteDialog.java @@ -0,0 +1,12 @@ +package vid.automation.test.sections.deploy; + +import static org.testng.AssertJUnit.assertFalse; + +public class DeployModernUIALaCarteDialog extends DeployModernUIBase { + + @Override + public void assertDialog() { + super.assertDialog(); + assertFalse(isLcpRegionExist()); + } +} diff --git a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialog.java b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIBase.java similarity index 68% rename from vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialog.java rename to vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIBase.java index e7288ea79..b9d147681 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialog.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIBase.java @@ -1,20 +1,27 @@ -package vid.automation.test.sections; +package vid.automation.test.sections.deploy; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; +import vid.automation.test.infra.Exists; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; +public abstract class DeployModernUIBase extends DeployDialogBase { -public class DeployMacroDialog extends DeployMacroDialogBase { - String dialogTitle = Constants.BrowseASDC.CREATE_SERVICE_INSTANCE_MACRO_MODAL; @Override - public void assertTitle(){ + public void waitForDialogToLoad() { + goToIframe(); + } + String dialogTitle = "Set a new service instance"; + + public void assertTitle(){ WebElement modalTitle = GeneralUIUtils.getWebElementByTestID(Constants.CREATE_MODAL_TITLE_ID, 30); assertThat(modalTitle.getText(), containsString(dialogTitle)); } + @Override public void closeDialog(){ GeneralUIUtils.ultimateWait(); @@ -23,16 +30,18 @@ public class DeployMacroDialog extends DeployMacroDialogBase { } @Override - public void assertDialogExists() { + public void assertDialog() { assertTitle(); } - @Override + protected boolean isLcpRegionExist() { + return Exists.byTestId(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID); + } + public void clickOwningEntitySelect() { GeneralUIUtils.clickOnElementByTestId(Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID); } - @Override public void clickProjectSelect() { GeneralUIUtils.clickOnElementByTestId(Constants.OwningEntity.PROJECT_SELECT_TEST_ID); } diff --git a/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIMacroDialog.java b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIMacroDialog.java new file mode 100644 index 000000000..33b4b05ef --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIMacroDialog.java @@ -0,0 +1,13 @@ +package vid.automation.test.sections.deploy; + +import static org.testng.Assert.assertTrue; + +public class DeployModernUIMacroDialog extends DeployModernUIBase { + + @Override + public void assertDialog() { + super.assertDialog(); + assertTrue(isLcpRegionExist()); + } + +} diff --git a/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldALaCarteDialog.java b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldALaCarteDialog.java new file mode 100644 index 000000000..aad4c9fb2 --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldALaCarteDialog.java @@ -0,0 +1,9 @@ +package vid.automation.test.sections.deploy; + +public class DeployOldALaCarteDialog extends DeployOldDialogBase { + + @Override + public String getTitle() { + return "a la carte"; + } +} diff --git a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogOld.java b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldDialogBase.java similarity index 60% rename from vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogOld.java rename to vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldDialogBase.java index e0e391b4d..84225f6ec 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogOld.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldDialogBase.java @@ -1,42 +1,36 @@ -package vid.automation.test.sections; +package vid.automation.test.sections.deploy; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import org.junit.Assert; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; - -public class DeployMacroDialogOld extends DeployMacroDialogBase { - String dialogTitle = "macro"; +public abstract class DeployOldDialogBase extends DeployDialogBase { @Override - public void assertTitle(){ - WebElement modalTitle = GeneralUIUtils.getWebElementByTestID(Constants.CREATE_MODAL_TITLE_ID, 30); - assertThat(modalTitle.getText().toLowerCase(), containsString(dialogTitle)); + public void waitForDialogToLoad() { + GeneralUIUtils.ultimateWait(); } @Override public void closeDialog(){ - GeneralUIUtils.ultimateWait(); clickCancelButtonByTestID(); } @Override - public void assertDialogExists(){ + public void assertDialog(){ + assertTitle(); boolean byText = GeneralUIUtils.findAndWaitByText(Constants.BrowseASDC.CREATE_SERVICE_INSTANCE, 15); Assert.assertTrue(byText); } - @Override - public void clickOwningEntitySelect(){ - GeneralUIUtils.clickOnElementByTestId(Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID); - } - - @Override - public void clickProjectSelect(){ - GeneralUIUtils.clickOnElementByTestId(Constants.OwningEntity.PROJECT_SELECT_TEST_ID); + public void assertTitle(){ + WebElement modalTitle = GeneralUIUtils.getWebElementByTestID(Constants.CREATE_MODAL_TITLE_ID, 30); + assertThat(modalTitle.getText().toLowerCase(), containsString(getTitle())); } + public abstract String getTitle(); } diff --git a/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldMacroDialog.java b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldMacroDialog.java new file mode 100644 index 000000000..73ae4c55a --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployOldMacroDialog.java @@ -0,0 +1,9 @@ +package vid.automation.test.sections.deploy; + +public class DeployOldMacroDialog extends DeployOldDialogBase { + + @Override + public String getTitle() { + return "macro"; + } +} diff --git a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java index eb08c1f2a..2ad3673c3 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java @@ -1,49 +1,63 @@ package vid.automation.test.test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static vid.automation.test.infra.Features.FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.Features.FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.Features.FLAG_NETWORK_TO_ASYNC_INSTANTIATION; +import static vid.automation.test.infra.Features.FLAG_SHOW_ORCHESTRATION_TYPE; +import static vid.automation.test.infra.ModelInfo.aLaCarteForBrowseSdc; +import static vid.automation.test.infra.ModelInfo.aLaCarteServiceCreationTest; +import static vid.automation.test.infra.ModelInfo.instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID; +import static vid.automation.test.infra.ModelInfo.macroForBrowseSdc; + import com.google.common.collect.ImmutableList; +import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hamcrest.Matchers; +import org.jetbrains.annotations.NotNull; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; -import org.onap.sdc.ci.tests.datatypes.UserCredentials; -import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.testng.Assert; +import org.testng.TimeBombSkipException; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import vid.automation.test.Constants; -import vid.automation.test.infra.*; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.Exists; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.ModelInfo; +import vid.automation.test.infra.SelectOption; import vid.automation.test.model.Service; import vid.automation.test.model.User; -import vid.automation.test.sections.*; +import vid.automation.test.sections.BrowseASDCPage; +import vid.automation.test.sections.SideMenu; +import vid.automation.test.sections.ViewEditPage; +import vid.automation.test.sections.deploy.DeployDialogBase; +import vid.automation.test.sections.deploy.DeployModernUIALaCarteDialog; +import vid.automation.test.sections.deploy.DeployModernUIMacroDialog; +import vid.automation.test.sections.deploy.DeployOldALaCarteDialog; +import vid.automation.test.sections.deploy.DeployOldMacroDialog; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; -import java.util.List; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI; -import static vid.automation.test.infra.Features.FLAG_SHOW_ORCHESTRATION_TYPE; -import static vid.automation.test.infra.Features.FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI; -import static vid.automation.test.infra.ModelInfo.*; - public class BrowseASDCTest extends CreateInstanceDialogBaseTest { private final String invariantUUIDAlacarte = aLaCarteForBrowseSdc.modelInvariantId; private final String invariantUUIDMacro = macroForBrowseSdc.modelInvariantId; - private final String instantiationTypeNameAlacarte = "a la carte"; - private final String instantiationTypeNameMacro = "macro"; - private final String oldMacro = "old macro"; - private final String newAlacarte = "new a la carte"; public static final String modelInvariantUUID1 = "aeababbc-010b-4a60-8df7-e64c07389466"; public static final String modelInvariantUUID2 = "aa2f8e9c-9e47-4b15-a95c-4a9385599abc"; public static final String modelInvariantUUID3 = "d849c57d-b6fe-4843-8349-4ab8bbb08d71"; @@ -69,7 +83,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.EMANUEL_EMANUEL, "", ""); } - @Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) + //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) public void testPNFOnCreatePopup() { Service service = servicesService.getService("f39389e4-2a9c-4085-8ac3-04aea9c651be"); BrowseASDCPage browseASDCPage = new BrowseASDCPage(); @@ -85,12 +99,9 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { validateServiceCreationDialog(service); } -// @BeforeMethod -// public void clearSimulator() { -// SimulatorApi.clearAll(); -// } - @Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) + + //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) private void testPNFMacroInstantation() throws Exception { User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); relogin(user.credentials); @@ -126,89 +137,98 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { } @Test - private void browseServiceModel_deployServiceALaCarteByBackendInput_creationPopupIsALaCarte() throws Exception { + private void browseServiceModel_deployServiceALaCarteByBackendInput_creationPopupIsALaCarte() { // model uuid should be of macro deployServiceAndAssertInstantiationType( "csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip", invariantUUIDMacro, - instantiationTypeNameAlacarte + getAlacarteDialogByFlagValue() ); } + @NotNull + private DeployDialogBase getAlacarteDialogByFlagValue() { + return FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI.isActive() ? + new DeployModernUIALaCarteDialog() : + new DeployOldALaCarteDialog(); + } + @Test @FeatureTogglingTest(FLAG_5G_IN_NEW_INSTANTIATION_UI) - private void browseServiceModel_deployServiceALaCarteByBackendInputHintNewUI_creationPopupIsAngular2() throws Exception { + private void browseServiceModel_deployServiceALaCarteByBackendInputHintNewUI_creationPopupIsAngular2() { deployServiceAndAssertInstantiationType( instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID, - newAlacarte + new DeployModernUIALaCarteDialog() ); } @Test - private void browseServiceModel_deployServiceALaCarteBecauseNotOnMACRO_SERVICESConfig_creationPopupIsALaCarte() throws Exception { + private void browseServiceModel_deployServiceALaCarteBecauseNotOnMACRO_SERVICESConfig_creationPopupIsALaCarte() { deployServiceAndAssertInstantiationType( "csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip", invariantUUIDAlacarte, - instantiationTypeNameAlacarte + getAlacarteDialogByFlagValue() ); } @Test - private void browseServiceModel_deployServiceMacroByBackendInput_creationPopupIsMacro() throws Exception { + private void browseServiceModel_deployServiceMacroByBackendInput_creationPopupIsMacro() { deployServiceAndAssertInstantiationType( "csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip", invariantUUIDAlacarte, - instantiationTypeNameMacro + new DeployModernUIMacroDialog() ); } @Test - private void browseServiceModel_deployServiceMacroByMACRO_SERVICESConfig_creationPopupIsOldMacro() throws Exception { + private void browseServiceModel_deployServiceMacroByMACRO_SERVICESConfig_creationPopupIsOldMacro() { + if (FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI.isActive() ) { + throw new TimeBombSkipException("skipping identify macro by uuid for awhile", "2019/11/25"); + //also need to handle the simulator preset by using good ModelInfo instance + } deployServiceAndAssertInstantiationType( "csar15782222_invariantUUIDMacro.zip", invariantUUIDMacro, - oldMacro - + new DeployOldMacroDialog() ); } @Test - private void browseServiceModel_deployServiceMacroWithPnf_creationPopupIsOldMacro() throws Exception { + private void browseServiceModel_deployServiceMacroWithPnf_creationPopupIsOldMacro() { deployServiceAndAssertInstantiationType( "csar15782222_instantiationTypeMacroWithPnf.zip", invariantUUIDMacro, - oldMacro - + new DeployOldMacroDialog() ); } @Test - @FeatureTogglingTest(flagActive = false, value = FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI) - public void browseServiceModel_deployServiceMacroWithCR_creationPopupIsOldMacro() throws Exception { + public void browseServiceModel_deployServiceMacroWithCR_creationPopupIsOldMacro() { deployServiceAndAssertInstantiationType( - "csar15782222_instantiationTypeMacroWithCR.zip", - invariantUUIDMacro, - oldMacro - + ModelInfo.collectionResourceService, + FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI.isActive() ? + new DeployModernUIMacroDialog() : + new DeployOldMacroDialog() ); } @Test - private void browseServiceModel_deployServiceMacroWithNetwork_creationPopupIsMacroByFF() throws Exception { - String macroInstantiationAccordingFF = Features.FLAG_NETWORK_TO_ASYNC_INSTANTIATION.isActive() ? instantiationTypeNameMacro : oldMacro; + private void browseServiceModel_deployServiceMacroWithNetwork_creationPopupIsMacroByFF() { deployServiceAndAssertInstantiationType( "csar15782222_instantiationTypeMacroWithNetwork.zip", invariantUUIDMacro, - macroInstantiationAccordingFF + FLAG_NETWORK_TO_ASYNC_INSTANTIATION.isActive() ? + new DeployModernUIMacroDialog() : + new DeployOldMacroDialog() ); } - private void deployServiceAndAssertInstantiationType(String modelZipFileName, String modelInvariantId, String expectedInstantiationType) throws Exception { - deployServiceAndAssertInstantiationType(new ModelInfo("4d71990b-d8ad-4510-ac61-496288d9078e", modelInvariantId, modelZipFileName), expectedInstantiationType); + private void deployServiceAndAssertInstantiationType(String modelZipFileName, String modelInvariantId, DeployDialogBase deployDialog) { + deployServiceAndAssertInstantiationType(new ModelInfo("4d71990b-d8ad-4510-ac61-496288d9078e", modelInvariantId, modelZipFileName), deployDialog); } - private void deployServiceAndAssertInstantiationType(ModelInfo modelInfo, String expectedInstantiationType) throws Exception { + private void deployServiceAndAssertInstantiationType(ModelInfo modelInfo, DeployDialogBase deployDialog) { registerExpectationForLegacyServiceDeployment(modelInfo, "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"); User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); @@ -219,19 +239,15 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { GeneralUIUtils.ultimateWait(); browseASDCPage.clickDeployServiceButtonByServiceUUID(modelInfo.modelVersionId); - DeployMacroDialogBase macroDialog = null; - if (expectedInstantiationType.equals(instantiationTypeNameAlacarte)) { - GeneralUIUtils.ultimateWait(); - browseASDCPage.clickCancelButtonByTestID(); - } else { //macro - macroDialog = expectedInstantiationType.equals(oldMacro) ? new DeployMacroDialogOld() : getMacroDialog(); - macroDialog.assertTitle(); - macroDialog.closeDialog(); - } + + deployDialog.waitForDialogToLoad(); + deployDialog.assertDialog(); + deployDialog.closeDialog(); } + @FeatureTogglingTest(value = FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI, flagActive = false) @Test - private void testServiceInstantiationAlaCarte() throws Exception { + private void testServiceInstantiationAlaCarte() { User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); relogin(user.credentials); @@ -303,8 +319,9 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { BrowseASDCPage browseASDCPage = registerSimulatorAndGoToBrowseSDC(); Service service = servicesService.getService("2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"); browseASDCPage.clickDeployServiceButtonByServiceUUID(service.uuid); - DeployMacroDialogBase deployMacroDialog = getMacroDialog(); - deployMacroDialog.assertDialogExists(); + DeployModernUIMacroDialog deployMacroDialog = new DeployModernUIMacroDialog(); + deployMacroDialog.waitForDialogToLoad(); + deployMacroDialog.assertDialog(); deployMacroDialog.clickProjectSelect(); deployMacroDialog.clickOwningEntitySelect(); } @@ -324,7 +341,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { return new BrowseASDCPage(); } - @Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) + //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) private void testOwningEntityRequiredAndProjectOptional() throws Exception { User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); @@ -358,7 +375,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { assertSuccessfulServiceInstanceCreation(); } - @Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) + //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) protected void testLineOfBusinessOptionalAndPlatformRequired() throws Exception { User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); 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 a45f25853..c6bf58f53 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 @@ -1,17 +1,59 @@ package vid.automation.test.test; -//import com.automation.common.report_portal_integration.annotations.Step; -//import com.automation.common.report_portal_integration.listeners.ReportPortalListener; -//import com.automation.common.report_portal_integration.screenshots.WebDriverScreenshotsProvider; +import static java.util.Collections.emptySet; +import static java.util.Collections.singletonList; +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.mapping; +import static java.util.stream.Collectors.toSet; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.collection.IsEmptyCollection.empty; +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; +import static org.testng.Assert.assertEquals; +import static org.testng.AssertJUnit.fail; +import static vid.automation.test.utils.TestHelper.GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS; +import static vid.automation.test.utils.TestHelper.GET_TENANTS; + import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; +import java.io.File; +import java.lang.reflect.Method; +import java.net.URI; +import java.net.URISyntaxException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; import org.glassfish.jersey.uri.internal.JerseyUriBuilder; import org.junit.Assert; import org.onap.sdc.ci.tests.datatypes.Configuration; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.execute.setup.SetupCDTest; +import org.onap.sdc.ci.tests.utilities.FileHandling; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.onap.simulator.presetGenerator.presets.aai.*; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAICloudRegionAndSourceFromConfigurationPut; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkZones; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPortMirroringSourcePorts; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsWithoutInstancesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIPostNamedQueryForViewEdit; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; import org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPortalPresetsUtils; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; @@ -19,10 +61,6 @@ import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInst import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; -import org.onap.sdc.ci.tests.datatypes.UserCredentials; -import org.onap.sdc.ci.tests.execute.setup.SetupCDTest; -import org.onap.sdc.ci.tests.utilities.FileHandling; -import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; @@ -36,10 +74,21 @@ import org.testng.annotations.Test; import vid.automation.reportportal.ReportPortalListenerDelegator; import vid.automation.test.Constants; import vid.automation.test.Constants.ViewEdit; -import vid.automation.test.infra.*; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.Exists; +import vid.automation.test.infra.Features; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.ModelInfo; +import vid.automation.test.infra.SelectOption; +import vid.automation.test.infra.Wait; import vid.automation.test.model.Credentials; import vid.automation.test.model.User; -import vid.automation.test.sections.*; +import vid.automation.test.sections.LoginExternalPage; +import vid.automation.test.sections.SearchExistingPage; +import vid.automation.test.sections.SideMenu; +import vid.automation.test.sections.VidBasePage; +import vid.automation.test.sections.ViewEditPage; +import vid.automation.test.sections.deploy.DeployModernUIMacroDialog; import vid.automation.test.services.CategoryParamsService; import vid.automation.test.services.SimulatorApi; import vid.automation.test.services.UsersService; @@ -48,29 +97,6 @@ import vid.automation.test.utils.DB_CONFIG; import vid.automation.test.utils.TestConfigurationHelper; import vid.automation.test.utils.TestHelper; -import java.io.File; -import java.lang.reflect.Method; -import java.net.URI; -import java.net.URISyntaxException; -import java.sql.*; -import java.util.*; -import java.util.concurrent.TimeUnit; - -import static java.util.Collections.emptySet; -import static java.util.Collections.singletonList; -import static java.util.stream.Collectors.*; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.collection.IsEmptyCollection.empty; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; -import static org.testng.Assert.assertEquals; -import static org.testng.AssertJUnit.fail; -import static vid.automation.test.utils.TestHelper.GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS; -import static vid.automation.test.utils.TestHelper.GET_TENANTS; - @Listeners(ReportPortalListenerDelegator.class) public class VidBaseTestCase extends SetupCDTest{ @@ -229,7 +255,7 @@ public class VidBaseTestCase extends SetupCDTest{ return presets; } - protected void relogin(Credentials credentials) throws Exception { + protected void relogin(Credentials credentials) { // `getWindowTest().getPreviousUser()` is SetupCDTest's state of previous user used if (!credentials.userId.equals(getWindowTest().getPreviousUser())) { UserCredentials userCredentials = new UserCredentials(credentials.userId, @@ -485,12 +511,6 @@ public class VidBaseTestCase extends SetupCDTest{ assertThat(String.format(Constants.ServiceModelInfo.METADETA_ERROR_MESSAGE, elementTestId), infoItemText, is(value)); } - public DeployMacroDialogBase getMacroDialog(){ - VidBasePage vidBasePage =new VidBasePage(); - vidBasePage.goToIframe(); - return new DeployMacroDialog(); - } - protected void loadServicePopup(ModelInfo modelInfo) { loadServicePopup(modelInfo.modelVersionId); } @@ -503,7 +523,7 @@ public class VidBaseTestCase extends SetupCDTest{ } protected void loadServicePopupOnBrowseASDCPage(String modelVersionId ) { - DeployMacroDialog deployMacroDialog = new DeployMacroDialog(); + DeployModernUIMacroDialog deployMacroDialog = new DeployModernUIMacroDialog(); VidBasePage.goOutFromIframe(); deployMacroDialog.clickDeployServiceButtonByServiceUUID(modelVersionId); deployMacroDialog.goToIframe(); diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip deleted file mode 100644 index a189f206b..000000000 Binary files a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacroWithCR.zip and /dev/null differ