MOSIP-30369 | Framework structure change to support device farm execu…

…tion (#1039) * Test script updated for new apk Signed-off-by: kamalsingh <[email protected]> * new test cases added Signed-off-by: kamalsingh <[email protected]> * new test cases added from master sheet Signed-off-by: kamalsingh <[email protected]> * Test cases added from regression sheet Signed-off-by: kamalsingh <[email protected]> * new test cases added Signed-off-by: kamalsingh <[email protected]> * automated ios tests for regression Signed-off-by: kamalsingh <[email protected]> * conflict resolved Signed-off-by: kamalsingh <[email protected]> * framework optimization Signed-off-by: kamalsingh <[email protected]> * folder structure changed Signed-off-by: kamalsingh <[email protected]> * framework restructure for device farm Signed-off-by: kamalsingh <[email protected]> * incorporated review comments Signed-off-by: kamalsingh <[email protected]> --------- Signed-off-by: kamalsingh <[email protected]>
mosip · Nov 30, 2023 · 7309938 · 7309938
1 parent 6ce73a2
commit 7309938
Show file tree

Hide file tree

Showing 109 changed files with 3,569 additions and 995 deletions.
diff --git a/injitest/pom.xml b/injitest/pom.xml
diff --git a/injitest/src/main/assembly/zip.xml b/injitest/src/main/assembly/zip.xml
@@ -0,0 +1,26 @@
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>zip</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>./</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>./</outputDirectory>
+            <includes>
+                <include>/dependency-jars/</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/...osip/test/mob/inji/api/AdminTestUtil.java → ...src/main/java/inji/api/AdminTestUtil.java b/...osip/test/mob/inji/api/AdminTestUtil.java → ...src/main/java/inji/api/AdminTestUtil.java
@@ -1,21 +1,19 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
 
+import io.restassured.response.Response;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import javax.ws.rs.core.MediaType;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.TimeZone;
 
-import javax.ws.rs.core.MediaType;
-
-import org.apache.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import io.restassured.response.Response;
-import org.apache.commons.lang.RandomStringUtils;
-
 public class AdminTestUtil extends BaseTestCase {
 
 	private static final Logger logger = Logger.getLogger(AdminTestUtil.class);
@@ -68,9 +66,9 @@ public static boolean activateUIN(String inputJson, String role) {
 	}
 
 	public static String buildaddIdentityRequestBody(String schemaJson, String uin, String rid) {
-		org.json.JSONObject schemaresponseJson = new org.json.JSONObject(schemaJson);
+		JSONObject schemaresponseJson = new JSONObject(schemaJson);
 
-		org.json.JSONObject schemaData = (org.json.JSONObject) schemaresponseJson.get("response");
+		JSONObject schemaData = (JSONObject) schemaresponseJson.get("response");
 		Double schemaVersion = (Double) schemaData.get("idVersion");
 		String schemaJsonData = schemaData.getString("schemaJson");
 		String schemaFile = schemaJsonData.toString();
@@ -159,21 +157,21 @@ public static int getOtpExpTimeFromActuator() {
 			if (!BaseTestCase.isTargetEnvLTS())
 				section = "/mosip-config/sandbox/application-lts.properties";
 			Response response = null;
-			org.json.JSONObject responseJson = null;
+			JSONObject responseJson = null;
 			JSONArray responseArray = null;
 			String url = ApplnURI + propsKernel.getProperty("actuatorIDAEndpoint");
 			try {
 				response = RestClient.getRequest(url, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON);
 
-				responseJson = new org.json.JSONObject(response.getBody().asString());
+				responseJson = new JSONObject(response.getBody().asString());
 				responseArray = responseJson.getJSONArray("propertySources");
 
 				for (int i = 0, size = responseArray.length(); i < size; i++) {
-					org.json.JSONObject eachJson = responseArray.getJSONObject(i);
+					JSONObject eachJson = responseArray.getJSONObject(i);
 					logger.info("eachJson is :" + eachJson.toString());
 					if (eachJson.get("name").toString().contains(section)) {
 
-						org.json.JSONObject otpExpiryTime = (org.json.JSONObject) eachJson
+						JSONObject otpExpiryTime = (JSONObject) eachJson
 								.getJSONObject(GlobalConstants.PROPERTIES).get("mosip.kernel.otp.expiry-time");
 						otpExpTime = otpExpiryTime.getString(GlobalConstants.VALUE);
 						if (ConfigManager.IsDebugEnabled())

diff --git a/...test/mob/inji/api/ApplicationLibrary.java → ...ain/java/inji/api/ApplicationLibrary.java b/...test/mob/inji/api/ApplicationLibrary.java → ...ain/java/inji/api/ApplicationLibrary.java
@@ -1,9 +1,9 @@
-package io.mosip.test.mob.inji.api;
-
-import javax.ws.rs.core.MediaType;
+package inji.api;
 
 import io.restassured.response.Response;
 
+import javax.ws.rs.core.MediaType;
+
 public class ApplicationLibrary extends BaseTestCase {
 
 	private static CommonLibrary commonLibrary = new CommonLibrary();

diff --git a/...mosip/test/mob/inji/api/BaseTestCase.java → .../src/main/java/inji/api/BaseTestCase.java b/...mosip/test/mob/inji/api/BaseTestCase.java → .../src/main/java/inji/api/BaseTestCase.java
@@ -1,21 +1,19 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
 
+import inji.driver.TestRunner;
+import inji.utils.TestDataReader;
+import io.restassured.response.Response;
+import org.apache.log4j.PropertyConfigurator;
+import org.json.simple.JSONObject;
+
+import javax.ws.rs.core.MediaType;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
-import io.restassured.response.Response;
-
-import javax.ws.rs.core.MediaType;
-
-import org.apache.log4j.PropertyConfigurator;
-import org.json.simple.JSONObject;
-
-import io.mosip.test.mob.inji.driver.TestRunner;
-import io.mosip.test.mob.inji.utils.TestDataReader;
 
 //import org.apache.log4j.Logger;
 
@@ -180,12 +178,13 @@ private static Properties getLoggerPropertyConfig() {
 		logProp.setProperty("log4j.appender.Appender2.layout.ConversionPattern", "%-7p %d [%t] %c %x - %m%n");
 		return logProp;
 	}
-
+
+	//ToDo - Need to address this
 	 public static String getOtp() {
-	  	  String otp="";
+	  	  /*String otp="";
 	  	  String externalemail = TestDataReader.readData("externalemail");
-	  	  otp = MockSMTPListener.getOtp(externalemail);
-	  	  return otp;
+	  	  otp = MockSMTPListener.getOtp(externalemail);*/
+	  	  return "111111";
 	    }
 
 	public static JSONObject getRequestJson(String filepath) {

diff --git a/...osip/test/mob/inji/api/CommonLibrary.java → ...src/main/java/inji/api/CommonLibrary.java b/...osip/test/mob/inji/api/CommonLibrary.java → ...src/main/java/inji/api/CommonLibrary.java
@@ -1,24 +1,18 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
 
-import static io.restassured.RestAssured.given;
+import inji.driver.TestRunner;
+import io.restassured.http.Cookie;
+import io.restassured.response.Response;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import io.mosip.test.mob.inji.driver.TestRunner;
-import io.restassured.http.Cookie;
-import io.restassured.response.Response;
+import static io.restassured.RestAssured.given;
 
 public class CommonLibrary extends BaseTestCase {
 	private static final org.slf4j.Logger logger= org.slf4j.LoggerFactory.getLogger(CommonLibrary.class);

diff --git a/...osip/test/mob/inji/api/ConfigManager.java → ...src/main/java/inji/api/ConfigManager.java b/...osip/test/mob/inji/api/ConfigManager.java → ...src/main/java/inji/api/ConfigManager.java
@@ -1,12 +1,13 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
 
+
+import inji.driver.TestRunner;
+import inji.utils.TestDataReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
-import io.mosip.test.mob.inji.driver.TestRunner;
-
 
 public class ConfigManager {
 

diff --git a/...ip/test/mob/inji/api/GlobalConstants.java → ...c/main/java/inji/api/GlobalConstants.java b/...ip/test/mob/inji/api/GlobalConstants.java → ...c/main/java/inji/api/GlobalConstants.java
@@ -1,4 +1,4 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
 
 public class GlobalConstants {
 	public static final String EXCEPTION_STRING_2 = "Exception ";

diff --git a/...osip/test/mob/inji/api/GlobalMethods.java → ...src/main/java/inji/api/GlobalMethods.java b/...osip/test/mob/inji/api/GlobalMethods.java → ...src/main/java/inji/api/GlobalMethods.java
@@ -1,7 +1,7 @@
-package io.mosip.test.mob.inji.api;
-import org.testng.Reporter;
+package inji.api;
 
 import io.restassured.response.Response;
+import org.testng.Reporter;
 public class GlobalMethods {
 
 	public static void reportResponse(String responseHeader, String url, Response response) {

diff --git a/...ip/test/mob/inji/api/JsonPrecondtion.java → ...c/main/java/inji/api/JsonPrecondtion.java b/...ip/test/mob/inji/api/JsonPrecondtion.java → ...c/main/java/inji/api/JsonPrecondtion.java
@@ -1,13 +1,12 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
 
-import org.apache.commons.beanutils.PropertyUtils;
-
-import org.apache.log4j.Logger;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.log4j.Logger;
 
 public class JsonPrecondtion {
 	private static final Logger JSONPRECONDATION_LOGGER = Logger.getLogger(JsonPrecondtion.class);

diff --git a/...st/mob/inji/api/KernelAuthentication.java → ...n/java/inji/api/KernelAuthentication.java b/...st/mob/inji/api/KernelAuthentication.java → ...n/java/inji/api/KernelAuthentication.java
@@ -1,10 +1,9 @@
-package io.mosip.test.mob.inji.api;
-
-import java.util.Map;
+package inji.api;
 
+import io.restassured.response.Response;
 import org.json.simple.JSONObject;
 
-import io.restassured.response.Response;
+import java.util.Map;
 
 
 public class KernelAuthentication extends BaseTestCase {

diff --git a/...est/mob/inji/api/KeycloakUserManager.java → ...in/java/inji/api/KeycloakUserManager.java b/...est/mob/inji/api/KeycloakUserManager.java → ...in/java/inji/api/KeycloakUserManager.java
@@ -1,14 +1,7 @@
-package io.mosip.test.mob.inji.api;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import javax.ws.rs.core.Response;
+package inji.api;
 
+import inji.driver.TestRunner;
+import inji.utils.TestDataReader;
 import org.keycloak.OAuth2Constants;
 import org.keycloak.admin.client.CreatedResponseUtil;
 import org.keycloak.admin.client.Keycloak;
@@ -20,7 +13,13 @@
 import org.keycloak.representations.idm.RoleRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
 
-import io.mosip.test.mob.inji.driver.TestRunner;
+import javax.ws.rs.core.Response;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
 
 
 public class KeycloakUserManager {

diff --git a/...p/test/mob/inji/api/MockSMTPListener.java → .../main/java/inji/api/MockSMTPListener.java b/...p/test/mob/inji/api/MockSMTPListener.java → .../main/java/inji/api/MockSMTPListener.java
@@ -1,4 +1,9 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import inji.api.pojo.Root;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
 
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -11,10 +16,6 @@
 import java.util.concurrent.CompletionStage;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.mosip.test.mob.inji.api.pojo.Root;
 
 
 public class MockSMTPListener{
@@ -45,7 +46,7 @@ public void run() {
 
 	}
 
-	private static class WebSocketClient implements WebSocket.Listener {
+	private static class WebSocketClient implements Listener {
 		Long count = (long) 00;
 		Root root = new Root();
 
@@ -57,7 +58,7 @@ public WebSocketClient() {
 		@Override
 		public void onOpen(WebSocket webSocket) {
 			logger.info("onOpen using subprotocol " + webSocket.getSubprotocol());
-			WebSocket.Listener.super.onOpen(webSocket);
+			Listener.super.onOpen(webSocket);
 		}
 
 		@Override
@@ -91,15 +92,15 @@ public CompletionStage<?> onText(WebSocket webSocket, CharSequence data, boolean
 				logger.error(e.getMessage());
 			}
 
-			return WebSocket.Listener.super.onText(webSocket, data, last);
+			return Listener.super.onText(webSocket, data, last);
 		}
 
 		@Override
 		public void onError(WebSocket webSocket, Throwable error) {
 
 			logger.info("Bad day! " + webSocket.toString());
 			logger.error(error.getMessage());
-			WebSocket.Listener.super.onError(webSocket, error);
+			Listener.super.onError(webSocket, error);
 		}
 	}
 

diff --git a/...est/mob/inji/api/OutputValidationDto.java → ...in/java/inji/api/OutputValidationDto.java b/...est/mob/inji/api/OutputValidationDto.java → ...in/java/inji/api/OutputValidationDto.java
@@ -1,4 +1,4 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
 
 public class OutputValidationDto {
 

diff --git a/...o/mosip/test/mob/inji/api/ReportUtil.java → ...st/src/main/java/inji/api/ReportUtil.java b/...o/mosip/test/mob/inji/api/ReportUtil.java → ...st/src/main/java/inji/api/ReportUtil.java
@@ -1,4 +1,4 @@
-package io.mosip.test.mob.inji.api;
+package inji.api;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...o/mosip/test/mob/inji/api/RestClient.java → ...st/src/main/java/inji/api/RestClient.java b/...o/mosip/test/mob/inji/api/RestClient.java → ...st/src/main/java/inji/api/RestClient.java
@@ -1,12 +1,12 @@
-package io.mosip.test.mob.inji.api;
-
-import org.testng.log4testng.Logger;
-import static io.restassured.RestAssured.given;
+package inji.api;
 
 import io.restassured.RestAssured;
 import io.restassured.config.HttpClientConfig;
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.response.Response;
+import org.testng.log4testng.Logger;
+
+import static io.restassured.RestAssured.given;
 
 public class RestClient {
 

diff --git a/...a/io/mosip/test/mob/inji/api/pojo/Cc.java → injitest/src/main/java/inji/api/pojo/Cc.java b/...a/io/mosip/test/mob/inji/api/pojo/Cc.java → injitest/src/main/java/inji/api/pojo/Cc.java
@@ -1,4 +1,4 @@
-package io.mosip.test.mob.inji.api.pojo;
+package inji.api.pojo;
 
 import java.util.ArrayList;
 

diff --git a/...io/mosip/test/mob/inji/api/pojo/From.java → ...est/src/main/java/inji/api/pojo/From.java b/...io/mosip/test/mob/inji/api/pojo/From.java → ...est/src/main/java/inji/api/pojo/From.java
@@ -1,4 +1,4 @@
-package io.mosip.test.mob.inji.api.pojo;
+package inji.api.pojo;
 
 import java.util.ArrayList;
 

diff --git a/...ip/test/mob/inji/api/pojo/HeaderLine.java → ...c/main/java/inji/api/pojo/HeaderLine.java b/...ip/test/mob/inji/api/pojo/HeaderLine.java → ...c/main/java/inji/api/pojo/HeaderLine.java
@@ -1,4 +1,4 @@
-package io.mosip.test.mob.inji.api.pojo;
+package inji.api.pojo;
 
 public class HeaderLine{
 	 public String key;

diff --git a/injitest/src/main/java/inji/api/pojo/Headers.java b/injitest/src/main/java/inji/api/pojo/Headers.java
@@ -0,0 +1,4 @@
+package inji.api.pojo;
+
+public class Headers{
+}