INJIMOB-2722 MOSIP-39001 incorporated changes and updated the prerequisite data

injitest/androidRegression.xml

@@ -147,10 +147,23 @@
                     <!-- <include name="verifyTuvaliVersion"/> invalid testcase-->
                 </methods>
             </class>
+            <class name="androidTestCases.VcDownloadAndVerifyUsingMockIdentity">
+                <methods>
+                    <include name="downloadAndVerifyVcUsingUinViaMockIdentity"/>
+                </methods>
+            </class>
+            <class name="androidTestCases.keyManagement">
+                <methods>
+                    <include name="downloadAndVerifyVcUsingUinViaMockIdentity"/>
+                    <include name="downloadAndVerifyVcUsingMockIdentity"/>
+                    <include name="downloadAndVerifyVcUsingEsignet"/>
+                </methods>
+            </class>
         </classes>
 	</test>
 </suite>
 
+
 <!--<suite name="All Test Suite">
 <listeners>
     <listener class-name="inji.utils.SuiteListener" />

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

@@ -1,5 +1,6 @@
 package inji.pages;
 
+import inji.utils.IosUtil;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.iOSXCUITFindBy;
@@ -11,8 +12,8 @@ public class AddNewCardPage extends BasePage{
     @iOSXCUITFindBy(accessibility = "title")
     private WebElement addNewCardHeader;
 
-    @AndroidFindBy(accessibility = "issuerHeading-MosipOtp")
-    @iOSXCUITFindBy(accessibility = "issuerHeading-MosipOtp")
+    @AndroidFindBy(accessibility = "issuerHeading-Mosip")
+    @iOSXCUITFindBy(accessibility = "issuerHeading-Mosip")
     private WebElement downloadViaUin;
 
     @AndroidFindBy(accessibility = "goBack")
@@ -23,9 +24,6 @@ public class AddNewCardPage extends BasePage{
     @iOSXCUITFindBy(accessibility = "issuerHeading-Mosip")
     private WebElement downloadViaEsignet;
 
-    @AndroidFindBy(accessibility = "issuerHeading-MockCertify")
-    @iOSXCUITFindBy(accessibility = "issuerHeading-MockCertify")
-    private WebElement downloadViaMockCertify;
     @iOSXCUITFindBy(accessibility = "Continue")
     private WebElement continueButton;
 
@@ -36,8 +34,8 @@ public class AddNewCardPage extends BasePage{
     @iOSXCUITFindBy(accessibility = "issuersScreenDescription")
     private WebElement addNewCardGuideMessage;
 
-    @AndroidFindBy(accessibility = "issuerDescription-MosipOtp")
-    @iOSXCUITFindBy(accessibility = "issuerDescription-MosipOtp")
+    @AndroidFindBy(accessibility = "issuerDescription-Mosip")
+    @iOSXCUITFindBy(accessibility = "issuerDescription-Mosip")
     private WebElement issuerDescriptionMosip;
 
     @AndroidFindBy(accessibility = "issuerDescription-Mosip")
@@ -60,8 +58,20 @@ public class AddNewCardPage extends BasePage{
     @iOSXCUITFindBy(accessibility = "credentialTypeHeading-MosipVerifiableCredential")
     private WebElement credentialTypeHeadingMOSIPVerifiableCredential;
 
-    @AndroidFindBy(accessibility = "credentialTypeHeading-MockVerifiableCredential_mdoc")
-    @iOSXCUITFindBy(accessibility = "credentialTypeHeading-MockVerifiableCredential_mdoc")
+    @AndroidFindBy(accessibility = "credentialTypeValue")
+    @iOSXCUITFindBy(accessibility = "credentialTypeValue")
+    private WebElement credentialTypeValue;
+
+    @AndroidFindBy(accessibility = "6stepCount")
+    @iOSXCUITFindBy(accessibility = "6stepCount")
+    private WebElement DoneButton;
+
+    @AndroidFindBy(accessibility = "issuerHeading-MockMdl")
+    @iOSXCUITFindBy(accessibility = "issuerHeading-MockMdl")
+    private WebElement downloadViaMockCertify;
+
+    @AndroidFindBy(accessibility = "credentialTypeHeading-DrivingLicenseCredential")
+    @iOSXCUITFindBy(accessibility = "credentialTypeHeading-DrivingLicenseCredential")
     private WebElement credentialTypeHeadingMockVerifiableCredential_mdoc;
 
     public AddNewCardPage(AppiumDriver driver) {
@@ -108,10 +118,6 @@ public boolean isDownloadViaEsignetDisplayed() {
         return this.isElementDisplayed(downloadViaEsignet);
     }
 
-    public boolean isDownloadViaMockCertifyDisplayed() {
-        return this.isElementDisplayed(downloadViaMockCertify);
-    }
-
     public boolean isDownloadViaEsignetDisplayedInHindi() {
         return this.isElementDisplayed(downloadViaEsignet);
     }
@@ -134,20 +140,6 @@ public EsignetLoginPage clickOnDownloadViaEsignet(){
         return new EsignetLoginPage(driver);
     }
 
-    public MockCertifyLoginPage clickOnDownloadViaMockCertify(){
-        clickOnElement(downloadViaMockCertify);
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        if(isElementDisplayed(credentialTypeHeadingMockVerifiableCredential_mdoc)) {
-            clickOnElement(credentialTypeHeadingMockVerifiableCredential_mdoc);
-        }
-        return new MockCertifyLoginPage(driver);
-    }
-
     public void clickOnContinueButtonInSigninPopupIos(){
         if(isElementDisplayed(continueButton))
         clickOnElement(continueButton);
@@ -204,5 +196,31 @@ public void clickOnCredentialTypeHeadingInsuranceCredential(){
             clickOnElement(credentialTypeHeadingInsuranceCredential);
         }
     }
+ public void  clickOnDoneButton(){
+     try {
+         Thread.sleep(3000);
+     } catch (InterruptedException e) {
+         throw new RuntimeException(e);
+     }
+     if (isElementDisplayed(DoneButton )){
+         clickOnElement(DoneButton);
+         IosUtil.scrollToElement(driver,100,800,100,200);
+     }
+ }
+
+    public MockCertifyLoginPage clickOnDownloadViaMockCertify(){
+        clickOnElement(downloadViaMockCertify);
+
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        if(isElementDisplayed(credentialTypeHeadingMockVerifiableCredential_mdoc)) {
+            clickOnElement(credentialTypeHeadingMockVerifiableCredential_mdoc);
+        }
+        return new MockCertifyLoginPage(driver);
+    }
+
 }
 

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

@@ -99,10 +99,6 @@ public class DetailedVcViewPage extends BasePage{
     @iOSXCUITFindBy(accessibility = "KebabIcon")
     public WebElement moreOptionsButton;
 
-    @AndroidFindBy(accessibility = "keyTypeVcDetailViewValue")
-    @iOSXCUITFindBy(accessibility = "keyTypeVcDetailViewValue")
-    public WebElement keyTypeVcDetailViewValue;
-
     public DetailedVcViewPage(AppiumDriver driver) {
         super(driver);
     }
@@ -222,8 +218,6 @@ public void clickOnMoreOptionsInDetails() {
         }
         clickOnElement(moreOptionsButton);
     }
-    public boolean isKeyTypeVcDetailViewValueDisplayed() {
-        return isElementDisplayed(keyTypeVcDetailViewValue);
-    }
+
 
 }

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

@@ -88,7 +88,6 @@ public class EsignetLoginPage extends BasePage {
     private WebElement credentialTypeHeadingMOSIPVerifiableCredential;
 
 
-
     public EsignetLoginPage(AppiumDriver driver) {
         super(driver);
     }
@@ -117,6 +116,7 @@ public void clickOnEsignetLoginWithOtpButton() {
         if(isElementDisplayed(esignetLoginButton)) {
             clickOnElement(esignetLoginButton);
         }
+
     }
 
     public OtpVerificationPage setEnterIdTextBox(String uinOrVid) {

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

@@ -36,22 +36,22 @@ public boolean isHistoryPageLoaded() {
     }
 
     private boolean verifyHistoryIos(String vcNumber) {
-        By locator = By.xpath("//*[contains(@name,'National ID " + vcNumber + " is downloaded.')]");
+        By locator = By.xpath("//*[contains(@name,'National ID is downloaded.')]");
         return this.isElementDisplayed(locator);
     }
 
     private boolean verifyHistoryAndroid(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'National ID " + vcNumber + " is downloaded.')]");
+        By locator = By.xpath("//*[contains(@text,'National ID is downloaded.')]");
         return this.isElementDisplayed(locator);
     }
 
     private boolean verifyHistoryAndroidforInsuranceCard(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'Health Insurance " + vcNumber + " is downloaded.')]");
+        By locator = By.xpath("//*[contains(@text,'Health Insurance is downloaded.')]");
         return this.isElementDisplayed(locator);
     }
 
     private boolean verifyHistoryIosInsuranceCard(String vcNumber) {
-        By locator = By.xpath("//*[@name=\"Health Insurance " + vcNumber + " is downloaded.\"]");
+        By locator = By.xpath("//*[@name=\"Health Insurance is downloaded.\"]");
         return this.isElementDisplayed(locator);
     }
 
@@ -61,33 +61,33 @@ private boolean verifyActivityHeaderAndroid(String vcNumber) {
     }
 
     private boolean verifyDeleteHistoryAndroid(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'MOSIP National ID " + vcNumber + " is removed from wallet.')]");
