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;
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 = "<html><font color=\"red\">ReRun - </font></html>";
return url;
}
- public static void navigateToUrl(String url) throws Exception {
+ public static void navigateToUrl(String url) {
try {
System.out.println("Deleting cookies...");
deleteCookies();
}
}
- public void navigateAndLogin(UserCredentials userCredentials) throws Exception {
+ public void navigateAndLogin(UserCredentials userCredentials) {
int refreshAttempts = getWindowTest().getRefreshAttempts() != 0 ? getWindowTest().getRefreshAttempts() : 0;
setRefreshAttempts(refreshAttempts);
setUser(userCredentials);
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);
}
StartTest.main(testSuiteArr);
}
-}
\ No newline at end of file
+}
}};
}
- public static final String CREATE_SERVICE_INSTANCE_MACRO_MODAL = "Set a new service instance";
+
}
+++ /dev/null
-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();
-
-
-}
--- /dev/null
+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();
+}
--- /dev/null
+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());
+ }
+}
-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();
}
@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);
}
--- /dev/null
+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());
+ }
+
+}
--- /dev/null
+package vid.automation.test.sections.deploy;
+
+public class DeployOldALaCarteDialog extends DeployOldDialogBase {
+
+ @Override
+ public String getTitle() {
+ return "a la carte";
+ }
+}
-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();
}
--- /dev/null
+package vid.automation.test.sections.deploy;
+
+public class DeployOldMacroDialog extends DeployOldDialogBase {
+
+ @Override
+ public String getTitle() {
+ return "macro";
+ }
+}
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";
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();
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);
}
@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);
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);
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();
}
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);
assertSuccessfulServiceInstanceCreation();
}
- @Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
+ //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
protected void testLineOfBusinessOptionalAndPlatformRequired() throws Exception {
User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA);
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;
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;
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;
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{
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,
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);
}
}
protected void loadServicePopupOnBrowseASDCPage(String modelVersionId ) {
- DeployMacroDialog deployMacroDialog = new DeployMacroDialog();
+ DeployModernUIMacroDialog deployMacroDialog = new DeployModernUIMacroDialog();
VidBasePage.goOutFromIframe();
deployMacroDialog.clickDeployServiceButtonByServiceUUID(modelVersionId);
deployMacroDialog.goToIframe();
Code Review / vid.git / commitdiff