Pull request #228: Failed testcases got fixed.

Merge in EDELIVERY/smp from restBaseIssue to development

* commit '1bbbf5cddc0d3ccaebde6330f7ecc9241e5bbbf6':
  Failed testcases got fixed.
  Failed testcases got fixed.

smp-ui-tests/src/test/java/ui/DomainPgTest.java

@@ -453,7 +453,7 @@ public class DomainPgTest extends BaseTest {
 		SoftAssert soft = new SoftAssert();
 		DomainPage page = new DomainPage(driver);
 		String randstring =Generator.randomAlphaNumeric(10);
-		ArrayList<String> smlsmpId = new ArrayList<>(Arrays.asList("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnop",
+		ArrayList<String> smlsmpId = new ArrayList<>(Arrays.asList("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopmkjh",
 				"abc@k",
 				"abcd-",
 				"-abgxknvlk",

smp-ui-tests/src/test/java/ui/LoginPgTest.java

@@ -259,60 +259,35 @@ public class LoginPgTest extends BaseTest {
 		SoftAssert soft = new SoftAssert();
 		String userName = Generator.randomAlphaNumeric(10);
 		String validPass = "Aabcdefghijklm1@";
-		String validPass1 = "Aabcdefghijklm1@2";
 
-		SMPPage page = new SMPPage(driver);
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-		HashMap<String, String> user = testDataProvider.getUserWithRole("SYS_ADMIN");
-		SearchPage searchPage = loginPage.login(user.get("username"), user.get("password"));
-		soft.assertTrue(searchPage.pageHeader.sandwichMenu.isLoggedIn(), "User is logged in");
-		logger.info("Going to login page");
+		SMPPage page = genericLoginProcedure("SYS_ADMIN");
 		SMPRestClient.createUser(userName,"SMP_ADMIN");
 		logger.info("created user " + userName);
-		page.sidebar.goToPage(UsersPage.class);
-		UsersPage usersPage = new UsersPage(driver);
-		int index = usersPage.grid().scrollToUser(userName);
-		String adminPass = "123456";
-		usersPage.grid().selectRow(index);
-		UserPopup popup = usersPage.clickEdit();
+		page.pageHeader.sandwichMenu.logout();
+		page.pageHeader.goToLogin();
+		LoginPage loginPage = new LoginPage(driver);
+		SearchPage searchPage = loginPage.login(userName, "QW!@qw12");
+		PasswordChangepopup passDialog = searchPage.pageHeader.sandwichMenu.clickChangePasswordOption();
 
 		try {
 			Thread.sleep(1000);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		popup.clickSetOrChangePassword();
-		popup.setOrChangePassword(adminPass, validPass, validPass);
-		popup.clickChangedPassword();
-		popup.clickCloseAfterChangedPass();
+
+		passDialog.fillDataForLoggedUser("QW!@qw12", validPass, validPass);
+		passDialog.clickChangedPassword();
+		 searchPage = passDialog.clickCloseAfterChangedPassForLoggedUser();
 		try {
-			Thread.sleep(1000);
+			Thread.sleep(10000);
 		} catch (Exception e) {
 		}
-		popup.clickOK();
-		usersPage.pageHeader.sandwichMenu.logout();
-		SearchPage searchpage = new SearchPage(driver);
-		logger.info("Going to login page");
-		searchpage.pageHeader.goToLogin();
-	/*	page.pageHeader.goToLogin();*/
-		LoginPage loginpage = new LoginPage(driver);
-		searchpage = loginpage.login(userName, "validPass");
-
-		soft.assertTrue(searchpage.pageHeader.sandwichMenu.isLoggedIn(), "User is logged in");
-		soft.assertTrue(searchpage.isLoaded(), "Search page is loaded");
-
-		PasswordChangepopup passDialog = searchpage.pageHeader.sandwichMenu.clickChangePasswordOption();
-		passDialog.fillDataForLoggedUser(validPass,validPass1,validPass1);
-
-		passDialog.clickChangedPassword();
-		 passDialog.clickClosePasswordDialog();
-		/*SearchPage page = passDialog.clickCloseAfterChangedPassForLoggedUser();
-		soft.assertEquals(page.getTitle(),"Search");*/
-		//passDialog.clickOK();
-		//soft.assertTrue(usersPage.grid().isUserListed(username), "User present in the page");
+		soft.assertTrue(searchPage.isLoaded(),"After changing the password for a logged user the page is not redirecting to searchpage");
+		SMPPage page1 = genericLoginProcedure("SYS_ADMIN");
+		logger.info("Going to Users page");
+		page1.sidebar.goToPage(UsersPage.class);
+		UsersPage usersPage = new UsersPage(driver);
+		soft.assertTrue(usersPage.grid().isUserListed(userName), "User is not present in the page after changing the password");
 
 		soft.assertAll();
 

smp-ui-tests/src/test/java/ui/UsersPgTest.java

@@ -320,7 +320,8 @@ public class UsersPgTest extends BaseTest {
         soft.assertTrue(options.size() == 2, "Role dropdown has only two values");
         soft.assertTrue(options.get(0).equalsIgnoreCase("SMP_ADMIN"), "Role dropdown has value \"SMP_ADMIN\"");
         soft.assertTrue(options.get(1).equalsIgnoreCase("SERVICE_GROUP_ADMIN"), "Role dropdown has value \"SERVICE_GROUP_ADMIN\"");
-        popup.clickCancel();
+        page.refreshPage();
+
         int index2 = page.grid().scrollToUserWithRole("SERVICE_GROUP_ADMIN");
 
         page.grid().selectRow(index2);
@@ -331,7 +332,6 @@ public class UsersPgTest extends BaseTest {
         soft.assertTrue(options.get(0).equalsIgnoreCase("SMP_ADMIN"), "Role dropdown has value \"SMP_ADMIN\"");
         soft.assertTrue(options.get(1).equalsIgnoreCase("SERVICE_GROUP_ADMIN"), "Role dropdown has value \"SERVICE_GROUP_ADMIN\"");
 
-
         soft.assertAll();
     }
 
@@ -665,24 +665,6 @@ public class UsersPgTest extends BaseTest {
         soft.assertAll();
     }
 
-   /* @Test(description = "USR-124")
-    public void creteInvalidUser() {
-
-        ArrayList<String> usernameToValidate = new ArrayList<>(Arrays.asList("qwq",
-                "QWERQWERQWERQWERQWERQWERQWERQWE33s",
-                "~1a#2d2dds"));
-        SoftAssert soft = new SoftAssert();
-        UsersPage usersPage = new UsersPage(driver);
-        usersPage.clickVoidSpace();
-        UserPopup popup = usersPage.clickNew();
-        for (String username : usernameToValidate) {
-            popup.fillDetailsForm(username);
-            popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-            soft.assertTrue(!popup.isOKButtonActive(), "OK button is active after putting the invalidusername");
-            soft.assertEquals(popup.getUsernameValidationError(),SMPMessages.USERNAME_VALIDATION_MESSAGE,String.format("Username policy message is displayed - %s", username));
-        }
-    }*/
-
     @Test(description = "USR-160")
     public void userPageUIAppearanceAndBehaviour(){
         SoftAssert soft = new SoftAssert();
@@ -761,9 +743,7 @@ public class UsersPgTest extends BaseTest {
         String username = Generator.randomAlphaNumeric(10);
         ArrayList<String> email = new ArrayList<>(Arrays.asList("sdfdgfdghxvfv@gmail.c",
                 "sdfdgfdghxvfv$gmail.com",
-                 "hdbvsdkvdsvf",
-                  "dshujhfgbid@gmail.co",
-                  "sdfdgfdghxvfv@cmail.com"));
+                 "hdbvsdkvdsvf"));
         UserPopup popup = page.clickNew();
         soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
         for(String emailId:email)