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 69c8eb503ce4561f0d7363201bd0a14f10b82410 Author: Andrus Adamchik <[email protected]> AuthorDate: Sat May 16 15:23:29 2026 -0400 tests cleanup --- .../test/java/org/apache/cayenne/dbsync/merge/MergeCase.java | 2 +- .../cayenne/CayennePersistentObjectFlattenedRelIT.java | 2 +- .../org/apache/cayenne/access/DataContextDeleteRulesIT.java | 2 +- .../apache/cayenne/access/DataContextEJBQLInheritanceIT.java | 2 +- .../access/DataContextObjectIdQuery_PolymorphicIT.java | 2 +- .../org/apache/cayenne/access/DataContextOuterJoinsIT.java | 2 +- .../apache/cayenne/access/DataContextQualifiedEntityIT.java | 2 +- .../org/apache/cayenne/access/SingleTableInheritanceIT.java | 8 ++++---- .../org/apache/cayenne/access/types/DateTimeTypesIT.java | 12 +++++------- .../src/test/java/org/apache/cayenne/query/SQLExecIT.java | 10 +++++----- .../test/java/org/apache/cayenne/unit/CayenneTestsEnv.java | 4 ---- .../test/java/org/apache/cayenne/unit/PeopleProjectCase.java | 6 +----- .../test/java/org/apache/cayenne/unit/jira/CAY_194IT.java | 7 ++----- 13 files changed, 24 insertions(+), 37 deletions(-) diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java index 4f896433d..37dad13cb 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java @@ -85,7 +85,7 @@ public abstract class MergeCase { accessStackAdapter = env.testDbAdapter(); // break circular FK before DBCleaner.clean() - env.dbHelper().update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); + env.table("ARTGROUP").update().set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); env.dbCleaner().clean(); // this map can't be safely modified in this test, as it is reset by DI container on every test diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java index 5b649aa38..36aa657be 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java @@ -50,7 +50,7 @@ public class CayennePersistentObjectFlattenedRelIT { @BeforeEach public void setUp() throws Exception { runtime = env.runtime(); - env.dbHelper().update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); + env.table("ARTGROUP").update().set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); env.dbCleaner().clean(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java index 8e7051bf4..898ccec1e 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java @@ -56,7 +56,7 @@ public class DataContextDeleteRulesIT { @BeforeEach public void cleanUpDB() throws Exception { // Break ARTGROUP self-referencing FK before DB clean, then re-clean - env.dbHelper().update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); + env.table("ARTGROUP").update().set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); env.dbCleaner().clean(); context = env.context(); } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java index e28d482e3..e38b5c2b2 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java @@ -41,7 +41,7 @@ public class DataContextEJBQLInheritanceIT extends PeopleProjectCase { public void setUp() throws Exception { context = env.context(); - TableHelper person = new TableHelper(dbHelper, "PERSON").setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY").setColumnTypes(Types.INTEGER, Types.VARCHAR, + TableHelper person = env.table("PERSON").setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR, Types.FLOAT); person.insert(1, "a", "EE", 20000); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java index cb98bb546..cca109524 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java @@ -45,7 +45,7 @@ public class DataContextObjectIdQuery_PolymorphicIT extends PeopleProjectCase { public void before() { context1 = env.context(); context2 = (DataContext) env.runtime().newContext(); - tPerson = new TableHelper(dbHelper, "PERSON").setColumns("PERSON_ID", "NAME", "PERSON_TYPE") + tPerson = env.table("PERSON").setColumns("PERSON_ID", "NAME", "PERSON_TYPE") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java index 034f54190..2cd69d249 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java @@ -46,7 +46,7 @@ public class DataContextOuterJoinsIT { @BeforeEach public void cleanUpDB() throws Exception { - env.dbHelper().update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); + env.table("ARTGROUP").update().set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); env.dbCleaner().clean(); artistHelper = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java index 49c22ae1f..095d8beff 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java @@ -45,7 +45,7 @@ public class DataContextQualifiedEntityIT extends PeopleProjectCase { @BeforeEach public void setUp() throws Exception { context = env.context(); - tPerson = new TableHelper(dbHelper, "PERSON").setColumns( + tPerson = env.table("PERSON").setColumns( "CLIENT_COMPANY_ID", "CLIENT_CONTACT_TYPE", "DEPARTMENT_ID", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java index b85b11697..f75970f50 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java @@ -55,13 +55,13 @@ public class SingleTableInheritanceIT extends PeopleProjectCase { public void setUp() { context = env.context(); context2 = (DataContext) env.runtime().newContext(); - tAddress = new TableHelper(dbHelper, "ADDRESS", "ADDRESS_ID", "CITY", "PERSON_ID"); + tAddress = env.table("ADDRESS", "ADDRESS_ID", "CITY", "PERSON_ID"); - tClientCompany = new TableHelper(dbHelper, "CLIENT_COMPANY", "CLIENT_COMPANY_ID", "NAME"); + tClientCompany = env.table("CLIENT_COMPANY", "CLIENT_COMPANY_ID", "NAME"); - tDepartment = new TableHelper(dbHelper, "DEPARTMENT", "DEPARTMENT_ID", "NAME"); + tDepartment = env.table("DEPARTMENT", "DEPARTMENT_ID", "NAME"); - tPerson = new TableHelper(dbHelper, "PERSON").setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY", + tPerson = env.table("PERSON").setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY", "CLIENT_COMPANY_ID", "DEPARTMENT_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR, Types.FLOAT, Types.INTEGER, Types.INTEGER); } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/types/DateTimeTypesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/types/DateTimeTypesIT.java index 7f403cd10..75efc8abc 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/types/DateTimeTypesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/types/DateTimeTypesIT.java @@ -23,7 +23,6 @@ import org.apache.cayenne.access.DataContext; import org.apache.cayenne.query.ObjectSelect; import org.apache.cayenne.query.SQLExec; import org.apache.cayenne.query.SQLSelect; -import org.apache.cayenne.test.jdbc.DbHelper; import org.apache.cayenne.testdo.datetime.DurationTestEntity; import org.apache.cayenne.testdo.datetime.LocalDateTestEntity; import org.apache.cayenne.testdo.datetime.LocalDateTimeTestEntity; @@ -61,12 +60,11 @@ public class DateTimeTypesIT { public void before() throws SQLException { context = env.context(); testDbAdapter = env.testDbAdapter(); - DbHelper dbHelper = env.dbHelper(); - dbHelper.deleteAll("LOCAL_DATE_TEST"); - dbHelper.deleteAll("LOCAL_DATETIME_TEST"); - dbHelper.deleteAll("LOCAL_TIME_TEST"); - dbHelper.deleteAll("DURATION_TEST"); - dbHelper.deleteAll("PERIOD_TEST"); + env.table("LOCAL_DATE_TEST").deleteAll(); + env.table("LOCAL_DATETIME_TEST").deleteAll(); + env.table("LOCAL_TIME_TEST").deleteAll(); + env.table("DURATION_TEST").deleteAll(); + env.table("PERIOD_TEST").deleteAll(); } @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/query/SQLExecIT.java b/cayenne/src/test/java/org/apache/cayenne/query/SQLExecIT.java index b46a19868..2153302c7 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/SQLExecIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/SQLExecIT.java @@ -71,7 +71,7 @@ public class SQLExecIT { .paramsArray("a3").update(env.context()); assertEquals(1, inserted); - assertEquals("a3", env.dbHelper().getString("ARTIST", "ARTIST_NAME").trim()); + assertEquals("a3", env.table("ARTIST").getString("ARTIST_NAME").trim()); } @Test @@ -103,8 +103,8 @@ public class SQLExecIT { .paramsArray(55, "a3").update(env.context()); assertEquals(1, inserted); - assertEquals(55L, env.dbHelper().getLong("ARTIST", "ARTIST_ID")); - assertEquals("a3", env.dbHelper().getString("ARTIST", "ARTIST_NAME").trim()); + assertEquals(55L, env.table("ARTIST").getLong("ARTIST_ID")); + assertEquals("a3", env.table("ARTIST").getString("ARTIST_NAME").trim()); } @Test @@ -114,7 +114,7 @@ public class SQLExecIT { QueryResult<?> result = inserter.paramsArray(i, "artist " + i).execute(env.context()); assertEquals(1, result.firstUpdateCount()); } - assertEquals(2, env.dbHelper().getRowCount("ARTIST")); + assertEquals(2, env.table("ARTIST").getRowCount()); } @Test @@ -127,6 +127,6 @@ public class SQLExecIT { QueryResult<?> result = inserter.params(params).execute(env.context()); assertEquals(1, result.firstUpdateCount()); } - assertEquals(2, env.dbHelper().getRowCount("ARTIST")); + assertEquals(2, env.table("ARTIST").getRowCount()); } } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java index cc481ea09..6203a0d30 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java @@ -171,10 +171,6 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { return context; } - public DbHelper dbHelper() { - return dbHelper; - } - public TableHelper table(String tableName, String... columns) { return new TableHelper(dbHelper, tableName, columns); } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java b/cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java index 1a31e25a5..7b75b9c6a 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.cayenne.unit; -import org.apache.cayenne.test.jdbc.DbHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,14 +30,11 @@ public class PeopleProjectCase { .forProject(CayenneProjects.PEOPLE_PROJECT) .withoutAutoClean(); - protected DbHelper dbHelper; - @BeforeEach public void cleanUpDB() throws Exception { // must null out the circular FK before DBCleaner.clean() runs, otherwise // PostgreSQL's strict FK enforcement aborts the cleanup - dbHelper = env.dbHelper(); - dbHelper.update("PERSON").set("DEPARTMENT_ID", null, Types.INTEGER).execute(); + env.table("PERSON").update().set("DEPARTMENT_ID", null, Types.INTEGER).execute(); env.dbCleaner().clean(); } } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java index 990a162d4..ed0b0b49b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java @@ -21,7 +21,6 @@ package org.apache.cayenne.unit.jira; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.query.ObjectSelect; -import org.apache.cayenne.test.jdbc.DbHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.relationships.ReflexiveAndToOne; import org.apache.cayenne.unit.CayenneProjects; @@ -47,17 +46,15 @@ public class CAY_194IT { static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.RELATIONSHIPS_PROJECT); protected DataContext context; - private DbHelper dbHelper; @BeforeEach public void setUp() throws Exception { context = env.context(); - dbHelper = env.dbHelper(); - TableHelper tReflexive = new TableHelper(dbHelper, "REFLEXIVE_AND_TO_ONE", "REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID"); + TableHelper tReflexive = env.table("REFLEXIVE_AND_TO_ONE", "REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID"); tReflexive.update().set("PARENT_ID", null, Types.INTEGER).execute(); - dbHelper.deleteAll("REFLEXIVE_AND_TO_ONE"); + env.table("REFLEXIVE_AND_TO_ONE").deleteAll(); } @Test
