Merge pull request #1467 from mohanachandran-s/develop

 MOSIP-33173 moved to component/module wise api automation testrig

.github/workflows/apitest-push-trigger.yml

@@ -0,0 +1,66 @@
+name: Automationtests Build
+
+on:
+  release:
+    types: [published]
+  pull_request:
+    types: [opened, reopened, synchronize]
+  workflow_call:
+  workflow_dispatch:
+    inputs:
+      message:
+        description: 'Message for manually triggering'
+        required: false
+        default: 'Triggered for Updates'
+        type: string
+  push:
+    branches:
+      - '!release-branch'
+      - master
+      - 1.*
+      - develop*
+      - MOSIP*
+      - release*
+
+jobs:
+  build-maven-apitest-commons:
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master
+    with:
+      SERVICE_LOCATION: ./apitest-commons
+      BUILD_ARTIFACT: apitest-commons
+    secrets:
+      OSSRH_USER: ${{ secrets.OSSRH_USER }}
+      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
+      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+      GPG_SECRET: ${{ secrets.GPG_SECRET }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
+  publish_to_nexus:
+    if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}"
+    needs: build-maven-apitest-commons
+    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master
+    with:
+      SERVICE_LOCATION: ./apitest-commons
+    secrets:
+      OSSRH_USER: ${{ secrets.OSSRH_USER }}
+      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
+      OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }}
+      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+      GPG_SECRET: ${{ secrets.GPG_SECRET }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
+
+  sonar_analysis:
+    needs: build-maven-apitest-commons
+    if: "${{  github.event_name != 'pull_request' }}"
+    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
+    with:
+      SERVICE_LOCATION: ./apitest-commons
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      ORG_KEY: ${{ secrets.ORG_KEY }}
+      OSSRH_USER: ${{ secrets.OSSRH_USER }}
+      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
+      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+      GPG_SECRET: ${{ secrets.GPG_SECRET }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/authdemo-push-trigger.yml

@@ -17,7 +17,7 @@ on:
       - '!release-branch'
       - master
       - 1.*
-      - develop
+      - develop*
       - MOSIP*
       - release*
       - camdgc-*
@@ -86,7 +86,4 @@ jobs:
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
-  build-automation-tests:
-    needs: publish_to_nexus
-    uses: ./.github/workflows/automationtests-push-trigger.yml
-    secrets: inherit
+

automationtests/pom.xml → apitest-commons/pom.xml

@@ -2,10 +2,10 @@
 	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.automationtests</groupId>
-	<artifactId>automationtests</artifactId>
+	<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
+	<artifactId>apitest-commons</artifactId>
 	<packaging>jar</packaging>
-	<name>mosip-functional-test</name>
+	<name>apitest-commons</name>
 	<description>Parent project of MOSIP functional tests</description>
 	<url>https://github.com/mosip/mosip-functional-tests</url>
 	<version>1.2.0.1-SNAPSHOT</version>
@@ -190,7 +190,7 @@
 		<rest.assured.version>3.0.7</rest.assured.version>
 		<testng.version>6.11</testng.version>
 		<zt.zip.version>1.13</zt.zip.version>
-		<fileName>automationtests-1.2.0.1-SNAPSHOT-jar-with-dependencies</fileName>
+		<fileName>apitest-commons-1.2.0.1-SNAPSHOT-jar-with-dependencies</fileName>
 
 	</properties>
 	<dependencies>

automationtests/src/main/java/io/mosip/testrig/apirig/dbaccess/AuditDBManager.java → apitest-commons/src/main/java/io/mosip/testrig/apirig/dbaccess/AuditDBManager.java

@@ -19,9 +19,9 @@
 import org.hibernate.jdbc.Work;
 import org.testng.Assert;
 
-import io.mosip.testrig.apirig.admin.fw.util.AdminTestUtil;
-import io.mosip.testrig.apirig.kernel.util.ConfigManager;
 import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.utils.AdminTestUtil;
+import io.mosip.testrig.apirig.utils.ConfigManager;
 
 public class AuditDBManager extends AdminTestUtil {
 	private static final Logger DBCONNECTION_LOGGER = Logger.getLogger(AuditDBManager.class);

automationtests/src/main/java/io/mosip/testrig/apirig/dbaccess/DBManager.java → apitest-commons/src/main/java/io/mosip/testrig/apirig/dbaccess/DBManager.java

@@ -6,6 +6,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+
 import org.apache.log4j.Logger;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -14,9 +15,9 @@
 import org.hibernate.cfg.Environment;
 import org.hibernate.jdbc.Work;
 
-import io.mosip.testrig.apirig.global.utils.GlobalConstants;
-import io.mosip.testrig.apirig.kernel.util.ConfigManager;
 import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.utils.ConfigManager;
+import io.mosip.testrig.apirig.utils.GlobalConstants;
 public class DBManager {
 	private static Logger logger = Logger.getLogger(DBManager.class);
 	public static void clearPMSDbData() {

automationtests/src/main/java/io/mosip/testrig/apirig/authentication/fw/dto/AuthTransactionDto.java → apitest-commons/src/main/java/io/mosip/testrig/apirig/dto/AuthTransactionDto.java

@@ -1,13 +1,13 @@
-package io.mosip.testrig.apirig.authentication.fw.dto;
-
-public class AuthTransactionDto {
-
-	public String transactionID;
-	public String requestdatetime;
-	public String authtypeCode;
-	public String statusCode;
-	public String statusComment;
-	public String referenceIdType;
-	public String entityName;
-
-}
+package io.mosip.testrig.apirig.dto;
+
+public class AuthTransactionDto {
+
+	public String transactionID;
+	public String requestdatetime;
+	public String authtypeCode;
+	public String statusCode;
+	public String statusComment;
+	public String referenceIdType;
+	public String entityName;
+
+}

automationtests/src/main/java/io/mosip/testrig/apirig/authentication/fw/dto/AuthTypeStatusDto.java → apitest-commons/src/main/java/io/mosip/testrig/apirig/dto/AuthTypeStatusDto.java

@@ -1,21 +1,21 @@
-package io.mosip.testrig.apirig.authentication.fw.dto;
-
-import java.util.Map;
-
-public class AuthTypeStatusDto {
-
-	public String authType;
-	public String authSubType;
-	public String locked;
-
-	private static Map<String,String> authTypeStatus;
-
-	public static Map<String, String> getAuthTypeStatus() {
-		return authTypeStatus;
-	}
-
-	public static void setAuthTypeStatus(Map<String, String> authTypeStatus) {
-		AuthTypeStatusDto.authTypeStatus = authTypeStatus;
-	}
-
-}
+package io.mosip.testrig.apirig.dto;
+
+import java.util.Map;
+
+public class AuthTypeStatusDto {
+
+	public String authType;
+	public String authSubType;
+	public String locked;
+
+	private static Map<String,String> authTypeStatus;
+
+	public static Map<String, String> getAuthTypeStatus() {
+		return authTypeStatus;
+	}
+
+	public static void setAuthTypeStatus(Map<String, String> authTypeStatus) {
+		AuthTypeStatusDto.authTypeStatus = authTypeStatus;
+	}
+
+}