Skip to content

Commit

Permalink
Merge pull request #711 from Sohandey/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@ckm007
ckm007 authored Aug 9, 2024
2 parents 958d5f1 + 44a8133 commit 131a4dd
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 32 deletions.
3 changes: 3 additions & 0 deletions apitest/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public static void main(String[] arg) {
BaseTestCase.suiteSetup();
setLogLevels();


// For now we are not doing health check for qa-115.
if (BaseTestCase.isTargetEnvLTS()) {
HealthChecker healthcheck = new HealthChecker();
Expand All @@ -82,6 +83,8 @@ public static void main(String[] arg) {
KeycloakUserManager.removeUser();
KeycloakUserManager.createUsers();
KeycloakUserManager.closeKeycloakInstance();

//List<String> localDocCatCode =new ArrayList<>(BaseTestCase.getDocCatCode());

startTestRunner();
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion ...ources/preReg/GetAllApplicationsWithapplicationId/GetAllApplicationsWithapplicationId.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ GetAllApplicationsWithapplicationId:
inputTemplate: preReg/GetAllApplicationsWithapplicationId/GetAllApplicationsWithapplicationId
outputTemplate: preReg/GetAllApplicationsWithapplicationId/getAllApplicationsResult
input: '{
"applicationId": "$ID:CreatePrereg_with_future_date_preRegistrationId$"
"applicationId": "$ID:CreatePrereg_All_Valid_Smoke_sid_preRegistrationId$"
}'
output: '{
}'
Expand Down
10 changes: 5 additions & 5 deletions apitest/src/main/resources/preReg/GetBookingsForRegCenter/GetBookingsForRegCenter.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ GetBookingsForRegCenter:
endPoint: /preregistration/v1/applications/bookings/{regCenterId}?from_date=2020-10-01&to_date=2034-10-13
role: batch
restMethod: get
inputTemplate: preReg/GetAvailableSlotForRegCentreId/getAvailableSlotForRegCentreId
outputTemplate: preReg/GetAvailableSlotForRegCentreId/getAvailableSlotForRegCentreIdResult
inputTemplate: preReg/GetBookingsForRegCenter/getBookingsForRegCenter
outputTemplate: preReg/GetBookingsForRegCenter/getBookingsForRegCenterResult
input: '{
"regCenterId": "10003"
}'
Expand All @@ -15,7 +15,7 @@ GetBookingsForRegCenter:
endPoint: /preregistration/v1/applications/bookings/{regCenterId}?from_date=2020-45461&to_date=2034-10-13
role: batch
restMethod: get
inputTemplate: preReg/GetAvailableSlotForRegCentreId/getAvailableSlotForRegCentreId
inputTemplate: preReg/GetBookingsForRegCenter/getBookingsForRegCenter
outputTemplate: preReg/error
input: '{
"regCenterId": "10003"
Expand All @@ -31,7 +31,7 @@ GetBookingsForRegCenter:
endPoint: /preregistration/v1/applications/bookings/{regCenterId}?from_date=2020-10-01&to_date=2034-10-13
role: batch
restMethod: get
inputTemplate: preReg/GetAvailableSlotForRegCentreId/getAvailableSlotForRegCentreId
inputTemplate: preReg/GetBookingsForRegCenter/getBookingsForRegCenter
outputTemplate: preReg/error
input: '{
"regCenterId": "10@@#$$003"
Expand All @@ -47,7 +47,7 @@ GetBookingsForRegCenter:
endPoint: /preregistration/v1/applications/bookings/{regCenterId}?from_date=20204555&to_date=2034-10-13
role: batch
restMethod: get
inputTemplate: preReg/GetAvailableSlotForRegCentreId/getAvailableSlotForRegCentreId
inputTemplate: preReg/GetBookingsForRegCenter/getBookingsForRegCenter
outputTemplate: preReg/error
input: '{
"regCenterId": "10@@#$$003"
Expand Down
22 changes: 11 additions & 11 deletions apitest/src/main/resources/preReg/ValidateOtp/ValidateOtp.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ValidateOtp:
Prereg_SendOtp_All_Valid_Smoke_email_sid:
Prereg_ValidateOtp_All_Valid_Smoke_email_sid:
endPoint: /preregistration/v1/login/validateOtp
role: batch
checkErrorsOnlyInResponse: true
Expand All @@ -10,7 +10,7 @@ ValidateOtp:
"version": "1.0",
"requesttime": "$TIMESTAMP$",
"userId": "[email protected]",
"otp": "111111",
"otp": "DYNAMICOTP",
"id": "mosip.pre-registration.login.useridotp"
}'
output: '{
Expand All @@ -26,13 +26,13 @@ ValidateOtp:
"version": "1.0",
"requesttime": "$TIMESTAMP$",
"userId": "9090872300",
"otp": "111111",
"otp": "DYNAMICOTP",
"id": "mosip.pre-registration.login.useridotp"
}'
output: '{
}'

