From 991a2c1af4038383dcc84143f6479dac3c66703f Mon Sep 17 00:00:00 2001 From: Adam Saghy Date: Wed, 26 Feb 2025 19:36:24 +0100 Subject: [PATCH] FINERACT-2181: Update Test annotation import (org.junit.Test -> org.junit.jupiter.api.Test) --- .../businessdate/data/BusinessDateData.java | 2 +- .../businessdate/data/BusinessDataSerialized.java | 2 +- .../businessdate/data/BusinessDataTypeTest.java | 2 +- .../businessdate/mapper/BusinessDateMapperTest.java | 2 +- .../validator/BusinessDateValidatorTest.java | 10 +++++----- .../external/service/message/MessageFactoryTest.java | 2 +- .../LoanChargeEffectiveDueDateComparatorTest.java | 2 +- .../integrationtests/LoanPrepayAmountTest.java | 2 +- .../fineract/integrationtests/LoanSummaryTest.java | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fineract-core/src/main/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDateData.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDateData.java index 1687da175..0e5999a28 100644 --- a/fineract-core/src/main/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDateData.java +++ b/fineract-core/src/main/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDateData.java @@ -36,7 +36,7 @@ public class BusinessDateData implements Serializable { private LocalDate date; public static BusinessDateData instance(BusinessDateType businessDateType, LocalDate value) { - return new BusinessDateData().setType(businessDateType.getName()).setDate(value); + return new BusinessDateData().setType(businessDateType.getName()).setDescription(businessDateType.getDescription()).setDate(value); } } diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDataSerialized.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDataSerialized.java index ff5ede342..59c06a596 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDataSerialized.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDataSerialized.java @@ -28,7 +28,7 @@ import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSer import org.apache.fineract.infrastructure.core.serialization.ExcludeNothingWithPrettyPrintingOffJsonSerializerGoogleGson; import org.apache.fineract.infrastructure.core.serialization.ExcludeNothingWithPrettyPrintingOnJsonSerializerGoogleGson; import org.apache.fineract.infrastructure.core.serialization.GoogleGsonSerializerHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BusinessDataSerialized { diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDataTypeTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDataTypeTest.java index a3257a317..958a12dbe 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDataTypeTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/data/BusinessDataTypeTest.java @@ -21,7 +21,7 @@ package org.apache.fineract.infrastructure.businessdate.data; import static org.junit.Assert.assertEquals; import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BusinessDataTypeTest { diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/mapper/BusinessDateMapperTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/mapper/BusinessDateMapperTest.java index 9bbd6a5f0..5f6639453 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/mapper/BusinessDateMapperTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/mapper/BusinessDateMapperTest.java @@ -27,7 +27,7 @@ import java.util.List; import org.apache.fineract.infrastructure.businessdate.data.BusinessDateData; import org.apache.fineract.infrastructure.businessdate.domain.BusinessDate; import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mapstruct.factory.Mappers; public class BusinessDateMapperTest { diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/validator/BusinessDateValidatorTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/validator/BusinessDateValidatorTest.java index bd308c0d6..4b9e03f76 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/validator/BusinessDateValidatorTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/businessdate/validator/BusinessDateValidatorTest.java @@ -26,7 +26,7 @@ import org.apache.fineract.infrastructure.businessdate.data.BusinessDateData; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BusinessDateValidatorTest { @@ -61,7 +61,7 @@ public class BusinessDateValidatorTest { JsonCommand command = JsonCommand.from(json); PlatformApiDataValidationException exception = assertThrows(PlatformApiDataValidationException.class, () -> businessDateDataParserAndValidator.validateAndParseUpdate(command)); - assertEquals("PlatformApiDataValidationException{errors=[The parameter `locale` has an invalid language value: `invalid`.]}", + assertEquals("PlatformApiDataValidationException{errors=[The parameter `locale` has an invalid language value invalid .]}", exception.toString()); } @@ -82,7 +82,7 @@ public class BusinessDateValidatorTest { PlatformApiDataValidationException exception = assertThrows(PlatformApiDataValidationException.class, () -> businessDateDataParserAndValidator.validateAndParseUpdate(command)); assertEquals( - "PlatformApiDataValidationException{errors=[The parameter `date` (value=2022-06-11) is invalid based on the dateFormat: `y2yyy-MM-dd` and locale: `hu` provided.]}", + "PlatformApiDataValidationException{errors=[The parameter `date` is invalid based on the dateFormat: `y2yyy-MM-dd` and locale: `hu` provided:]}", exception.toString()); } @@ -93,7 +93,7 @@ public class BusinessDateValidatorTest { PlatformApiDataValidationException exception = assertThrows(PlatformApiDataValidationException.class, () -> businessDateDataParserAndValidator.validateAndParseUpdate(command)); assertEquals( - "PlatformApiDataValidationException{errors=[The parameter `date` (value=2y22-06-11) is invalid based on the dateFormat: `yyyy-MM-dd` and locale: `hu` provided.]}", + "PlatformApiDataValidationException{errors=[The parameter `date` is invalid based on the dateFormat: `yyyy-MM-dd` and locale: `hu` provided:]}", exception.toString()); } @@ -104,7 +104,7 @@ public class BusinessDateValidatorTest { PlatformApiDataValidationException exception = assertThrows(PlatformApiDataValidationException.class, () -> businessDateDataParserAndValidator.validateAndParseUpdate(command)); assertEquals( - "PlatformApiDataValidationException{errors=[The parameter `date` (value=11-06-2022) is invalid based on the dateFormat: `yyyy-MM-dd` and locale: `hu` provided.]}", + "PlatformApiDataValidationException{errors=[The parameter `date` is invalid based on the dateFormat: `yyyy-MM-dd` and locale: `hu` provided:]}", exception.toString()); } diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/message/MessageFactoryTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/message/MessageFactoryTest.java index cd47a86c0..420d7d826 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/message/MessageFactoryTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/message/MessageFactoryTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MessageFactoryTest { diff --git a/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/domain/LoanChargeEffectiveDueDateComparatorTest.java b/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/domain/LoanChargeEffectiveDueDateComparatorTest.java index a3172411b..cafa4620b 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/domain/LoanChargeEffectiveDueDateComparatorTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/domain/LoanChargeEffectiveDueDateComparatorTest.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; import org.apache.fineract.portfolio.charge.domain.ChargeTimeType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.test.util.ReflectionTestUtils; public class LoanChargeEffectiveDueDateComparatorTest { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPrepayAmountTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPrepayAmountTest.java index bde69d064..d5bfee134 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPrepayAmountTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPrepayAmountTest.java @@ -25,8 +25,8 @@ import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.PostLoanProductsResponse; import org.apache.fineract.client.models.PostLoansResponse; import org.apache.fineract.integrationtests.common.ClientHelper; -import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j public class LoanPrepayAmountTest extends BaseLoanIntegrationTest { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanSummaryTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanSummaryTest.java index a410ab5c5..17d0e2ca9 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanSummaryTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanSummaryTest.java @@ -24,8 +24,8 @@ import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.PostLoanProductsResponse; import org.apache.fineract.client.models.PostLoansResponse; import org.apache.fineract.integrationtests.common.ClientHelper; -import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class LoanSummaryTest extends BaseLoanIntegrationTest {