+        By locator = By.xpath("//*[contains(@text,'MOSIP National ID is removed from wallet.')]");
         return this.isElementDisplayed(locator);
     }
 
     private boolean verifyDeletedHistoryIos(String vcNumber) {
-        By locator = By.xpath("//*[contains(@name,'MOSIP National ID " + vcNumber + " is removed from wallet.')]");
+        By locator = By.xpath("//*[contains(@name,'MOSIP National ID is removed from wallet.')]");
         return this.isElementDisplayed(locator);
     }
 
     private boolean verifyDeleteHistoryAndroidInsuranceCard(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'Health Insurance " + vcNumber + " is removed from wallet.')]");
+        By locator = By.xpath("//*[contains(@text,'Health Insurance is removed from wallet.')]");
         return this.isElementDisplayed(locator);
     }
 
     private boolean verifyDeletedHistoryIosInsuranceCard(String vcNumber) {
-        By locator = By.xpath("//*[contains(@name,'Health Insurance " + vcNumber + " is removed from wallet.')]");
+        By locator = By.xpath("//*[contains(@name,'Health Insurance is removed from wallet.')]");
         return this.isElementDisplayed(locator);
     }
 
     private int verifyNumberOfRecordsInHistoryAndroid(String vcNumber) throws InterruptedException {
-        By locator = By.xpath("//*[contains(@text,'" + vcNumber + " is downloaded.')]");
+        By locator = By.xpath("//*[contains(@text,'is downloaded.')]");
         List<WebElement> elements = driver.findElements(locator);
         return elements.size();
     }
 
     private int verifyNumberOfRecordsInHistoryIos(String vcNumber) {
-        By locator = By.xpath("//XCUIElementTypeStaticText[@name=\"National ID "+ vcNumber +" is downloaded.\"]");
+        By locator = By.xpath("//XCUIElementTypeStaticText[@name=\"National ID is downloaded.\"]");
 
         List<WebElement> elements = driver.findElements(locator);
         return elements.size();
@@ -168,12 +168,12 @@ public boolean verifyActivationFailedRecordInHistory(String vcNumber, Target os)
     }
 
     private boolean verifyActivationFailedRecordIos(String vcNumber) {
-        By locator = By.xpath("//*[contains(@name,'National ID " + vcNumber + " has failed.')]");
+        By locator = By.xpath("//*[contains(@name,'National ID has failed.')]");
         return this.isElementDisplayed(locator);
     }
 
     private boolean verifyActivationFailedRecordAndroid(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'National ID " + vcNumber + " has failed.')]");
