1 files changed, 51 insertions, 17 deletions

diff --git a/vid-automation/src/main/java/vid/automation/test/test/SearchExistingInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/SearchExistingInstanceTest.java
index f3261a21a..7f18b2f83 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/SearchExistingInstanceTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/SearchExistingInstanceTest.java
@@ -1,23 +1,32 @@
 package vid.automation.test.test;
 
+import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import vid.automation.test.Constants;
 import vid.automation.test.infra.Click;
+import vid.automation.test.infra.Wait;
 import vid.automation.test.model.User;
 import vid.automation.test.sections.SearchExistingPage;
 import vid.automation.test.sections.SideMenu;
-import vid.automation.test.services.UsersService;
+import vid.automation.test.services.BulkRegistration;
+import vid.automation.test.services.SimulatorApi;
 
-import java.io.IOException;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 public class SearchExistingInstanceTest extends VidBaseTestCase {
 
-    private UsersService usersService = new UsersService();
+    public static final String serviceIdOeWirelineProjectX1 = "7e4f8130-5dee-47c4-8770-1abc5f5ded83";
+    public static final String serviceIdOeWirelineProjectYYY1 = "13695dfb-db99-4c2f-905e-fe7bf2fc7b9f";
 
-    public SearchExistingInstanceTest() throws IOException {
+    @BeforeClass
+    public void registerToSimulatorAndLogin() {
+        SimulatorApi.clearAll();
+        BulkRegistration.searchExistingServiceInstanceByOEAndProject();
     }
 
-    @Test
+    @Test(groups = { "shouldBeMigratedToWorkWithSimulator" })
     private void testSearchExistingInstanceById() throws Exception {
         User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP);
         relogin(user.credentials);
@@ -28,19 +37,17 @@ public class SearchExistingInstanceTest extends VidBaseTestCase {
     }
 
     @Test
-    private void testSearchExistingInstanceByOwningEntitySingleValue() throws Exception {
-        User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP);
-        relogin(user.credentials);
+    private void testSearchExistingInstanceByOwningEntitySingleValue() {
         SearchExistingPage searchExistingPage = new SearchExistingPage();
         SideMenu.navigateToSearchExistingPage();
-        Click.byId(Constants.EditExistingInstance.SELECT_OWNING_ENTITY_ID);
-        Thread.sleep(1000);
-        Click.byText("owning-entity-SDN-RXU4");
+        searchExistingPage.searchByOwningEntity("Wireline");
         searchExistingPage.clickSubmitButton();
-        searchExistingPage.clickEditViewByInstanceId("SDN-RXU4-B-servInstance-E1802");
+        GeneralUIUtils.ultimateWait();
+        assertTrue(searchExistingPage.checkEditOrViewExistsByInstanceId(serviceIdOeWirelineProjectX1));
+        assertTrue(searchExistingPage.checkEditOrViewExistsByInstanceId(serviceIdOeWirelineProjectYYY1));
     }
 
-    @Test
+    @Test(groups = { "shouldBeMigratedToWorkWithSimulator" })
     private void testSearchExistingInstanceByOwningEntityMultiValue() throws Exception {
         User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP);
         relogin(user.credentials);
@@ -50,24 +57,51 @@ public class SearchExistingInstanceTest extends VidBaseTestCase {
         Thread.sleep(1000);
         Click.byText("owning-entity-SDN-RXU4");
         Click.byText("owning-entity-SDN-LT1");
+
         searchExistingPage.clickSubmitButton();
         searchExistingPage.clickEditViewByInstanceId("SDN-LT1-B-servInstance-E1802");
     }
 
     @Test
-    private void testSearchExistingInstanceByProjectSingleValue() throws Exception {
+    private void testSearchExistingInstanceByProjectSingleValue() {
+        SearchExistingPage searchExistingPage = new SearchExistingPage();
+        SideMenu.navigateToSearchExistingPage();
+        searchExistingPage.searchByProject("x1");
+        searchExistingPage.clickSubmitButton();
+        GeneralUIUtils.ultimateWait();
+        assertTrue(searchExistingPage.checkEditOrViewExistsByInstanceId(serviceIdOeWirelineProjectX1));
+        assertFalse(searchExistingPage.checkEditOrViewExistsByInstanceId(serviceIdOeWirelineProjectYYY1));
+    }
+
+    @Test
+    private void testSearchExistingInstanceByProjectAndOwningEntity() {
+        SearchExistingPage searchExistingPage = new SearchExistingPage();
+        SideMenu.navigateToSearchExistingPage();
+        searchExistingPage.searchByProject("yyy1");
+        searchExistingPage.searchByOwningEntity("Wireline");
+        searchExistingPage.clickSubmitButton();
+        GeneralUIUtils.ultimateWait();
+        assertTrue(searchExistingPage.checkEditOrViewExistsByInstanceId(serviceIdOeWirelineProjectYYY1));
+        assertFalse(searchExistingPage.checkEditOrViewExistsByInstanceId(serviceIdOeWirelineProjectX1));
+    }
+
+
+    @Test(groups = { "shouldBeMigratedToWorkWithSimulator" })
+    private void testSearchExistingInstanceByProjectWithSpecialCharacters() throws Exception {
         User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP);
         relogin(user.credentials);
         SearchExistingPage searchExistingPage = new SearchExistingPage();
         SideMenu.navigateToSearchExistingPage();
         Click.byId(Constants.EditExistingInstance.SELECT_PROJECT_ID);
         Thread.sleep(1000);
-        Click.byText("x1");
+        Click.byText("VIP(VelocitytoIP)");//must be in DB
+        Click.byId(Constants.EditExistingInstance.SELECT_PROJECT_ID);
         searchExistingPage.clickSubmitButton();
-        searchExistingPage.clickEditViewByInstanceId("SDN-LT1-B-servInstance-E1802");
+        searchExistingPage.clickEditViewByInstanceId("c8a85099-e5a3-4e4d-a75d-afa3e2ed2a94");
     }
 
-    @Test
+
+    @Test(groups = { "shouldBeMigratedToWorkWithSimulator" })
     private void testSearchExistingInstanceByProjectMultiValue() throws Exception {
         User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP);
         relogin(user.credentials);