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 039a31952e290cb71d432597af450e0898bb29ed Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 10 09:53:05 2026 -0400 JUnit 5 migration of "cayenne-cache-invalidation" module --- cayenne-cache-invalidation/pom.xml | 7 +------ .../apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java | 4 ++-- .../cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java | 8 ++++---- .../apache/cayenne/cache/invalidation/CacheInvalidationCase.java | 8 ++++---- .../cache/invalidation/CacheInvalidationCustomHandlerIT.java | 6 +++--- .../invalidation/CayenneCacheInvalidationModuleProviderTest.java | 4 ++-- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/cayenne-cache-invalidation/pom.xml b/cayenne-cache-invalidation/pom.xml index 46c1cb3f8..0f8519ec0 100644 --- a/cayenne-cache-invalidation/pom.xml +++ b/cayenne-cache-invalidation/pom.xml @@ -44,12 +44,7 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> +<dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java index bcb27e1bc..5d211f986 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheGroupsHandlerTest.java @@ -26,9 +26,9 @@ import java.util.function.Function; import org.apache.cayenne.Persistent; import org.apache.cayenne.cache.invalidation.db.E1; import org.apache.cayenne.cache.invalidation.db.E2; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @since 4.0 diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java index 67df82112..3071c5bb8 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCacheGroupsHandlerIT.java @@ -26,12 +26,12 @@ import org.apache.cayenne.cache.invalidation.db.E1; import org.apache.cayenne.cache.invalidation.db.E2; import org.apache.cayenne.di.Module; import org.apache.cayenne.query.ObjectSelect; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @since 4.0 @@ -41,7 +41,7 @@ public class CacheInvalidationCacheGroupsHandlerIT extends CacheInvalidationCase private AtomicInteger removeGroupUntypedCounter; private AtomicInteger removeGroupTypedCounter; - @Before + @BeforeEach public void resetCounters() { removeGroupUntypedCounter = new AtomicInteger(0); removeGroupTypedCounter = new AtomicInteger(0); diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java index 05c73fedc..7afa8cd86 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java @@ -23,8 +23,8 @@ import org.apache.cayenne.runtime.CayenneRuntime; import org.apache.cayenne.runtime.CayenneRuntimeBuilder; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; public abstract class CacheInvalidationCase { @@ -34,7 +34,7 @@ public abstract class CacheInvalidationCase { protected TableHelper e2; - @Before + @BeforeEach public void startCayenne() throws Exception { this.runtime = configureCayenne().build(); @@ -63,7 +63,7 @@ public abstract class CacheInvalidationCase { .addConfig("cayenne-lifecycle.xml"); } - @After + @AfterEach public void shutdownCayenne() { if (runtime != null) { runtime.shutdown(); diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCustomHandlerIT.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCustomHandlerIT.java index d847df744..22601e8ec 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCustomHandlerIT.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCustomHandlerIT.java @@ -23,13 +23,13 @@ import org.apache.cayenne.ObjectContext; import org.apache.cayenne.Persistent; import org.apache.cayenne.cache.invalidation.db.E1; import org.apache.cayenne.query.ObjectSelect; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collection; import java.util.Collections; import java.util.function.Function; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @since 4.0 @@ -42,7 +42,7 @@ public class CacheInvalidationCustomHandlerIT extends CacheInvalidationCase { } @Test - public void testInvalidate() throws Exception { + public void invalidate() throws Exception { ObjectContext context = runtime.newContext(); // no explicit cache group must still work - it lands inside default cache called 'cayenne.default.cache' diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java index b84eee614..72b78dc02 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java @@ -21,12 +21,12 @@ package org.apache.cayenne.cache.invalidation; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; import org.apache.cayenne.unit.util.ModuleProviderChecker; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CayenneCacheInvalidationModuleProviderTest { @Test - public void testAutoLoadable() { + public void autoLoadable() { ModuleProviderChecker.testProviderPresent(CacheInvalidationModuleProvider.class, CayenneRuntimeModuleProvider.class); } }
