MOSIP-35404

Signed-off-by: Nandhukumar <[email protected]>
mosip · Jan 6, 2025 · c994e5a · c994e5a
2 parents 4490185 + 7ee98d6
commit c994e5a
Show file tree

Hide file tree

Showing 18 changed files with 351 additions and 74 deletions.
diff --git a/apitest-commons/README.md b/apitest-commons/README.md
@@ -24,6 +24,7 @@ Ensure the following software is installed on the machine from where the automat
 - **Java 21** ([download here](https://jdk.java.net/)).
 - **Maven 3.9.6** or higher ([installation guide](https://maven.apache.org/install.html)).
 - **Lombok** (Refer to [Lombok Project](https://projectlombok.org/))
+- **setting.xml** ([download here](https://github.com/mosip/mosip-functional-tests/blob/master/settings.xml))
 
 ---
 

diff --git a/apitest-commons/pom.xml b/apitest-commons/pom.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
+	<groupId>io.mosip.testrig.apitest.commons</groupId>
 	<artifactId>apitest-commons</artifactId>
 	<packaging>jar</packaging>
 	<name>apitest-commons</name>
@@ -36,7 +36,7 @@
 	<properties>
 		<!-- kernel versions -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<kernel-websubclient-api.version>1.2.1-SNAPSHOT</kernel-websubclient-api.version>
+		<kernel-websubclient-api.version>1.3.0-beta.1</kernel-websubclient-api.version>
 
 		<!-- maven -->
 		<maven.compiler.target>21</maven.compiler.target>
@@ -59,15 +59,14 @@
 
 		<!-- automationtests version -->
 		<wink-json4j-provider.version>1.1.2-incubating</wink-json4j-provider.version>
-		<kernel.version>1.2.1-SNAPSHOT</kernel.version>
+		<kernel.version>1.3.0-beta.1</kernel.version>
 		<zjsonpatch.version>0.4.7</zjsonpatch.version>
 		<extentreports.aventstack.version>3.0.0</extentreports.aventstack.version>
 		<extentreports.relevantcodes.version>2.41.2</extentreports.relevantcodes.version>
 		<maven.model.version>3.3.9</maven.model.version>
 		<testng.version>6.11</testng.version>
 		<zt.zip.version>1.13</zt.zip.version>
 		<fileName>apitest-commons-1.2.2-cleanup-SNAPSHOT-jar-with-dependencies</fileName>
-
 	</properties>
 
 	<dependencies>
@@ -377,7 +376,7 @@
 		<dependency>
 			<groupId>io.mosip.mock.mds</groupId>
 			<artifactId>mock-mds</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.3.0-beta.1</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -437,13 +436,13 @@
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-templatemanager-velocity</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.3.0-beta.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-keymanager-service</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.3.0-beta.1</version>
 			<classifier>lib</classifier>
 			<exclusions>
 				<exclusion>
@@ -482,7 +481,7 @@
 			<dependency>
 				<groupId>io.mosip.kernel</groupId>
 				<artifactId>kernel-bom</artifactId>
-				<version>1.2.1-SNAPSHOT</version>
+				<version>1.3.0-beta.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -725,4 +724,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java
@@ -64,6 +64,7 @@ public class BaseTestCase {
 	public String regProcCookie = null;
 	public String regProCookie = null;
 	public String regAdminCookie = null;
+	public String invalidcookie = "anyRandomString";
 	public String registrationOfficerCookie = null;
 	public String regSupervisorCookie = null;
 	public String zonalAdminCookie = null;
@@ -137,6 +138,7 @@ public class BaseTestCase {
 
 	public static String locationCode = "";
 	public static String ZonelocationCode = "";
+	public static String leafZoneCode = "";
 	public static String hierarchyZoneCode = "";
 
 	public static String genRid = "27847" + generateRandomNumberString(10);

diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/HealthChecker.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/HealthChecker.java
@@ -119,6 +119,7 @@ public void run() {
 
 	public static String checkActuatorNoAuth(String actuatorURL) {
 		Response response = null;
+		actuatorURL = GlobalMethods.addToServerEndPointMap(actuatorURL);
 		response = given().contentType(ContentType.JSON).get(actuatorURL);
 		if (response != null && response.getStatusCode() == 200) {
 			logger.info(response.getBody().asString());