Skip to content

Commit 857d461

Browse files
committed
Migrate ModuleProviderChecker to JUnit 5; remove spurious cayenne-test-utilities from cayenne-cgen
1 parent 993513e commit 857d461

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

cayenne-cgen/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@
7878
<artifactId>junit-jupiter</artifactId>
7979
<scope>test</scope>
8080
</dependency>
81-
<dependency>
82-
<groupId>org.apache.cayenne.build-tools</groupId>
83-
<artifactId>cayenne-test-utilities</artifactId>
84-
<version>${project.version}</version>
85-
<scope>test</scope>
86-
</dependency>
87-
8881
<dependency>
8982
<groupId>org.mockito</groupId>
9083
<artifactId>mockito-core</artifactId>

cayenne/src/test/java/org/apache/cayenne/unit/util/ModuleProviderChecker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import java.util.Objects;
2626
import java.util.ServiceLoader;
2727

28-
import static org.junit.Assert.assertTrue;
29-
import static org.junit.Assert.fail;
28+
import static org.junit.jupiter.api.Assertions.assertTrue;
29+
import static org.junit.jupiter.api.Assertions.fail;
3030

3131
public class ModuleProviderChecker {
3232

@@ -42,7 +42,7 @@ protected ModuleProviderChecker(Class<? extends ModuleProvider> expectedProvider
4242
Class<? extends ModuleProvider> providerInterface) {
4343
this.expectedProvider = Objects.requireNonNull(expectedProvider);
4444
this.providerInterface = Objects.requireNonNull(providerInterface);
45-
assertTrue("Provider interface expected", providerInterface.isInterface());
45+
assertTrue(providerInterface.isInterface(), "Provider interface expected");
4646
if(expectedProvider.equals(providerInterface)) {
4747
fail("Expected provider class and required interface should be different.");
4848
}

0 commit comments

Comments
 (0)