ruzeynalov commented on code in PR #5870:
URL: https://github.com/apache/fineract/pull/5870#discussion_r3298386581
##########
integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanRepaymentTest.java:
##########
@@ -363,17 +365,17 @@ private static void assertEqualBigDecimal(final
BigDecimal expected, final JsonE
private static void assertScheduleRow(final JsonObject payment, final
String expectedPaymentAmount,
final String expectedActualPaymentAmount, final String
expectedDiscountFactor, final String expectedNpvValue,
final String expectedBalance, final String
expectedExpectedAmortization, final String expectedActualAmortization,
- final String expectedIncomeModification, final String
expectedDeferredBalance, final String rowDateLabel) {
+ final String expectedIncomeModification, final String
expectedDiscountFeeBalance, final String rowDateLabel) {
assertNotNull(payment, "Expected payment row to exist for date " +
rowDateLabel);
assertAmount(payment, "expectedPaymentAmount", expectedPaymentAmount,
rowDateLabel);
assertAmountOrNull(payment, "actualPaymentAmount",
expectedActualPaymentAmount, rowDateLabel);
assertDiscountFactor(payment, expectedDiscountFactor, rowDateLabel);
Review Comment:
@budaidev these three lines assert that the API response contains (and
matches an expected non-null value for) the internal fields that should be
excluded
##########
integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanRepaymentTest.java:
##########
@@ -363,17 +365,17 @@ private static void assertEqualBigDecimal(final
BigDecimal expected, final JsonE
private static void assertScheduleRow(final JsonObject payment, final
String expectedPaymentAmount,
final String expectedActualPaymentAmount, final String
expectedDiscountFactor, final String expectedNpvValue,
final String expectedBalance, final String
expectedExpectedAmortization, final String expectedActualAmortization,
- final String expectedIncomeModification, final String
expectedDeferredBalance, final String rowDateLabel) {
+ final String expectedIncomeModification, final String
expectedDiscountFeeBalance, final String rowDateLabel) {
assertNotNull(payment, "Expected payment row to exist for date " +
rowDateLabel);
assertAmount(payment, "expectedPaymentAmount", expectedPaymentAmount,
rowDateLabel);
assertAmountOrNull(payment, "actualPaymentAmount",
expectedActualPaymentAmount, rowDateLabel);
assertDiscountFactor(payment, expectedDiscountFactor, rowDateLabel);
assertAmount(payment, "npvValue", expectedNpvValue, rowDateLabel);
- assertAmount(payment, "balance", expectedBalance, rowDateLabel);
+ assertAmount(payment, "expectedBalance", expectedBalance,
rowDateLabel);
assertAmount(payment, "expectedAmortizationAmount",
expectedExpectedAmortization, rowDateLabel);
assertAmountOrNull(payment, "actualAmortizationAmount",
expectedActualAmortization, rowDateLabel);
assertAmountOrNull(payment, "incomeModification",
expectedIncomeModification, rowDateLabel);
Review Comment:
@budaidev should be excluded as well
##########
fineract-e2e-tests-runner/src/test/resources/features/WorkingCapitalLoanRepayment.feature:
##########
@@ -2,7 +2,7 @@
Feature: Working Capital Loan Repayment
Review Comment:
@budaidev All 17 scenario from this feature file has zero actualBalance /
actualDiscountFeeBalance assertions
##########
integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanRepaymentTest.java:
##########
@@ -363,17 +365,17 @@ private static void assertEqualBigDecimal(final
BigDecimal expected, final JsonE
private static void assertScheduleRow(final JsonObject payment, final
String expectedPaymentAmount,
final String expectedActualPaymentAmount, final String
expectedDiscountFactor, final String expectedNpvValue,
final String expectedBalance, final String
expectedExpectedAmortization, final String expectedActualAmortization,
- final String expectedIncomeModification, final String
expectedDeferredBalance, final String rowDateLabel) {
+ final String expectedIncomeModification, final String
expectedDiscountFeeBalance, final String rowDateLabel) {
assertNotNull(payment, "Expected payment row to exist for date " +
rowDateLabel);
assertAmount(payment, "expectedPaymentAmount", expectedPaymentAmount,
rowDateLabel);
assertAmountOrNull(payment, "actualPaymentAmount",
expectedActualPaymentAmount, rowDateLabel);
assertDiscountFactor(payment, expectedDiscountFactor, rowDateLabel);
assertAmount(payment, "npvValue", expectedNpvValue, rowDateLabel);
- assertAmount(payment, "balance", expectedBalance, rowDateLabel);
+ assertAmount(payment, "expectedBalance", expectedBalance,
rowDateLabel);
assertAmount(payment, "expectedAmortizationAmount",
expectedExpectedAmortization, rowDateLabel);
assertAmountOrNull(payment, "actualAmortizationAmount",
expectedActualAmortization, rowDateLabel);
assertAmountOrNull(payment, "incomeModification",
expectedIncomeModification, rowDateLabel);
- assertAmount(payment, "deferredBalance", expectedDeferredBalance,
rowDateLabel);
+ assertAmount(payment, "expectedDiscountFeeBalance",
expectedDiscountFeeBalance, rowDateLabel);
Review Comment:
@budaidev the renamed "deferred balance" — should be excluded from assert
as well
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
