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 998596d590e63ca25bbe92967c71622a738390e2 Author: Andrus Adamchik <[email protected]> AuthorDate: Wed May 13 12:19:19 2026 -0400 Unit tests cleanup --- .../CayennePersistentObjectSetToManyListIT.java | 3 +- .../cayenne/DataContextMaxIdQualifierIT.java | 3 +- .../org/apache/cayenne/OneWayRelationshipsIT.java | 3 +- .../access/DataContextDisjointByIdPrefetchIT.java | 3 +- .../access/DataContextEJBQLArrayResultIT.java | 3 +- .../access/DataContextEJBQLConditionsIT.java | 3 +- .../cayenne/access/DataContextEJBQLDeleteIT.java | 3 +- .../access/DataContextEJBQLFetchJoinIT.java | 3 +- .../access/DataContextEJBQLGroupByHavingIT.java | 3 +- .../access/DataContextEJBQLInheritanceIT.java | 3 +- .../cayenne/access/DataContextEJBQLIsNullIT.java | 3 +- .../cayenne/access/DataContextEJBQLJoinsIT.java | 3 +- .../cayenne/access/DataContextEJBQLOrderByIT.java | 3 +- .../cayenne/access/DataContextEJBQLQueryIT.java | 3 +- .../cayenne/access/DataContextEJBQLSubqueryIT.java | 3 +- .../cayenne/access/DataContextEJBQLUpdateIT.java | 3 +- .../apache/cayenne/access/DataContextExtrasIT.java | 3 +- .../access/DataContextFlattenedAttributesIT.java | 3 +- .../access/DataContextObjectTrackingIT.java | 3 +- .../access/DataContextPerformQueryAPIIT.java | 3 +- .../cayenne/access/DataContextPrefetchIT.java | 3 +- .../access/DataContextQualifiedEntityIT.java | 3 +- .../cayenne/access/DataContextRefreshingIT.java | 3 +- .../cayenne/access/DataContextSQLTemplateIT.java | 3 +- .../cayenne/access/NestedDataContextReadIT.java | 3 +- .../cayenne/access/NestedDataContextWriteIT.java | 3 +- .../cayenne/access/ObjectStoreDiffRetainingIT.java | 6 +- .../apache/cayenne/access/OptimisticLockingIT.java | 3 +- .../cayenne/access/VerticalInheritanceIT.java | 93 ++++++++-------------- .../VerticalInheritanceMultipleAttributesIT.java | 9 +-- .../AshwoodEntitySorter_RelationshipsIT.java | 3 +- 31 files changed, 64 insertions(+), 128 deletions(-) diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java index 136e462e1..fbf58bc33 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java @@ -55,8 +55,7 @@ public class CayennePersistentObjectSetToManyListIT { context = env.context(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, + tPainting = env.table("PAINTING").setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.BIGINT); createArtistWithPaintingDataSet(); diff --git a/cayenne/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java b/cayenne/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java index 5a60018bf..df448b63a 100644 --- a/cayenne/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java @@ -57,8 +57,7 @@ public class DataContextMaxIdQualifierIT { runtime = env.runtime(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE").setColumnTypes(Types.INTEGER, Types.BIGINT, + tPainting = env.table("PAINTING").setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE").setColumnTypes(Types.INTEGER, Types.BIGINT, Types.VARCHAR); } diff --git a/cayenne/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java b/cayenne/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java index 927238849..21a574702 100644 --- a/cayenne/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java @@ -58,8 +58,7 @@ public class OneWayRelationshipsIT { t2Helper = env.table("oneway_table2", "ID", "TABLE1_ID"); t3Helper = env.table("oneway_table3", "ID"); - t4Helper = env.table("oneway_table4"); - t4Helper.setColumns("ID", "TABLE3_ID").setColumnTypes(Types.INTEGER, Types.INTEGER); + t4Helper = env.table("oneway_table4").setColumns("ID", "TABLE3_ID").setColumnTypes(Types.INTEGER, Types.INTEGER); } @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java index dbe90ba0c..e980f3d7d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java @@ -63,8 +63,7 @@ public class DataContextDisjointByIdPrefetchIT { queryInterceptor = env.getInstance(DataChannelInterceptor.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE").setColumnTypes(Types.INTEGER, Types.BIGINT, + tPainting = env.table("PAINTING").setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE").setColumnTypes(Types.INTEGER, Types.BIGINT, Types.VARCHAR); tPaintingInfo = env.table("PAINTING_INFO", "PAINTING_ID", "TEXT_REVIEW"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java index b68360068..7023a4f28 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java @@ -52,8 +52,7 @@ public class DataContextEJBQLArrayResultIT { tArtist.insert(33003, "BB1"); tArtist.insert(33004, "BB2"); - TableHelper tPainting = env.table("PAINTING"); - tPainting.setColumns( + TableHelper tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java index 21b0dc131..c66830c54 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java @@ -57,8 +57,7 @@ public class DataContextEJBQLConditionsIT { context = env.context(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java index 7fa8bf33d..247c4ccee 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java @@ -53,8 +53,7 @@ public class DataContextEJBQLDeleteIT { public void setUp() throws Exception { context = env.context(); runtime = env.runtime(); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java index 1d7ea580e..34d69d8bf 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java @@ -68,8 +68,7 @@ public class DataContextEJBQLFetchJoinIT { queryBlocker = env.getInstance(DataChannelInterceptor.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java index ea8ed0d1b..cf7b32cca 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java @@ -59,8 +59,7 @@ public class DataContextEJBQLGroupByHavingIT { context = env.context(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "GALLERY_ID", 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 d6ca4f248..5292f88b9 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java @@ -41,8 +41,7 @@ public class DataContextEJBQLInheritanceIT extends PeopleProjectCase { public void setUp() throws Exception { context = env.context(); - TableHelper person = new TableHelper(dbHelper, "PERSON"); - person.setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY").setColumnTypes(Types.INTEGER, Types.VARCHAR, + TableHelper person = new TableHelper(dbHelper, "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/DataContextEJBQLIsNullIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java index 4844f1f15..3ed7c39bc 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java @@ -55,8 +55,7 @@ public class DataContextEJBQLIsNullIT { accessStackAdapter = env.getInstance(UnitDbAdapter.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java index c2cd1f406..61a678dc3 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java @@ -56,8 +56,7 @@ public class DataContextEJBQLJoinsIT { context = env.context(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "GALLERY_ID", "PAINTING_TITLE", "ESTIMATED_PRICE") + tPainting = env.table("PAINTING").setColumns("PAINTING_ID", "ARTIST_ID", "GALLERY_ID", "PAINTING_TITLE", "ESTIMATED_PRICE") .setColumnTypes(Types.INTEGER, Types.BIGINT, Types.INTEGER, Types.VARCHAR, Types.DECIMAL); tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java index 74b7a44f0..3eeea9929 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java @@ -51,8 +51,7 @@ public class DataContextEJBQLOrderByIT { context = env.context(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java index 39604e7bf..eeb5d6aa8 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java @@ -65,8 +65,7 @@ public class DataContextEJBQLQueryIT { accessStackAdapter = env.getInstance(UnitDbAdapter.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java index 339425cc6..ff70474a1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java @@ -59,8 +59,7 @@ public class DataContextEJBQLSubqueryIT { accessStackAdapter = env.getInstance(UnitDbAdapter.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java index d778270c1..b4320eba9 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java @@ -52,8 +52,7 @@ public class DataContextEJBQLUpdateIT { context = env.context(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java index b9d3aba1b..5da683f09 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java @@ -74,8 +74,7 @@ public class DataContextExtrasIT { objectFactory = env.getInstance(AdhocObjectFactory.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java index 5a9f32be1..2e32a8bb3 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java @@ -71,8 +71,7 @@ public class DataContextFlattenedAttributesIT { runtime = env.runtime(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java index 9a42d8ef9..17110d883 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java @@ -69,8 +69,7 @@ public class DataContextObjectTrackingIT { runtime = env.runtime(); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java index 4c3e85851..4e2b7ceab 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java @@ -75,8 +75,7 @@ public class DataContextPerformQueryAPIIT { jdbcEventLogger = env.getInstance(JdbcEventLogger.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", "ESTIMATED_PRICE").setColumnTypes( + tPainting = env.table("PAINTING").setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", "ESTIMATED_PRICE").setColumnTypes( Types.INTEGER, Types.BIGINT, Types.VARCHAR, Types.DECIMAL); } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java index b86f127a8..a55ac13bf 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java @@ -81,8 +81,7 @@ public class DataContextPrefetchIT { queryInterceptor = env.getInstance(DataChannelInterceptor.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE", "GALLERY_ID").setColumnTypes( + tPainting = env.table("PAINTING").setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE", "GALLERY_ID").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.BIGINT, Types.DECIMAL, Types.INTEGER); tPaintingInfo = env.table("PAINTING_INFO", "PAINTING_ID", "TEXT_REVIEW"); 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 279ceb51f..810fbca63 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java @@ -45,8 +45,7 @@ public class DataContextQualifiedEntityIT extends PeopleProjectCase { @BeforeEach public void setUp() throws Exception { context = env.context(); - tPerson = new TableHelper(dbHelper, "PERSON"); - tPerson.setColumns( + tPerson = new TableHelper(dbHelper, "PERSON").setColumns( "CLIENT_COMPANY_ID", "CLIENT_CONTACT_TYPE", "DEPARTMENT_ID", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java index b5bcb8a92..44e53b75c 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java @@ -65,8 +65,7 @@ public class DataContextRefreshingIT { queryInterceptor = env.getInstance(DataChannelInterceptor.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java index 24aba3ddc..b4a1aef80 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java @@ -67,8 +67,7 @@ public class DataContextSQLTemplateIT { sqlTemplateCustomizer = env.getInstance(SQLTemplateCustomizer.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE").setColumnTypes( + tPainting = env.table("PAINTING").setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.BIGINT, Types.DECIMAL); } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java index 1079fc5d8..fe684d8f5 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java @@ -62,8 +62,7 @@ public class NestedDataContextReadIT { queryInterceptor = env.getInstance(DataChannelInterceptor.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java index 50cf4a638..97dfe7d64 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java @@ -65,8 +65,7 @@ public class NestedDataContextWriteIT { queryInterceptor = env.getInstance(DataChannelInterceptor.class); tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java index f6f5f6a11..ca2dfd655 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java @@ -47,12 +47,10 @@ public class ObjectStoreDiffRetainingIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH") + tArtist = env.table("ARTIST").setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH") .setColumnTypes(Types.BIGINT, Types.CHAR, Types.DATE); - tPainting = env.table("PAINTING"); - tPainting.setColumns( + tPainting = env.table("PAINTING").setColumns( "ARTIST_ID", "ESTIMATED_PRICE", "GALLERY_ID", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java index aa7917bb2..db6e32729 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java @@ -54,8 +54,7 @@ public class OptimisticLockingIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tSimpleLockingTest = env.table("SIMPLE_LOCKING_TEST"); - tSimpleLockingTest.setColumns("LOCKING_TEST_ID", "NAME", "DESCRIPTION", "INT_COLUMN_NOTNULL") + tSimpleLockingTest = env.table("SIMPLE_LOCKING_TEST").setColumns("LOCKING_TEST_ID", "NAME", "DESCRIPTION", "INT_COLUMN_NOTNULL") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER); tRelLockingTest = env.table("REL_LOCKING_TEST", "REL_LOCKING_TEST_ID", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java index 0ace51477..818897d67 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java @@ -64,11 +64,9 @@ public class VerticalInheritanceIT { public void setup() { context = env.context(); runtime = env.runtime(); - ivAbstractTable = env.table("IV_ABSTRACT"); - ivAbstractTable.setColumns("ID", "PARENT_ID", "TYPE") + ivAbstractTable = env.table("IV_ABSTRACT").setColumns("ID", "PARENT_ID", "TYPE") .setColumnTypes(Types.INTEGER, Types.INTEGER, Types.CHAR); - ivConcreteTable = env.table("IV_CONCRETE"); - ivConcreteTable.setColumns("ID", "NAME", "RELATED_ABSTRACT_ID") + ivConcreteTable = env.table("IV_CONCRETE").setColumns("ID", "NAME", "RELATED_ABSTRACT_ID") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); } @@ -309,8 +307,7 @@ public class VerticalInheritanceIT { @Test public void selectQuerySuperSub() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( + TableHelper ivRootTable = env.table("IV_ROOT").setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); @@ -350,8 +347,7 @@ public class VerticalInheritanceIT { @Test public void selectQueryDeepAndWide() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( + TableHelper ivRootTable = env.table("IV_ROOT").setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); @@ -417,8 +413,7 @@ public class VerticalInheritanceIT { @Test public void selectQueryMiddleLeaf() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( + TableHelper ivRootTable = env.table("IV_ROOT").setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); @@ -473,8 +468,7 @@ public class VerticalInheritanceIT { @Test public void deleteMix() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( + TableHelper ivRootTable = env.table("IV_ROOT").setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); @@ -529,8 +523,7 @@ public class VerticalInheritanceIT { @Test public void selectQueryAttributeOverrides() throws Exception { - TableHelper iv1RootTable = env.table("IV1_ROOT"); - iv1RootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( + TableHelper iv1RootTable = env.table("IV1_ROOT").setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); TableHelper iv1Sub1Table = env.table("IV1_SUB1", "ID", "SUB1_NAME"); @@ -660,14 +653,11 @@ public class VerticalInheritanceIT { @Test public void updateFlattenedRelationshipWithInverse() throws SQLException { - TableHelper ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME").setColumnTypes(Types.INTEGER, Types.VARCHAR); + TableHelper ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME").setColumnTypes(Types.INTEGER, Types.VARCHAR); - TableHelper ivBaseTable = env.table("IV_BASE"); - ivBaseTable.setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); + TableHelper ivBaseTable = env.table("IV_BASE").setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - TableHelper ivImplTable = env.table("IV_IMPL"); - ivImplTable.setColumns("ID", "ATTR1", "OTHER3_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); + TableHelper ivImplTable = env.table("IV_IMPL").setColumns("ID", "ATTR1", "OTHER3_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); ivOtherTable.insert(1, "other1"); ivOtherTable.insert(2, "other2"); @@ -836,14 +826,11 @@ public class VerticalInheritanceIT { */ @Test public void baseJointPrefetchBelongsTo() throws SQLException { - TableHelper ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME", "BASE_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); + TableHelper ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME", "BASE_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); - TableHelper ivBaseTable = env.table("IV_BASE"); - ivBaseTable.setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); + TableHelper ivBaseTable = env.table("IV_BASE").setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - TableHelper ivImplTable = env.table("IV_IMPL"); - ivImplTable.setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); + TableHelper ivImplTable = env.table("IV_IMPL").setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); ivBaseTable.insert(1, "Impl 1", "I"); ivImplTable.insert(1, "attr1"); @@ -866,14 +853,11 @@ public class VerticalInheritanceIT { */ @Test public void baseDisjointPrefetchBelongsTo() throws SQLException { - TableHelper ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME", "BASE_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); + TableHelper ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME", "BASE_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); - TableHelper ivBaseTable = env.table("IV_BASE"); - ivBaseTable.setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); + TableHelper ivBaseTable = env.table("IV_BASE").setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - TableHelper ivImplTable = env.table("IV_IMPL"); - ivImplTable.setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); + TableHelper ivImplTable = env.table("IV_IMPL").setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); ivBaseTable.insert(1, "Impl 1", "I"); ivImplTable.insert(1, "attr1"); @@ -896,14 +880,11 @@ public class VerticalInheritanceIT { */ @Test public void baseDisjointByIdPrefetchBelongsTo() throws SQLException { - TableHelper ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME", "BASE_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); + TableHelper ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME", "BASE_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); - TableHelper ivBaseTable = env.table("IV_BASE"); - ivBaseTable.setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); + TableHelper ivBaseTable = env.table("IV_BASE").setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - TableHelper ivImplTable = env.table("IV_IMPL"); - ivImplTable.setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); + TableHelper ivImplTable = env.table("IV_IMPL").setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); ivBaseTable.insert(1, "Impl 1", "I"); ivImplTable.insert(1, "attr1"); @@ -926,14 +907,11 @@ public class VerticalInheritanceIT { */ @Test public void implJointPrefetchBelongsTo() throws SQLException { - TableHelper ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME", "IMPL_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); + TableHelper ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME", "IMPL_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); - TableHelper ivBaseTable = env.table("IV_BASE"); - ivBaseTable.setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); + TableHelper ivBaseTable = env.table("IV_BASE").setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - TableHelper ivImplTable = env.table("IV_IMPL"); - ivImplTable.setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); + TableHelper ivImplTable = env.table("IV_IMPL").setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); ivBaseTable.insert(1, "Impl 1", "I"); ivImplTable.insert(1, "attr1"); @@ -961,14 +939,11 @@ public class VerticalInheritanceIT { */ @Test public void implDisjointPrefetchBelongsTo() throws SQLException { - TableHelper ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME", "IMPL_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); + TableHelper ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME", "IMPL_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); - TableHelper ivBaseTable = env.table("IV_BASE"); - ivBaseTable.setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); + TableHelper ivBaseTable = env.table("IV_BASE").setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - TableHelper ivImplTable = env.table("IV_IMPL"); - ivImplTable.setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); + TableHelper ivImplTable = env.table("IV_IMPL").setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); ivBaseTable.insert(1, "Impl 1", "I"); ivImplTable.insert(1, "attr1"); @@ -998,14 +973,11 @@ public class VerticalInheritanceIT { */ @Test public void implDisjointByIdPrefetchBelongsTo() throws SQLException { - TableHelper ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME", "IMPL_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); + TableHelper ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME", "IMPL_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); - TableHelper ivBaseTable = env.table("IV_BASE"); - ivBaseTable.setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); + TableHelper ivBaseTable = env.table("IV_BASE").setColumns("ID", "NAME", "TYPE").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - TableHelper ivImplTable = env.table("IV_IMPL"); - ivImplTable.setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); + TableHelper ivImplTable = env.table("IV_IMPL").setColumns("ID", "ATTR1").setColumnTypes(Types.INTEGER, Types.VARCHAR); ivBaseTable.insert(1, "Impl 1", "I"); ivImplTable.insert(1, "attr1"); @@ -1035,15 +1007,12 @@ public class VerticalInheritanceIT { */ @Test public void updateWithOptimisticLocks() throws SQLException { - TableHelper ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME").setColumnTypes(Types.INTEGER, Types.VARCHAR); + TableHelper ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME").setColumnTypes(Types.INTEGER, Types.VARCHAR); - TableHelper ivBaseWithLockTable = env.table("IV_BASE_WITH_LOCK"); - ivBaseWithLockTable.setColumns("ID", "NAME", "TYPE") + TableHelper ivBaseWithLockTable = env.table("IV_BASE_WITH_LOCK").setColumns("ID", "NAME", "TYPE") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - TableHelper ivImplWithLockTable = env.table("IV_IMPL_WITH_LOCK"); - ivImplWithLockTable.setColumns("ID", "ATTR1", "OTHER1_ID") + TableHelper ivImplWithLockTable = env.table("IV_IMPL_WITH_LOCK").setColumns("ID", "ATTR1", "OTHER1_ID") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.INTEGER); // Insert records we want to update (will end up adding more records for final test) diff --git a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java index b44b899bc..57e869277 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java @@ -56,16 +56,13 @@ public class VerticalInheritanceMultipleAttributesIT { public void setupTableHelpers() throws Exception { context = env.context(); runtime = env.runtime(); - ivOtherTable = env.table("IV_OTHER"); - ivOtherTable.setColumns("ID", "NAME") + ivOtherTable = env.table("IV_OTHER").setColumns("ID", "NAME") .setColumnTypes(Types.INTEGER, Types.VARCHAR); - ivBaseTable = env.table("IV_BASE"); - ivBaseTable.setColumns("ID", "NAME", "TYPE") + ivBaseTable = env.table("IV_BASE").setColumns("ID", "NAME", "TYPE") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR); - ivImplTable = env.table("IV_IMPL"); - ivImplTable.setColumns("ID", "ATTR1", "ATTR2", "OTHER1_ID", "OTHER2_ID") + ivImplTable = env.table("IV_IMPL").setColumns("ID", "ATTR1", "ATTR2", "OTHER1_ID", "OTHER2_ID") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER); ivImplTable.deleteAll(); diff --git a/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_RelationshipsIT.java b/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_RelationshipsIT.java index c2a12b15d..f17b2eab6 100644 --- a/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_RelationshipsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_RelationshipsIT.java @@ -56,8 +56,7 @@ public class AshwoodEntitySorter_RelationshipsIT { tRelationshipHelper = env.table("RELATIONSHIP_HELPER", "RELATIONSHIP_HELPER_ID", "NAME"); - tReflexiveAndToOne = env.table("REFLEXIVE_AND_TO_ONE"); - tReflexiveAndToOne.setColumns("REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID", "RELATIONSHIP_HELPER_ID", "NAME") + tReflexiveAndToOne = env.table("REFLEXIVE_AND_TO_ONE").setColumns("REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID", "RELATIONSHIP_HELPER_ID", "NAME") .setColumnTypes(Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.VARCHAR); }
