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.

Sign up for GitHub

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 35404 commons cleanup #798

Merged
merged 7 commits into from
Jan 8, 2025
Merged

Mosip 35404 commons cleanup #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0afdf9a
MOSIP-37137 | changed package name
nandhu-kumar Nov 5, 2024
7f696f7
Merge remote-tracking branch 'upstream/develop' into develop
nandhu-kumar Nov 5, 2024
4b8fa8c
Merge remote-tracking branch 'upstream/develop' into develop
nandhu-kumar Nov 26, 2024
67d343e
MOSIP-35404
nandhu-kumar Dec 2, 2024
d4b97e6
MOSIP-35404
nandhu-kumar Jan 6, 2025
0e5fd0f
Merge remote-tracking branch 'upstream/develop' into MOSIP-35404-Comm…
nandhu-kumar Jan 6, 2025
3651f37
MOSIP-35404
nandhu-kumar Jan 8, 2025
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
4 changes: 2 additions & 2 deletions api-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@

<dependencies>
<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>
</dependency>
</dependencies>

Expand Down
1 change: 0 additions & 1 deletion api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ public void test(TestCaseDTO testCaseDTO)
String[] templateFields = testCaseDTO.getTemplateFields();

String jsonInput = testCaseDTO.getInput();
testCaseName = isTestCaseValidForExecution(testCaseDTO);
String inputJson = getJsonFromTemplate(jsonInput, testCaseDTO.getInputTemplate(), false);
String outputJson = getJsonFromTemplate(testCaseDTO.getOutput(), testCaseDTO.getOutputTemplate());
if (testCaseDTO.getTemplateFields() != null && templateFields.length > 0) {
Expand Down
1 change: 0 additions & 1 deletion api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/DeleteWithParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public Object[] getTestCaseList(ITestContext context) {
public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
testCaseName = testCaseDTO.getTestCaseName();
testCaseName = PreRegUtil.isTestCaseValidForExecution(testCaseDTO);
testCaseName = isTestCaseValidForExecution(testCaseDTO);
if (HealthChecker.signalTerminateExecution) {
throw new SkipException(
GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
Expand Down
1 change: 0 additions & 1 deletion api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ public Object[] getTestCaseList(ITestContext context) {
public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
testCaseName = testCaseDTO.getTestCaseName();
testCaseName = PreRegUtil.isTestCaseValidForExecution(testCaseDTO);
testCaseName = isTestCaseValidForExecution(testCaseDTO);
if (HealthChecker.signalTerminateExecution) {
throw new SkipException(
GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
Expand Down
1 change: 0 additions & 1 deletion ...st/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParamForAutoGenId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ public Object[] getTestCaseList(ITestContext context) {
public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
testCaseName = testCaseDTO.getTestCaseName();
testCaseName = PreRegUtil.isTestCaseValidForExecution(testCaseDTO);
testCaseName = isTestCaseValidForExecution(testCaseDTO);
if (HealthChecker.signalTerminateExecution) {
throw new SkipException(
GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
Expand Down
1 change: 0 additions & 1 deletion api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/SimplePost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ public Object[] getTestCaseList(ITestContext context) {
public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
testCaseName = testCaseDTO.getTestCaseName();
testCaseName = PreRegUtil.isTestCaseValidForExecution(testCaseDTO);
testCaseName = isTestCaseValidForExecution(testCaseDTO);
auditLogCheck = testCaseDTO.isAuditLogCheck();
String[] templateFields = testCaseDTO.getTemplateFields();
if (HealthChecker.signalTerminateExecution) {
Expand Down
16 changes: 16 additions & 0 deletions api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.mosip.testrig.apirig.prereg.utils;

import org.apache.log4j.Logger;
import org.json.JSONArray;
import org.testng.SkipException;

import io.mosip.testrig.apirig.dto.TestCaseDTO;
Expand All @@ -15,9 +16,24 @@ public class PreRegUtil extends AdminTestUtil {
public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) {
String testCaseName = testCaseDTO.getTestCaseName();

int indexof = testCaseName.indexOf("_");
String modifiedTestCaseName = testCaseName.substring(indexof + 1);

addTestCaseDetailsToMap(modifiedTestCaseName, testCaseDTO.getUniqueIdentifier());

if (SkipTestCaseHandler.isTestCaseInSkippedList(testCaseName)) {
throw new SkipException(GlobalConstants.KNOWN_ISSUES);
}

JSONArray postalCodeArray = new JSONArray(getValueFromAuthActuator("json-property", "postal_code"));

if (testCaseName.startsWith("Prereg_")
&& (testCaseName.contains("_Invalid_PostalCode_")
|| testCaseName.contains("_SpacialCharacter_PostalCode_"))
&& (globalRequiredFields != null && !globalRequiredFields.toList().contains(postalCodeArray))) {
throw new SkipException(GlobalConstants.FEATURE_NOT_SUPPORTED_MESSAGE);
}

return testCaseName;
}

Expand Down
Loading