Automating pmp-revamp ui application

uitest-pmprevamp/src/main/java/io/mosip/testrig/pmprevampui/pages/ApiKeyPage.java

@@ -196,6 +196,27 @@ public class ApiKeyPage extends BasePage {
 	@FindBy(xpath = "//*[text()='No Data Available.']")
 	private WebElement noDataAvailableText;
 
+	@FindBy(id = "generate_api_key_btn")
+	private WebElement apiKeyListPageGenerateApiKeyBtn;
+
+	@FindBy(xpath = "//*[contains(text(), 'Select Partner ID')]")
+	private WebElement partnerIdHelpText;
+
+	@FindBy(xpath = "//*[contains(text(), 'Select policy for which API Key is required')]")
+	private WebElement policyNameHelpText;
+
+	@FindBy(id = "generate_clear_form")
+	private WebElement clearButton;
+
+	@FindBy(id = "generate_cancel_btn")
+	private WebElement cancelButton;
+
+	@FindBy(xpath = "//*[contains(text(), 'Entered API Key name already exists. Provide a unique API Key name and submit.')]")
+	private WebElement duplicateApiKeyNameErrorMessage;
+
+	@FindBy(id = "error_close_btn")
+	private WebElement duplicateApiKeyNameErrorMessageCancelButton;
+
 	public ApiKeyPage(WebDriver driver) {
 		super(driver);
 	}
@@ -231,11 +252,11 @@ public boolean isGenerateAPIKeyDisplayed() {
 		return isElementDisplayed(generateAPIKey);
 	}
 
-	public void ClickOnAPIKeyDisplayed() {
+	public void clickOnAPIKeyDisplayed() {
 		clickOnElement(generateAPIKey);
 	}
 
-	public void ClickOnSubmitButton() {
+	public void clickOnSubmitButton() {
 		clickOnElement(submitButton);
 	}
 
@@ -452,4 +473,51 @@ public boolean isnoDataAvailableTextDisplayed() {
 		return isElementDisplayed(noDataAvailableText);
 	}
 
+	public boolean isApiKeyListPageGenerateApiKeyBtnDisplayed() {
+		return isElementDisplayed(apiKeyListPageGenerateApiKeyBtn);
+	}
+
+	public void clickOnApiKeyListPageGenerateApiKeyBtnDisplayed() {
+		clickOnElement(apiKeyListPageGenerateApiKeyBtn);
+	}
+
+	public boolean isPartnerIdHelpTextDisplayed() {
+		return isElementDisplayed(partnerIdHelpText);
+	}
+
+	public boolean isPolicyNameHelpTextDisplayed() {
+		return isElementDisplayed(policyNameHelpText);
+	}
+
+	public boolean isClearButtonDisplayed() {
+		return isElementDisplayed(clearButton);
+	}
+
+	public void clickOnClearButton() {
+		clickOnElement(clearButton);
+	}
+
+	public boolean isCancelButtonDisplayed() {
+		return isElementDisplayed(cancelButton);
+	}
+
+	public void clickOnCancelButton() {
+		clickOnElement(cancelButton);
+	}
+
+	public void navigateBackDefaultButton() {
+		driver.navigate().back();
+	}
+
+	public void navigateRefreshDefaultButton() {
+		driver.navigate().refresh();
+	}
+
+	public boolean isDuplicateApiKeyNameErrorMessageDisplayed() {
+		return isElementDisplayed(duplicateApiKeyNameErrorMessage);
+	}
+
+	public void clickOnDuplicateApiKeyNameErrorMessageCancelButton() {
+		clickOnElement(duplicateApiKeyNameErrorMessageCancelButton);
+	}
 }

uitest-pmprevamp/src/main/java/io/mosip/testrig/pmprevampui/pages/DashboardPage.java

@@ -83,9 +83,7 @@ public class DashboardPage extends BasePage {
 	@FindBy(xpath = "//*[text()='Root of Trust Certificate']")
 	private WebElement RootOFTrustCertText;
 
-	//@FindBy(id = "root_certificate_upload_btn")
-	//@FindBy(id = "upload_root_trust_certificate_btn")
-	@FindBy(id = "upload_certificate_btn")
+	@FindBy(id = "rootCertificateList.uploadRootCaCertificate")
 	private WebElement rootCertificateUploadButton;
 
 	@FindBy(xpath = "//*[text()='Policies']")

uitest-pmprevamp/src/main/java/io/mosip/testrig/pmprevampui/pages/OidcClientPage.java

@@ -145,10 +145,10 @@ public class OidcClientPage extends BasePage {
 	@FindBy(id = "partnerId_asc_icon")
 	private WebElement partnerId_asc_icon;
 
-	@FindBy(id = "oidcClientName_desc_icon")
+	@FindBy(id = "clientNameEng_desc_icon")
 	private WebElement oidcClientName_desc_icon;
 
-	@FindBy(id = "oidcClientName_asc_icon")
+	@FindBy(id = "clientNameEng_asc_icon")
 	private WebElement oidcClientName_asc_icon;
 
 	@FindBy(id = "policyGroupName_desc_icon")
@@ -232,6 +232,9 @@ public class OidcClientPage extends BasePage {
 	@FindBy(id = "sub_title_home_btn")
 	private WebElement subTitleHomeButton;
 
+	@FindBy(id = "create_oidc_btn")
+	private WebElement oidcClientListPageCreateOidcClientBtn;
+
 	public OidcClientPage(WebDriver driver) {
 		super(driver);
 	}
@@ -535,5 +538,7 @@ public boolean isCreateOidcCancelButtonDisplayed() {
 	public boolean isSubTitleHomeButtonDisplayed() {
 		return isElementDisplayed(subTitleHomeButton);
 	}
-
+	public void clickOnOidcClientListPageCreateOidcClientBtn() {
+		clickOnElement(oidcClientListPageCreateOidcClientBtn);
+	}
 }

uitest-pmprevamp/src/main/java/io/mosip/testrig/pmprevampui/pages/PartnerPolicyMappingPage.java

@@ -23,11 +23,20 @@ public class PartnerPolicyMappingPage extends BasePage {
 	@FindBy(id = "partner_list_view1")
 	private WebElement partnerListViewElipsisButton;
 
+	@FindBy(xpath = "//*[contains(text(), 'Approve / Reject')]")
+	private WebElement approveOrRejectButton;
+
+	@FindBy(xpath = "//*[contains(text(), 'Do you want to Approve/Reject the Policy')]")
+	private WebElement confirmationPopup;
+
+	@FindBy(xpath = "//*[contains(text(), 'Please review the policy details carefully before taking appropriate action.')]")
+	private WebElement confirmationPopupDetailedMessage;
+
 	@FindBy(xpath = "(//*[@id='partner_details_view_btn'])[1]")
 	private WebElement approveRejectButton;
 
-	@FindBy(id = "approve_reject_request_submit_btn")
-	private WebElement approveSubmitButton;
+	@FindBy(xpath = "(//*[contains(text(), 'Approve')])[3]")
+	private WebElement approveButton;
 
 	public PartnerPolicyMappingPage(WebDriver driver) {
 		super(driver);
@@ -57,12 +66,32 @@ public void clickOnPartnerListViewElipsisButton() {
 		clickOnElement(partnerListViewElipsisButton);
 	}
 
+	public void clickOnApproveOrRejectButton() {
+		clickOnElement(approveOrRejectButton);
+	}
+
+	public boolean isConfirmationPopupDisplayed() {
+		return isElementEnabled(confirmationPopup);
+	}
+
+	public boolean isConfirmationPopupDetailedMessageDisplayed() {
+		return isElementEnabled(confirmationPopupDetailedMessage);
+	}
+
+	public boolean isApproveRejectButtonDisplayed() {
+		return isElementEnabled(approveRejectButton);
+	}
+
+	public boolean isApproveSubmitButtonDisplayed() {
+		return isElementEnabled(approveButton);
+	}
+
 	public void clickOnApproveRejectButton() {
 		clickOnElement(approveRejectButton);
 	}
 
 	public void clickOnApproveSubmitButton() {
-		clickOnElement(approveSubmitButton);
+		clickOnElement(approveButton);
 	}
 
 }

uitest-pmprevamp/src/main/java/io/mosip/testrig/pmprevampui/pages/PoliciesPage.java

@@ -236,6 +236,9 @@ public class PoliciesPage extends BasePage {
 	@FindBy(id = "policy_details_policy_group_name_label")
 	private WebElement policyDetailsPolicyGroupNameLabel;
 
+	@FindBy(id = "policy_details_policy_name_label")
+	private WebElement policyDetailsPolicyNameLabel;
+
 	@FindBy(id = "policy_details_policy_name_context")
 	private WebElement policyDetailsPolicyNameContext;
 
@@ -559,6 +562,10 @@ public boolean isPolicyDetailsPartnerIdLabelDisplayed() {
 		return isElementDisplayed(policyDetailsPartnerIdLabel);
 	}
 
+	public boolean isPolicyDetailsPolicyGroupNameLabelDisplayed() {
+		return isElementDisplayed(policyDetailsPolicyGroupNameLabel);
+	}
+
 	public boolean isPolicyDetailsPolicyGroupNameContextDisplayed() {
 		return isElementDisplayed(policyDetailsPolicyGroupNameContext);
 	}
@@ -571,8 +578,8 @@ public boolean isPolicyDetailsPartnerTypeContextDisplayed() {
 		return isElementDisplayed(policyDetailsPartnerTypeContext);
 	}
 
-	public boolean isPolicyDetailsPolicyGroupNameLabelDisplayed() {
-		return isElementDisplayed(policyDetailsPolicyGroupNameLabel);
+	public boolean isPolicyDetailsPolicyNameLabelDisplayed() {
+		return isElementDisplayed(policyDetailsPolicyNameLabel);
 	}
 
 	public boolean isPolicyDetailsPolicyNameContextDisplayed() {

uitest-pmprevamp/src/main/java/io/mosip/testrig/pmprevampui/pages/RegisterPage.java

@@ -179,7 +179,7 @@ public void openPreviousTab() {
 	}
 
 	public void openRevampInNewTab() {
-		((JavascriptExecutor) driver).executeScript("window.open('https://pmp-new.dev1.mosip.net/ ')");
+		((JavascriptExecutor) driver).executeScript("window.open('https://pmp-revamp.dev1.mosip.net/ ')");
 		Set<String> allWindowHandles = driver.getWindowHandles();
 		System.out.println(allWindowHandles);
 		if (allWindowHandles.size() >= 2) {