Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOSIP-38852--Update Dsl Pom with latest version Of api-test commons #693

Merged
merged 6 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mosip-acceptance-tests/ivv-orchestrator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@
</dependency>

<dependency>
<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
<groupId>io.mosip.testrig.apitest.commons</groupId>
<artifactId>apitest-commons</artifactId>
<version>1.2.2-SNAPSHOT</version>
<version>1.3.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
Expand All @@ -138,7 +138,7 @@
<dependency>
<groupId>io.mosip.esignet</groupId>
<artifactId>apitest-esignet</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.5.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public Object[] getTestCaseList(ITestContext context) {
@Test(dataProvider = "testcaselist")
public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
testCaseName = testCaseDTO.getTestCaseName();
testCaseName = isTestCaseValidForExecution(testCaseDTO);
// testCaseName = isTestCaseValidForExecution(testCaseDTO);
if (HealthChecker.signalTerminateExecution) {
throw new SkipException(GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public Object[] getTestCaseList(ITestContext context) {
@Test(dataProvider = "testcaselist")
public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
testCaseName = testCaseDTO.getTestCaseName();
testCaseName = isTestCaseValidForExecution(testCaseDTO);
// testCaseName = isTestCaseValidForExecution(testCaseDTO);
auditLogCheck = testCaseDTO.isAuditLogCheck();
String[] templateFields = testCaseDTO.getTemplateFields();
if (HealthChecker.signalTerminateExecution) {
Expand All @@ -106,19 +106,19 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
inputJson = inputJson.replace("&quot;", "\"");
}

if (inputJson.contains("$PHONENUMBERFROMREGEXFORSIGNUP$")) {
String phoneNumber = getPhoneNumber();
if (phoneNumber != null && !phoneNumber.isEmpty()) {
inputJson = replaceKeywordWithValue(inputJson, "$PHONENUMBERFROMREGEXFORSIGNUP$", phoneNumber);
writeAutoGeneratedId(testCaseDTO.getTestCaseName(), "PHONE", phoneNumber);
}
}

if (inputJson.contains("$FULLNAMETOREGISTERUSER$")) {
String jsonString = generateFullNameToRegisterUser(inputJson, testCaseDTO.getTestCaseName());
if (!jsonString.isBlank())
inputJson = jsonString;
}
// if (inputJson.contains("$PHONENUMBERFROMREGEXFORSIGNUP$")) {
// String phoneNumber = getPhoneNumber();
// if (phoneNumber != null && !phoneNumber.isEmpty()) {
// inputJson = replaceKeywordWithValue(inputJson, "$PHONENUMBERFROMREGEXFORSIGNUP$", phoneNumber);
// writeAutoGeneratedId(testCaseDTO.getTestCaseName(), "PHONE", phoneNumber);
// }
// }
//
// if (inputJson.contains("$FULLNAMETOREGISTERUSER$")) {
// String jsonString = generateFullNameToRegisterUser(inputJson, testCaseDTO.getTestCaseName());
// if (!jsonString.isBlank())
// inputJson = jsonString;
// }



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import io.mosip.testrig.apirig.utils.AdminTestUtil;
import io.mosip.testrig.apirig.dto.TestCaseDTO;
import io.mosip.testrig.apirig.esignet.testscripts.EsignetBioAuth;
import io.mosip.testrig.apirig.esignet.utils.EsignetUtil;
import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
import io.mosip.testrig.apirig.utils.AuthenticationTestException;
import io.mosip.testrig.apirig.utils.GlobalMethods;
Expand Down Expand Up @@ -1198,7 +1199,7 @@ public void esignetBioAuth(String modility, String bioValue, String uin, String

private String getAuthTransactionId(String oidcTransactionId) {
final String transactionId = oidcTransactionId.replaceAll("_|-", "");
String lengthOfTransactionId = AdminTestUtil.getValueFromEsignetActuator("/mosip/mosip-config/esignet-default.properties", "mosip.esignet.auth-txn-id-length");
String lengthOfTransactionId = EsignetUtil.getValueFromEsignetActuator("/mosip/mosip-config/esignet-default.properties", "mosip.esignet.auth-txn-id-length");
int authTransactionIdLength = lengthOfTransactionId != null ? Integer.parseInt(lengthOfTransactionId): 0;
final byte[] oidcTransactionIdBytes = transactionId.getBytes();
final byte[] authTransactionIdBytes = new byte[authTransactionIdLength];
Expand Down
Loading