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 815f6cb0703f33c58327bb7988407c3f0f4880d6 Author: Andrus Adamchik <[email protected]> AuthorDate: Thu May 14 10:40:24 2026 -0400 tests cleanup - unwinding DI --- .../java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java | 11 ++++------- .../cayenne/unit/di/runtime/AllTestsSchemaManager.java | 11 +++++------ .../cayenne/unit/di/runtime/CayenneTestsEnv.java | 18 ++++++++++++------ .../cayenne/unit/di/runtime/RuntimeCaseModule.java | 1 - 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/cayenne/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java b/cayenne/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java index 39af0df33..1a7af43f1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java @@ -25,7 +25,6 @@ import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.runtime.CayenneProjects; import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv; -import org.apache.cayenne.unit.di.runtime.AllTestsSchemaManager; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -42,15 +41,13 @@ public class JdbcPkGeneratorIT { static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT); private DataNode node; - private AllTestsSchemaManager schemaManager; @BeforeEach public void setUp() throws Exception { node = env.dataNode(); - schemaManager = env.schemaManager(); - schemaManager.dropPKSupport(); + CayenneTestsEnv.SCHEMA_MANAGER.dropPKSupport(); } - + @AfterEach public void tearDown() throws Exception { @@ -60,8 +57,8 @@ public class JdbcPkGeneratorIT { pkGenerator.setPkStartValue(JdbcPkGenerator.DEFAULT_PK_START_VALUE); - schemaManager.dropPKSupport(); - schemaManager.createPKSupport(); + CayenneTestsEnv.SCHEMA_MANAGER.dropPKSupport(); + CayenneTestsEnv.SCHEMA_MANAGER.createPKSupport(); } } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/AllTestsSchemaManager.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/AllTestsSchemaManager.java index e76798efc..6788af0e3 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/AllTestsSchemaManager.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/AllTestsSchemaManager.java @@ -30,7 +30,6 @@ import org.apache.cayenne.ashwood.AshwoodEntitySorter; import org.apache.cayenne.cache.MapQueryCache; import org.apache.cayenne.configuration.DataMapLoader; import org.apache.cayenne.dba.DbAdapter; -import org.apache.cayenne.di.Inject; import org.apache.cayenne.event.DefaultEventManager; import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.map.DataMap; @@ -93,11 +92,11 @@ public class AllTestsSchemaManager { private final DataDomain domain; public AllTestsSchemaManager( - @Inject RuntimeCaseDataSourceFactory dataSourceFactory, - @Inject UnitDbAdapter unitDbAdapter, - @Inject DbAdapter dbAdapter, - @Inject JdbcEventLogger jdbcEventLogger, - @Inject DataMapLoader loader) { + RuntimeCaseDataSourceFactory dataSourceFactory, + UnitDbAdapter unitDbAdapter, + DbAdapter dbAdapter, + JdbcEventLogger jdbcEventLogger, + DataMapLoader loader) { this.dataSourceFactory = dataSourceFactory; this.unitDbAdapter = unitDbAdapter; 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 664747bb8..ba8c14145 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 @@ -22,14 +22,17 @@ import org.apache.cayenne.access.DataContext; import org.apache.cayenne.access.DataDomain; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.configuration.Constants; +import org.apache.cayenne.configuration.DataMapLoader; import org.apache.cayenne.configuration.DataSourceDescriptor; import org.apache.cayenne.configuration.runtime.CoreModule; +import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Binder; import org.apache.cayenne.di.DIBootstrap; import org.apache.cayenne.di.Injector; import org.apache.cayenne.di.Module; import org.apache.cayenne.di.spi.DefaultScope; +import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.runtime.CayenneRuntime; @@ -51,11 +54,18 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { private static final DefaultScope TEST_SCOPE; private static final Injector INJECTOR; + public static final AllTestsSchemaManager SCHEMA_MANAGER; static { TEST_SCOPE = new DefaultScope(); INJECTOR = DIBootstrap.createInjector(new RuntimeCaseModule(TEST_SCOPE)); - INJECTOR.getInstance(AllTestsSchemaManager.class).rebuildSchema(); + SCHEMA_MANAGER = new AllTestsSchemaManager( + INJECTOR.getInstance(RuntimeCaseDataSourceFactory.class), + INJECTOR.getInstance(UnitDbAdapter.class), + INJECTOR.getInstance(DbAdapter.class), + INJECTOR.getInstance(JdbcEventLogger.class), + INJECTOR.getInstance(DataMapLoader.class)); + SCHEMA_MANAGER.rebuildSchema(); } private final String project; @@ -120,7 +130,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { this.context = (DataContext) runtime.newContext(); this.dbHelper = INJECTOR.getInstance(DbHelper.class); this.dbCleaner = new DbCleaner( - INJECTOR.getInstance(AllTestsSchemaManager.class), + SCHEMA_MANAGER, dbHelper, context.getEntityResolver().getDataMaps().stream().map(DataMap::getName).collect(Collectors.toSet())); @@ -191,10 +201,6 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { return INJECTOR.getInstance(SQLTemplateCustomizer.class); } - public AllTestsSchemaManager schemaManager() { - return INJECTOR.getInstance(AllTestsSchemaManager.class); - } - public static class WeakReferenceStrategyModule implements Module { @Override public void configure(Binder binder) { diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseModule.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseModule.java index 78f0f2f11..a72e31168 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseModule.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseModule.java @@ -202,7 +202,6 @@ public class RuntimeCaseModule implements Module { binder.bind(ValueObjectTypeRegistry.class).to(DefaultValueObjectTypeRegistry.class); binder.bind(ValueComparisonStrategyFactory.class).to(DefaultValueComparisonStrategyFactory.class); - binder.bind(AllTestsSchemaManager.class).to(AllTestsSchemaManager.class); binder.bind(JdbcEventLogger.class).to(Slf4jJdbcEventLogger.class); binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class); binder.bind(ObjectMapRetainStrategy.class).to(DefaultObjectMapRetainStrategy.class);
