MOSIP-32267 updating automation script according to ui changes And adding testcases

injitest/src/main/java/inji/pages/BackupAndRestorePage.java

@@ -139,6 +139,9 @@ public class BackupAndRestorePage extends BasePage {
     @AndroidFindBy(accessibility = "help")
     private WebElement helpButton;
 
+    @AndroidFindBy(xpath = "//*[@resource-id=\"com.google.android.gms:id/account_display_name\"]")
+    private WebElement selectAccount;
+
 
     public BackupAndRestorePage(AppiumDriver driver) {
         super(driver);
@@ -302,6 +305,10 @@ public void clickOnHelpButton() {
         clickOnElement(helpButton);
     }
 
+    public void clickOnEmailHeader() {
+        clickOnElement(selectAccount);
+    }
+
     public boolean  isBackupFQADisplayed() throws InterruptedException {
         Thread.sleep(5000);
         String context= driver.getPageSource();

injitest/src/main/java/inji/pages/DetailedVcViewPage.java

@@ -12,43 +12,43 @@ public class DetailedVcViewPage extends BasePage{
     @iOSXCUITFindBy(accessibility = "idDetailsHeader")
     private WebElement detailedVcViewPageTitle;
 
-    @AndroidFindBy(accessibility = "fullNameValue")
-    @iOSXCUITFindBy(accessibility = "fullNameValue")
+    @AndroidFindBy(accessibility = "Full NameValue")
+    @iOSXCUITFindBy(accessibility = "Full NameValue")
     private WebElement fullNameValue;
 
-    @AndroidFindBy(accessibility = "genderValue")
-    @iOSXCUITFindBy(accessibility = "genderValue")
+    @AndroidFindBy(accessibility = "GenderValue")
+    @iOSXCUITFindBy(accessibility = "GenderValue")
     private WebElement genderValue;
 
-    @AndroidFindBy(accessibility = "dateOfBirthValue")
-    @iOSXCUITFindBy(accessibility = "dateOfBirthValue")
+    @AndroidFindBy(accessibility = "Date of BirthValue")
+    @iOSXCUITFindBy(accessibility = "Date of BirthValue")
     private WebElement dateOfBirthValue;
 
-    @AndroidFindBy(accessibility = "nationalCard")
-    @iOSXCUITFindBy(accessibility = "nationalCard")
+    @AndroidFindBy(accessibility = "ID TypeValue")
+    @iOSXCUITFindBy(accessibility = "ID TypeValue")
     private WebElement idTypeValue;
 
     @AndroidFindBy(accessibility = "valid")
     @iOSXCUITFindBy(accessibility = "valid")
     private WebElement statusValue;
 
-    @AndroidFindBy(accessibility = "uinNumber")
-    @iOSXCUITFindBy(accessibility = "uinNumber")
+    @AndroidFindBy(accessibility = "UINValue")
+    @iOSXCUITFindBy(accessibility = "UINValue")
     private WebElement uinNumberValue;
 
     @AndroidFindBy(accessibility = "generatedOnValue")
     @iOSXCUITFindBy(accessibility = "generatedOnValue")
     private WebElement generatedOnValue;
 
-    @AndroidFindBy(accessibility = "phoneNumberValue")
-    @iOSXCUITFindBy(accessibility = "phoneNumberValue")
+    @AndroidFindBy(accessibility = "phoneValue")
+    @iOSXCUITFindBy(accessibility = "phoneValue")
     private WebElement phoneNumberValue;
 
-    @AndroidFindBy(accessibility = "emailIdValue")
-    @iOSXCUITFindBy(accessibility = "emailIdValue")
+    @AndroidFindBy(accessibility = "EmailValue")
+    @iOSXCUITFindBy(accessibility = "EmailValue")
     private WebElement emailIdValue;
 
-    @AndroidFindBy(uiAutomator = "new UiScrollable(new UiSelector()).scrollIntoView(new UiSelector().description(\"enableVerification\"));")
+    @AndroidFindBy(accessibility = "enableVerification")
     @iOSXCUITFindBy(accessibility = "enableVerification")
     private WebElement activateButton;
 
@@ -145,7 +145,7 @@ public PleaseConfirmPopupPage clickOnActivateButtonAndroid(){
         return new PleaseConfirmPopupPage(driver);
     }
 
-    public PleaseConfirmPopupPage clickOnActivateButtonIos(){  //Scroll for ios need to be done
+    public PleaseConfirmPopupPage clickOnActivateButtonIos(){
         IosUtil.scrollToElement(driver,58,712,160,129);
         clickOnElement(activeButtonIos);
         return new PleaseConfirmPopupPage(driver);

injitest/src/main/java/inji/pages/GenerateUinOrVidPage.java

@@ -19,6 +19,12 @@ public class GenerateUinOrVidPage extends BasePage {
     @iOSXCUITFindBy(accessibility = "getIdButton")
     private WebElement getUinOrVidButton;
 
+    @AndroidFindBy(xpath = "//*[@text=\"Network request failed\"]")
+    @iOSXCUITFindBy(accessibility = "getIdButton")
+    private WebElement networkErrorMesseage;
+
+
+
     public GenerateUinOrVidPage(AppiumDriver driver) {
         super(driver);
     }
@@ -37,4 +43,12 @@ public OtpVerificationPage clickOnGetUinOrVidButton() {
         return new OtpVerificationPage(driver);
     }
 
+    public String getGenerateUinOrVidPageTextloaded() {
+        return this.getTextFromLocator(retrieveUinVidText);
+    }
+
+    public boolean isNetworkRequesFailedDisplayed() {
+        return this.isElementDisplayed(networkErrorMesseage);
+    }
+
 }

injitest/src/main/java/inji/pages/HistoryPage.java

@@ -41,7 +41,7 @@ private boolean verifyHistoryIos(String vcNumber) {
     }
 
     private boolean verifyHistoryAndroid(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " downloaded')]");
+        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " is downloaded.')]");
         return this.isElementDisplayed(locator);
     }
 
@@ -50,17 +50,17 @@ private boolean verifyActivityHeaderAndroid(String vcNumber) {
     }
 
     private boolean verifyDeleteHistoryAndroid(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " Removed from wallet')]");
+        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " is removed from wallet.')]");
         return this.isElementDisplayed(locator);
     }
 
     private boolean verifyDeletedHistoryIos(String vcNumber) {
-        By locator = By.xpath("//*[contains(@name,'" + vcNumber + " Removed from wallet')]");
+        By locator = By.xpath("//*[contains(@name,'" + vcNumber + " is removed from wallet.')]");
         return this.isElementDisplayed(locator);
     }
 
     private int verifyNumberOfRecordsInHistoryAndroid(String vcNumber) throws InterruptedException {
-        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " downloaded')]");
+        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " is downloaded.')]");
         List<WebElement> elements = driver.findElements(locator);
         return elements.size();
     }
