This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 857d461fc67bca9be7ad5bf795e3ebef1ef2354d Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 10 12:05:40 2026 -0400 Migrate ModuleProviderChecker to JUnit 5; remove spurious cayenne-test-utilities from cayenne-cgen --- cayenne-cgen/pom.xml | 7 ------- .../java/org/apache/cayenne/unit/util/ModuleProviderChecker.java | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/cayenne-cgen/pom.xml b/cayenne-cgen/pom.xml index 5d470d411..3ae1faff0 100644 --- a/cayenne-cgen/pom.xml +++ b/cayenne-cgen/pom.xml @@ -78,13 +78,6 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.cayenne.build-tools</groupId> - <artifactId>cayenne-test-utilities</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/util/ModuleProviderChecker.java b/cayenne/src/test/java/org/apache/cayenne/unit/util/ModuleProviderChecker.java index 0c988afb9..88e73ca67 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/util/ModuleProviderChecker.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/util/ModuleProviderChecker.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Objects; import java.util.ServiceLoader; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ModuleProviderChecker { @@ -42,7 +42,7 @@ public class ModuleProviderChecker { Class<? extends ModuleProvider> providerInterface) { this.expectedProvider = Objects.requireNonNull(expectedProvider); this.providerInterface = Objects.requireNonNull(providerInterface); - assertTrue("Provider interface expected", providerInterface.isInterface()); + assertTrue(providerInterface.isInterface(), "Provider interface expected"); if(expectedProvider.equals(providerInterface)) { fail("Expected provider class and required interface should be different."); }
