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 17ee5a32c109a51e31805144a12c3a56d8250267 Author: Andrus Adamchik <[email protected]> AuthorDate: Wed May 13 18:26:26 2026 -0400 Unit tests cleanup - no need to make a distinction between ObjectContext and DataContext in the test Env --- .../cayenne/dbsync/merge/MergerFactoryIT.java | 22 +++++-------------- .../cayenne/dbsync/merge/token/ValueForNullIT.java | 25 ++++++---------------- .../cayenne/unit/di/runtime/CayenneTestsEnv.java | 4 ---- 3 files changed, 12 insertions(+), 39 deletions(-) diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergerFactoryIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergerFactoryIT.java index a01d41187..607d485cc 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergerFactoryIT.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergerFactoryIT.java @@ -18,31 +18,20 @@ ****************************************************************/ package org.apache.cayenne.dbsync.merge; -import java.sql.Types; - import org.apache.cayenne.GenericPersistentObject; -import org.apache.cayenne.access.DataContext; import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.DbJoin; import org.apache.cayenne.map.DbRelationship; import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - -public class MergerFactoryIT extends MergeCase { +import java.sql.Types; - private DataContext context; +import static org.junit.jupiter.api.Assertions.*; - @BeforeEach - public void setUpContext() { - context = env.dataContext(); - } +public class MergerFactoryIT extends MergeCase { @Test public void addAndDropColumnToDb() throws Exception { @@ -165,11 +154,10 @@ public class MergerFactoryIT extends MergeCase { map.addObjEntity(objEntity); for (int i = 0; i < 5; i++) { - GenericPersistentObject dao = (GenericPersistentObject) context.newObject(objEntity - .getName()); + GenericPersistentObject dao = (GenericPersistentObject) env.context().newObject(objEntity.getName()); dao.writeProperty(oatr1.getName(), "test " + i); } - context.commitChanges(); + env.context().commitChanges(); // clear up map.removeObjEntity(objEntity.getName(), true); diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/ValueForNullIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/ValueForNullIT.java index 37cfc44b0..249b4f57e 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/ValueForNullIT.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/ValueForNullIT.java @@ -19,11 +19,7 @@ package org.apache.cayenne.dbsync.merge.token; -import java.sql.Types; -import java.util.List; - import org.apache.cayenne.Persistent; -import org.apache.cayenne.access.DataContext; import org.apache.cayenne.access.translator.ParameterBinding; import org.apache.cayenne.dbsync.merge.DataMapMerger; import org.apache.cayenne.dbsync.merge.MergeCase; @@ -35,24 +31,17 @@ import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.query.ObjectSelect; import org.apache.cayenne.testdo.testmap.Painting; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import java.sql.Types; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; public class ValueForNullIT extends MergeCase { private static final String DEFAULT_VALUE_STRING = "DEFSTRING"; - private DataContext context; - - @BeforeEach - public void setUpContext() { - context = env.dataContext(); - } - @Test public void test() throws Exception { DbEntity dbEntity = map.getDbEntity("PAINTING"); @@ -63,10 +52,10 @@ public class ValueForNullIT extends MergeCase { // insert some rows before adding "not null" column final int nrows = 10; for (int i = 0; i < nrows; i++) { - Persistent o = context.newObject("Painting"); + Persistent o = env.context().newObject("Painting"); o.writeProperty("paintingTitle", "ptitle" + i); } - context.commitChanges(); + env.context().commitChanges(); // create and add new column to model and db DbAttribute column = new DbAttribute("NEWCOL2", Types.VARCHAR, dbEntity); @@ -98,7 +87,7 @@ public class ValueForNullIT extends MergeCase { // check values for null Expression qual = ExpressionFactory.matchExp(objAttr.getName(), DEFAULT_VALUE_STRING); ObjectSelect<Painting> query = ObjectSelect.query(Painting.class).where(qual); - List<Painting> rows = query.select(context); + List<Painting> rows = query.select(env.context()); assertEquals(nrows, rows.size()); // clean up diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneTestsEnv.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneTestsEnv.java index cd41a52f3..5f566329b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneTestsEnv.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneTestsEnv.java @@ -134,10 +134,6 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { return dbHelper; } - public TableHelper table(String tableName) { - return new TableHelper(dbHelper, tableName); - } - public TableHelper table(String tableName, String... columns) { return new TableHelper(dbHelper, tableName, columns); }
