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 5a01e7850faf77697facc624a69689fd0ec7cab9 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 10 12:20:59 2026 -0400 JUnit 5 migration of "cayenne-lifecycle" module --- cayenne-lifecycle/pom.xml | 7 +----- .../cayenne/lifecycle/id/EntityIdCoderTest.java | 28 +++++++++++----------- .../apache/cayenne/lifecycle/id/IdCoderTest.java | 22 ++++++++--------- .../cayenne/lifecycle/id/StringIdQueryTest.java | 20 ++++++++-------- .../ObjectIdRelationshipHandlerTest.java | 22 ++++++++--------- 5 files changed, 47 insertions(+), 52 deletions(-) diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml index 07460374f..d22957af7 100644 --- a/cayenne-lifecycle/pom.xml +++ b/cayenne-lifecycle/pom.xml @@ -39,12 +39,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.apache.cayenne.build-tools</groupId> <artifactId>cayenne-test-utilities</artifactId> <version>${project.version}</version> diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/EntityIdCoderTest.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/EntityIdCoderTest.java index 2e338115e..48397befc 100644 --- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/EntityIdCoderTest.java +++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/EntityIdCoderTest.java @@ -23,16 +23,16 @@ import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.runtime.CayenneRuntime; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.sql.Types; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -40,24 +40,24 @@ public class EntityIdCoderTest { private CayenneRuntime runtime; - @Before + @BeforeEach public void setUp() throws Exception { runtime = CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml").build(); } - @After + @AfterEach public void tearDown() throws Exception { runtime.shutdown(); } @Test - public void testGetEntityName() { + public void getEntityName() { assertEquals("M", EntityIdCoder.getEntityName("M:N:K")); assertEquals("M", EntityIdCoder.getEntityName(".M:N:K")); } @Test - public void testTempId() { + public void tempId() { ObjEntity e1 = runtime.getChannel().getEntityResolver() .getObjEntity("E1"); @@ -75,7 +75,7 @@ public class EntityIdCoderTest { } @Test - public void testSingleIntPk() { + public void singleIntPk() { DbEntity dbEntity = new DbEntity("X"); DbAttribute pk = new DbAttribute("ID"); pk.setType(Types.INTEGER); @@ -97,7 +97,7 @@ public class EntityIdCoderTest { } @Test - public void testSingleLongPk() { + public void singleLongPk() { DbEntity dbEntity = new DbEntity("X"); DbAttribute pk = new DbAttribute("ID"); pk.setType(Types.BIGINT); @@ -119,7 +119,7 @@ public class EntityIdCoderTest { } @Test - public void testSingleStringPk() { + public void singleStringPk() { DbEntity dbEntity = new DbEntity("X"); DbAttribute pk = new DbAttribute("ID"); pk.setType(Types.VARCHAR); @@ -141,7 +141,7 @@ public class EntityIdCoderTest { } @Test - public void testIdEncoding() { + public void idEncoding() { DbEntity dbEntity = new DbEntity("X"); DbAttribute pk = new DbAttribute("ID"); pk.setType(Types.VARCHAR); @@ -163,7 +163,7 @@ public class EntityIdCoderTest { } @Test - public void testMixedCompoundPk() { + public void mixedCompoundPk() { DbEntity dbEntity = new DbEntity("X"); DbAttribute pk1 = new DbAttribute("ID"); pk1.setType(Types.VARCHAR); diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/IdCoderTest.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/IdCoderTest.java index af02bb5b5..1b62d972e 100644 --- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/IdCoderTest.java +++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/IdCoderTest.java @@ -21,28 +21,28 @@ package org.apache.cayenne.lifecycle.id; import org.apache.cayenne.ObjectId; import org.apache.cayenne.lifecycle.db.E1; import org.apache.cayenne.runtime.CayenneRuntime; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class IdCoderTest { private CayenneRuntime runtime; - @Before + @BeforeEach public void setUp() throws Exception { runtime = CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml").build(); } - @After + @AfterEach public void tearDown() throws Exception { runtime.shutdown(); } @Test - public void testGetStringId() { + public void getStringId() { IdCoder handler = new IdCoder(runtime.getChannel().getEntityResolver()); E1 e1 = new E1(); @@ -51,13 +51,13 @@ public class IdCoderTest { } @Test - public void testGetStringId_ObjectId() { + public void getStringId_ObjectId() { IdCoder handler = new IdCoder(runtime.getChannel().getEntityResolver()); assertEquals("E1:5", handler.getStringId(ObjectId.of("E1", "ID", 5))); } @Test - public void testGetStringId_Temp() { + public void getStringId_Temp() { IdCoder handler = new IdCoder(runtime.getChannel().getEntityResolver()); byte[] key = new byte[] { 1, 2, 10, 100 }; @@ -69,7 +69,7 @@ public class IdCoderTest { } @Test - public void testGetObjectId_Temp() { + public void getObjectId_Temp() { IdCoder handler = new IdCoder(runtime.getChannel().getEntityResolver()); byte[] key = new byte[] { 1, (byte) 0xD7, 10, 100 }; @@ -79,7 +79,7 @@ public class IdCoderTest { } @Test - public void testGetSringId_TempWithReplacement() { + public void getSringId_TempWithReplacement() { IdCoder handler = new IdCoder(runtime.getChannel().getEntityResolver()); byte[] key = new byte[] { 5, 2, 11, 99 }; diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java index 004bc0ec9..1eea6eeee 100644 --- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java +++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java @@ -23,17 +23,17 @@ import org.apache.cayenne.QueryResponse; import org.apache.cayenne.runtime.CayenneRuntime; 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.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class StringIdQueryTest { @@ -41,7 +41,7 @@ public class StringIdQueryTest { private TableHelper e1Helper; private TableHelper e2Helper; - @Before + @BeforeEach public void setUp() { runtime = CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml").build(); DBHelper dbHelper = new DBHelper(runtime.getDataSource("lifecycle-db")); @@ -49,13 +49,13 @@ public class StringIdQueryTest { e2Helper = new TableHelper(dbHelper, "E2", "ID"); } - @After + @AfterEach public void tearDown() { runtime.shutdown(); } @Test - public void testConstructor() { + public void constructor() { StringIdQuery q1 = new StringIdQuery(); assertEquals(0, q1.getStringIds().size()); @@ -73,7 +73,7 @@ public class StringIdQueryTest { } @Test - public void testPerformQuery_SingleEntity() throws Exception { + public void performQuery_SingleEntity() throws Exception { e1Helper.deleteAll(); e1Helper.insert(3).insert(4); @@ -95,7 +95,7 @@ public class StringIdQueryTest { } @Test - public void testPerformQuery_MultipleEntities() throws Exception { + public void performQuery_MultipleEntities() throws Exception { e1Helper.deleteAll(); e1Helper.insert(3).insert(4); diff --git a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java index c46d30bbb..913b73fcf 100644 --- a/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java +++ b/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java @@ -27,13 +27,13 @@ import org.apache.cayenne.query.ObjectSelect; import org.apache.cayenne.runtime.CayenneRuntime; 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.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertSame; public class ObjectIdRelationshipHandlerTest { @@ -42,7 +42,7 @@ public class ObjectIdRelationshipHandlerTest { private TableHelper rootTable; private TableHelper e1Table; - @Before + @BeforeEach public void setUp() throws Exception { runtime = CayenneRuntime.builder().addConfig("cayenne-lifecycle.xml").build(); @@ -60,13 +60,13 @@ public class ObjectIdRelationshipHandlerTest { e1Table.deleteAll(); } - @After + @AfterEach public void tearDown() { runtime.shutdown(); } @Test - public void testRelate_Existing() throws Exception { + public void relate_Existing() throws Exception { e1Table.insert(1); @@ -89,7 +89,7 @@ public class ObjectIdRelationshipHandlerTest { } @Test - public void testRelate_New() throws Exception { + public void relate_New() throws Exception { ObjectContext context = runtime.newContext(); E1 e1 = context.newObject(E1.class); @@ -113,7 +113,7 @@ public class ObjectIdRelationshipHandlerTest { } @Test - public void testRelate_Change() throws Exception { + public void relate_Change() throws Exception { e1Table.insert(1); rootTable.insert(1, "E1:1");