@@ -145,12 +145,14 @@ public boolean verifyActivationSuccessfulRecordInHistory(String vcNumber, Target
     }
 
     private boolean verifyActivationSuccessfulRecordIos(String vcNumber) {
-        By locator = By.xpath("//*[contains(@name,'" + vcNumber + " Activation successful')]");
+        By locator = By.xpath("//*[contains(@name,'Activation of National Card " + vcNumber + " is successful.')]");
         return this.isElementDisplayed(locator);
     }
 
+
+
     private boolean verifyActivationSuccessfulRecordAndroid(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " Activation successful')]");
+        By locator = By.xpath("//*[contains(@text,'Activation of National Card " + vcNumber + " is successful.')]");
         return this.isElementDisplayed(locator);
     }
 }

injitest/src/main/java/inji/pages/HomePage.java

@@ -63,8 +63,8 @@ public class HomePage extends BasePage {
     @AndroidFindBy(accessibility = "share")
     @iOSXCUITFindBy(accessibility = "share")
     private WebElement shareButton;
-    
-    @AndroidFindBy(uiAutomator = "new UiSelector().className(\"android.widget.TextView\").instance(6);")// fix with accecibility
+
+    @AndroidFindBy(uiAutomator = "new UiSelector().className(\"android.widget.TextView\").instance(5)")// fix with accecibility
     @iOSXCUITFindBy(accessibility = "share")
     private WebElement shareButtonByForText;
 
@@ -105,8 +105,8 @@ public class HomePage extends BasePage {
     @iOSXCUITFindBy(accessibility = "activatedVcPopupText")
     private WebElement activatedVcPopupText;
 
-    @AndroidFindBy(accessibility = "fullNameTitle")
-    @iOSXCUITFindBy(accessibility = "fullNameTitle")
+    @AndroidFindBy(accessibility = "fullNameValue")
+    @iOSXCUITFindBy(accessibility = "fullNameValue")
     private WebElement fullNameTitle;
 
 
@@ -280,4 +280,8 @@ public void clickPopupCloseButtonButton() {
         clickOnElement(popupCloseButton);
     }
 
+    public void clickOnHomeButton() {
+        clickOnElement(homeButton);
+    }
+
 }

injitest/src/main/java/inji/pages/MoreOptionsPage.java

@@ -7,28 +7,31 @@
 
 public class MoreOptionsPage extends BasePage {
 
-    @AndroidFindBy(accessibility = "removeFromWallet")
-    @iOSXCUITFindBy(accessibility = "removeFromWallet")
+//    @AndroidFindBy(accessibility = "outlined-delete-icon")
+//    @iOSXCUITFindBy(accessibility = "removeFromWallet")
+//    private WebElement removeFromWalletButton;
+
+    @AndroidFindBy(uiAutomator = "new UiScrollable(new UiSelector().scrollable(true).instance(0)).scrollIntoView(new UiSelector().description(\"outlined-delete-icon\"))")
     private WebElement removeFromWalletButton;
 
     @AndroidFindBy(accessibility = "kebabTitle")
     @iOSXCUITFindBy(accessibility = "kebabTitle")
     private WebElement moreOptionsText;
 
-    @AndroidFindBy(accessibility = "viewActivityLog")
-    @iOSXCUITFindBy(accessibility = "viewActivityLog")
+    @AndroidFindBy(accessibility = "outlined-schedule-icon")
+    @iOSXCUITFindBy(accessibility = "outlined-schedule-icon")
     private WebElement viewActivityLogButton;
 
-    @AndroidFindBy(accessibility = "pinOrUnPinCard")
-    @iOSXCUITFindBy(accessibility = "pinOrUnPinCard")
+    @AndroidFindBy(accessibility = "outlinedPinIcon")
+    @iOSXCUITFindBy(accessibility = "outlinedPinIcon")
     private WebElement pinOrUnPinCardButton;
 
-    @AndroidFindBy(accessibility = "pendingActivationOrActivated")
-    @iOSXCUITFindBy(accessibility = "pendingActivationOrActivated")
+    @AndroidFindBy(accessibility = "outlined-shielded-icon")
+    @iOSXCUITFindBy(accessibility = "outlined-shielded-icon")
     private WebElement activationPending;
 
-    @AndroidFindBy(accessibility = "profileAuthenticated")
-    @iOSXCUITFindBy(accessibility = "profileAuthenticated")
+    @AndroidFindBy(accessibility = "wallet-activated-icon")
+    @iOSXCUITFindBy(accessibility = "wallet-activated-icon")
     private WebElement activatedForOnlineLoginButton;
 
     @AndroidFindBy(accessibility = "close")

injitest/src/main/java/inji/pages/OtpVerificationPage.java

@@ -45,14 +45,18 @@ public class OtpVerificationPage extends BasePage {
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"VID not available in database\"`]")
     private WebElement vidNotAvailableMessage;
 
-    @AndroidFindBy(xpath = "//android.view.ViewGroup[@resource-id=\"resendCodeView\"]") //Not using accessibility id as parent component has correct element property
+    @AndroidFindBy(xpath = "//*[@resource-id=\"resendCodeView\"]") //Not using accessibility id as parent component has correct element property
     @iOSXCUITFindBy(accessibility = "resendCode")
     private WebElement resendCodeButton;
 
     @AndroidFindBy(accessibility = "wait")
     @iOSXCUITFindBy(accessibility = "wait")
     private WebElement waitPopupButton;
 
+    @AndroidFindBy(accessibility = "otpVerificationDescription")
+    @iOSXCUITFindBy(accessibility = "otpVerificationDescription")
+    private WebElement otpVerificationDescription;
+
 
     public OtpVerificationPage(AppiumDriver driver) {
         super(driver);
@@ -113,8 +117,13 @@ public boolean verifyResendCodeButtonDisplayedEnabled() {
     }
 
     public void clickOnResendButton() {
-        ((HidesKeyboard) driver).hideKeyboard();
-        clickIfVisible(waitPopupButton);
+//        ((HidesKeyboard) driver).hideKeyboard();
+//        clickIfVisible(waitPopupButton);
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
         retrieClickOnElemet(resendCodeButton);
     }
 
@@ -128,6 +137,9 @@ public void WatingTimeForVerificationTimerComplete() {
 
     public boolean verifyOtpVerificationTimerDisplayedAfterClickOnResend() {
         return this.isElementDisplayed(otpVerificationTimer);
+    }
 
+    public boolean verifyotpVerificationDescriptionDisplayed() {
+        return this.isElementDisplayed(otpVerificationDescription);
     }
 }

injitest/src/main/java/inji/pages/SunbirdLoginPage.java

@@ -21,11 +21,11 @@ public class SunbirdLoginPage extends BasePage {
     @AndroidFindBy(xpath = "//*[contains(@text,'Login with KBA')]")
     private WebElement loginWithKBA;
 
-    @AndroidFindBy(uiAutomator = "UiSelector().className(\"android.widget.EditText\").instance(0)")
+    @AndroidFindBy(xpath = "//android.widget.EditText[@resource-id=\"_form_policyNumber\"]")
     @iOSXCUITFindBy(xpath = "//XCUIElementTypeTextField[@name=\"Please fill in this field\" and @value=\"Policy Number\"]")
     private WebElement enterPolicyTextBox;
 
-    @AndroidFindBy(uiAutomator = "UiSelector().className(\"android.widget.EditText\").instance(1)")
+    @AndroidFindBy(xpath = "//android.widget.EditText[@resource-id=\"_form_fullName\"]")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeTextField[`name == \"Please fill in this field\"`][2]")
     private WebElement enterFullnameTextBox;
 
@@ -58,24 +58,24 @@ public class SunbirdLoginPage extends BasePage {
     @iOSXCUITFindBy(accessibility = "Previous Month")
     private WebElement previousMonth;
 
-    @AndroidFindBy(accessibility = "activated")
-    @iOSXCUITFindBy(accessibility = "activated")
+    @AndroidFindBy(accessibility = "wallet-activated-icon")
+    @iOSXCUITFindBy(accessibility = "wallet-activated-icon")
     private WebElement activatedStatus;
 
     @AndroidFindBy(accessibility = "a square logo of a Sunbird")
     @iOSXCUITFindBy(accessibility = "a square logo of a Sunbird")
     private WebElement sunbirdLogo;
 
-    @AndroidFindBy(accessibility = "NameValue")
-    @iOSXCUITFindBy(accessibility = "NameValue")
+    @AndroidFindBy(accessibility = "fullNameValue")
+    @iOSXCUITFindBy(accessibility = "fullNameValue")
     private WebElement fullName;
 
     @AndroidFindBy(accessibility = "Policy NameValue")
     @iOSXCUITFindBy(accessibility = "Policy NameValue")
     private WebElement policyName;
 
-    @AndroidFindBy(accessibility = "idTypeValue")
-    @iOSXCUITFindBy(accessibility = "idTypeValue")
+    @AndroidFindBy(accessibility = "ID TypeValue")
+    @iOSXCUITFindBy(accessibility = "ID TypeValue")
     private WebElement idType;
 
     @iOSXCUITFindBy(accessibility = "Continue")