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 441088f4fcb2aafcdc34e725e2dcce94373d51d7 Author: Andrus Adamchik <[email protected]> AuthorDate: Sat May 16 13:56:29 2026 -0400 Tests cleanup --- .../java/org/apache/cayenne/unit/AllTestsSchemaManager.java | 13 +++++++------ .../test/java/org/apache/cayenne/unit/CayenneTestsEnv.java | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java b/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java index ade9e1be1..c229bacd7 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java @@ -41,6 +41,7 @@ import org.apache.cayenne.unit.dba.TestDbAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.ResultSet; @@ -83,18 +84,18 @@ public class AllTestsSchemaManager { private static final Set<String> EXTRA_EXCLUDED_FOR_NO_LOB = Set.of("CLOB_DETAIL"); private static final Set<String> EXTRA_EXCLUDED_FOR_NO_NATIVE_JSON = Set.of("JSON_OTHER"); - private final TestDataSources dataSources; + private final DataSource dataSource; private final TestDbAdapter testDbAdapter; private final JdbcEventLogger jdbcEventLogger; private final DataDomain domain; public AllTestsSchemaManager( - TestDataSources dataSources, + DataSource dataSource, DbAdapter dbAdapter, JdbcEventLogger jdbcEventLogger, DataMapLoader loader) { - this.dataSources = dataSources; + this.dataSource = dataSource; this.testDbAdapter = TestDbAdapter.of(dbAdapter); this.jdbcEventLogger = jdbcEventLogger; @@ -120,7 +121,7 @@ public class AllTestsSchemaManager { DataNode node = new DataNode(map.getName()); node.setJdbcEventLogger(jdbcEventLogger); node.setAdapter(dbAdapter); - node.setDataSource(dataSources.sharedDataSource()); + node.setDataSource(dataSource); // tweak mapping with a delegate for (Procedure proc : map.getProcedures()) { @@ -302,7 +303,7 @@ public class AllTestsSchemaManager { List<DbEntity> list = dbEntitiesInInsertOrder(map.getName()); - try (Connection conn = dataSources.sharedDataSource().getConnection()) { + try (Connection conn = dataSource.getConnection()) { DatabaseMetaData md = conn.getMetaData(); List<String> allTables = new ArrayList<>(); @@ -355,7 +356,7 @@ public class AllTestsSchemaManager { private void createSchema(DataNode node, DataMap map) throws Exception { - try (Connection conn = dataSources.sharedDataSource().getConnection()) { + try (Connection conn = dataSource.getConnection()) { testDbAdapter.willCreateTables(conn, map); try (Statement stmt = conn.createStatement()) { 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 729ada370..e23013762 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java @@ -79,7 +79,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { INJECTOR.getInstance(AdhocObjectFactory.class)); SCHEMAS = new AllTestsSchemaManager( - DATA_SOURCES, + DATA_SOURCES.sharedDataSource(), INJECTOR.getInstance(DbAdapter.class), INJECTOR.getInstance(JdbcEventLogger.class), INJECTOR.getInstance(DataMapLoader.class));
