diff options
| -rw-r--r-- | vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java | 29 | ||||
| -rw-r--r-- | vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java | 4 |
2 files changed, 24 insertions, 9 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java b/vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java index fa7181c89..e2f3380f0 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java @@ -1,27 +1,40 @@ package vid.automation.test.test; +import static org.testng.AssertJUnit.assertFalse; +import static vid.automation.test.Constants.DrawingBoard.AVAILABLE_MODELS_TREE; +import static vid.automation.test.Constants.DrawingBoard.BACK_BUTTON; +import static vid.automation.test.Constants.DrawingBoard.CONTEXT_MENU_BUTTON_HEADER; +import static vid.automation.test.Constants.DrawingBoard.CONTEXT_MENU_HEADER_EDIT_ITEM; +import static vid.automation.test.Constants.DrawingBoard.DEFAULT_SERVICE_NAME; +import static vid.automation.test.Constants.DrawingBoard.DRAWING_BOARD_TREE; +import static vid.automation.test.Constants.DrawingBoard.SEARCH_LEFT_TREE; +import static vid.automation.test.Constants.DrawingBoard.SERVICE_QUANTITY; +import static vid.automation.test.infra.ModelInfo.macroDrawingBoardComplexService; +import static vid.automation.test.infra.ModelInfo.macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails; + import com.google.common.collect.ImmutableList; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; import org.openqa.selenium.WebDriver; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeMethod; 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.Get; +import vid.automation.test.infra.Input; +import vid.automation.test.infra.ModelInfo; +import vid.automation.test.infra.SelectOption; +import vid.automation.test.infra.Wait; import vid.automation.test.model.User; import vid.automation.test.sections.BrowseASDCPage; import vid.automation.test.sections.DrawingBoardPage; import vid.automation.test.sections.VidBasePage; -import static org.testng.AssertJUnit.assertFalse; -import static vid.automation.test.Constants.DrawingBoard.*; -import static vid.automation.test.infra.ModelInfo.macroDrawingBoardComplexService; -import static vid.automation.test.infra.ModelInfo.macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails; - public class DrawingBoardTest extends VidBaseTestCase { private DrawingBoardPage drawingBoardPage = new DrawingBoardPage(); @@ -323,6 +336,7 @@ public class DrawingBoardTest extends VidBaseTestCase { Click.byTestId(CONTEXT_MENU_BUTTON_HEADER); Click.byTestId(CONTEXT_MENU_HEADER_EDIT_ITEM); Assert.assertTrue(Exists.byId("instance-popup"), "context menu should not appear"); + GeneralUIUtils.ultimateWait(); SelectOption.byIdAndVisibleText("quantity-select", String.valueOf(updatedQuantity)); Input.replaceText(updatedInstanceName,Constants.BrowseASDC.NewServicePopup.INSTANCE_NAME ); Click.byTestId(Constants.BrowseASDC.NewServicePopup.SET_BUTTON); @@ -341,6 +355,7 @@ public class DrawingBoardTest extends VidBaseTestCase { Click.byTestId(CONTEXT_MENU_BUTTON_HEADER); Click.byTestId(CONTEXT_MENU_HEADER_EDIT_ITEM); Assert.assertTrue(Exists.byId("instance-popup"), "context menu should not appear"); + GeneralUIUtils.ultimateWait(); SelectOption.byIdAndVisibleText("quantity-select", String.valueOf(updatedQuantity)); Input.replaceText(updatedInstanceName,Constants.BrowseASDC.NewServicePopup.INSTANCE_NAME ); Click.byTestId(Constants.BrowseASDC.NewServicePopup.CANCEL_BUTTON); diff --git a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java index 02c739809..084c68eb2 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java @@ -754,7 +754,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { browseASDCPage.selectServiceTypeByName(serviceType); SelectOption.byTestIdAndVisibleText("WayneHolland", (Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID)); SelectOption.byTestIdAndVisibleText("WATKINS", Constants.OwningEntity.PROJECT_SELECT_TEST_ID); - clickToCloseModal("form-set"); + Click.byTestId("form-set"); VidBasePage.goOutFromIframe(); browseASDCPage.goToIframe(); } @@ -1127,7 +1127,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { vidBasePage.screenshotDeployDialog("createALaCarteService-" + serviceInstanceName); - clickToCloseModal(setButtonTestId); + Click.byTestId(setButtonTestId); VidBasePage.goOutFromIframe(); |