fix and improve testClickPreviousInstantiationsInCreationDialog

Issue-ID: VID-724
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I85d4d2735e89df09ef831de49cee819a4b03aa4a

1 files changed, 22 insertions, 9 deletions

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 03006ade7..f6b883ac1 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
@@ -14,6 +14,8 @@ 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 static vid.automation.test.sections.VidBasePage.goOutFromIframe;
+import static vid.automation.test.sections.VidBasePage.goToIframe;
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;
@@ -299,7 +301,10 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest {
 
     @DataProvider
     public static Object[][] filterTexts() {
-        return new Object[][]{{serviceName},{modelInvariantId},{serviceUuid}};
+        return new Object[][]{
+            {serviceName},
+            {modelInvariantId},
+            {serviceUuid}};
     }
 
     @Test(dataProvider = "filterTexts")
@@ -335,14 +340,22 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest {
 
     @Test
     @FeatureTogglingTest(FLAG_2004_TEMP_BUTTON_TO_INSTANTIATION_STATUS_FILTER)
-    private void testClickPreviousInstantiationsInCreationDialog() throws Exception {
-
-        String serviceId = "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd";
-        DeployModernUIMacroDialog deployMacroDialog = getDeployModernUIMacroDialog(serviceId);
-        deployMacroDialog.clickPreviousInstantiationButton();
-
-        InstantiationStatusPage.verifyUrlMatchInstantiationStatusWithFilterSearchParam(serviceId);
-
+    public void testClickPreviousInstantiationsInCreationDialog() {
+        try {
+            String serviceId = "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd";
+            DeployModernUIMacroDialog deployMacroDialog = getDeployModernUIMacroDialog(serviceId);
+            deployMacroDialog.clickPreviousInstantiationButton();
+
+            //exit form deploy dialog
+            goOutFromIframe();
+            //go into Instantiation Status page
+            goToIframe();
+
+            InstantiationStatusPage.verifyInstantiationStatusFilterValue(serviceId);
+        }
+        finally {
+            goOutFromIframe();
+        }
     }
 
     private BrowseASDCPage registerSimulatorAndGoToBrowseSDC() {