fixed some spelling issues and locators for 2 error messages

smp-ui-tests/src/main/java/pages/domain/DomainPopup.java

@@ -28,13 +28,17 @@ public class DomainPopup extends PageComponent {
 	WebElement userClientCertHeaderToggle;
 	@FindBy(css = "#smlClientCertHeaderAuth_id-input")
 	WebElement userClientCertHeaderToggleInput;
-	@FindBy(css = "div.mat-form-field-infix > div.ng-star-inserted")
+	@FindBy(css = "#domainCode_id + div")
 	WebElement domainCodeValidationError;
+
+	@FindBy(css = "#smlSMPId_id + div")
+	WebElement smlSmpIdValidationError;
 	@FindBy(css = "#smlClientKeyAlias_id")
 	WebElement smlClientAliasSelectContainer;
 	GenericSelect smlClientAliasSelect;
 	@FindBy(css = "#MetadataTextArea")
 	private WebElement metadataTextArea;
+
 	public DomainPopup(WebDriver driver) {
 		super(driver);
 		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
@@ -138,25 +142,6 @@ public class DomainPopup extends PageComponent {
 
 	}
 
-	public String domainCode63CharValidationGetErrMsg() {
-		try {
-			waitForElementToBeVisible(domainCodeValidationError);
-			return domainCodeValidationError.getAttribute("value");
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	public String getSmlSmpId63CharValidationMsg() {
-		WebElement invalidSmlSmpIdErrorMsg = driver.findElement(By.cssSelector("div.mat-form-field-infix > div.ng-star-inserted"));
-		try {
-			waitForElementToBeVisible(invalidSmlSmpIdErrorMsg);
-			return invalidSmlSmpIdErrorMsg.getAttribute("value");
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
 	public String xmlFieldVALUE() {
 		log.info("value is " + metadataTextArea.getAttribute("value"));
 		return metadataTextArea.getAttribute("value");
@@ -188,4 +173,21 @@ public class DomainPopup extends PageComponent {
 	}
 
 
+	public String domainCode63CharValidationGetErrMsg() {
+		try {
+			return waitForElementToBeVisible(domainCodeValidationError).getText().trim();
+		} catch (Exception e) {
+		}
+		return null;
+	}
+
+	public String getSmlSmpId63CharValidationMsg() {
+		try {
+			return waitForElementToBeVisible(smlSmpIdValidationError).getText().trim();
+		} catch (Exception e) {
+		}
+		return null;
+	}
+
+
 }

smp-ui-tests/src/main/java/pages/users/UsersPage.java

@@ -53,6 +53,7 @@ public class UsersPage extends SMPPage {
         log.info("save button");
         return isEnabled(saveBtn);
     }
+
     public boolean isEditButtonEnabled() {
         log.info("save button");
         return isEnabled(editBtn);
@@ -118,7 +119,8 @@ public class UsersPage extends SMPPage {
         }
         return false;
     }
-    public boolean isEditTruststoreButtonEnabled(){
+
+    public boolean isEditTruststoreButtonEnabled() {
         try {
             return isEnabled(editTruststore);
         } catch (Exception e) {
@@ -127,7 +129,8 @@ public class UsersPage extends SMPPage {
         return false;
 
     }
-    public boolean isDeleteButtonVisibled(){
+
+    public boolean isDeleteButtonVisible() {
         try {
             return isVisible(deleteBtn);
         } catch (Exception e) {
@@ -136,7 +139,7 @@ public class UsersPage extends SMPPage {
         return false;
     }
 
-    public boolean isEditButtonVisibled(){
+    public boolean isEditButtonVisible() {
         try {
             return isVisible(editBtn);
         } catch (Exception e) {
@@ -146,18 +149,15 @@ public class UsersPage extends SMPPage {
     }
 
 
-    public boolean isCancelButtonVisibled() {
+    public boolean isCancelButtonVisible() {
 
         return isVisible(cancelBtn);
     }
 
-    public boolean isSaveButtonVisibled() {
+    public boolean isSaveButtonVisible() {
 
         return isVisible(saveBtn);
     }
 
 
-
-
-
 }

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

@@ -296,7 +296,7 @@ public class DomainPgTest extends BaseTest {
 		soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
 		popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
 		soft.assertEquals(popup.getDuplicateDomainErrorMsgText(), errorMsg, "The message is not matching with our expected error message");
-		soft.assertFalse(popup.isEnableOkButton(), "Ok button is enable");
+		soft.assertFalse(popup.isEnableOkButton(), "Ok button is enabled");
 		soft.assertTrue(popup.isEnableCancelButton(), "Cancel button is disabled");
 		popup.clickCancel();
 		soft.assertAll();
@@ -460,7 +460,7 @@ public class DomainPgTest extends BaseTest {
 		DomainPopup popup = page.clickNew();
 		for (String smlsmpid : smlsmpId) {
 			popup.fillDataForNewDomain(randstring, randstring, smlsmpid, randstring);
-			soft.assertTrue(!popup.isEnableOkButton(), "OK button is enable after sending the invalid smlsmpId");
+			soft.assertTrue(!popup.isEnableOkButton(), "OK button is enabled after sending the invalid smlsmpId");
 			soft.assertEquals(popup.getSmlSmpIdValidationMsg(), SMPMessages.SMLSMPID_VALIDATION_MESSAGE, "Error message is not in list");
 
 		}

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

@@ -496,7 +496,7 @@ public class EditPgTest extends BaseTest {
 		ServiceMetadataWizardPopup metadataWizard = metadataPopup.clickMetadataWizard();
 		soft.assertTrue(!metadataPopup.isParticipantIdentifierEnabled(), "participantId field is enabled for an existing service group in service metadata popup");
 		soft.assertTrue(!metadataPopup.isParticipantSchemeEnabled(), "participantScheme field is enabled for an existing service group in service metadata popup");
-		soft.assertFalse(metadataWizard.isEnableOkBtn(), "OK button is enable before providing the valid data");
+		soft.assertFalse(metadataWizard.isEnableOkBtn(), "OK button is enabled before providing the valid data");
 		metadataWizard.fillForm(generator, generator, generator, generator, "bdxr-transport-ebms3-as4-v1p0", "internal/rest/domain");
 		metadataWizard.fillCerificateBox(generator);
 		soft.assertTrue(metadataWizard.isEnableOkBtn(), "OK button is disable after providing the valid data");

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

 package ui;
 
 import org.openqa.selenium.JavascriptExecutor;
-import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 import org.testng.asserts.SoftAssert;
+import pages.components.baseComponents.SMPPage;
 import pages.components.messageArea.AlertMessage;
+import pages.login.LoginPage;
 import pages.password.PasswordChangepopup;
 import pages.service_groups.search.SearchPage;
-import pages.components.baseComponents.SMPPage;
-import pages.login.LoginPage;
-import pages.users.UserPopup;
 import pages.users.UsersPage;
 import utils.Generator;
 import utils.enums.SMPMessages;
@@ -182,8 +180,7 @@ public class LoginPgTest extends BaseTest {
 	}
 
 	@Test(description = "LGN-80")
-	public void verifyLoginButtonEnable()
-	{
+	public void verifyLoginButtonEnable() {
 		SoftAssert soft = new SoftAssert();
 		SearchPage page = new SearchPage(driver);
 		logger.info("Going to login page");
@@ -196,8 +193,7 @@ public class LoginPgTest extends BaseTest {
 	}
 
 	@Test(description = "LGN-90")
-	public void verifyRoleAfterLogin()
-	{
+	public void verifyRoleAfterLogin() {
 		SoftAssert soft = new SoftAssert();
 
 		SMPPage page = new SMPPage(driver);
@@ -209,14 +205,13 @@ public class LoginPgTest extends BaseTest {
 		SearchPage searchPage = loginPage.login(user.get("username"), user.get("password"));
 		soft.assertTrue(searchPage.pageHeader.sandwichMenu.isLoggedIn(), "User is logged in");
 		String roleName = page.pageHeader.getRoleName();
-		soft.assertEquals(roleName , "System administrator" , "the role doesn't contain System administrator");
+		soft.assertEquals(roleName, "System administrator", "the role doesn't contain System administrator");
 
 		soft.assertAll();
 	}
 
 	@Test(description = "LGN-100")
-	public void loggedUserPasswordDialogView()
-	{
+	public void loggedUserPasswordDialogView() {
 		SoftAssert soft = new SoftAssert();
 
 
@@ -236,9 +231,9 @@ public class LoginPgTest extends BaseTest {
 		soft.assertTrue(searchPage.isLoaded(), "Search page is not loaded");
 
 		PasswordChangepopup passPopup = searchPage.pageHeader.sandwichMenu.clickChangePasswordOption();
-		soft.assertTrue(passPopup.isCurrentPasswordInputEnable(),"Current password input is not enable in the password dialog for logged user");
-		soft.assertTrue(passPopup.isNewPasswordInputEnable(),"New password input is not enable in the password dialog for logged user");
-		soft.assertTrue(passPopup.isConfirmPasswordInputEnable(),"Confirm password input is not enable in the password dialog for logged user");
+		soft.assertTrue(passPopup.isCurrentPasswordInputEnable(), "Current password input is not enabled in the password dialog for logged user");
+		soft.assertTrue(passPopup.isNewPasswordInputEnable(), "New password input is not enabled in the password dialog for logged user");
+		soft.assertTrue(passPopup.isConfirmPasswordInputEnable(), "Confirm password input is not enabled in the password dialog for logged user");
 
 		searchPage = passPopup.clickClosePasswordDialog();
 
@@ -248,14 +243,13 @@ public class LoginPgTest extends BaseTest {
 
 
 	@Test(description = "LGN-100")
-	public void passwordChangeForLoggedUser()
-	{
+	public void passwordChangeForLoggedUser() {
 		SoftAssert soft = new SoftAssert();
 		String userName = Generator.randomAlphaNumeric(10);
 		String validPass = "Aabcdefghijklm1@";
 
 		SMPPage page = genericLoginProcedure("SYS_ADMIN");
-		SMPRestClient.createUser(userName,"SMP_ADMIN");
+		SMPRestClient.createUser(userName, "SMP_ADMIN");
 		logger.info("created user " + userName);
 		page.pageHeader.sandwichMenu.logout();
 		page.pageHeader.goToLogin();
@@ -271,12 +265,12 @@ public class LoginPgTest extends BaseTest {
 
 		passDialog.fillDataForLoggedUser("QW!@qw12", validPass, validPass);
 		passDialog.clickChangedPassword();
-		 searchPage = passDialog.clickCloseAfterChangedPassForLoggedUser();
+		searchPage = passDialog.clickCloseAfterChangedPassForLoggedUser();
 		try {
 			Thread.sleep(10000);
 		} catch (Exception e) {
 		}
-		soft.assertTrue(searchPage.isLoaded(),"After changing the password for a logged user the page is not redirecting to searchpage");
+		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);

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

@@ -73,8 +73,8 @@ public class PropertiesPgTest extends BaseTest {
 
 		servicePopup.clickOK();
 
-		soft.assertTrue(editPage.isSaveButtonEnabled(), "Save button is not enable after cration of servicegroup without scheme");
-		soft.assertTrue(editPage.isCancelButtonEnabled(), "Cancel button is not enable after cration of servicegroup without scheme");
+		soft.assertTrue(editPage.isSaveButtonEnabled(), "Save button is not enabled after cration of servicegroup without scheme");
+		soft.assertTrue(editPage.isCancelButtonEnabled(), "Cancel button is not enabled after cration of servicegroup without scheme");
 		editPage.clickSave().confirm();
 		;
 

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

@@ -525,7 +525,7 @@ public class UsersPgTest extends BaseTest {
 		soft.assertTrue(page.isNewButtonEnabled(), "New button should be enabled");
 
 		UserPopup popup = page.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button is enable before valid data is filled in the popup");
+		soft.assertTrue(!popup.isOKButtonActive(), "OK button is enabled before valid data is filled in the popup");
 		popup.fillDetailsForm(userName, email);
 		popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
 		popup.clickOK();
@@ -548,7 +548,7 @@ public class UsersPgTest extends BaseTest {
 		popup.fillDetailsForm(userName, email);
 		popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
 
-		soft.assertFalse(popup.isOKButtonActive(), "OK button is enable after duplicate user name is filled in the popup");
+		soft.assertFalse(popup.isOKButtonActive(), "OK button is enabled after duplicate user name is filled in the popup");
 
 		soft.assertTrue(popup.isDuplicateUserNameErrorMsgDisPlayed(), "The user page is not containing the expected error message");
 		popup.clickCancel();
@@ -566,7 +566,7 @@ public class UsersPgTest extends BaseTest {
 		SoftAssert soft = new SoftAssert();
 		UsersPage usersPage = new UsersPage(driver);
 		UserPopup popup = usersPage.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button is enable before valid data is filled in the popup");
+		soft.assertTrue(!popup.isOKButtonActive(), "OK button is enabled before valid data is filled in the popup");
 		popup.fillDetailsForm(username, email);
 		popup.rolesSelect.selectOptionWithText("SMP_ADMIN");
 		popup.clickOK();
@@ -648,12 +648,12 @@ public class UsersPgTest extends BaseTest {
 
 		UsersPage page = new UsersPage(driver);
 		soft.assertTrue(page.isLoaded());
-		soft.assertTrue(page.isNewButtonEnabled(), "New button is not enable");
+		soft.assertTrue(page.isNewButtonEnabled(), "New button is not enabled");
 		soft.assertTrue(page.isEditTruststoreButtonEnabled(), "EditTruststore Button is not enabled");
-		soft.assertTrue(page.isDeleteButtonVisibled(), "Delete button is not visibled");
-		soft.assertTrue(page.isEditButtonVisibled(), "Edit button is not visibled");
-		soft.assertTrue(page.isSaveButtonVisibled(), "Save button is not visibled");
-		soft.assertTrue(page.isCancelButtonVisibled(), "Cancel button is not visibled");
+		soft.assertTrue(page.isDeleteButtonVisible(), "Delete button is not visible");
+		soft.assertTrue(page.isEditButtonVisible(), "Edit button is not visible");
+		soft.assertTrue(page.isSaveButtonVisible(), "Save button is not visible");
+		soft.assertTrue(page.isCancelButtonVisible(), "Cancel button is not visible");
 		soft.assertTrue(!page.isEditButtonEnabled(), "Edit button is  enabled");
 		soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is  enabled");
 		soft.assertTrue(!page.isCancelButtonEnabled(), "Cancel button is  enabled");
@@ -725,7 +725,7 @@ public class UsersPgTest extends BaseTest {
 		for (String emailId : email) {
 			popup.fillDetailsForm(username, emailId);
 			popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-			soft.assertTrue(!popup.isOKButtonActive(), "OK button is active after s4ending invalid email");
+			soft.assertTrue(!popup.isOKButtonActive(), "OK button is active after sending invalid email");
 			soft.assertEquals(popup.userEmailValidationGetErrMsg(), SMPMessages.USER_EMAIL_VALIDATION_MESSAGE, "Message is not in the list");
 		}
 		soft.assertAll();