Skip to content

Commit

Permalink
MOSIP-39719 (#808)
Browse files Browse the repository at this point in the history
Signed-off-by: Nandhukumar <[email protected]>
  • Loading branch information
nandhu-kumar authored Feb 18, 2025
1 parent b541362 commit 5257eb2
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.nimbusds.jose.jwk.RSAKey;

import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
import io.mosip.testrig.apirig.testrunner.BaseTestCase;
import io.mosip.testrig.apirig.testrunner.ExtractResource;
import io.mosip.testrig.apirig.testrunner.HealthChecker;
Expand All @@ -32,7 +33,9 @@
import io.mosip.testrig.apirig.utils.CertsUtil;
import io.mosip.testrig.apirig.utils.ConfigManager;
import io.mosip.testrig.apirig.utils.GlobalConstants;
import io.mosip.testrig.apirig.utils.GlobalMethods;
import io.mosip.testrig.apirig.utils.JWKKeyUtil;
import io.mosip.testrig.apirig.utils.KernelAuthentication;
import io.mosip.testrig.apirig.utils.KeyCloakUserAndAPIKeyGeneration;
import io.mosip.testrig.apirig.utils.KeycloakUserManager;
import io.mosip.testrig.apirig.utils.MispPartnerAndLicenseKeyGeneration;
Expand Down Expand Up @@ -61,12 +64,8 @@ public class MosipTestRunner {
public static void main(String[] arg) {

try {

Map<String, String> envMap = System.getenv();
LOGGER.info("** ------------- Get ALL ENV varibales --------------------------------------------- **");
for (String envName : envMap.keySet()) {
LOGGER.info(String.format("ENV %s = %s%n", envName, envMap.get(envName)));
}
LOGGER.info("** ------------- API Test Rig Run Started --------------------------------------------- **");

BaseTestCase.setRunContext(getRunType(), jarUrl);
ExtractResource.removeOldMosipTestTestResource();
if (getRunType().equalsIgnoreCase("JAR")) {
Expand All @@ -78,6 +77,7 @@ public static void main(String[] arg) {
PreRegConfigManager.init();
suiteSetup(getRunType());
SkipTestCaseHandler.loadTestcaseToBeSkippedList("testCaseSkippedList.txt");
GlobalMethods.setModuleNameAndReCompilePattern(PreRegConfigManager.getproperty("moduleNamePattern"));
setLogLevels();
AdminTestUtil.getRequiredField();

Expand Down Expand Up @@ -134,6 +134,9 @@ private static void setLogLevels() {
MispPartnerAndLicenseKeyGeneration.setLogLevel();
JWKKeyUtil.setLogLevel();
CertsUtil.setLogLevel();
KernelAuthentication.setLogLevel();
BaseTestCase.setLogLevel();
PreRegUtil.setLogLevel();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Map;
import java.util.Properties;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;

import io.mosip.testrig.apirig.prereg.testrunner.MosipTestRunner;
Expand All @@ -13,6 +14,9 @@ public class PreRegConfigManager extends ConfigManager{
private static final Logger LOGGER = Logger.getLogger(PreRegConfigManager.class);

public static void init() {
Logger configManagerLogger = Logger.getLogger(ConfigManager.class);
configManagerLogger.setLevel(Level.WARN);

Map<String, Object> moduleSpecificPropertiesMap = new HashMap<>();
// Load scope specific properties
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.mosip.testrig.apirig.prereg.utils;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.json.JSONArray;
import org.testng.SkipException;
Expand All @@ -13,6 +14,13 @@ public class PreRegUtil extends AdminTestUtil {

private static final Logger logger = Logger.getLogger(PreRegUtil.class);

public static void setLogLevel() {
if (PreRegConfigManager.IsDebugEnabled())
logger.setLevel(Level.ALL);
else
logger.setLevel(Level.ERROR);
}

public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) {
String testCaseName = testCaseDTO.getTestCaseName();

Expand Down

0 comments on commit 5257eb2

Please sign in to comment.