+        By locator = By.xpath("//*[contains(@text,'National ID has failed.')]");
         return this.isElementDisplayed(locator);
     }
 
@@ -188,14 +188,14 @@ public boolean verifyActivationSuccessfulRecordInHistory(String vcNumber, Target
     }
 
     private boolean verifyActivationSuccessfulRecordIos(String vcNumber) {
-        By locator = By.xpath("//*[contains(@name,'Activation of MOSIP National ID " + vcNumber + " is successful.')]");
+        By locator = By.xpath("//*[contains(@name,'Activation of MOSIP National ID is successful.')]");
         return this.isElementDisplayed(locator);
     }
 
 
 
     private boolean verifyActivationSuccessfulRecordAndroid(String vcNumber) {
-        By locator = By.xpath("//*[contains(@text,'Activation of MOSIP National ID " + vcNumber + " is successful.')]");
+        By locator = By.xpath("//*[contains(@text,'Activation of MOSIP National ID is successful.')]");
         return this.isElementDisplayed(locator);
     }
 }

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

@@ -90,6 +90,10 @@ public class HomePage extends BasePage {
     @iOSXCUITFindBy(accessibility = "fullNameValue")
     private WebElement fullNameValue;
 
+    @AndroidFindBy(accessibility = "credentialTypeValue")
+    @iOSXCUITFindBy(accessibility = "credentialTypeValue")
+    private WebElement credentialTypeValue;
+
     @AndroidFindBy(accessibility = "activationPending")
     @iOSXCUITFindBy(accessibility = "activationPending")
     private WebElement activationPending;
@@ -236,6 +240,7 @@ public class HomePage extends BasePage {
     @iOSXCUITFindBy(accessibility = "cardViewDescription")
     private WebElement cardViewDescription;
 
+
     public HomePage(AppiumDriver driver) {
         super(driver);
     }
@@ -250,24 +255,8 @@ public AddNewCardPage downloadCard() {
         return new AddNewCardPage(driver);
     }
 
-    public boolean isNameDisplayed(String name) {
-
-        if(isElementDisplayed(doneButton)){
-            clickOnElement(doneButton);
-        }
-        By fullName = By.xpath("//*[contains(@value,'" + name + "') or contains(@text,'" + name + "')]");
-        return this.isElementDisplayed(fullName, 150);
-    }
-
-    public boolean isSecondNameDisplayed(String name) {
-        By fullName = By.xpath("(//*[contains(@value,'" + name + "') or contains(@text,'" + name + "')])[2]");
-        return this.isElementDisplayed(fullName, 80);
-
-    }
-
-    public DetailedVcViewPage openDetailedVcView(String name) {
-        By fullName = By.xpath("//*[contains(@value,'" + name + "') or contains(@text,'" + name + "')]");
-        clickOnElement(fullName);
+    public DetailedVcViewPage openDetailedVcView() {
+        clickOnElement(credentialTypeValue);
         return new DetailedVcViewPage(driver);
     }
 
@@ -816,4 +805,14 @@ public void clickOnNextButtonForInjiTour() {
             clickOnElement(fifthDoneButton);
         }
     }
+
+    public boolean isCredentialTypeValueDisplayed() {
+        if(isElementDisplayed(doneButton)){
+            clickOnElement(doneButton);
+        }
+        return this.isElementDisplayed(credentialTypeValue);
+
+
+}
+
 }

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

@@ -61,8 +61,8 @@ public class OtpVerificationPage extends BasePage {
     private WebElement waitPopupButton;
 
 
-    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Please enter valid OTP.\")")
-    @iOSXCUITFindBy(accessibility = "Please enter valid OTP.")
+    @AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"OTP is invalid\")")
+    @iOSXCUITFindBy(accessibility = "OTP is invalid")
     private WebElement invalidOtpMessageforEsignet;
 
     public OtpVerificationPage(AppiumDriver driver) {

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

@@ -198,8 +198,6 @@ public void clickOnCameraDisabledToasterClose(){
     public void clickOnDontAllowCameraAccessButton(){
         if(isElementDisplayed(cameraDontAllowAccessPopup))
             clickOnElement(cameraDontAllowAccessPopup);
-
-
     }
 
     public boolean isCameraAccessLostPageLoaded() {