You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/05/15 22:44:52 UTC
(cayenne) branch master updated (79e45cf2b -> 0f7fdb51c)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 79e45cf2b DbAdapterFactory.createAdapter(..), DataSourceFactory.getDataSource(..) and other such factories should not declare a checked exception
new 2c967a1ab tests cleanup: passing extra modules as lambdas
new 0f7fdb51c Test cleanup...
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/cayenne/dbsync/merge/MergeCase.java | 2 +-
.../cayenne/jcache/CayenneJCacheModuleIT.java | 2 +-
.../cayenne/CDOReflexiveRelICustomSorterIT.java | 10 +-----
.../access/DataContextDataChannelEventsIT.java | 4 +--
.../access/DataContextDelegateSharedCacheIT.java | 4 +--
...tyWithMeaningfulPKAndCustomDbRowOpSorterIT.java | 4 ++-
.../DataContextExtendedTypeOperationsIT.java | 16 +++++----
.../apache/cayenne/access/DataContextExtrasIT.java | 3 +-
.../access/DataContextSharedCacheEmpiricIT.java | 10 +-----
.../cayenne/access/DataContextSharedCacheIT.java | 4 +--
.../apache/cayenne/access/GraphSorterModule.java | 35 -------------------
.../access/NestedDataContextParentEventsIT.java | 4 +--
.../NestedDataContextParentPeerEventsIT.java | 4 +--
.../access/NestedDataContextPeerEventsIT.java | 4 +--
.../cayenne/access/VerticalInheritanceIT.java | 4 ++-
.../translator/batch/DeleteBatchTranslatorIT.java | 3 --
.../translator/batch/InsertBatchTranslatorIT.java | 2 --
.../translator/batch/UpdateBatchTranslatorIT.java | 8 ++---
.../cayenne/access/util/RuntimeCaseSyncModule.java | 30 -----------------
.../java/org/apache/cayenne/dba/AutoAdapterIT.java | 14 ++++----
.../org/apache/cayenne/unit/CayenneTestsEnv.java | 39 ++++++++++------------
.../unit/runtime/AllTestsSchemaManager.java | 6 +---
22 files changed, 61 insertions(+), 151 deletions(-)
delete mode 100644 cayenne/src/test/java/org/apache/cayenne/access/GraphSorterModule.java
delete mode 100644 cayenne/src/test/java/org/apache/cayenne/access/util/RuntimeCaseSyncModule.java
(cayenne) 02/02: Test cleanup...
Posted by aa...@apache.org.
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 0f7fdb51cab61226f4f4ad138d54ee492ff64c4b
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri May 15 18:13:41 2026 -0400
Test cleanup...
* using AutoAdapter for tests instead of manually matching the DB
---
.../access/DataContextExtendedTypeOperationsIT.java | 16 ++++++++++------
.../org/apache/cayenne/access/DataContextExtrasIT.java | 3 ++-
.../translator/batch/DeleteBatchTranslatorIT.java | 3 ---
.../translator/batch/InsertBatchTranslatorIT.java | 2 --
.../translator/batch/UpdateBatchTranslatorIT.java | 8 ++------
.../java/org/apache/cayenne/dba/AutoAdapterIT.java | 14 ++++++--------
.../java/org/apache/cayenne/unit/CayenneTestsEnv.java | 18 ++++++++++++------
.../cayenne/unit/runtime/AllTestsSchemaManager.java | 6 +-----
8 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
index 0c61738dd..f89ba571d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java
@@ -18,30 +18,34 @@
****************************************************************/
package org.apache.cayenne.access;
-import java.util.Arrays;
-
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.testdo.extended_type.ExtendedTypeEntity;
import org.apache.cayenne.testdo.extended_type.StringET1;
-import org.apache.cayenne.unit.runtime.CayenneProjects;
+import org.apache.cayenne.testdo.extended_type.StringET1ExtendedType;
import org.apache.cayenne.unit.CayenneTestsEnv;
+import org.apache.cayenne.unit.runtime.CayenneProjects;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+import java.util.Arrays;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
public class DataContextExtendedTypeOperationsIT {
@RegisterExtension
- static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.EXTENDED_TYPE_PROJECT);
+ static final CayenneTestsEnv env = CayenneTestsEnv
+ .forProject(CayenneProjects.EXTENDED_TYPE_PROJECT)
+ .withExtraModules(b -> CoreModule.extend(b).addUserExtendedType(StringET1ExtendedType.class));
@Test
public void storeExtendedType() {
ExtendedTypeEntity e1 = env.context().newObject(ExtendedTypeEntity.class);
e1.setName(new StringET1("X"));
- e1.getObjectContext().commitChanges();
+ env.context().commitChanges();
SQLTemplate checkQ = new SQLTemplate(
ExtendedTypeEntity.class,
@@ -62,7 +66,7 @@ public class DataContextExtendedTypeOperationsIT {
ExtendedTypeEntity e3 = e1.getObjectContext().newObject(ExtendedTypeEntity.class);
e3.setName(new StringET1("Z"));
- e1.getObjectContext().commitChanges();
+ env.context().commitChanges();
ObjectSelect<ExtendedTypeEntity> query = ObjectSelect.query(ExtendedTypeEntity.class)
.where(ExtendedTypeEntity.NAME.in(new StringET1("X"), new StringET1("Y")));
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 6852efa4e..503fd3fee 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
+import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.JdbcPkGenerator;
import org.apache.cayenne.dba.PkGenerator;
@@ -263,7 +264,7 @@ public class DataContextExtrasIT {
.next()
.getAdapter()
.getPkGenerator();
- JdbcAdapter adapter = (JdbcAdapter) domain
+ DbAdapter adapter = domain
.getDataNodes()
.iterator()
.next()
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
index a351f11dd..e31dbcea1 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
@@ -117,7 +117,6 @@ public class DeleteBatchTranslatorIT {
List<DbAttribute> idAttributes = Collections.singletonList(entity.getAttribute("LOCKING_TEST_ID"));
DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity, idAttributes, Collections.emptySet(), 1);
- JdbcAdapter adapter = (JdbcAdapter) this.adapter;
DeleteBatchTranslator builder = new DeleteBatchTranslator(deleteQuery, adapter);
String generatedSql = builder.getSql();
@@ -148,8 +147,6 @@ public class DeleteBatchTranslatorIT {
DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity, idAttributes, nullAttributes, 1);
- JdbcAdapter adapter = (JdbcAdapter) this.adapter;
-
DeleteBatchTranslator builder = new DeleteBatchTranslator(deleteQuery, adapter);
String generatedSql = builder.getSql();
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
index b4471a522..46542bb76 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
@@ -91,8 +91,6 @@ public class InsertBatchTranslatorIT {
entity.getDataMap().setQuotingSQLIdentifiers(true);
- JdbcAdapter adapter = (JdbcAdapter) this.adapter;
-
InsertBatchQuery insertQuery = new InsertBatchQuery(entity, 1);
InsertBatchTranslator builder = new InsertBatchTranslator(insertQuery, adapter);
String generatedSql = builder.getSql();
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
index a5a25c8df..37a73e80d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
@@ -121,9 +121,7 @@ public class UpdateBatchTranslatorIT {
List<DbAttribute> idAttributes = Collections.singletonList(entity.getAttribute("LOCKING_TEST_ID"));
List<DbAttribute> updatedAttributes = Collections.singletonList(entity.getAttribute("DESCRIPTION"));
- UpdateBatchQuery updateQuery = new UpdateBatchQuery(entity, idAttributes, updatedAttributes,
- Collections.emptySet(), 1);
- JdbcAdapter adapter = (JdbcAdapter) this.adapter;
+ UpdateBatchQuery updateQuery = new UpdateBatchQuery(entity, idAttributes, updatedAttributes, Collections.emptySet(), 1);
UpdateBatchTranslator builder = new UpdateBatchTranslator(updateQuery, adapter);
String generatedSql = builder.getSql();
@@ -153,9 +151,7 @@ public class UpdateBatchTranslatorIT {
Collection<String> nullAttributes = Collections.singleton("NAME");
- UpdateBatchQuery updateQuery = new UpdateBatchQuery(entity, idAttributes, updatedAttributes,
- nullAttributes, 1);
- JdbcAdapter adapter = (JdbcAdapter) this.adapter;
+ UpdateBatchQuery updateQuery = new UpdateBatchQuery(entity, idAttributes, updatedAttributes, nullAttributes, 1);
UpdateBatchTranslator builder = new UpdateBatchTranslator(updateQuery, adapter);
String generatedSql = builder.getSql();
diff --git a/cayenne/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java b/cayenne/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
index 920237f4f..5d0c012d8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
@@ -29,10 +29,7 @@ import org.apache.cayenne.unit.CayenneTestsEnv;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.*;
public class AutoAdapterIT {
@@ -48,16 +45,17 @@ public class AutoAdapterIT {
@Test
public void createSQLTemplateAction() {
- AutoAdapter autoAdapter = new AutoAdapter(() -> env.dataNode().getAdapter(), NoopJdbcEventLogger.getInstance());
- SQLTemplateAction action = (SQLTemplateAction) autoAdapter.getAction(new SQLTemplate(Artist.class,
- "select * from artist"), env.dataNode());
+ assertInstanceOf(AutoAdapter.class, env.dataNode().getAdapter());
+ AutoAdapter autoAdapter = (AutoAdapter) env.dataNode().getAdapter();
+
+ SQLTemplateAction action = (SQLTemplateAction) autoAdapter
+ .getAction(new SQLTemplate(Artist.class, "select * from artist"), env.dataNode());
// it is important for SQLTemplateAction to be used with unwrapped adapter,
// as the adapter class name is used as a key to the correct SQL template.
assertNotNull(action.getAdapter());
assertFalse(action.getAdapter() instanceof AutoAdapter);
- assertSame(env.dataNode().getAdapter(), action.getAdapter());
}
@Test
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 074793fa0..45210734c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
@@ -28,8 +28,10 @@ import org.apache.cayenne.access.translator.batch.BatchTranslatorFactory;
import org.apache.cayenne.access.translator.select.SelectTranslatorFactory;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataMapLoader;
+import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.DataSourceDescriptor;
import org.apache.cayenne.configuration.runtime.CoreModule;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Binder;
@@ -53,6 +55,7 @@ import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
+import javax.sql.DataSource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -183,17 +186,24 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
BatchTranslatorFactory batchTranslatorFactory = runtimeInjector.getInstance(BatchTranslatorFactory.class);
SelectTranslatorFactory selectTranslatorFactory = runtimeInjector.getInstance(SelectTranslatorFactory.class);
SQLTemplateProcessor sqlTemplateProcessor = runtimeInjector.getInstance(SQLTemplateProcessor.class);
- DbAdapter adapter = runtimeInjector.getInstance(DbAdapter.class);
DataNode lastNode = null;
for (DataMap dataMap : domain.getDataMaps()) {
+
+ DataSource dataSource = DATA_SOURCES.dataSource(dataMap.getName());
+
DataNode node = new TestTelemetryDataNode(dataMap.getName());
node.setJdbcEventLogger(jdbcEventLogger);
node.setRowReaderFactory(rowReaderFactory);
node.setBatchTranslatorFactory(batchTranslatorFactory);
node.setSelectTranslatorFactory(selectTranslatorFactory);
- node.setDataSource(DATA_SOURCES.dataSource(dataMap.getName()));
+ node.setDataSource(dataSource);
+
+ // this gives us AutoAdapter
+ DbAdapter adapter = runtimeInjector.getInstance(DbAdapterFactory.class)
+ .createAdapter(new DataNodeDescriptor(), dataSource);
+
node.setAdapter(adapter);
node.setSchemaUpdateStrategy(new SkipSchemaUpdateStrategy());
node.setSqlTemplateProcessor(sqlTemplateProcessor);
@@ -278,10 +288,6 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
@Override
public void configure(Binder binder) {
- // TODO: factor it out of INJECTOR
- // a fresh DbAdapter per call — RuntimeCaseDbAdapterProvider is unscoped in the test injector
- binder.bind(DbAdapter.class).toProviderInstance(() -> INJECTOR.getInstance(DbAdapter.class));
-
binder.bind(UnitDbAdapter.class).toInstance(INJECTOR.getInstance(UnitDbAdapter.class));
binder.bind(TestDataSources.class).toInstance(DATA_SOURCES);
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java
index 12ca7dc28..367c222ce 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java
@@ -37,7 +37,6 @@ import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.resource.URLResource;
-import org.apache.cayenne.testdo.extended_type.StringET1ExtendedType;
import org.apache.cayenne.unit.TestDataSources;
import org.apache.cayenne.unit.dba.UnitDbAdapter;
import org.slf4j.Logger;
@@ -124,10 +123,7 @@ public class AllTestsSchemaManager {
node.setJdbcEventLogger(jdbcEventLogger);
node.setAdapter(dbAdapter);
node.setDataSource(dataSourceFactory.sharedDataSource());
-
- // setup test extended types
- node.getAdapter().getExtendedTypes().registerType(new StringET1ExtendedType());
-
+
// tweak mapping with a delegate
for (Procedure proc : map.getProcedures()) {
unitDbAdapter.tweakProcedure(proc);
(cayenne) 01/02: tests cleanup: passing extra modules as lambdas
Posted by aa...@apache.org.
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 2c967a1abb14d7b87fce40e8f5f80f125b87d591
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri May 15 18:35:36 2026 -0400
tests cleanup: passing extra modules as lambdas
---
.../org/apache/cayenne/dbsync/merge/MergeCase.java | 2 +-
.../cayenne/jcache/CayenneJCacheModuleIT.java | 2 +-
.../cayenne/CDOReflexiveRelICustomSorterIT.java | 10 +------
.../access/DataContextDataChannelEventsIT.java | 4 +--
.../access/DataContextDelegateSharedCacheIT.java | 4 +--
...tyWithMeaningfulPKAndCustomDbRowOpSorterIT.java | 4 ++-
.../access/DataContextSharedCacheEmpiricIT.java | 10 +------
.../cayenne/access/DataContextSharedCacheIT.java | 4 +--
.../apache/cayenne/access/GraphSorterModule.java | 35 ----------------------
.../access/NestedDataContextParentEventsIT.java | 4 +--
.../NestedDataContextParentPeerEventsIT.java | 4 +--
.../access/NestedDataContextPeerEventsIT.java | 4 +--
.../cayenne/access/VerticalInheritanceIT.java | 4 ++-
.../cayenne/access/util/RuntimeCaseSyncModule.java | 30 -------------------
.../org/apache/cayenne/unit/CayenneTestsEnv.java | 21 ++++---------
15 files changed, 28 insertions(+), 114 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 e35e198b2..1ce7ea345 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
@@ -67,7 +67,7 @@ public abstract class MergeCase {
@RegisterExtension
protected static final CayenneTestsEnv env = CayenneTestsEnv
.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(DbSyncModule.class)
+ .withExtraModules(new DbSyncModule())
.withoutAutoClean();
protected EntityResolver resolver;
diff --git a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java
index 0c9eca0ae..e06e00960 100644
--- a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java
+++ b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java
@@ -47,7 +47,7 @@ public class CayenneJCacheModuleIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv
.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(EhCacheModule.class);
+ .withExtraModules(new EhCacheModule());
ObjectContext context;
CayenneRuntime runtime;
diff --git a/cayenne/src/test/java/org/apache/cayenne/CDOReflexiveRelICustomSorterIT.java b/cayenne/src/test/java/org/apache/cayenne/CDOReflexiveRelICustomSorterIT.java
index 421981b93..1607e67e3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CDOReflexiveRelICustomSorterIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CDOReflexiveRelICustomSorterIT.java
@@ -21,8 +21,6 @@ package org.apache.cayenne;
import org.apache.cayenne.access.flush.operation.DbRowOpSorter;
import org.apache.cayenne.access.flush.operation.GraphBasedDbRowOpSorter;
-import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.Module;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.testdo.testmap.ArtGroup;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -40,7 +38,7 @@ public class CDOReflexiveRelICustomSorterIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv
.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(GraphSorterModule.class);
+ .withExtraModules(binder -> binder.bind(DbRowOpSorter.class).to(GraphBasedDbRowOpSorter.class));
@Test
public void addDeleteNoCommit() {
@@ -201,10 +199,4 @@ public class CDOReflexiveRelICustomSorterIT {
context.commitChanges();
}
- public static class GraphSorterModule implements Module {
- @Override
- public void configure(Binder binder) {
- binder.bind(DbRowOpSorter.class).to(GraphBasedDbRowOpSorter.class);
- }
- }
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java
index 9581c94fb..b811560ec 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.access;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.DataChannelListener;
import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.access.util.RuntimeCaseSyncModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.graph.GraphEvent;
import org.apache.cayenne.test.parallel.ParallelTestContainer;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -43,7 +43,7 @@ public class DataContextDataChannelEventsIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(RuntimeCaseSyncModule.class);
+ .withExtraModules(binder -> CoreModule.extend(binder).syncContexts());
private DataContext context;
private DataContext peer;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
index be88a77f3..73dfe1f06 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java
@@ -24,7 +24,7 @@ import java.util.Date;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.access.util.RuntimeCaseSyncModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.test.parallel.ParallelTestContainer;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.runtime.CayenneProjects;
@@ -43,7 +43,7 @@ public class DataContextDelegateSharedCacheIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(RuntimeCaseSyncModule.class);
+ .withExtraModules(binder -> CoreModule.extend(binder).syncContexts());
private DataContext context;
private DataContext context1;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKAndCustomDbRowOpSorterIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKAndCustomDbRowOpSorterIT.java
index ec10f6eb7..3a640db38 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKAndCustomDbRowOpSorterIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKAndCustomDbRowOpSorterIT.java
@@ -19,6 +19,8 @@
package org.apache.cayenne.access;
+import org.apache.cayenne.access.flush.operation.DbRowOpSorter;
+import org.apache.cayenne.access.flush.operation.GraphBasedDbRowOpSorter;
import org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKDep;
import org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKTest1;
import org.apache.cayenne.testdo.meaningful_pk.MeaningfulPk;
@@ -32,7 +34,7 @@ public class DataContextEntityWithMeaningfulPKAndCustomDbRowOpSorterIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv
.forProject(CayenneProjects.MEANINGFUL_PK_PROJECT)
- .withExtraModules(GraphSorterModule.class);
+ .withExtraModules(binder -> binder.bind(DbRowOpSorter.class).to(GraphBasedDbRowOpSorter.class));
@Test
public void insertDelete() {
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
index dc6547389..715a621e8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
@@ -26,8 +26,6 @@ import java.util.List;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.runtime.CoreModule;
-import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.Module;
import org.apache.cayenne.event.DefaultEventManager;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.runtime.CayenneRuntime;
@@ -49,7 +47,7 @@ public class DataContextSharedCacheEmpiricIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(DataContextSharedCacheEmpiricIT.SyncContextsModule.class);
+ .withExtraModules(binder -> CoreModule.extend(binder).syncContexts());
private static final String NEW_NAME = "versionX";
@@ -173,10 +171,4 @@ public class DataContextSharedCacheEmpiricIT {
helper.runTest(3000);
}
- public static class SyncContextsModule implements Module {
- @Override
- public void configure(Binder binder) {
- CoreModule.extend(binder).syncContexts();
- }
- }
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
index b3ecb2eb3..183c3ce76 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
-import org.apache.cayenne.access.util.RuntimeCaseSyncModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.test.parallel.ParallelTestContainer;
@@ -51,7 +51,7 @@ public class DataContextSharedCacheIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(RuntimeCaseSyncModule.class);
+ .withExtraModules(binder -> CoreModule.extend(binder).syncContexts());
private DataContext context;
private DataContext context1;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/GraphSorterModule.java b/cayenne/src/test/java/org/apache/cayenne/access/GraphSorterModule.java
deleted file mode 100644
index d833d590b..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/access/GraphSorterModule.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-package org.apache.cayenne.access;
-
-import org.apache.cayenne.access.flush.operation.DbRowOpSorter;
-import org.apache.cayenne.access.flush.operation.GraphBasedDbRowOpSorter;
-import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.Module;
-
-/**
- * Test module that sets up {@link GraphBasedDbRowOpSorter} instead of default one
- */
-public class GraphSorterModule implements Module {
- @Override
- public void configure(Binder binder) {
- binder.bind(DbRowOpSorter.class).to(GraphBasedDbRowOpSorter.class);
- }
-}
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
index 4f577e11e..8a000d9b7 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.access;
import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.access.util.RuntimeCaseSyncModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.test.parallel.ParallelTestContainer;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.runtime.CayenneProjects;
@@ -36,7 +36,7 @@ public class NestedDataContextParentEventsIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(RuntimeCaseSyncModule.class);
+ .withExtraModules(binder -> CoreModule.extend(binder).syncContexts());
@Test
public void parentUpdatedId() throws Exception {
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
index be0c66163..bb4d831a4 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.access;
import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.access.util.RuntimeCaseSyncModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.test.parallel.ParallelTestContainer;
import org.apache.cayenne.testdo.relationships_child_master.Child;
@@ -41,7 +41,7 @@ public class NestedDataContextParentPeerEventsIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.RELATIONSHIPS_CHILD_MASTER_PROJECT)
- .withExtraModules(RuntimeCaseSyncModule.class);
+ .withExtraModules(binder -> CoreModule.extend(binder).syncContexts());
private CayenneRuntime runtime;
private DataContext parentContext1;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
index b0af29447..8bf693a80 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.access;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.access.util.RuntimeCaseSyncModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.test.parallel.ParallelTestContainer;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
@@ -38,7 +38,7 @@ public class NestedDataContextPeerEventsIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT)
- .withExtraModules(RuntimeCaseSyncModule.class);
+ .withExtraModules(binder -> CoreModule.extend(binder).syncContexts());
@Test
public void peerObjectUpdatedTempOID() throws Exception {
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 a9d86675e..94e628c07 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
@@ -21,6 +21,8 @@ package org.apache.cayenne.access;
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.Persistent;
+import org.apache.cayenne.access.flush.operation.DbRowOpSorter;
+import org.apache.cayenne.access.flush.operation.GraphBasedDbRowOpSorter;
import org.apache.cayenne.query.ColumnSelect;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.ObjectSelect;
@@ -51,7 +53,7 @@ public class VerticalInheritanceIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.INHERITANCE_VERTICAL_PROJECT)
- .withExtraModules(GraphSorterModule.class);
+ .withExtraModules(binder -> binder.bind(DbRowOpSorter.class).to(GraphBasedDbRowOpSorter.class));
protected CayenneRuntime runtime;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/util/RuntimeCaseSyncModule.java b/cayenne/src/test/java/org/apache/cayenne/access/util/RuntimeCaseSyncModule.java
deleted file mode 100644
index a2871bf72..000000000
--- a/cayenne/src/test/java/org/apache/cayenne/access/util/RuntimeCaseSyncModule.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.access.util;
-
-import org.apache.cayenne.configuration.runtime.CoreModule;
-import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.Module;
-
-public class RuntimeCaseSyncModule implements Module {
- @Override
- public void configure(Binder binder) {
- CoreModule.extend(binder).syncContexts();
- }
-}
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 b6767bd84..074793fa0 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
@@ -54,6 +54,7 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -81,7 +82,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
}
private final String project;
- private final Class<?>[] extraModules;
+ private final Module[] extraModules;
private final boolean autoClean;
private final boolean weakReferences;
@@ -91,7 +92,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
private DbCleaner dbCleaner;
private CayenneRuntime runtime;
- private CayenneTestsEnv(String project, Class<?>[] extraModules, boolean autoClean, boolean weakReferences) {
+ private CayenneTestsEnv(String project, Module[] extraModules, boolean autoClean, boolean weakReferences) {
this.project = project;
this.extraModules = extraModules;
this.autoClean = autoClean;
@@ -99,10 +100,10 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
}
public static CayenneTestsEnv forProject(String project) {
- return new CayenneTestsEnv(project, new Class<?>[0], true, false);
+ return new CayenneTestsEnv(project, new Module[0], true, false);
}
- public CayenneTestsEnv withExtraModules(Class<?>... modules) {
+ public CayenneTestsEnv withExtraModules(Module... modules) {
return new CayenneTestsEnv(project, modules, autoClean, weakReferences);
}
@@ -155,9 +156,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
List<Module> modules = new ArrayList<>();
modules.add(new TestRuntimeOverridesModule());
- for (Class<?> moduleType : extraModules) {
- modules.add(instantiateModule(moduleType));
- }
+ Collections.addAll(modules, extraModules);
if (weakReferences) {
modules.add(new WeakReferenceStrategyModule());
@@ -214,14 +213,6 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
}
}
- private static Module instantiateModule(Class<?> moduleType) {
- try {
- return (Module) moduleType.getConstructor().newInstance();
- } catch (ReflectiveOperationException e) {
- throw new RuntimeException("Failed to instantiate extra module: " + moduleType.getName(), e);
- }
- }
-
public DataContext context() {
return context;
}