Prereg_ValidateOtp_Invalid_Phone_Neg:
Prereg_ValidateOtp_Invalid_Phone_Neg_INVALIDOTP:
endPoint: /preregistration/v1/login/validateOtp
role: batch
checkErrorsOnlyInResponse: true
Expand All @@ -43,7 +43,7 @@ ValidateOtp:
"version": "1.0",
"requesttime": "$TIMESTAMP$",
"userId": "909",
"otp": "111111",
"otp": "DYNAMICOTP",
"id": "mosip.pre-registration.login.useridotp"
}'
output: '{
Expand All @@ -53,7 +53,7 @@ ValidateOtp:
}
]
}'
Prereg_ValidateOtp_SpacialCharacters_Phone_Neg:
Prereg_ValidateOtp_SpacialCharacters_Phone_Neg_INVALIDOTP:
endPoint: /preregistration/v1/login/validateOtp
role: batch
checkErrorsOnlyInResponse: true
Expand All @@ -64,7 +64,7 @@ ValidateOtp:
"version": "1.0",
"requesttime": "$TIMESTAMP$",
"userId": "$!(",
"otp": "111111",
"otp": "DYNAMICOTP",
"id": "mosip.pre-registration.login.useridotp"
}'
output: '{
Expand All @@ -74,7 +74,7 @@ ValidateOtp:
}
]
}'
Prereg_ValidateOtp_SpacialCharacters_Email_Neg:
Prereg_ValidateOtp_SpacialCharacters_Email_Neg_INVALIDOTP:
endPoint: /preregistration/v1/login/validateOtp
role: batch
checkErrorsOnlyInResponse: true
Expand All @@ -85,7 +85,7 @@ ValidateOtp:
"version": "1.0",
"requesttime": "$TIMESTAMP$",
"userId": "john.doe@mail$!inator.com",
"otp": "111111",
"otp": "DYNAMICOTP",
"id": "mosip.pre-registration.login.useridotp"
}'
output: '{
Expand All @@ -95,7 +95,7 @@ ValidateOtp:
}
]
}'
Prereg_ValidateOtp_Invalid_Email_Neg:
Prereg_ValidateOtp_Invalid_Email_Neg_INVALIDOTP:
endPoint: /preregistration/v1/login/validateOtp
role: batch
checkErrorsOnlyInResponse: true
Expand All @@ -106,7 +106,7 @@ ValidateOtp:
"version": "1.0",
"requesttime": "$TIMESTAMP$",
"userId": "joh23",
"otp": "111111",
"otp": "DYNAMICOTP",
"id": "mosip.pre-registration.login.useridotp"
}'
output: '{
Expand Down
2 changes: 1 addition & 1 deletion apitest/src/main/resources/preReg/uploadDocument/uploadDocument.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ UploadDocument:
"errors": [
{
"errorCode": "PRG_CORE_REQ_017"
}
]
}'
Prereg_UploadDocument_missing_docTypCode_sid:
Expand Down
29 changes: 15 additions & 14 deletions apitest/testNgXmlFiles/preregApi.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,6 @@
</listeners>


<test name="SendOtp">
<parameter name="ymlFile"
value="preReg/SendOtp/SendOtp.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
</classes>
</test>
<test name="ValidateOtp">
<parameter name="ymlFile"
value="preReg/ValidateOtp/ValidateOtp.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
</classes>
</test>
<test name="CreatePreregistration">
<parameter name="ymlFile"
value="preReg/createPrereg/createPrereg.yml" />
Expand Down Expand Up @@ -332,4 +318,19 @@
</test>


<test name="SendOtp">
<parameter name="ymlFile"
value="preReg/SendOtp/SendOtp.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
</classes>
</test>
<test name="ValidateOtp">
<parameter name="ymlFile"
value="preReg/ValidateOtp/ValidateOtp.yml" />
<classes>
<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
</classes>
</test>

</suite>

0 comments on commit 131a4dd

Please sign in to comment.