Skip to content

Commit

Permalink
MOSIP-35886 - Modified the injection of Auth Demo Service utils
Browse files Browse the repository at this point in the history 
Signed-off-by: Mohanachandran S <[email protected]>
  • Loading branch information
@mohanachandran-s
mohanachandran-s committed Sep 24, 2024
1 parent 1f8fee2 commit f4141da
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 29 deletions.
2 changes: 1 addition & 1 deletion apitest/entrypoint.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

## Run automationtests
java -jar -Dmodules="$MODULES" -Denv.user="$ENV_USER" -Denv.endpoint="$ENV_ENDPOINT" -Denv.testLevel="$ENV_TESTLEVEL" apitest-auth-*-jar-with-dependencies.jar;
java -Dmodules="$MODULES" -Denv.user="$ENV_USER" -Denv.endpoint="$ENV_ENDPOINT" -Denv.testLevel="$ENV_TESTLEVEL" -jar apitest-auth-*-jar-with-dependencies.jar;
8 changes: 2 additions & 6 deletions apitest/src/main/java/io/mosip/testrig/apirig/testscripts/BioAuth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.testng.ITest;
import org.testng.ITestContext;
Expand Down Expand Up @@ -43,11 +42,8 @@ public class BioAuth extends AdminTestUtil implements ITest {
public Response newResponse = null;
public boolean isInternal = false;

@Autowired
private EncryptionDecrptionUtil encryptDecryptUtil;

@Autowired
private BioDataUtility bioDataUtil;
private EncryptionDecrptionUtil encryptDecryptUtil = new EncryptionDecrptionUtil();
private BioDataUtility bioDataUtil = new BioDataUtility();

@BeforeClass
public static void setLogLevel() {
Expand Down
6 changes: 1 addition & 5 deletions apitest/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.testng.ITest;
import org.testng.ITestContext;
import org.testng.ITestResult;
import org.testng.Reporter;
import org.testng.SkipException;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
Expand All @@ -26,7 +24,6 @@
import io.mosip.testrig.apirig.dto.OutputValidationDto;
import io.mosip.testrig.apirig.dto.TestCaseDTO;
import io.mosip.testrig.apirig.testrunner.BaseTestCase;
import io.mosip.testrig.apirig.testrunner.HealthChecker;
import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
import io.mosip.testrig.apirig.utils.AdminTestException;
import io.mosip.testrig.apirig.utils.AdminTestUtil;
Expand All @@ -45,8 +42,7 @@ public class DemoAuth extends AdminTestUtil implements ITest {
public Response response = null;
public boolean isInternal = false;

@Autowired
private EncryptionDecrptionUtil encryptDecryptUtil;
private EncryptionDecrptionUtil encryptDecryptUtil = new EncryptionDecrptionUtil();

@BeforeClass
public static void setLogLevel() {
Expand Down
12 changes: 2 additions & 10 deletions apitest/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@

import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.testng.ITest;
import org.testng.ITestContext;
import org.testng.ITestResult;
import org.testng.Reporter;
import org.testng.SkipException;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
Expand All @@ -27,7 +23,6 @@

import io.mosip.testrig.apirig.dto.OutputValidationDto;
import io.mosip.testrig.apirig.dto.TestCaseDTO;
import io.mosip.testrig.apirig.testrunner.HealthChecker;
import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
import io.mosip.testrig.apirig.utils.AdminTestException;
import io.mosip.testrig.apirig.utils.AdminTestUtil;
Expand All @@ -46,11 +41,8 @@ public class MultiFactorAuthNew extends AdminTestUtil implements ITest {
protected String testCaseName = "";
public Response response = null;

@Autowired
private EncryptionDecrptionUtil encryptDecryptUtil;

@Autowired
private BioDataUtility bioDataUtil;
private EncryptionDecrptionUtil encryptDecryptUtil = new EncryptionDecrptionUtil();
private BioDataUtility bioDataUtil = new BioDataUtility();

@BeforeClass
public static void setLogLevel() {
Expand Down
8 changes: 1 addition & 7 deletions apitest/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@


import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.testng.ITest;
import org.testng.ITestContext;
import org.testng.ITestResult;
import org.testng.Reporter;
import org.testng.SkipException;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
Expand All @@ -27,7 +23,6 @@

import io.mosip.testrig.apirig.dto.OutputValidationDto;
import io.mosip.testrig.apirig.dto.TestCaseDTO;
import io.mosip.testrig.apirig.testrunner.HealthChecker;
import io.mosip.testrig.apirig.utils.AdminTestException;
import io.mosip.testrig.apirig.utils.AdminTestUtil;
import io.mosip.testrig.apirig.utils.AuthenticationTestException;
Expand All @@ -47,8 +42,7 @@ public class OtpAuthNew extends AdminTestUtil implements ITest {
public Response response = null;
public boolean isInternal = false;

@Autowired
private EncryptionDecrptionUtil encryptDecryptUtil;
private EncryptionDecrptionUtil encryptDecryptUtil = new EncryptionDecrptionUtil();

@BeforeClass
public static void setLogLevel() {
Expand Down

0 comments on commit f4141da

Please sign in to comment.