CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FINERACT-2181: Improve AssertJ assertions in DefaultScheduledDateGeneratorTest

Browse Source
This commit is contained in:
Hossam Hatem
2025-03-19 17:39:01 +01:00
committed by Adam Saghy
parent 2cfc0b2503
commit 1cb5d7c371
5 changed files with 126 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-progressive-loan/src/test/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/ChangeOperationTest.java
+34 -28
View File
@@ -24,6 +24,7 @@ import java.time.OffsetDateTime;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
import org.apache.fineract.portfolio.loanaccount.data.LoanTermVariationsData;
@@ -33,6 +34,9 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
@@ -57,10 +61,10 @@ public class ChangeOperationTest {
ChangeOperation interestChange = createInterestRateChange("2023-10-17");
ChangeOperation charge = createCharge("2023-10-17", "2023-10-17", "2023-10-17T10:15:30+01:00");
ChangeOperation transaction = createTransaction("2023-10-17", "2023-10-17", "2023-10-17T10:15:30+01:00");
Assertions.assertTrue(interestChange.compareTo(transaction) < 0);
Assertions.assertTrue(interestChange.compareTo(charge) < 0);
Assertions.assertTrue(charge.compareTo(transaction) == 0);
Assertions.assertTrue(transaction.compareTo(charge) == 0);
Assertions.assertEquals(-1, interestChange.compareTo(transaction));
Assertions.assertEquals(-1, interestChange.compareTo(charge));
Assertions.assertEquals(0, charge.compareTo(transaction));
Assertions.assertEquals(0, transaction.compareTo(charge));
}
@Test
@@ -68,34 +72,37 @@ public class ChangeOperationTest {
ChangeOperation interestChange = createInterestRateChange("2023-10-17");
ChangeOperation charge = createCharge("2023-10-16", "2023-10-17", "2023-10-17T10:15:30+01:00");
ChangeOperation transaction = createTransaction("2023-10-16", "2023-10-17", "2023-10-17T10:15:30+01:00");
Assertions.assertTrue(interestChange.compareTo(transaction) > 0);
Assertions.assertTrue(interestChange.compareTo(charge) > 0);
Assertions.assertTrue(charge.compareTo(transaction) == 0);
Assertions.assertTrue(transaction.compareTo(charge) == 0);
Assertions.assertEquals(1, interestChange.compareTo(transaction));
Assertions.assertEquals(1, interestChange.compareTo(charge));
Assertions.assertEquals(0, charge.compareTo(transaction));
Assertions.assertEquals(0, transaction.compareTo(charge));
}
@Test
public void testCompareToCreatedDateTime() {
ChangeOperation charge = createCharge("2023-10-17", "2023-10-17", "2023-10-17T10:15:31+01:00");
ChangeOperation transaction = createTransaction("2023-10-17", "2023-10-17", "2023-10-17T10:15:30+01:00");
Assertions.assertTrue(charge.compareTo(transaction) > 0);
Assertions.assertTrue(transaction.compareTo(charge) < 0);
@ParameterizedTest
@MethodSource("provideComparisonTestData")
public void testComparison(String chargeEffectiveDate, String chargeSubmittedDate, String chargeCreationDateTime,
String transactionDate, String transactionSubmittedDate, String transactionCreationDateTime, int expectedChargeVsTransaction,
int expectedTransactionVsCharge) {
ChangeOperation charge = createCharge(chargeEffectiveDate, chargeSubmittedDate, chargeCreationDateTime);
ChangeOperation transaction = createTransaction(transactionDate, transactionSubmittedDate, transactionCreationDateTime);
Assertions.assertEquals(expectedChargeVsTransaction, charge.compareTo(transaction));
Assertions.assertEquals(expectedTransactionVsCharge, transaction.compareTo(charge));
}
@Test
public void testCompareToSubmittedOnDate() {
ChangeOperation charge = createCharge("2023-10-17", "2023-10-17", "2023-10-17T10:15:30+01:00");
ChangeOperation transaction = createTransaction("2023-10-17", "2023-10-16", "2023-10-17T10:15:30+01:00");
Assertions.assertTrue(charge.compareTo(transaction) > 0);
Assertions.assertTrue(transaction.compareTo(charge) < 0);
}
private static Stream<Arguments> provideComparisonTestData() {
return Stream.of(
// Test case for createdDateTime comparison
Arguments.of("2023-10-17", "2023-10-17", "2023-10-17T10:15:31+01:00", "2023-10-17", "2023-10-17",
"2023-10-17T10:15:30+01:00", 1, -1),
@Test
public void testComparatorEffectiveDate() {
ChangeOperation charge = createCharge("2023-10-17", "2023-10-17", "2023-10-17T10:15:30+01:00");
ChangeOperation transaction = createTransaction("2023-10-16", "2023-10-17", "2023-10-17T10:15:30+01:00");
Assertions.assertTrue(charge.compareTo(transaction) > 0);
Assertions.assertTrue(transaction.compareTo(charge) < 0);
// Test case for submittedOnDate comparison
Arguments.of("2023-10-17", "2023-10-17", "2023-10-17T10:15:30+01:00", "2023-10-17", "2023-10-16",
"2023-10-17T10:15:30+01:00", 1, -1),
// Test case for effectiveDate comparison
Arguments.of("2023-10-17", "2023-10-17", "2023-10-17T10:15:30+01:00", "2023-10-16", "2023-10-17",
"2023-10-17T10:15:30+01:00", 1, -1));
}
@Test
@@ -155,5 +162,4 @@ public class ChangeOperationTest {
Mockito.when(transaction.getCreatedDate()).thenReturn(Optional.of(OffsetDateTime.parse(creationDateTime)));
return new ChangeOperation(transaction);
}
}
fineract-progressive-loan/src/test/java/org/apache/fineract/portfolio/loanproduct/domain/AdvancedPaymentAllocationsValidatorTest.java
+7 -3
View File
@@ -28,7 +28,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
import org.jetbrains.annotations.NotNull;
@@ -214,8 +213,13 @@ class AdvancedPaymentAllocationsValidatorTest {
@NotNull
private static List<Pair<Integer, PaymentAllocationType>> createPaymentAllocationTypeList() {
AtomicInteger i = new AtomicInteger(1);
return EnumSet.allOf(PaymentAllocationType.class).stream().map(p -> Pair.of(i.getAndIncrement(), p)).toList();
return EnumSet.allOf(PaymentAllocationType.class).stream().map(p -> {
try {
return Pair.of(Integer.parseInt(String.valueOf(Integer.parseInt(String.valueOf(p.ordinal())) + 1)), p);
} catch (NumberFormatException e) {
throw new RuntimeException("Failed to create payment allocation type list", e);
}
}).toList();
}
private void assertPlatformException(String expectedMessage, String expectedCode,