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/14 22:10:22 UTC
(cayenne) 10/10: tests cleanup - unwinding DI
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 06e534fb1b8de46a44fbb7271921ad4bc38e6b61
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Thu May 14 10:40:24 2026 -0400
tests cleanup - unwinding DI
---
.../org/apache/cayenne/dbsync/merge/MergeCase.java | 11 ++++-------
.../cayenne/dbsync/reverse/dbload/BaseLoaderIT.java | 7 ++-----
.../cayenne/dbsync/reverse/dbload/DbLoaderIT.java | 19 ++++---------------
.../java/org/apache/cayenne/access/DataContextIT.java | 7 ++-----
.../cayenne/access/DataNodeQueryExceptionsIT.java | 2 +-
.../cayenne/access/jdbc/SQLTemplateActionIT.java | 19 ++++++++-----------
.../java/org/apache/cayenne/dba/TypesMappingIT.java | 4 ++--
.../cayenne/dba/sqlserver/SQLServerSnifferIT.java | 2 +-
.../java/org/apache/cayenne/unit/CayenneTestsEnv.java | 10 +++-------
.../java/org/apache/cayenne/unit/TestDataSources.java | 4 ++--
.../cayenne/unit/runtime/AllTestsSchemaManager.java | 6 +++---
.../runtime/RuntimeCaseSharedDataSourceFactory.java | 2 +-
12 files changed, 33 insertions(+), 60 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 03bbde400..e35e198b2 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
@@ -26,8 +26,8 @@ import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.dbsync.merge.context.MergerContext;
import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory;
import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactoryProvider;
-import org.apache.cayenne.dbsync.merge.token.db.AbstractToDbToken;
import org.apache.cayenne.dbsync.merge.token.MergerToken;
+import org.apache.cayenne.dbsync.merge.token.db.AbstractToDbToken;
import org.apache.cayenne.dbsync.merge.token.db.SetColumnTypeToDb;
import org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator;
import org.apache.cayenne.dbsync.naming.NoStemStemmer;
@@ -43,13 +43,12 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.test.jdbc.DbHelper;
+import org.apache.cayenne.unit.CayenneTestsEnv;
import org.apache.cayenne.unit.dba.UnitDbAdapter;
import org.apache.cayenne.unit.runtime.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.unit.TestDataSources;
-import org.slf4j.Logger;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.RegisterExtension;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.Connection;
@@ -78,7 +77,6 @@ public abstract class MergeCase {
private DbHelper dbHelper;
private CayenneRuntime runtime;
protected UnitDbAdapter accessStackAdapter;
- private TestDataSources dataSourceFactory;
@BeforeEach
public void setUp() throws Exception {
@@ -87,7 +85,6 @@ public abstract class MergeCase {
dbHelper = env.dbHelper();
runtime = env.runtime();
accessStackAdapter = env.unitDbAdapter();
- dataSourceFactory = env.dataSourceFactory();
// break circular FK before DBCleaner.clean()
dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute();
@@ -234,7 +231,7 @@ public abstract class MergeCase {
private void executeSql(String sql) throws Exception {
- try (Connection conn = dataSourceFactory.getSharedDataSource().getConnection();) {
+ try (Connection conn = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();) {
try (Statement st = conn.createStatement();) {
st.execute(sql);
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java
index 46ba42ace..0cc98a2f5 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java
@@ -23,10 +23,9 @@ import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.model.DetectedDbEntity;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.unit.CayenneTestsEnv;
import org.apache.cayenne.unit.dba.UnitDbAdapter;
import org.apache.cayenne.unit.runtime.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.unit.TestDataSources;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -44,7 +43,6 @@ public class BaseLoaderIT {
protected DbAdapter adapter;
protected CayenneRuntime runtime;
- protected TestDataSources dataSourceFactory;
protected UnitDbAdapter accessStackAdapter;
Connection connection;
@@ -55,11 +53,10 @@ public class BaseLoaderIT {
public void before() throws Exception {
adapter = env.dataNode().getAdapter();
runtime = env.runtime();
- dataSourceFactory = env.dataSourceFactory();
accessStackAdapter = env.unitDbAdapter();
store = new DbLoadDataStore();
assertTrue(store.getDbEntities().isEmpty(), "Store is not empty");
- this.connection = dataSourceFactory.getSharedDataSource().getConnection();
+ this.connection = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();
}
@AfterEach
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderIT.java
index 0028cde50..f54c4dfef 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderIT.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderIT.java
@@ -31,11 +31,8 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.runtime.CayenneRuntime;
-import org.apache.cayenne.unit.dba.UnitDbAdapter;
-import org.apache.cayenne.unit.runtime.CayenneProjects;
import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.unit.TestDataSources;
+import org.apache.cayenne.unit.runtime.CayenneProjects;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -55,14 +52,9 @@ public class DbLoaderIT {
private static final DbLoaderConfiguration CONFIG = new DbLoaderConfiguration();
- private CayenneRuntime runtime;
private DbAdapter adapter;
- private TestDataSources dataSourceFactory;
- private UnitDbAdapter accessStackAdapter;
-
private Connection connection;
-
@Test
public void loadingOrder() throws Exception {
ReverseEngineering engineering = new ReverseEngineering();
@@ -100,7 +92,7 @@ public class DbLoaderIT {
*/
@Test
public void simpleLoad() throws Exception {
- DbLoader loader = createDbLoader(true, true);
+ DbLoader loader = createDbLoader();
DataMap loaded = loader.load();
assertNotNull(loaded);
assertEquals("__generated_by_dbloader__", loaded.getName());
@@ -145,14 +137,11 @@ public class DbLoaderIT {
@BeforeEach
public void before() throws Exception {
- runtime = env.runtime();
adapter = env.dataNode().getAdapter();
- dataSourceFactory = env.dataSourceFactory();
- accessStackAdapter = env.unitDbAdapter();
- this.connection = dataSourceFactory.getSharedDataSource().getConnection();
+ this.connection = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();
}
- private DbLoader createDbLoader(boolean meaningfulPK, boolean meaningfulFK) {
+ private DbLoader createDbLoader() {
return new DbLoader(adapter, connection, CONFIG, null, new DefaultObjectNameGenerator(NoStemStemmer.getInstance()));
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java
index 38fcc0a3f..52ae32361 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java
@@ -40,13 +40,12 @@ import org.apache.cayenne.testdo.testmap.Exhibit;
import org.apache.cayenne.testdo.testmap.NullTestEntity;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.ROArtist;
+import org.apache.cayenne.unit.CayenneTestsEnv;
import org.apache.cayenne.unit.dba.UnitDbAdapter;
import org.apache.cayenne.unit.runtime.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.unit.TestDataSources;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import java.math.BigDecimal;
import java.sql.Timestamp;
@@ -67,7 +66,6 @@ public class DataContextIT {
protected DataContext context;
protected UnitDbAdapter accessStackAdapter;
- protected TestDataSources dataSourceFactory;
protected TableHelper tArtist;
protected TableHelper tExhibit;
@@ -78,7 +76,6 @@ public class DataContextIT {
public void setUp() throws Exception {
context = env.context();
accessStackAdapter = env.unitDbAdapter();
- dataSourceFactory = env.dataSourceFactory();
tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME");
tExhibit = env.table("EXHIBIT", "EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE");
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataNodeQueryExceptionsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataNodeQueryExceptionsIT.java
index 6cfd47289..7d3a74cf6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataNodeQueryExceptionsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataNodeQueryExceptionsIT.java
@@ -77,7 +77,7 @@ public class DataNodeQueryExceptionsIT {
int activeConnections() {
try {
- UnmanagedPoolingDataSource ds = env.dataSourceFactory().getSharedDataSource().unwrap(UnmanagedPoolingDataSource.class);
+ UnmanagedPoolingDataSource ds = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().unwrap(UnmanagedPoolingDataSource.class);
Method poolSize = UnmanagedPoolingDataSource.class.getDeclaredMethod("poolSize");
poolSize.setAccessible(true);
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
index 524baf50d..d6e6efb93 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java
@@ -30,10 +30,9 @@ import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
+import org.apache.cayenne.unit.CayenneTestsEnv;
import org.apache.cayenne.unit.dba.UnitDbAdapter;
import org.apache.cayenne.unit.runtime.CayenneProjects;
-import org.apache.cayenne.unit.CayenneTestsEnv;
-import org.apache.cayenne.unit.TestDataSources;
import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -54,7 +53,6 @@ public class SQLTemplateActionIT {
@RegisterExtension
static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
- private TestDataSources dataSourceFactory;
private DataNode node;
private UnitDbAdapter unitDbAdapter;
private ObjectContext context;
@@ -63,7 +61,6 @@ public class SQLTemplateActionIT {
@BeforeEach
public void setUp() throws Exception {
- dataSourceFactory = env.dataSourceFactory();
node = env.dataNode();
unitDbAdapter = env.unitDbAdapter();
context = env.context();
@@ -109,7 +106,7 @@ public class SQLTemplateActionIT {
MockOperationObserver observer = new MockOperationObserver();
- try (Connection c = dataSourceFactory.getSharedDataSource().getConnection();) {
+ try (Connection c = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();) {
plan.performAction(c, observer);
}
@@ -166,7 +163,7 @@ public class SQLTemplateActionIT {
MockOperationObserver observer = new MockOperationObserver();
- try (Connection c = dataSourceFactory.getSharedDataSource().getConnection();) {
+ try (Connection c = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();) {
plan.performAction(c, observer);
}
@@ -196,7 +193,7 @@ public class SQLTemplateActionIT {
MockOperationObserver observer = new MockOperationObserver();
- try (Connection c = dataSourceFactory.getSharedDataSource().getConnection();) {
+ try (Connection c = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();) {
plan.performAction(c, observer);
}
@@ -226,7 +223,7 @@ public class SQLTemplateActionIT {
MockOperationObserver observer = new MockOperationObserver();
- try (Connection c = dataSourceFactory.getSharedDataSource().getConnection();) {
+ try (Connection c = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();) {
plan.performAction(c, observer);
}
@@ -254,7 +251,7 @@ public class SQLTemplateActionIT {
SQLAction action = node.getAdapter().getAction(template, node);
- try (Connection c = dataSourceFactory.getSharedDataSource().getConnection();) {
+ try (Connection c = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();) {
MockOperationObserver observer = new MockOperationObserver();
action.performAction(c, observer);
@@ -276,7 +273,7 @@ public class SQLTemplateActionIT {
SQLAction action = node.getAdapter().getAction(template, node);
- try (Connection c = dataSourceFactory.getSharedDataSource().getConnection();) {
+ try (Connection c = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();) {
MockOperationObserver observer = new MockOperationObserver();
action.performAction(c, observer);
@@ -311,7 +308,7 @@ public class SQLTemplateActionIT {
assertSame(node, action.dataNode);
assertSame(template, action.getQuery());
- try (Connection c = dataSourceFactory.getSharedDataSource().getConnection();) {
+ try (Connection c = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection();) {
MockOperationObserver observer = new MockOperationObserver();
action.performAction(c, observer);
diff --git a/cayenne/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java b/cayenne/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
index c69f8cdbb..d097fdb8a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/dba/TypesMappingIT.java
@@ -130,7 +130,7 @@ public class TypesMappingIT {
// check counts
// since more then 1 database type can map to a single JDBC type
int len = 0;
- try (Connection conn = env.dataSourceFactory().getSharedDataSource().getConnection()) {
+ try (Connection conn = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection()) {
DatabaseMetaData md = conn.getMetaData();
try (ResultSet rs = md.getTypeInfo()) {
while (rs.next()) {
@@ -153,7 +153,7 @@ public class TypesMappingIT {
}
private TypesMapping createTypesMapping() throws Exception {
- try (Connection conn = env.dataSourceFactory().getSharedDataSource().getConnection()) {
+ try (Connection conn = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection()) {
DatabaseMetaData md = conn.getMetaData();
return new TypesMapping(md);
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java b/cayenne/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
index d8b96120b..284a566e0 100644
--- a/cayenne/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
@@ -43,7 +43,7 @@ public class SQLServerSnifferIT {
DbAdapter adapter;
- try (Connection c = env.dataSourceFactory().getSharedDataSource().getConnection()) {
+ try (Connection c = CayenneTestsEnv.DATA_SOURCES.sharedDataSource().getConnection()) {
adapter = sniffer.createAdapter(c.getMetaData());
}
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 2c0d9a527..b6767bd84 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
@@ -63,7 +63,7 @@ import java.util.stream.Collectors;
public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
private static final Injector INJECTOR;
- private static final TestDataSources DATA_SOURCES;
+ public static final TestDataSources DATA_SOURCES;
public static final AllTestsSchemaManager SCHEMAS;
static {
@@ -126,7 +126,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
DataNode node = runtime.getDataDomain().getDataNodes().iterator().next();
DataMap firstMap = context.getEntityResolver().getDataMaps().iterator().next();
this.dbHelper = new FlavoredDbHelper(
- DATA_SOURCES.getSharedDataSource(),
+ DATA_SOURCES.sharedDataSource(),
node.getAdapter().getQuotingStrategy(),
firstMap);
@@ -194,7 +194,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
node.setRowReaderFactory(rowReaderFactory);
node.setBatchTranslatorFactory(batchTranslatorFactory);
node.setSelectTranslatorFactory(selectTranslatorFactory);
- node.setDataSource(DATA_SOURCES.getDataSource(dataMap.getName()));
+ node.setDataSource(DATA_SOURCES.dataSource(dataMap.getName()));
node.setAdapter(adapter);
node.setSchemaUpdateStrategy(new SkipSchemaUpdateStrategy());
node.setSqlTemplateProcessor(sqlTemplateProcessor);
@@ -263,10 +263,6 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
return runtime.getInjector().getInstance(AdhocObjectFactory.class);
}
- public TestDataSources dataSourceFactory() {
- return DATA_SOURCES;
- }
-
public DbCleaner dbCleaner() {
return dbCleaner;
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/TestDataSources.java b/cayenne/src/test/java/org/apache/cayenne/unit/TestDataSources.java
index f1370b4f2..366cfcf06 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/TestDataSources.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/TestDataSources.java
@@ -48,11 +48,11 @@ public class TestDataSources {
this.sharedDataSource = createDataSource();
}
- public DataSource getSharedDataSource() {
+ public DataSource sharedDataSource() {
return sharedDataSource;
}
- public DataSource getDataSource(String dataMapName) {
+ public DataSource dataSource(String dataMapName) {
DataSource ds = dataSources.get(dataMapName);
if (ds == null) {
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 7148011ab..12ca7dc28 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
@@ -123,7 +123,7 @@ public class AllTestsSchemaManager {
DataNode node = new DataNode(map.getName());
node.setJdbcEventLogger(jdbcEventLogger);
node.setAdapter(dbAdapter);
- node.setDataSource(dataSourceFactory.getSharedDataSource());
+ node.setDataSource(dataSourceFactory.sharedDataSource());
// setup test extended types
node.getAdapter().getExtendedTypes().registerType(new StringET1ExtendedType());
@@ -315,7 +315,7 @@ public class AllTestsSchemaManager {
List<DbEntity> list = dbEntitiesInInsertOrder(map.getName());
- try (Connection conn = dataSourceFactory.getSharedDataSource().getConnection()) {
+ try (Connection conn = dataSourceFactory.sharedDataSource().getConnection()) {
DatabaseMetaData md = conn.getMetaData();
List<String> allTables = new ArrayList<>();
@@ -370,7 +370,7 @@ public class AllTestsSchemaManager {
private void createSchema(DataNode node, DataMap map) throws Exception {
- try (Connection conn = dataSourceFactory.getSharedDataSource().getConnection()) {
+ try (Connection conn = dataSourceFactory.sharedDataSource().getConnection()) {
unitDbAdapter.willCreateTables(conn, map);
try (Statement stmt = conn.createStatement()) {
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseSharedDataSourceFactory.java b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseSharedDataSourceFactory.java
index 26c17ea31..56d2a3059 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseSharedDataSourceFactory.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseSharedDataSourceFactory.java
@@ -34,6 +34,6 @@ public class RuntimeCaseSharedDataSourceFactory implements DataSourceFactory {
}
public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
- return factory.getSharedDataSource();
+ return factory.sharedDataSource();
}
}