adjust BrowseASDCTest with FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI

[vid.git] / vid-automation / src / main / java / vid / automation / test / sections / deploy / DeployModernUIBase.java

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 e7288ea..b9d1476 100644 (file)
--- 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);
     }