From e418c99b3ea77910bc24fbf5cd4d233818457d5e Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Mon, 15 Jan 2024 12:14:39 +0530 Subject: [PATCH 1/6] MOSIP-31083 Signed-off-by: Jayesh Kharode --- .../residentui/kernel/util/ConfigManager.java | 141 +++++++- .../testcase/BookinganAppointment.java | 2 +- .../residentui/testcase/GetInformation.java | 24 +- .../testrig/residentui/testcase/GetMyUIN.java | 7 +- .../residentui/testcase/LoginTest.java | 86 +++-- .../residentui/testcase/TrackMyRequests.java | 3 +- .../residentui/testcase/UpdateMyData.java | 5 +- .../testcase/VerifyPhoneNumberEmailID.java | 7 +- .../testrig/residentui/utility/BaseClass.java | 10 +- .../testrig/residentui/utility/JsonUtil.java | 301 +++++++++--------- .../residentui/utility/ResidentBaseClass.java | 26 +- .../residentui/utility/TestRunner.java | 18 +- .../main/resources/config/Kernel.properties | 25 +- .../resources/config/Kernel_dev.properties | 25 +- .../resources/config/Kernel_dev2.properties | 25 +- .../config/Kernel_qa-trinity.properties | 271 ++++++++++++++++ 16 files changed, 735 insertions(+), 241 deletions(-) create mode 100644 residenttest/src/main/resources/config/Kernel_qa-trinity.properties diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/kernel/util/ConfigManager.java b/residenttest/src/main/java/io/mosip/testrig/residentui/kernel/util/ConfigManager.java index 04e534c4..fabb8e0c 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/kernel/util/ConfigManager.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/kernel/util/ConfigManager.java @@ -62,8 +62,22 @@ public class ConfigManager { private static String S3_ACCOUNT = "s3-account"; private static String PUSH_TO_S3 = "push-reports-to-s3"; private static String ENABLE_DEBUG = "enableDebug"; + private static String LOGIN_LANG = "loginlang"; private static String THREAD_COUNT = "threadCount"; private static String LANG_SELECT = "langselect"; + private static String IdentityGenManual = "identityGenManual"; + private static String Perpetualvid = "perpetualvid"; + private static String Temporaryvid = "temporaryvid"; + private static String UIN = "uin"; + private static String Onetimevid = "onetimevid"; + private static String Externalemail = "externalemail"; + private static String Tempemail1 = "tempemail1"; + private static String Tempemail = "tempemail"; + private static String TempEID = "tempEID"; + private static String Aid = "aid"; + private static String Postalcode = "postalcode"; + private static String Headless = "headless"; + private static String Docker = "docker"; private static String preconfiguredOtp; @@ -78,6 +92,11 @@ public class ConfigManager { private static String AUDIT_DB_USER = "db-su-user"; private static String AUDIT_DB_PASS = "postgresql-password"; private static String AUDIT_DB_SCHEMA = "audit_db_schema"; + private static String HierarchyLevel0 = "hierarchyLevel0"; + private static String HierarchyLevel1 = "hierarchyLevel1"; + private static String HierarchyLevel2 = "hierarchyLevel2"; + private static String HierarchyLevel3 = "hierarchyLevel3"; + private static String HierarchyLevel4 = "hierarchyLevel4"; private static String IDA_DB_USER = "db-su-user"; private static String IDA_DB_PASS = "postgresql-password"; @@ -125,6 +144,11 @@ public class ConfigManager { private static String idrepo_client_secret; private static String idrepo_client_id; private static String idrepo_app_id; + private static String hierarchyLevel0; + private static String hierarchyLevel1; + private static String hierarchyLevel2; + private static String hierarchyLevel3; + private static String hierarchyLevel4; private static String admin_client_secret; private static String admin_client_id; @@ -153,6 +177,20 @@ public class ConfigManager { private static String s3_secret_key; private static String push_reports_to_s3; private static String enableDebug; + private static String loginlang; + private static String identityGenManual; + private static String perpetualvid; + private static String temporaryvid; + private static String uin; + private static String onetimevid; + private static String externalemail; + private static String tempemail1; + private static String tempemail; + private static String tempEID; + private static String aid; + private static String postalcode; + private static String headless; + private static String docker; private static String threadCount; private static String langselect; @@ -351,15 +389,116 @@ public static void init() { langselect =System.getenv(LANG_SELECT) == null ? propsKernel.getProperty(LANG_SELECT) : System.getenv(LANG_SELECT); propsKernel.setProperty(LANG_SELECT, langselect); + loginlang =System.getenv(LOGIN_LANG) == null ? propsKernel.getProperty(LOGIN_LANG) : System.getenv(LOGIN_LANG); + propsKernel.setProperty(LOGIN_LANG, loginlang); + + identityGenManual =System.getenv(IdentityGenManual) == null ? propsKernel.getProperty(IdentityGenManual) : System.getenv(IdentityGenManual); + propsKernel.setProperty(IdentityGenManual, identityGenManual); + perpetualvid =System.getenv(Perpetualvid) == null ? propsKernel.getProperty(Perpetualvid) : System.getenv(Perpetualvid); + propsKernel.setProperty(Perpetualvid, perpetualvid); + temporaryvid =System.getenv(Temporaryvid) == null ? propsKernel.getProperty(Temporaryvid) : System.getenv(Temporaryvid); + propsKernel.setProperty(Temporaryvid, temporaryvid); + uin =System.getenv(UIN) == null ? propsKernel.getProperty(UIN) : System.getenv(UIN); + propsKernel.setProperty(UIN, uin); + onetimevid =System.getenv(Onetimevid) == null ? propsKernel.getProperty(Onetimevid) : System.getenv(Onetimevid); + propsKernel.setProperty(Onetimevid, onetimevid); + externalemail =System.getenv(Externalemail) == null ? propsKernel.getProperty(Externalemail) : System.getenv(Externalemail); + propsKernel.setProperty(Externalemail, externalemail); + tempemail1 =System.getenv(Tempemail1) == null ? propsKernel.getProperty(Tempemail1) : System.getenv(Tempemail1); + propsKernel.setProperty(Tempemail1, tempemail1); + tempemail =System.getenv(Tempemail) == null ? propsKernel.getProperty(Tempemail) : System.getenv(Tempemail); + propsKernel.setProperty(Tempemail, tempemail); + tempEID =System.getenv(TempEID) == null ? propsKernel.getProperty(TempEID) : System.getenv(TempEID); + propsKernel.setProperty(TempEID, tempEID); + aid =System.getenv(Aid) == null ? propsKernel.getProperty(Aid) : System.getenv(Aid); + propsKernel.setProperty(Aid, aid); + postalcode =System.getenv(Postalcode) == null ? propsKernel.getProperty(Postalcode) : System.getenv(Postalcode); + propsKernel.setProperty(Postalcode, postalcode); + headless =System.getenv(Headless) == null ? propsKernel.getProperty(Headless) : System.getenv(Headless); + propsKernel.setProperty(Headless, headless); + docker =System.getenv(Docker) == null ? propsKernel.getProperty(Docker) : System.getenv(Docker); + propsKernel.setProperty(Docker, docker); + + hierarchyLevel0 =System.getenv(HierarchyLevel0) == null ? propsKernel.getProperty(HierarchyLevel0) : System.getenv(HierarchyLevel0); + propsKernel.setProperty(HierarchyLevel0, hierarchyLevel0); + + hierarchyLevel1 =System.getenv(HierarchyLevel1) == null ? propsKernel.getProperty(HierarchyLevel1) : System.getenv(HierarchyLevel1); + propsKernel.setProperty(HierarchyLevel1, hierarchyLevel1); + + hierarchyLevel2 =System.getenv(HierarchyLevel2) == null ? propsKernel.getProperty(HierarchyLevel2) : System.getenv(HierarchyLevel2); + propsKernel.setProperty(HierarchyLevel2, hierarchyLevel2); + + hierarchyLevel3 =System.getenv(HierarchyLevel3) == null ? propsKernel.getProperty(HierarchyLevel3) : System.getenv(HierarchyLevel3); + propsKernel.setProperty(HierarchyLevel3, hierarchyLevel3); + + hierarchyLevel4 =System.getenv(HierarchyLevel4) == null ? propsKernel.getProperty(HierarchyLevel4) : System.getenv(HierarchyLevel4); + propsKernel.setProperty(HierarchyLevel4, hierarchyLevel4); + //enableDebug threadCount langselect } - + public static String gethierarchyLevel0() { + return hierarchyLevel0; + } + public static String gethierarchyLevel1() { + return hierarchyLevel1; + } + public static String gethierarchyLevel2() { + return hierarchyLevel2; + } + public static String gethierarchyLevel3() { + return hierarchyLevel3; + } + public static String gethierarchyLevel4() { + return hierarchyLevel4; + } + public static String getDocker() { + return docker; + } + public static String getHeadless() { + return headless; + } + public static String getPostalcode() { + return postalcode; + } + public static String getaid() { + return aid; + } + public static String gettempEID() { + return tempEID; + } + public static String gettempemail() { + return tempemail; + } + public static String gettempemail1() { + return tempemail1; + } + public static String getexternalemail() { + return externalemail; + } + public static String getonetimevid() { + return onetimevid; + } + public static String getuin() { + return uin; + } + public static String gettemporaryvid() { + return temporaryvid; + } + public static String getperpetualvid() { + return perpetualvid; + } + public static String getidentityGenManual() { + return identityGenManual; + } public static String getAuthDemoServicePort() { return authDemoServicePort; } + public static String getloginlang() { + return loginlang; + } public static String getAuthDemoServiceBaseUrl() { return authDemoServiceBaseUrl; diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/BookinganAppointment.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/BookinganAppointment.java index 3c1d11bf..2e5ae2f3 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/BookinganAppointment.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/BookinganAppointment.java @@ -11,7 +11,7 @@ public class BookinganAppointment extends ResidentBaseClass { @Test public void bookinganAppointment () throws Exception { - String externalemail=JsonUtil.JsonObjParsing(Commons.getTestData(),"externalemail"); + String externalemail=""; diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetInformation.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetInformation.java index 5c7d998c..fbb44ba5 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetInformation.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetInformation.java @@ -6,7 +6,7 @@ import org.openqa.selenium.By; import org.testng.annotations.Test; - +import io.mosip.testrig.residentui.kernel.util.ConfigManager; import io.mosip.testrig.residentui.utility.Commons; import io.mosip.testrig.residentui.utility.JsonUtil; import io.mosip.testrig.residentui.utility.ResidentBaseClass; @@ -16,12 +16,12 @@ public class GetInformation extends ResidentBaseClass { @Test(groups = "GI") public void getInformation() throws Exception { - String hierarchyLevel0 = JsonUtil.JsonObjArrayListParsing2(Commons.getTestData(), "hierarchyLevel0"); //Country - String hierarchyLevel1 = JsonUtil.JsonObjArrayListParsing2(Commons.getTestData(), "hierarchyLevel1"); //Region - String hierarchyLevel2 = JsonUtil.JsonObjArrayListParsing2(Commons.getTestData(), "hierarchyLevel2");//Province - String hierarchyLevel3 = JsonUtil.JsonObjArrayListParsing2(Commons.getTestData(), "hierarchyLevel3");//City - String hierarchyLevel4 = JsonUtil.JsonObjArrayListParsing2(Commons.getTestData(), "hierarchyLevel4");//Zone - String postalcode = JsonUtil.JsonObjParsing(Commons.getTestData(), "postalcode"); + String hierarchyLevel0 = JsonUtil.JsonObjArrayListParsing2( "hierarchyLevel0"); //Country + String hierarchyLevel1 = JsonUtil.JsonObjArrayListParsing2("hierarchyLevel1"); //Region + String hierarchyLevel2 = JsonUtil.JsonObjArrayListParsing2( "hierarchyLevel2");//Province + String hierarchyLevel3 = JsonUtil.JsonObjArrayListParsing2( "hierarchyLevel3");//City + String hierarchyLevel4 = JsonUtil.JsonObjArrayListParsing2("hierarchyLevel4");//Zone + String postalcode = ConfigManager.getPostalcode(); test = extent.createTest("GetInformation test", "verify Login"); Thread.sleep(2000); @@ -79,7 +79,7 @@ public void getInformation() throws Exception { } public void GetInformationWithInvalidcountry() throws Exception { - String postalcode = JsonUtil.JsonObjParsing(Commons.getTestData(), "postalcode"); + String postalcode =ConfigManager.getPostalcode(); test = extent.createTest("Get Information With Invalid country", "verify country"); Thread.sleep(2000); Commons.click(test, driver, By.id("getInformation")); @@ -91,7 +91,7 @@ public void GetInformationWithInvalidcountry() throws Exception { } public void GetInformationWithInvalidProvince() throws Exception { - String postalcode = JsonUtil.JsonObjParsing(Commons.getTestData(), "postalcode"); + String postalcode = ConfigManager.getPostalcode(); test = extent.createTest("Get Information With Invalid Province", "verify Province"); Thread.sleep(2000); Commons.click(test, driver, By.id("getInformation")); @@ -103,7 +103,7 @@ public void GetInformationWithInvalidProvince() throws Exception { } public void GetInformationWithInvalidRegion() throws Exception { - String postalcode = JsonUtil.JsonObjParsing(Commons.getTestData(), "postalcode"); + String postalcode = ConfigManager.getPostalcode(); test = extent.createTest("Get Information With Invalid Region", "verify Region"); Thread.sleep(2000); Commons.click(test, driver, By.id("getInformation")); @@ -115,7 +115,7 @@ public void GetInformationWithInvalidRegion() throws Exception { } public void GetInformationWithInvalidCity() throws Exception { - String postalcode = JsonUtil.JsonObjParsing(Commons.getTestData(), "postalcode"); + String postalcode = ConfigManager.getPostalcode(); test = extent.createTest("GetI nformation With InvalidCity", "verify City"); Thread.sleep(2000); Commons.click(test, driver, By.id("getInformation")); @@ -127,7 +127,7 @@ public void GetInformationWithInvalidCity() throws Exception { } public void GetInformationWithInvalidZone() throws Exception { - String postalcode = JsonUtil.JsonObjParsing(Commons.getTestData(), "postalcode"); + String postalcode = ConfigManager.getPostalcode(); test = extent.createTest("Get Information With Invalid Zone", "verify Zone"); Thread.sleep(2000); Commons.click(test, driver, By.id("getInformation")); diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java index 5d2a5a76..3fb6a808 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java @@ -7,6 +7,7 @@ import com.aventstack.extentreports.Status; +import io.mosip.testrig.residentui.kernel.util.ConfigManager; import io.mosip.testrig.residentui.utility.Commons; import io.mosip.testrig.residentui.utility.JsonUtil; import io.mosip.testrig.residentui.utility.MockSMTPListener; @@ -20,7 +21,7 @@ public class GetMyUIN extends ResidentBaseClass{ // @Test(groups = "GMU") public void getMyUIN() throws Exception { - String tempemail = JsonUtil.JsonObjParsing(Commons.getTestData(), "tempemail"); + String tempemail = ConfigManager.gettempemail(); test = extent.createTest("getMyUIN", "verify Login"); Commons.click(test, driver, By.id("getMyUIN")); Commons.enter(test, driver, By.id("aidValue"), vid);// @@ -48,7 +49,7 @@ public void getMyUINWithoutAID() throws InterruptedException, IOException { public void getMyUINWithInvalidOtp() throws Exception { - String tempemail=JsonUtil.JsonObjParsing(Commons.getTestData(),"tempemail"); + String tempemail = ConfigManager.gettempemail(); test=extent.createTest("get My UIN With Invalid Otp", "verify Login"); Commons.click(test, driver, By.id("getMyUIN")); @@ -67,7 +68,7 @@ public void getMyUINWithInvalidOtp() throws Exception { } public void getMyUINWithExpiredOtp() throws Exception { - String tempemail=JsonUtil.JsonObjParsing(Commons.getTestData(),"tempemail"); + String tempemail = ConfigManager.gettempemail(); test=extent.createTest("get My UIN With Expired Otp", "verify Login"); Commons.click(test, driver, By.id("getMyUIN"));//id diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java index f3505513..0bff1f7f 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java @@ -38,36 +38,30 @@ import io.mosip.testrig.residentui.utility.MockSMTPListener; import io.mosip.testrig.residentui.utility.TestRunner; -// @Test(groups = "LG") + @Test(groups = "LG") public class LoginTest extends BaseClass { -// + // @Test(priority = 0) public static void loginTest() throws Exception { - + String envPath = ConfigManager.getiam_adminportal_path(); - + String otp = ""; - String externalemail = JsonUtil.JsonObjParsing(Commons.getTestData(), "externalemail"); + String externalemail = ConfigManager.getexternalemail(); test = extent.createTest("Login Test with valid Vid/UIN", "verify Login"); driver.get(envPath); Thread.sleep(2000); driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS); - Commons.clickWebelement(test, driver, By.xpath("//*[@id='UINservices']")); - try { + Commons.clickWebelement(test, driver, By.xpath("//*[@id='UINservices']")); - Commons.clickWebelement(test, driver, By.id("here_tab_id")); - Commons.clickWebelement(test, driver, By.id("more_ways_to_sign_in")); - Commons.clickWebelement(test, driver, By.id("login_with_otp")); - Thread.sleep(2000); - }catch(Exception e) { Commons.clickWebelement(test, driver, By.id("login_with_otp")); Thread.sleep(2000); - } + Commons.enter(test, driver, By.id("Otp_mosip-vid"), TestRunner.perpetualVid); Commons.clickWebelement(test, driver, By.id("get_otp")); - //otp = MockSMTPListener.getOtp(externalemail); -otp="111111"; + //otp = MockSMTPListener.getOtp(externalemail); + otp="111111"; System.out.println(otp); for (int i = 0; i <= otp.length() - 1; i++) { Commons.enter(test, driver, By.xpath("//*[@id='otp_verify_input']//div//input[" + (i + 1) + "]"), @@ -82,7 +76,7 @@ public static void loginTest() throws Exception { Thread.sleep(2000); try { driver.findElement(By.id("dismissBtn")).click(); - + }catch(Exception a) { Commons.click(test,driver, By.id("authorize_scope"));Commons.click(test,driver, By.id("voluntary_claims")); test.log(Status.INFO, "ALL Checkboxes are selected"); @@ -92,31 +86,31 @@ public static void loginTest() throws Exception { } - - - - - - - - + + + + + + + + // @Test(priority = 0) public static void loginTestWithTempraryVID() throws Exception { -String envPath = ConfigManager.getiam_adminportal_path(); - + String envPath = ConfigManager.getiam_adminportal_path(); + String otp = ""; - String externalemail = JsonUtil.JsonObjParsing(Commons.getTestData(), "externalemail"); + String externalemail = ConfigManager.getexternalemail(); test = extent.createTest("Login Test with valid Vid/UIN", "verify Login"); driver.get(envPath); Thread.sleep(2000); driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS); - Commons.clickWebelement(test, driver, By.xpath("//*[@id='UINservices']")); + Commons.clickWebelement(test, driver, By.xpath("//*[@id='UINservices']")); try { - - Commons.clickWebelement(test, driver, By.id("here_tab_id")); - Commons.clickWebelement(test, driver, By.id("more_ways_to_sign_in")); - Commons.clickWebelement(test, driver, By.id("login_with_otp")); - Thread.sleep(2000); + + Commons.clickWebelement(test, driver, By.id("here_tab_id")); + Commons.clickWebelement(test, driver, By.id("more_ways_to_sign_in")); + Commons.clickWebelement(test, driver, By.id("login_with_otp")); + Thread.sleep(2000); }catch(Exception e) { Commons.clickWebelement(test, driver, By.id("login_with_otp")); Thread.sleep(2000); @@ -124,7 +118,7 @@ public static void loginTestWithTempraryVID() throws Exception { Commons.enter(test, driver, By.id("Otp_mosip-vid"), TestRunner.temporaryVid); Commons.clickWebelement(test, driver, By.id("get_otp")); - otp = MockSMTPListener.getOtp(externalemail); + otp = MockSMTPListener.getOtp(externalemail); System.out.println(otp); for (int i = 0; i <= otp.length() - 1; i++) { @@ -140,7 +134,7 @@ public static void loginTestWithTempraryVID() throws Exception { Thread.sleep(2000); try { driver.findElement(By.id("dismissBtn")).click(); - + }catch(Exception a) { Commons.click(test,driver, By.id("authorize_scope"));Commons.click(test,driver, By.id("voluntary_claims")); test.log(Status.INFO, "ALL Checkboxes are selected"); @@ -151,21 +145,21 @@ public static void loginTestWithTempraryVID() throws Exception { // @Test public static void loginTestWithOneTimeVID() throws Exception { -String envPath = ConfigManager.getiam_adminportal_path(); - + String envPath = ConfigManager.getiam_adminportal_path(); + String otp = ""; - String externalemail = JsonUtil.JsonObjParsing(Commons.getTestData(), "externalemail"); + String externalemail = ConfigManager.getexternalemail(); test = extent.createTest("Login Test with valid Vid/UIN", "verify Login"); driver.get(envPath); Thread.sleep(2000); driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS); - Commons.clickWebelement(test, driver, By.xpath("//*[@id='UINservices']")); + Commons.clickWebelement(test, driver, By.xpath("//*[@id='UINservices']")); try { - - Commons.clickWebelement(test, driver, By.id("here_tab_id")); - Commons.clickWebelement(test, driver, By.id("more_ways_to_sign_in")); - Commons.clickWebelement(test, driver, By.id("login_with_otp")); - Thread.sleep(2000); + + Commons.clickWebelement(test, driver, By.id("here_tab_id")); + Commons.clickWebelement(test, driver, By.id("more_ways_to_sign_in")); + Commons.clickWebelement(test, driver, By.id("login_with_otp")); + Thread.sleep(2000); }catch(Exception e) { Commons.clickWebelement(test, driver, By.id("login_with_otp")); Thread.sleep(2000); @@ -173,7 +167,7 @@ public static void loginTestWithOneTimeVID() throws Exception { Commons.enter(test, driver, By.id("Otp_mosip-vid"), TestRunner.onetimeuseVid); Commons.clickWebelement(test, driver, By.id("get_otp")); - otp = MockSMTPListener.getOtp(externalemail); + otp = MockSMTPListener.getOtp(externalemail); System.out.println(otp); for (int i = 0; i <= otp.length() - 1; i++) { @@ -189,7 +183,7 @@ public static void loginTestWithOneTimeVID() throws Exception { Thread.sleep(2000); try { driver.findElement(By.id("dismissBtn")).click(); - + }catch(Exception a) { Commons.click(test,driver, By.id("authorize_scope"));Commons.click(test,driver, By.id("voluntary_claims")); test.log(Status.INFO, "ALL Checkboxes are selected"); diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/TrackMyRequests.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/TrackMyRequests.java index dd16da14..7a008c79 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/TrackMyRequests.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/TrackMyRequests.java @@ -6,6 +6,7 @@ import com.aventstack.extentreports.Status; +import io.mosip.testrig.residentui.kernel.util.ConfigManager; import io.mosip.testrig.residentui.utility.BaseClass; import io.mosip.testrig.residentui.utility.Commons; import io.mosip.testrig.residentui.utility.JsonUtil; @@ -62,7 +63,7 @@ public void TrackMyRequestsInvalidEId() throws Exception { } public void TrackMyRequestsWithDiffEId() throws Exception { - String tempEID=JsonUtil.JsonObjParsing(Commons.getTestData(),"tempEID"); + String tempEID=ConfigManager.gettempEID(); LoginTest.loginTest(); test=extent.createTest("TrackMyRequestsInvalidEId", "verify Login"); Commons.click(test,driver, By.id("uinservices/trackservicerequest")); diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/UpdateMyData.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/UpdateMyData.java index 119706ba..a0e5eb91 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/UpdateMyData.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/UpdateMyData.java @@ -5,6 +5,7 @@ import com.aventstack.extentreports.Status; +import io.mosip.testrig.residentui.kernel.util.ConfigManager; import io.mosip.testrig.residentui.utility.BaseClass; import io.mosip.testrig.residentui.utility.Commons; import io.mosip.testrig.residentui.utility.JsonUtil; @@ -14,7 +15,7 @@ public class UpdateMyData extends BaseClass { public void updateMyDataName() throws Exception { - String tempemail1 = JsonUtil.JsonObjParsing(Commons.getTestData(), "tempemail1"); + String tempemail1 = ConfigManager.gettempemail1(); LoginTest.loginTest(); test = extent.createTest("updateMyData Test ", "verify Login"); Commons.clickWebelement(test, driver, By.id("uinservices/updatedemographic")); @@ -68,7 +69,7 @@ public void updateMyDataAddress() throws Exception { } public void UpdateDataWithEmail() throws Exception { - String tempemail1 = JsonUtil.JsonObjParsing(Commons.getTestData(), "tempemail1"); + String tempemail1 = ConfigManager.gettempemail1(); LoginTest.loginTest(); test.log(Status.INFO, "Update Email"); Commons.click(test, driver, By.id("uinservices/updatedemographic")); diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/VerifyPhoneNumberEmailID.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/VerifyPhoneNumberEmailID.java index f98fe961..a8e267e3 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/VerifyPhoneNumberEmailID.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/VerifyPhoneNumberEmailID.java @@ -5,6 +5,7 @@ import org.openqa.selenium.By; import org.testng.annotations.Test; +import io.mosip.testrig.residentui.kernel.util.ConfigManager; import io.mosip.testrig.residentui.utility.Commons; import io.mosip.testrig.residentui.utility.JsonUtil; import io.mosip.testrig.residentui.utility.MockSMTPListener; @@ -43,7 +44,7 @@ public void VerifyPhoneWIthInvalidVid() throws IOException, InterruptedException } @Test(priority=2) public void VerifyEmailIDWIthInvalidOtp() throws Exception { - String externalemail = JsonUtil.JsonObjParsing(Commons.getTestData(), "externalemail"); + String externalemail = ConfigManager.getexternalemail(); Thread.sleep(2000); Commons.click(test, driver, By.id("verifyPhoneNumber/EmailID")); Commons.click(test, driver, By.id("emailChannelBtn-button")); @@ -62,7 +63,7 @@ public void VerifyEmailIDWIthInvalidOtp() throws Exception { } @Test(priority=3) public void VerifyEmailIDWIthoutOtp() throws Exception { - String externalemail = JsonUtil.JsonObjParsing(Commons.getTestData(), "externalemail"); + String externalemail = ConfigManager.getexternalemail(); Thread.sleep(2000); Commons.click(test, driver, By.id("verifyPhoneNumber/EmailID")); Commons.click(test, driver, By.id("emailChannelBtn-button")); @@ -77,7 +78,7 @@ public void VerifyEmailIDWIthoutOtp() throws Exception { } @Test(priority=4) public void VerifyEmailID() throws Exception { - String externalemail = JsonUtil.JsonObjParsing(Commons.getTestData(), "externalemail"); + String externalemail = ConfigManager.getexternalemail(); Thread.sleep(2000); Commons.click(test, driver, By.id("verifyPhoneNumber/EmailID")); Commons.click(test, driver, By.id("emailChannelBtn-button")); diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/BaseClass.java b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/BaseClass.java index 94d37632..6ae374b9 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/BaseClass.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/BaseClass.java @@ -88,7 +88,7 @@ public void setUp() throws Exception { logger.info("Start set up"); if(System.getProperty("os.name").equalsIgnoreCase("Linux")) { - if(JsonUtil.JsonObjParsing(Commons.getTestData(),"Docker").equals("yes")) { + if(ConfigManager.getDocker().equals("yes")) { logger.info("Docker start"); String configFilePath ="/usr/bin/chromedriver"; System.setProperty("webdriver.chrome.driver", configFilePath); @@ -100,7 +100,7 @@ public void setUp() throws Exception { logger.info("window chrome driver start"); } ChromeOptions options = new ChromeOptions(); - String headless=JsonUtil.JsonObjParsing(Commons.getTestData(),"headless"); + String headless=ConfigManager.getHeadless(); if(headless.equalsIgnoreCase("yes")) { logger.info("Running is headless mode"); options.addArguments("--headless", "--disable-gpu","--no-sandbox", "--window-size=1920x1080","--disable-dev-shm-usage"); @@ -118,11 +118,11 @@ public void setUp() throws Exception { driver.manage().window().maximize(); - String langid="lang"+JsonUtil.JsonObjParsing(Commons.getTestData(),"language"); - String language=JsonUtil.JsonObjParsing(Commons.getTestData(),"loginlang"); + + String language=ConfigManager.getloginlang(); try { if(!language.equals("sin")) { - Commons.dropdown( driver, By.id("languages"), By.id(langid)); + Commons.dropdown( driver, By.id("languages"), By.id("lang"+language)); } } catch (Exception e) { diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/JsonUtil.java b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/JsonUtil.java index 74aad67f..373aa4e4 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/JsonUtil.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/JsonUtil.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import io.mosip.testrig.residentui.kernel.util.ConfigManager; import org.apache.commons.io.IOUtils; import java.io.File; @@ -22,152 +23,162 @@ public class JsonUtil { private static final org.slf4j.Logger logger= org.slf4j.LoggerFactory.getLogger(JsonUtil.class); - private static ObjectMapper mapper; - - static { - mapper = new ObjectMapper(); - } - - public static String convertJavaToJson(Object object) { - - String jsonResult = ""; - try { - jsonResult = mapper.writeValueAsString(object); - } catch (JsonParseException e) { - logger.error("", e); - } catch (JsonMappingException e) { - logger.error("", e); - } catch (IOException e) { - logger.error("", e); - } - return jsonResult; - } - - public static T convertJsonintoJava(String jsonString, Class cls) { - T payload = null; - try { - payload = mapper.readValue(jsonString, cls); - } catch (JsonParseException e) { - e.printStackTrace(); - } catch (JsonMappingException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - return payload; - } - - public static String JsonObjSimpleParsing(String jsonIdentity, String idfield) - throws Exception { - String val =null; - JSONObject json = new JSONObject(jsonIdentity); - - JSONObject identity = json.getJSONObject("identity"); - - JSONArray identityitems = identity.getJSONArray(idfield); - - for (int i = 0, size = identityitems.length(); i < size; i++) { - JSONObject idItem = identityitems.getJSONObject(i); - String lang = idItem.getString("language"); - val = idItem.getString("value"); - if (lang.equalsIgnoreCase(JsonUtil.JsonObjParsing(Commons.getTestData(),"loginlang"))) - return val; - } - return "sin"; - } - - - /** - * Direct String - * - * @param json - * @param jsonObjName - * @param idfield - * @return - * @throws Exception - */ - public static String JsonObjParsing(String jsonIdentity, String idfield) throws Exception { - String value = null; - JSONObject json = new JSONObject(jsonIdentity); - JSONObject identity = json.getJSONObject("identity"); - - value = identity.getString(idfield); - - return value; - } - - public static double JsonObjDoubleParsing(String jsonIdentity, String idfield) throws Exception { - double value = 0; - JSONObject json = new JSONObject(jsonIdentity); - JSONObject identity = json.getJSONObject("identity"); - - value = identity.getDouble(idfield); - - return value; - } - - public static List JsonObjArrayListParsing(String jsonIdentity, String idfield) throws Exception { - List list = new LinkedList(); - JSONObject json = new JSONObject(jsonIdentity); - - JSONObject identity = json.getJSONObject("identity"); - - JSONArray identityitems = identity.getJSONArray(idfield); - if (identityitems != null) { - for (int i = 0; i < identityitems.length(); i++) { - list.add(identityitems.getString(i)); - } - } - return list; - - } - public static String JsonObjArrayListParsing2(String jsonIdentity, String idfield) throws Exception { - List list = new LinkedList(); - JSONObject json = new JSONObject(jsonIdentity); - - JSONObject identity = json.getJSONObject("identity"); - - JSONArray identityitems = identity.getJSONArray(idfield); - - - - for (int i = 0, size = identityitems.length(); i < size; i++) { - JSONObject idItem = identityitems.getJSONObject(i); - String lang = idItem.getString("language"); - String val = idItem.getString("value"); - if (lang.equals(JsonUtil.JsonObjParsing(Commons.getTestData(),"language"))) { - return val; - } - - } + private static ObjectMapper mapper; + + static { + mapper = new ObjectMapper(); + } + + public static String convertJavaToJson(Object object) { + + String jsonResult = ""; + try { + jsonResult = mapper.writeValueAsString(object); + } catch (JsonParseException e) { + logger.error("", e); + } catch (JsonMappingException e) { + logger.error("", e); + } catch (IOException e) { + logger.error("", e); + } + return jsonResult; + } + + public static T convertJsonintoJava(String jsonString, Class cls) { + T payload = null; + try { + payload = mapper.readValue(jsonString, cls); + } catch (JsonParseException e) { + e.printStackTrace(); + } catch (JsonMappingException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return payload; + } + + public static String JsonObjSimpleParsing(String jsonIdentity, String idfield) + throws Exception { + String val =null; + JSONObject json = new JSONObject(jsonIdentity); + + JSONObject identity = json.getJSONObject("identity"); + + JSONArray identityitems = identity.getJSONArray(idfield); + + for (int i = 0, size = identityitems.length(); i < size; i++) { + JSONObject idItem = identityitems.getJSONObject(i); + String lang = idItem.getString("language"); + val = idItem.getString("value"); + if (lang.equalsIgnoreCase(ConfigManager.getloginlang())) + return val; + } + return "sin"; + } + + + /** + * Direct String + * + * @param json + * @param jsonObjName + * @param idfield + * @return + * @throws Exception + */ + public static String JsonObjParsing(String jsonIdentity, String idfield) throws Exception { + String value = null; + JSONObject json = new JSONObject(jsonIdentity); + JSONObject identity = json.getJSONObject("identity"); + + value = identity.getString(idfield); + + return value; + } + + public static double JsonObjDoubleParsing(String jsonIdentity, String idfield) throws Exception { + double value = 0; + JSONObject json = new JSONObject(jsonIdentity); + JSONObject identity = json.getJSONObject("identity"); + + value = identity.getDouble(idfield); + + return value; + } + + public static List JsonObjArrayListParsing(String jsonIdentity, String idfield) throws Exception { + List list = new LinkedList(); + JSONObject json = new JSONObject(jsonIdentity); + + JSONObject identity = json.getJSONObject("identity"); + + JSONArray identityitems = identity.getJSONArray(idfield); + if (identityitems != null) { + for (int i = 0; i < identityitems.length(); i++) { + list.add(identityitems.getString(i)); + } + } + return list; + + } + public static String JsonObjArrayListParsing2(String idfield) throws Exception { + String a=""; + if(idfield.equals("hierarchyLevel0")) + a=ConfigManager.gethierarchyLevel0(); + else if(idfield.equals("hierarchyLevel1")) + a=ConfigManager.gethierarchyLevel1(); + + else if(idfield.equals("hierarchyLevel2")) + a=ConfigManager.gethierarchyLevel2(); + + else if(idfield.equals("hierarchyLevel3")) + a=ConfigManager.gethierarchyLevel3(); + + else if(idfield.equals("hierarchyLevel4")) + a=ConfigManager.gethierarchyLevel4(); + + JSONArray jsonArray = new JSONArray(a); + + + + for (int i = 0, size = jsonArray.length(); i < size; i++) { + JSONObject idItem = jsonArray.getJSONObject(i); + String lang = idItem.getString("language"); + String val = idItem.getString("value"); + if (lang.equals(ConfigManager.getloginlang())) { + return val; + } + + } return ""; - - - } - public static String readJsonFileText(String document) { - - String jsonTxt = null; - File f=null; - - try { - - if (TestRunner.checkRunType().equalsIgnoreCase("JAR")) { - f = new File(TestRunner.getResourcePath() + "/" +document); - } else if (TestRunner.checkRunType().equalsIgnoreCase("IDE")) { - - - f = new File(System.getProperty("user.dir") + System.getProperty("path.config")+ "/"+document); - } - if (f.exists()) { - InputStream is = new FileInputStream(f); - jsonTxt = IOUtils.toString(is, "UTF-8"); - logger.info("readJsonFileText"); - } - } catch (Exception e) { - logger.error("", e); - } - return jsonTxt; - } + + + } + public static String readJsonFileText(String document) { + + String jsonTxt = null; + File f=null; + + try { + + if (TestRunner.checkRunType().equalsIgnoreCase("JAR")) { + f = new File(TestRunner.getResourcePath() + "/" +document); + } else if (TestRunner.checkRunType().equalsIgnoreCase("IDE")) { + + + f = new File(System.getProperty("user.dir") + System.getProperty("path.config")+ "/"+document); + } + if (f.exists()) { + InputStream is = new FileInputStream(f); + jsonTxt = IOUtils.toString(is, "UTF-8"); + logger.info("readJsonFileText"); + } + } catch (Exception e) { + logger.error("", e); + } + return jsonTxt; + } } diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/ResidentBaseClass.java b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/ResidentBaseClass.java index 5f1729ce..0829f5f2 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/ResidentBaseClass.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/ResidentBaseClass.java @@ -63,18 +63,25 @@ public void setUp() throws Exception { test = extent.createTest(env, getCommitId()); if(System.getProperty("os.name").equalsIgnoreCase("Linux")) { - String configFilePath ="/usr/bin/chromedriver"; - System.setProperty("webdriver.chrome.driver", configFilePath); + + if(ConfigManager.getDocker().equals("yes")) { + logger.info("Docker start"); + String configFilePath ="/usr/bin/chromedriver"; + System.setProperty("webdriver.chrome.driver", configFilePath); + }else { + WebDriverManager.chromedriver().setup(); + } }else { WebDriverManager.chromedriver().setup(); + logger.info("window chrome driver start"); } - - - ChromeOptions options = new ChromeOptions(); - String headless=JsonUtil.JsonObjParsing(Commons.getTestData(),"headless"); + ChromeOptions options = new ChromeOptions(); + String headless=ConfigManager.getHeadless(); if(headless.equalsIgnoreCase("yes")) { - options.addArguments("--headless", "--disable-gpu", "--window-size=1920,1200", "--ignore-certificate-errors", "--log-level=DEBUG"); + logger.info("Running is headless mode"); + options.addArguments("--headless", "--disable-gpu","--no-sandbox", "--window-size=1920x1080","--disable-dev-shm-usage"); + } driver = new ChromeDriver(options); @@ -84,11 +91,10 @@ public void setUp() throws Exception { Thread.sleep(500); driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS); driver.manage().window().maximize(); - String langid="lang"+JsonUtil.JsonObjParsing(Commons.getTestData(),"language"); - String language=JsonUtil.JsonObjParsing(Commons.getTestData(),"loginlang"); + String language=ConfigManager.getloginlang(); try { if(!language.equals("sin")) { - Commons.dropdown( driver, By.id("languages"), By.id(langid)); + Commons.dropdown( driver, By.id("languages"), By.id("lang"+language)); } } catch (Exception e) { diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/TestRunner.java b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/TestRunner.java index 1ce71f28..b14b78ba 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/TestRunner.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/TestRunner.java @@ -28,12 +28,12 @@ public class TestRunner { public static void main(String[] args) throws Exception { AdminTestUtil.initialize(); - String identityGenManual=JsonUtil.JsonObjParsing(Commons.getTestData(),"identityGenManual"); + String identityGenManual=ConfigManager.getidentityGenManual(); if(identityGenManual.equals("yes")) { - uin=JsonUtil.JsonObjParsing(Commons.getTestData(),"UIN"); - perpetualVid=JsonUtil.JsonObjParsing(Commons.getTestData(),"perpetualvid"); - onetimeuseVid=JsonUtil.JsonObjParsing(Commons.getTestData(),"onetimevid"); - temporaryVid=JsonUtil.JsonObjParsing(Commons.getTestData(),"temporaryvid"); + uin=ConfigManager.getuin(); + perpetualVid=ConfigManager.getperpetualvid(); + onetimeuseVid=ConfigManager.getonetimevid(); + temporaryVid=ConfigManager.gettemporaryvid(); }else { uin = AdminTestUtil.generateUIN(); @@ -73,16 +73,16 @@ public static void startTestRunner() throws Exception { runner.setTestSuites(suitefiles); - String langid=JsonUtil.JsonObjParsing(Commons.getTestData(),"language"); - String language=JsonUtil.JsonObjParsing(Commons.getTestData(),"loginlang"); + + String language=ConfigManager.getloginlang(); if(language.equals("sin")) { - langid=""; + language=""; } System.getProperties().setProperty("testng.outpur.dir", "testng-report"); runner.setOutputDirectory("testng-report"); System.getProperties().setProperty("emailable.report2.name", "RESIDENT-" + BaseTestCase.environment + "-" - + langid + "-run-" + System.currentTimeMillis() + "-report.html"); + + language + "-run-" + System.currentTimeMillis() + "-report.html"); runner.run(); diff --git a/residenttest/src/main/resources/config/Kernel.properties b/residenttest/src/main/resources/config/Kernel.properties index ec17744c..392a0969 100644 --- a/residenttest/src/main/resources/config/Kernel.properties +++ b/residenttest/src/main/resources/config/Kernel.properties @@ -197,6 +197,8 @@ enableDebug=no threadCount=1 # supported values are 0 ,1, 2 based on number of env languages langselect=0 +#suppport sin or eng,hin,kan,tam,fra,ara +loginlang=eng #----------------------------------Database properties----------------------------------------------------------# postgresqlUser=postgresql db-port=5432 @@ -246,4 +248,25 @@ servicesNotDeployed= keycloakurl=https://iam.dev2.mosip.net/ adminPortalPath=https://resident.dev2.mosip.net/ apiEnvUser=api-internal.dev2 -apiInternalEndPoint=https://api-internal.dev2.mosip.net \ No newline at end of file +apiInternalEndPoint=https://api-internal.dev2.mosip.net + +#-------------------------------------TEST DATA------------------------------------------- +identityGenManual=no +perpetualvid= +temporaryvid= +uin= +onetimevid= +externalemail=Resident_AddIdentity_ValidParam_smoke_Pos@mosip.net +tempemail1=mosipuser@gmail.com +tempemail=damudar@gmail.com" +tempEID= +aid= +postalcode=14080 +headless=yes +docker=yes + +hierarchyLevel0=[{"language":"eng","value":"MyCountry"},{"language":"kan","value":"\u0CA8\u0CA8\u0CCD\u0CA8 \u0CA6\u0CC6\u0CD5\u0CB6"},{"language":"hin","value":"\u092E\u0947\u0930\u093E \u0926\u0947\u0936"},{"language":"tam","value":"English"},{"language":"fra","value":"Maroc"},{"language":"ara","value":"\u0645\u0627\u064A\u0643\u0648\u0646\u062A\u0631\u064A"}] +hierarchyLevel1=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0930\u092C\u093E\u0924"},{"language":"eng","value":"Kenitra"},{"language":"fra","value":"Rabat-Salé-Kénitra"},{"language":"ara","value":"\u0627\u0644\u0631\u0628\u0627\u0637"}] +hierarchyLevel2=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0915\u0947\u0928\u093F\u091F\u094D\u0930\u093E"},{"language":"eng","value":"Rabat"},{"language":"fra","value":"Kénitra"},{"language":"ara","value":"\u0627\u0644\u0642\u0646\u064A\u0637\u0631\u0629"}] +hierarchyLevel3=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0915\u0947\u0928\u093F\u091F\u094D\u0930\u093E"},{"language":"eng","value":"Rabat"},{"language":"fra","value":"Kénitra"},{"language":"ara","value":"\u0627\u0644\u0642\u0646\u064A\u0637\u0631\u0629"}] +hierarchyLevel4=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0905\u0917\u0921\u093E\u0932"},{"language":"eng","value":"Agdal"},{"language":"fra","value":"Ben Mansour"},{"language":"ara","value":"\u0623\u0648\u0644\u062F \u0623\u0648\u062C\u064A\u0647"}] \ No newline at end of file diff --git a/residenttest/src/main/resources/config/Kernel_dev.properties b/residenttest/src/main/resources/config/Kernel_dev.properties index 9a42d2df..67adba3a 100644 --- a/residenttest/src/main/resources/config/Kernel_dev.properties +++ b/residenttest/src/main/resources/config/Kernel_dev.properties @@ -196,6 +196,8 @@ enableDebug=no threadCount=1 # supported values are 0 ,1, 2 based on number of env languages langselect=0 +#suppport sin or eng,hin,kan,tam,fra,ara +loginlang=hin #----------------------------------Database properties----------------------------------------------------------# postgresqlUser=postgresql db-port=5432 @@ -245,4 +247,25 @@ servicesNotDeployed= keycloakurl=https://iam.dev.mosip.net/ adminPortalPath=https://resident.dev.mosip.net/ apiEnvUser=api-internal.dev -apiInternalEndPoint=https://api-internal.dev.mosip.net \ No newline at end of file +apiInternalEndPoint=https://api-internal.dev.mosip.net + +#-------------------------------------TEST DATA------------------------------------------- +identityGenManual=no +perpetualvid= +temporaryvid= +uin= +onetimevid= +externalemail=Resident_AddIdentity_ValidParam_smoke_Pos@mosip.net +tempemail1=mosipuser@gmail.com +tempemail=damudar@gmail.com" +tempEID=9154434691678886 +aid=10001100800003920230505043751 +postalcode=14080 +headless=no +docker=yes + +hierarchyLevel0=[{"language":"eng","value":"MyCountry"},{"language":"kan","value":"\u0CA8\u0CA8\u0CCD\u0CA8 \u0CA6\u0CC6\u0CD5\u0CB6"},{"language":"hin","value":"\u092E\u0947\u0930\u093E \u0926\u0947\u0936"},{"language":"tam","value":"English"},{"language":"fra","value":"Maroc"},{"language":"ara","value":"\u0645\u0627\u064A\u0643\u0648\u0646\u062A\u0631\u064A"}] +hierarchyLevel1=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0930\u092C\u093E\u0924"},{"language":"eng","value":"Kenitra"},{"language":"fra","value":"Rabat-Salé-Kénitra"},{"language":"ara","value":"\u0627\u0644\u0631\u0628\u0627\u0637"}] +hierarchyLevel2=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0915\u0947\u0928\u093F\u091F\u094D\u0930\u093E"},{"language":"eng","value":"Rabat"},{"language":"fra","value":"Kénitra"},{"language":"ara","value":"\u0627\u0644\u0642\u0646\u064A\u0637\u0631\u0629"}] +hierarchyLevel3=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0915\u0947\u0928\u093F\u091F\u094D\u0930\u093E"},{"language":"eng","value":"Rabat"},{"language":"fra","value":"Kénitra"},{"language":"ara","value":"\u0627\u0644\u0642\u0646\u064A\u0637\u0631\u0629"}] +hierarchyLevel4=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0905\u0917\u0921\u093E\u0932"},{"language":"eng","value":"Agdal"},{"language":"fra","value":"Ben Mansour"},{"language":"ara","value":"\u0623\u0648\u0644\u062F \u0623\u0648\u062C\u064A\u0647"}] \ No newline at end of file diff --git a/residenttest/src/main/resources/config/Kernel_dev2.properties b/residenttest/src/main/resources/config/Kernel_dev2.properties index ec17744c..392a0969 100644 --- a/residenttest/src/main/resources/config/Kernel_dev2.properties +++ b/residenttest/src/main/resources/config/Kernel_dev2.properties @@ -197,6 +197,8 @@ enableDebug=no threadCount=1 # supported values are 0 ,1, 2 based on number of env languages langselect=0 +#suppport sin or eng,hin,kan,tam,fra,ara +loginlang=eng #----------------------------------Database properties----------------------------------------------------------# postgresqlUser=postgresql db-port=5432 @@ -246,4 +248,25 @@ servicesNotDeployed= keycloakurl=https://iam.dev2.mosip.net/ adminPortalPath=https://resident.dev2.mosip.net/ apiEnvUser=api-internal.dev2 -apiInternalEndPoint=https://api-internal.dev2.mosip.net \ No newline at end of file +apiInternalEndPoint=https://api-internal.dev2.mosip.net + +#-------------------------------------TEST DATA------------------------------------------- +identityGenManual=no +perpetualvid= +temporaryvid= +uin= +onetimevid= +externalemail=Resident_AddIdentity_ValidParam_smoke_Pos@mosip.net +tempemail1=mosipuser@gmail.com +tempemail=damudar@gmail.com" +tempEID= +aid= +postalcode=14080 +headless=yes +docker=yes + +hierarchyLevel0=[{"language":"eng","value":"MyCountry"},{"language":"kan","value":"\u0CA8\u0CA8\u0CCD\u0CA8 \u0CA6\u0CC6\u0CD5\u0CB6"},{"language":"hin","value":"\u092E\u0947\u0930\u093E \u0926\u0947\u0936"},{"language":"tam","value":"English"},{"language":"fra","value":"Maroc"},{"language":"ara","value":"\u0645\u0627\u064A\u0643\u0648\u0646\u062A\u0631\u064A"}] +hierarchyLevel1=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0930\u092C\u093E\u0924"},{"language":"eng","value":"Kenitra"},{"language":"fra","value":"Rabat-Salé-Kénitra"},{"language":"ara","value":"\u0627\u0644\u0631\u0628\u0627\u0637"}] +hierarchyLevel2=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0915\u0947\u0928\u093F\u091F\u094D\u0930\u093E"},{"language":"eng","value":"Rabat"},{"language":"fra","value":"Kénitra"},{"language":"ara","value":"\u0627\u0644\u0642\u0646\u064A\u0637\u0631\u0629"}] +hierarchyLevel3=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0915\u0947\u0928\u093F\u091F\u094D\u0930\u093E"},{"language":"eng","value":"Rabat"},{"language":"fra","value":"Kénitra"},{"language":"ara","value":"\u0627\u0644\u0642\u0646\u064A\u0637\u0631\u0629"}] +hierarchyLevel4=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0905\u0917\u0921\u093E\u0932"},{"language":"eng","value":"Agdal"},{"language":"fra","value":"Ben Mansour"},{"language":"ara","value":"\u0623\u0648\u0644\u062F \u0623\u0648\u062C\u064A\u0647"}] \ No newline at end of file diff --git a/residenttest/src/main/resources/config/Kernel_qa-trinity.properties b/residenttest/src/main/resources/config/Kernel_qa-trinity.properties new file mode 100644 index 00000000..d0dd8140 --- /dev/null +++ b/residenttest/src/main/resources/config/Kernel_qa-trinity.properties @@ -0,0 +1,271 @@ +#Kernel resource uris +#Make sure all resource apis are covered +authclientidsecretkeyURL=/v1/authmanager/authenticate/clientidsecretkey +authentication=/v1/authmanager/authenticate/useridPwd +authenticationInternal=/v1/authmanager/authenticate/internal/useridPwd +keycloakAuthURL=/auth/realms/master/protocol/openid-connect/token +auditLog_URI = /v1/auditmanager/audits +CentetMachineUserMappingToMasterData_uri= /v1/masterdata/registrationmachineusermappings +EmailNotification_URI= /v1/notifier/email/send +encrypt_URI=/v1/keymanager/encrypt +decrypt_URI=/v1/keymanager/decrypt +FetchApplication_URI=/v1/masterdata/applicationtypes +FetchApplication_lang_URI=/v1/masterdata/applicationtypes/{langcode} +FetchApplication_id_lang_URI=/v1/masterdata/applicationtypes/{code}/{langcode} +FetchBiometricAttribute_URI=/v1/masterdata/getbiometricattributesbyauthtype/{langcode}/{biometrictypecode} +FetchBiometricAuthType_URI=/v1/masterdata/biometrictypes/{langcode} +FetchBlackListedWord_URI=/v1/masterdata/blacklistedwords/{langcode} +Fetchqa-trinityice_lang_URI = /v1/masterdata/qa-trinityices/{languagecode} +Fetchqa-trinityice_id_lang_URI = /v1/masterdata/qa-trinityices/{languagecode}/{qa-trinityiceType} +Fetchqa-trinityiceSpec_lang_URI = /v1/masterdata/qa-trinityicespecifications/{langcode} +Fetchqa-trinityiceSpec_id_lang_URI = /v1/masterdata/qa-trinityicespecifications/{langcode}/{qa-trinityicetypecode} +FetchDocumentCategories_URI = /v1/masterdata/documentcategories/{langcode} +FetchDocumentCategories_URI_withcodeAndLangCode = /v1/masterdata/documentcategories/{code}/{langcode} +FetchDocumentTypes_URI = /v1/masterdata/documenttypes/{documentcategorycode}/{langcode} +FetchGenderType_URI = /v1/masterdata/gendertypes +FetchGenderType_id_lang_URI = /v1/masterdata/gendertypes/{langcode} +FetchHolidays_URI = /v1/masterdata/holidays +FetchHolidays_id_URI = /v1/masterdata/holidays/{holidayid} +FetchHolidays_id_lang_URI = /v1/masterdata/holidays/{holidayid}/{langcode} +FetchIDlist_URI = /v1/masterdata/idtypes/{langcode} +FetchLocationHierarchy_URI_withlangCode = /v1/masterdata/locations/{langcode} +FetchLocationHierarchy_URI_locationcode = /v1/masterdata/locations/{locationcode}/{langcode} +FetchLocationHierarchy_URI_hierarchyname = /v1/masterdata/locations/locationhierarchy/{hierarchyname} +FetchMachine_URI=/v1/masterdata/machines +FetchMachine_lang_URI=/v1/masterdata/machines/{langcode} +FetchMachine_id_lang_URI=/v1/masterdata/machines/{id}/{langcode} +FetchMachineHistory_URI = /v1/masterdata/machineshistories/{id}/{langcode}/{effdatetimes} +FetchRegCent_URI = /v1/masterdata/registrationcenters +FetchRegCent_id_lang_URI = /v1/masterdata/registrationcenters/{id}/{langcode} +FetchRegCent_loc_lang_URI = /v1/masterdata/getlocspecificregistrationcenters/{langcode}/{locationcode} +FetchRegCent_hir_name_lang_URI = /v1/masterdata/registrationcenters/{langcode}/{hierarchylevel}/{name} +FetchRegCent_prox_lang_URI = /v1/masterdata/getcoordinatespecificregistrationcenters/{langcode}/{longitude}/{latitude}/{proximitydistance} +FetchRegCentHistory_URI = /v1/masterdata/registrationcentershistory/{registrationCenterId}/{langcode}/{effectiveDate} +FetchRegCentHolidays_URI = /v1/masterdata/getregistrationcenterholidays/{langcode}/{registrationcenterid}/{year} +FetchRegcentMachUserMaping_URI = /v1/masterdata/getregistrationmachineusermappinghistory/{effdtimes}/{registrationcenterid}/{machineid}/{userid} +FetchRejectionReason_URI = /v1/masterdata/packetrejectionreasons/{reasoncategorycode}/{langcode} +FetchTemplate_URI = /v1/masterdata/templates +FetchTemplate_lang_URI = /v1/masterdata/templates/{langcode} +FetchTemplate_id_lang_URI = /v1/masterdata/templates/{langcode}/{templatetypecode} +FetchTitle_URI = /v1/masterdata/title/{langcode} +fetchAllTemplate = /v1/masterdata/templates/templatetypecodes/{code} +getApplicantType = /v1/masterdata/getApplicantType +fetchqa-trinityiceHistory = /v1/masterdata/qa-trinityiceshistories/{id}/{langcode}/{effdatetimes} +getDocType_DocCatByAppID = /v1/masterdata/applicanttype/{applicantId}/languages +getDocTypeDocCatByLangCode = /v1/masterdata/validdocuments/{languagecode} +fetchImmediateChildLocation = /v1/masterdata/locations/immediatechildren/{locationcode}/{langcode} +getIndividualType = /v1/masterdata/individualtypes +getRoles = /v1/syncdata/roles +fetchRegCenter = /v1/masterdata/registrationcenters/validate/{id}/{langCode}/{timestamp} +fetchRegistrationCenterqa-trinityiceHistory = /v1/masterdata/registrationcenterqa-trinityicehistory/{regcenterid}/{qa-trinityiceid}/{effdatetimes} +getusersBasedOnRegCenter = /v1/syncdata/userdetails/{regid} +licKeyGenerator = /v1/keymanager/license/generate +mapLicenseKey = /v1/keymanager/license/permission +fetchmapLicenseKey = /v1/keymanager/license/permission +OTPGeneration = /v1/otpmanager/otp/generate +OTPValidation = /v1/otpmanager/otp/validate +otpNotifier = /v1/otpnotifier/otp/send +RIDGenerator_URI = /v1/ridgenerator/generate/rid/{centerid}/{machineid} +SmsNotification_URI = /v1/notifier/sms/send +syncConf = /v1/syncdata/configs +fetchIncrementalData = /v1/syncjob/syncjobdef +fetchmasterdata = /v1/syncdata/masterdata +fetchmasterdatawithRID = /v1/syncdata/masterdata/{regcenterId} +SyncPublicKeyToRegClient_URI = /v1/keymanager/publickey/ +uingenerator = /v1/idgenerator/uin +validateGenderByName = /v1/masterdata/gendertypes/validate/{gendername} +validateLocationByName = /v1/masterdata/locations/validate/{locationname} +tokenIdGenerator_URI = /v1/keymanager/{uin}/{partnercode} +getRIDByUserId = /v1/authmanager/rid/{appid}/{userid} +syncMdatawithKeyIndex = /v1/syncdata/clientsettings +syncMdatawithRegCentIdKeyIndex = /v1/syncdata/clientsettings/{regcenterid} +uploadpublickey = /v1/syncdata/tpm/publickey +getUserHistory = /v1/masterdata/users/{id}/{eff_dtimes} +sendOtp = /v1/authmanager/authenticate/sendotp +useridOTP = /v1/authmanager/authenticate/useridOTP +#preregSendOtp = /preregistration/v1/login/sendOtp +preregSendOtp = /preregistration/v1/login/sendOtp/langcode +preregValidateOtp = /preregistration/v1/login/validateOtp +zoneMappingUrl=/v1/masterdata/zoneuser +zoneNameUrl=/v1/masterdata/zones/zonename +zoneMappingActivateUrl=/v1/masterdata/zoneuser +userCenterMappingUrl=/v1/masterdata/usercentermapping +bulkUploadUrl=/v1/admin/bulkupload +credentialRequestUrl=/v1/credentialrequest/v2/requestgenerator/ +mountPath=/home/mosip/mountvolume +packetUtilityBaseUrl=http://localhost:8080 +mountPathForScenario=D:/centralized/mountvolume +# OTP Details +OTPTimeOut = 181 +attempt = 10 +ConfigParameters=mosip.kernel.rid.length,mosip.kernel.uin.length,mosip.kernel.sms.country.code,mosip.kernel.sms.number.length,mosip.kernel.otp.default-length,mosip.kernel.otp.expiry-time,mosip.kernel.otp.key-freeze-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.min-key-length,mosip.kernel.otp.max-key-length,mosip.kernel.licensekey.length,mosip.supported-languages +#Below users are used for authentication +#PARTNER +#Dont change the partner id +pmsAuthInternal=true +mosip_pms_app_id=partner +partner_password=mosip123 +partner_userName=111997 +partner_user_password=mosip123 +mosip_pms_client_id=mosip-pms-client +mosip_pms_client_secret=NRtVJysucwAhkszy +policytest_password=mosip123 +policytest_userName=111998 +#RESIDENT & IDA +mosip_resident_app_id=resident +mosip_resident_client_id=mosip-resident-client +mosip_resident_client_secret=FWSWctpbzWpksRpd +#IDREPO +mosip_idrepo_app_id=idrepo +mosip_idrepo_client_id=mosip-idrepo-client +mosip_idrepo_client_secret=vanZDLJyddpuSpxv +#admin +mosip_admin_app_id=admin +mosip_admin_client_id=mosip-admin-client +mosip_admin_client_secret=idknMgce5bp2nTYe +#admin +admin_zone_password=mosip123 +admin_zone_userName=globaladmin +mosip_regclient_app_id=registrationclient +mosip_reg_client_id=mosip-reg-client +mosip_reg_client_secret=FXcxmIFspPlFqPDK +#mparter_mobile +mpartner_default_mobile_client_id=mpartner-default-mobile +mpartner_default_mobile_secret=nrFosOjtTOQ0gQjf + + + + +#This credentials are used to execute auth demo service +AuthClientID=mosip-resident-client +AuthClientSecret=FWSWctpbzWpksRpd +AuthAppID=resident +mosip_hotlist_app_id=hotlist +mosip_hotlist_client_id=mosip-hotlist-client +mosip_hotlist_client_secret=XZUJvsvT0CsHkfKQ +###Keycloak_User-Creation_Properties +#Dontchange the partner user_111997 + +#new_Resident_User=111995 +#new_Resident_Password=mosip123 +#new_Resident_Role=default-roles-mosip,PARTNER_ADMIN +#roles.111995=PARTNER_ADMIN,default-roles-mosip + + +keycloak_UserName = admin +keycloak_Password = 5pQ2N3xI22 + +keycloak-external-url=https://iam.qa-trinity.mosip.net +mosip_testrig_client_id=mosip-testrig-client +mosip_testrig_client_secret=XC2w1JXPtDSObcMb + +keycloak-realm-id=mosip +iam-users-to-create=auto +iam-users-password=mosip123 +roles=GLOBAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN +##DB_Connectivity +driver_class=org.postgresql.Driver +pool_size=1 +dialect=org.hibernate.dialect.PostgreSQLDialect +show_sql=true +current_session_context_class=thread +#audit details +audit_url=jdbc:postgresql://qa-trinity.mosip.net:5432/mosip_audit +audit_username=postgres +audit_password=l8zFfKcRar +audit_default_schema=audit +#ida-partner details +DB_PORT= +installation-domain= +partner_url=jdbc:postgresql://qa-trinity.mosip.net:5432/mosip_ida +partner_username=postgres +partner_password=kUmZbJTFRZ +partner_default_schema=partner +reportLogPath=automationLogAndReport +#--------minio proprties---------------- +s3-user-key=minioadmin +s3-user-secret=minioadmin +s3-host=http://minio.minio:9000 +s3-account=automation +s3-region=null +reportExpirationInDays=3 +# supported values yes or no +push-reports-to-s3=no +enableDebug=no +# supported values are 1 to 8 +threadCount=1 +# supported values are 0 ,1, 2 based on number of env languages +langselect=0 +#suppport sin or eng,hin,kan,tam,fra,ara +loginlang=eng +#----------------------------------Database properties----------------------------------------------------------# +postgresqlUser=postgresql +db-port=5432 +db-server=qa-trinity.mosip.net +hibernate.connection.driver_class=org.postgresql.Driver +hibernate.connection.pool_size=1 +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.show_sql=true +hibernate.current_session_context_class=thread +db-su-user=postgres +postgresql-password=kUmZbJTFRZ +pms_db_schema=pms +km_db_schema=keymgr +master_db_schema=master +audit_db_schema=audit +ida_db_schema=ida + +#----------------------------------AuthDemoService Host properties----------------------------------------------------------# +#To run locally +authDemoServiceBaseURL=http://localhost +authDemoServicePort=8082 + +#To run in Docker +#authDemoServiceBaseURL=http://authdemo.apitestrig +#authDemoServicePort=80 + + +#----------------------------------IdP properties----------------------------------------------------------# + +currentUserURI=/#/uinservices/viewhistory +actuatorEndpoint=/resident/v1/actuator/env +actuatorIDAEndpoint=/idauthentication/v1/actuator/env +actuatorRegprocEndpoint=/registrationprocessor/v1/registrationtransaction/actuator/env +tokenEndpoint=/v1/esignet/oauth/token +validateBindingEndpoint=esignet-binding + +#To run in Docker +#authCertsPath=/home/mosip/authcerts + +#To run locally +authCertsPath= +preconfiguredOtp=111111 +usePreConfiguredOtp=true + +servicesNotDeployed= + +keycloakurl=https://iam.qa-trinity.mosip.net/ +adminPortalPath=https://resident.qa-trinity.mosip.net/ +apiEnvUser=api-internal.qa-trinity +apiInternalEndPoint=https://api-internal.qa-trinity.mosip.net + +#-------------------------------------TEST DATA------------------------------------------- +identityGenManual=no +perpetualvid= +temporaryvid= +uin= +onetimevid= +externalemail=Resident_AddIdentity_ValidParam_smoke_Pos@mosip.net +tempemail1=mosipuser@gmail.com +tempemail=damudar@gmail.com" +tempEID=9154434691678886 +aid=10001100800003920230505043751 +postalcode=14080 +headless=yes +docker=yes + +hierarchyLevel0=[{"language":"eng","value":"MyCountry"},{"language":"kan","value":"\u0CA8\u0CA8\u0CCD\u0CA8 \u0CA6\u0CC6\u0CD5\u0CB6"},{"language":"hin","value":"\u092E\u0947\u0930\u093E \u0926\u0947\u0936"},{"language":"tam","value":"English"},{"language":"fra","value":"Maroc"},{"language":"ara","value":"\u0645\u0627\u064A\u0643\u0648\u0646\u062A\u0631\u064A"}] +hierarchyLevel1=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0930\u092C\u093E\u0924"},{"language":"eng","value":"Kenitra"},{"language":"fra","value":"Rabat-Salé-Kénitra"},{"language":"ara","value":"\u0627\u0644\u0631\u0628\u0627\u0637"}] +hierarchyLevel2=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0915\u0947\u0928\u093F\u091F\u094D\u0930\u093E"},{"language":"eng","value":"Rabat"},{"language":"fra","value":"Kénitra"},{"language":"ara","value":"\u0627\u0644\u0642\u0646\u064A\u0637\u0631\u0629"}] +hierarchyLevel3=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0915\u0947\u0928\u093F\u091F\u094D\u0930\u093E"},{"language":"eng","value":"Rabat"},{"language":"fra","value":"Kénitra"},{"language":"ara","value":"\u0627\u0644\u0642\u0646\u064A\u0637\u0631\u0629"}] +hierarchyLevel4=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"\u0905\u0917\u0921\u093E\u0932"},{"language":"eng","value":"Agdal"},{"language":"fra","value":"Ben Mansour"},{"language":"ara","value":"\u0623\u0648\u0644\u062F \u0623\u0648\u062C\u064A\u0647"}] \ No newline at end of file From 1a9fd24b25830bcdf090f982f2dd47ddb0bc07f3 Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Mon, 15 Jan 2024 15:33:47 +0530 Subject: [PATCH 2/6] MOSIP-31083 Signed-off-by: Jayesh Kharode --- .../io/mosip/testrig/residentui/testcase/UpdateMyData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/UpdateMyData.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/UpdateMyData.java index a0e5eb91..b8ddf681 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/UpdateMyData.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/UpdateMyData.java @@ -25,7 +25,7 @@ public void updateMyDataName() throws Exception { Commons.enter(test, driver, By.id("proofOfIdentityvalue"), data); Commons.dropdown(test, driver, By.id("proofOfIdentity")); Commons.enter(test, driver, By.id("fileDropRef"), - TestRunner.getResourcePath() + "\\BulkUploadFiles\\tonyId.png"); + TestRunner.getResourcePath() + "//BulkUploadFiles//tonyId.png"); Thread.sleep(2000); Commons.clickWebelement(test, driver, By.id("previewBtn")); @@ -55,7 +55,7 @@ public void updateMyDataAddress() throws Exception { Commons.dropdown(test, driver, By.id("proofOfAddress")); Commons.enter(test, driver, By.id("proofOfAddressvalue"), data); Commons.enter(test, driver, By.id("fileAddRef"), - TestRunner.getResourcePath() + "\\BulkUploadFiles\\tonyId.png"); + TestRunner.getResourcePath() + "//BulkUploadFiles//tonyId.png"); test.log(Status.INFO, "file Uploaded"); Thread.sleep(2000); Commons.clickWebelement(test, driver, By.id("previewBtn")); @@ -119,7 +119,7 @@ public void UpdateDataWithoutAddressLine() throws Exception { Commons.dropdown(test, driver, By.id("proofOfAddress")); Commons.enter(test, driver, By.id("proofOfAddressvalue"), data); Commons.enter(test, driver, By.id("fileAddRef"), - TestRunner.getResourcePath() + "\\BulkUploadFiles\\tonyId.png"); + TestRunner.getResourcePath() + "//BulkUploadFiles//tonyId.png"); test.log(Status.INFO, "file Uploaded"); Thread.sleep(2000); Commons.clickWebelement(test, driver, By.id("previewBtn")); From 1073f2935d81cef2479682d080a6941ab69e1a75 Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Mon, 15 Jan 2024 17:04:31 +0530 Subject: [PATCH 3/6] MOSIP-31080 Signed-off-by: Jayesh Kharode --- .../testrig/residentui/testcase/GetMyUIN.java | 2 +- .../residentui/testcase/LoginTest.java | 33 ++++++++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java index 3fb6a808..e9bf56cf 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java @@ -14,7 +14,7 @@ import io.mosip.testrig.residentui.utility.ResidentBaseClass; import io.mosip.testrig.residentui.utility.TestRunner; -@Test(groups = "GMU") +@Test(groups = "GMU",dependsOnGroups="UMD") public class GetMyUIN extends ResidentBaseClass{ String vid =TestRunner.perpetualVid; diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java index 0bff1f7f..62b2c34e 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java @@ -38,7 +38,7 @@ import io.mosip.testrig.residentui.utility.MockSMTPListener; import io.mosip.testrig.residentui.utility.TestRunner; - @Test(groups = "LG") +@Test(groups = "LG") public class LoginTest extends BaseClass { // @Test(priority = 0) @@ -53,19 +53,28 @@ public static void loginTest() throws Exception { Thread.sleep(2000); driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS); Commons.clickWebelement(test, driver, By.xpath("//*[@id='UINservices']")); - - Commons.clickWebelement(test, driver, By.id("login_with_otp")); - Thread.sleep(2000); - + + Commons.clickWebelement(test, driver, By.id("login_with_otp")); + Thread.sleep(2000); + Commons.enter(test, driver, By.id("Otp_mosip-vid"), TestRunner.perpetualVid); Commons.clickWebelement(test, driver, By.id("get_otp")); - - //otp = MockSMTPListener.getOtp(externalemail); - otp="111111"; - System.out.println(otp); - for (int i = 0; i <= otp.length() - 1; i++) { - Commons.enter(test, driver, By.xpath("//*[@id='otp_verify_input']//div//input[" + (i + 1) + "]"), - Character.toString(otp.charAt(i))); + try { + //otp = MockSMTPListener.getOtp(externalemail); + otp="111111"; + System.out.println(otp); + for (int i = 0; i <= otp.length() - 1; i++) { + Commons.enter(test, driver, By.xpath("//*[@id='otp_verify_input']//div//input[" + (i + 1) + "]"), + Character.toString(otp.charAt(i))); + } + }catch(Exception e) { + Thread.sleep(10000); + otp="111111"; + System.out.println(otp); + for (int i = 0; i <= otp.length() - 1; i++) { + Commons.enter(test, driver, By.xpath("//*[@id='otp_verify_input']//div//input[" + (i + 1) + "]"), + Character.toString(otp.charAt(i))); + } } test.log(Status.INFO, "Extracted OTP"); Thread.sleep(2000); From 1ccfc918eb9fe7bb81f3f68cd42b3e0936ba76c2 Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Mon, 15 Jan 2024 17:05:03 +0530 Subject: [PATCH 4/6] MOSIP-31080 Signed-off-by: Jayesh Kharode --- .../java/io/mosip/testrig/residentui/testcase/GetMyUIN.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java index e9bf56cf..ecb1c50e 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/GetMyUIN.java @@ -79,7 +79,7 @@ public void getMyUINWithExpiredOtp() throws Exception { // driver.switchTo().parentFrame(); Commons.click(test,driver, By.id("getUinSendOtpBtn")); String otp = MockSMTPListener.getOtp(tempemail); - Thread.sleep(180020); + Thread.sleep(2000); Commons.enter(test,driver, By.id("otp-input"), otp); Commons.click(test,driver, By.xpath("//button[@id='getUinsubmitBtn']")); Commons.click(test,driver, By.id("dismissBtn")); From f430496d9ce9c6549f6af11eaa5bc07b6a02e52c Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Tue, 16 Jan 2024 10:45:45 +0530 Subject: [PATCH 5/6] MOSIP-31163 Signed-off-by: Jayesh Kharode --- .../residentui/testcase/LoginTest.java | 32 +++++++++++-------- .../testrig/residentui/utility/BaseClass.java | 8 ++--- .../residentui/utility/ResidentBaseClass.java | 23 ++++++------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java index 62b2c34e..e38cf5cd 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java @@ -38,7 +38,7 @@ import io.mosip.testrig.residentui.utility.MockSMTPListener; import io.mosip.testrig.residentui.utility.TestRunner; -@Test(groups = "LG") + @Test(groups = "LG") public class LoginTest extends BaseClass { // @Test(priority = 0) @@ -53,22 +53,27 @@ public static void loginTest() throws Exception { Thread.sleep(2000); driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS); Commons.clickWebelement(test, driver, By.xpath("//*[@id='UINservices']")); - - Commons.clickWebelement(test, driver, By.id("login_with_otp")); - Thread.sleep(2000); - + + Commons.clickWebelement(test, driver, By.id("login_with_otp")); + Thread.sleep(2000); + Commons.enter(test, driver, By.id("Otp_mosip-vid"), TestRunner.perpetualVid); - Commons.clickWebelement(test, driver, By.id("get_otp")); + try { - //otp = MockSMTPListener.getOtp(externalemail); - otp="111111"; - System.out.println(otp); - for (int i = 0; i <= otp.length() - 1; i++) { - Commons.enter(test, driver, By.xpath("//*[@id='otp_verify_input']//div//input[" + (i + 1) + "]"), - Character.toString(otp.charAt(i))); - } + Commons.clickWebelement(test, driver, By.id("get_otp")); + + //otp = MockSMTPListener.getOtp(externalemail); + otp="111111"; + System.out.println(otp); + for (int i = 0; i <= otp.length() - 1; i++) { + Commons.enter(test, driver, By.xpath("//*[@id='otp_verify_input']//div//input[" + (i + 1) + "]"), + Character.toString(otp.charAt(i))); + } }catch(Exception e) { Thread.sleep(10000); + Commons.clickWebelement(test, driver, By.id("get_otp")); + + //otp = MockSMTPListener.getOtp(externalemail); otp="111111"; System.out.println(otp); for (int i = 0; i <= otp.length() - 1; i++) { @@ -76,6 +81,7 @@ public static void loginTest() throws Exception { Character.toString(otp.charAt(i))); } } + test.log(Status.INFO, "Extracted OTP"); Thread.sleep(2000); diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/BaseClass.java b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/BaseClass.java index 6ae374b9..7cd4ad67 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/BaseClass.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/BaseClass.java @@ -86,15 +86,13 @@ public void set() { @BeforeMethod public void setUp() throws Exception { logger.info("Start set up"); - if(System.getProperty("os.name").equalsIgnoreCase("Linux")) { + if(System.getProperty("os.name").equalsIgnoreCase("Linux") && ConfigManager.getDocker().equals("yes") ) { + - if(ConfigManager.getDocker().equals("yes")) { logger.info("Docker start"); String configFilePath ="/usr/bin/chromedriver"; System.setProperty("webdriver.chrome.driver", configFilePath); - }else { - WebDriverManager.chromedriver().setup(); - } + }else { WebDriverManager.chromedriver().setup(); logger.info("window chrome driver start"); diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/ResidentBaseClass.java b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/ResidentBaseClass.java index 0829f5f2..e93ee59d 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/utility/ResidentBaseClass.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/utility/ResidentBaseClass.java @@ -61,20 +61,17 @@ public void set() { @BeforeMethod public void setUp() throws Exception { test = extent.createTest(env, getCommitId()); - - if(System.getProperty("os.name").equalsIgnoreCase("Linux")) { + if(System.getProperty("os.name").equalsIgnoreCase("Linux") && ConfigManager.getDocker().equals("yes") ) { - if(ConfigManager.getDocker().equals("yes")) { - logger.info("Docker start"); - String configFilePath ="/usr/bin/chromedriver"; - System.setProperty("webdriver.chrome.driver", configFilePath); - }else { - WebDriverManager.chromedriver().setup(); - } - }else { - WebDriverManager.chromedriver().setup(); - logger.info("window chrome driver start"); - } + + logger.info("Docker start"); + String configFilePath ="/usr/bin/chromedriver"; + System.setProperty("webdriver.chrome.driver", configFilePath); + + }else { + WebDriverManager.chromedriver().setup(); + logger.info("window chrome driver start"); + } ChromeOptions options = new ChromeOptions(); String headless=ConfigManager.getHeadless(); if(headless.equalsIgnoreCase("yes")) { From 526f9a2f22581cc71345b71f3936c6ccea70122d Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Tue, 16 Jan 2024 11:27:29 +0530 Subject: [PATCH 6/6] MOSIP-31163 Signed-off-by: Jayesh Kharode --- .../java/io/mosip/testrig/residentui/testcase/LoginTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java index e38cf5cd..08a9b729 100644 --- a/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java +++ b/residenttest/src/main/java/io/mosip/testrig/residentui/testcase/LoginTest.java @@ -62,8 +62,8 @@ public static void loginTest() throws Exception { try { Commons.clickWebelement(test, driver, By.id("get_otp")); - //otp = MockSMTPListener.getOtp(externalemail); - otp="111111"; + otp = MockSMTPListener.getOtp(externalemail); + // otp="111111"; System.out.println(otp); for (int i = 0; i <= otp.length() - 1; i++) { Commons.enter(test, driver, By.xpath("//*[@id='otp_verify_input']//div//input[" + (i + 1) + "]"),