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

[PHEE-630] Fix BD-004 and BD-011 test #244

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,10 @@ public void parseBatchSummaryResponse() {

@And("Status of transaction is {string}")
public void checkIfCreatedAtIsNotNull(String status) {
assertThat(scenarioScopeState.batchDTO).isNotNull();
assertThat(scenarioScopeState.batchDTO.getStatus()).isEqualTo(status);
await().atMost(awaitMost, SECONDS).pollDelay(pollDelay, SECONDS).pollInterval(pollInterval, SECONDS).untilAsserted(() -> {
assertThat(scenarioScopeState.batchDTO).isNotNull();
assertThat(scenarioScopeState.batchDTO.getStatus()).isEqualTo(status);
});
}

@When("I call the batch details API with expected status of {int} with total {int} txns")
Expand All @@ -196,6 +198,7 @@ public void callBatchDetailsAPI(int expectedStatus, int totalTxns) {
requestSpec.header("Authorization", "Bearer " + scenarioScopeState.accessToken);
}
requestSpec.queryParam("batchId", scenarioScopeState.batchId);
requestSpec.queryParam("pageSize", "20");
logger.info("Calling with batch id : {}", scenarioScopeState.batchId);

scenarioScopeState.response = RestAssured.given(requestSpec).baseUri(operationsAppConfig.operationAppContactPoint).expect()
Expand Down
24 changes: 12 additions & 12 deletions src/test/java/resources/batch_demo_csv/ph-ee-bulk-demo-6.csv
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
id,request_id,payment_mode,payer_identifier_type,payer_identifier,payee_identifier_type,payee_identifier,amount,currency,note
0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,slcb,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,slcb,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,slcb,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,slcb,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,slcb,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,slcb,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,slcb,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,slcb,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,slcb,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,slcb,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
10,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,slcb,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
11,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,slcb,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
0,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
1,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
2,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
3,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
4,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
5,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
6,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
7,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
8,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
9,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment
10,f1e22fe3-9740-4fba-97b6-78f43bfa7f2f,mojaloop,accountNumber,003001003879112168,accountNumber,003001003873110196,850,USD,Test Payee Payment
11,72aa3ea4-e6f6-4880-877f-39f6ac4d052e,mojaloop,accountNumber,003001003879112168,accountNumber,003001003874120160,222,USD,Test Payee Payment