Merge pull request #1632 from nandhu-kumar/develop

MOSIP-35404 | Move component specific test code from common to component api test rigs
mosip · Oct 4, 2024 · 7af567b · 7af567b
2 parents e17bdc4 + c07b3d1
commit 7af567b
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 182 deletions.
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
@@ -178,7 +178,6 @@ public class BaseTestCase extends AbstractTestNGSpringContextTests {
 	public static String clientAssertionToken;
 	private static String zoneMappingRequest = "config/Authorization/zoneMappingRequest.json";
 	public static Properties props = null;
-	public static Properties propsKernel = null;
 
 	public static String currentRunningLanguage = "";
 
@@ -191,7 +190,6 @@ public static void setRunContext(String runType, String jarURL) {
 		runTypeS = runType;
 		jarURLS = jarURL;
 		props = getproperty(getGlobalResourcePath() + "/" + "config/application.properties");
-		propsKernel = getproperty(getGlobalResourcePath() + "/" + "config/Kernel.properties");
 	}
 
 	// Need to handle this

diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java
@@ -137,8 +137,6 @@ public class AdminTestUtil extends BaseTestCase {
 			getGlobalResourcePath() + "/" + "config/valueMapping.properties");
 	protected static final Properties propsBio = getproperty(
 			getGlobalResourcePath() + "/" + "config/bioValue.properties");
-	protected static final Properties propsKernel = getproperty(
-			getGlobalResourcePath() + "/" + "config/Kernel.properties");
 	public static String propsHealthCheckURL = getGlobalResourcePath() + "/"
 			+ "config/healthCheckEndpoint.properties";
 	private static String serverComponentsCommitDetails;

diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/CommonLibrary.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/CommonLibrary.java
@@ -150,8 +150,6 @@ public Map<String, String> readProperty(String propertyFileName) {
 		FileInputStream inputStream = null;
 		Map<String, String> mapProp = null;
 		try {
-//			File propertyFile = new File( CommonLibrary.class.getClassLoader().getResourceAsStream("config/Kernel.properties"));
-
 			try (InputStream input = ConfigManager.class.getClassLoader().getResourceAsStream("config/Kernel.properties")) {
 				if (input != null) {
 					// Load the properties from the input stream

diff --git a/apitest-commons/src/main/resources/config/application.properties b/apitest-commons/src/main/resources/config/application.properties
diff --git a/apitest-commons/src/main/resources/config/bioValue.properties b/apitest-commons/src/main/resources/config/bioValue.properties
diff --git a/apitest-commons/src/main/resources/config/valueMapping.properties b/apitest-commons/src/main/resources/config/valueMapping.properties