adjust BrowseASDCTest with FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI

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

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 e0e391b..84225f6 100644 (file)
--- 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();
 }