removing unused test mappings

Author: andrus

cayenne/src/test/java/org/apache/cayenne/datasource/BasePoolingDataSourceIT.java

@@ -40,7 +40,7 @@ public class BasePoolingDataSourceIT {
 
 	@BeforeEach
 	public void before() throws SQLException {
-        DataSourceDescriptor dataSourceInfo = env.dataSourceDescriptor();
+        DataSourceDescriptor dataSourceInfo = CayenneTestsEnv.COMMON_SCHEMA.dataSourceDescriptor();
         AdhocObjectFactory objectFactory = env.adhocObjectFactory();
 
 		Driver driver = objectFactory.newInstance(Driver.class, dataSourceInfo.getJdbcDriver());

cayenne/src/test/java/org/apache/cayenne/datasource/PoolingDataSource_FailingValidationQueryIT.java

@@ -18,14 +18,14 @@
  ****************************************************************/
 package org.apache.cayenne.datasource;
 
-import java.sql.Driver;
-
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.unit.runtime.CayenneProjects;
 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.sql.Driver;
+
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class PoolingDataSource_FailingValidationQueryIT {
@@ -45,9 +45,12 @@ protected PoolingDataSourceParameters createParameters() {
 	@Test
 	public void constructor() {
 		assertThrows(CayenneRuntimeException.class, () -> {
-			Driver driver = env.adhocObjectFactory().newInstance(Driver.class, env.dataSourceDescriptor().getJdbcDriver());
-			DriverDataSource nonPooling = new DriverDataSource(driver, env.dataSourceDescriptor().getDataSourceUrl(),
-					env.dataSourceDescriptor().getUserName(), env.dataSourceDescriptor().getPassword());
+			Driver driver = env.adhocObjectFactory().newInstance(Driver.class, CayenneTestsEnv.COMMON_SCHEMA.dataSourceDescriptor().getJdbcDriver());
+			DriverDataSource nonPooling = new DriverDataSource(
+					driver,
+					CayenneTestsEnv.COMMON_SCHEMA.dataSourceDescriptor().getDataSourceUrl(),
+					CayenneTestsEnv.COMMON_SCHEMA.dataSourceDescriptor().getUserName(),
+					CayenneTestsEnv.COMMON_SCHEMA.dataSourceDescriptor().getPassword());
 
 			PoolingDataSourceParameters poolParameters = createParameters();
 			UnmanagedPoolingDataSource ds = new UnmanagedPoolingDataSource(nonPooling, poolParameters);

cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java

@@ -59,8 +59,8 @@ public void stopLocalRuntime() {
     @BeforeEach
     public void setUp() throws Exception {
 
-        this.dsi = env.dataSourceDescriptor();
-        this.dataSource = env.runtime().getDataSource("testmap");
+        this.dsi = CayenneTestsEnv.COMMON_SCHEMA.dataSourceDescriptor();
+        this.dataSource = CayenneTestsEnv.COMMON_SCHEMA.dataSource();
 
         env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME")
                 .insert(33001, "AA1")

cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java

@@ -34,7 +34,6 @@
 import org.apache.cayenne.datasource.DataSourceBuilder;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.di.AdhocObjectFactory;
-import org.apache.cayenne.di.DIBootstrap;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.di.Module;
 import org.apache.cayenne.log.JdbcEventLogger;
@@ -46,7 +45,6 @@
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
 import org.apache.cayenne.unit.runtime.FlavoredDbHelper;
-import org.apache.cayenne.unit.runtime.RuntimeCaseModule;
 import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
@@ -64,25 +62,22 @@
  */
 public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback {
 
-    private static final Injector INJECTOR;
-
     // shared stack parts... use these directly from the tests
+    // TODO: we should support multiple physically-isolated schemas for cleaner tests
     public static final DbSchemaManager COMMON_SCHEMA;
 
     static {
-        INJECTOR = DIBootstrap.createInjector(new RuntimeCaseModule());
-
-        DataSourceDescriptor dataSourceDescriptor = INJECTOR.getInstance(DataSourceDescriptor.class);
-        DataSource dataSource = DataSourceBuilder
-                .url(dataSourceDescriptor.getDataSourceUrl())
-                .driver(dataSourceDescriptor.getJdbcDriver())
-                .userName(dataSourceDescriptor.getUserName())
-                .password(dataSourceDescriptor.getPassword())
-                .pool(dataSourceDescriptor.getMinConnections(), dataSourceDescriptor.getMaxConnections())
+        DataSourceDescriptor dsDescriptor = TestDataSourceDescriptorFactory.create();
+        DataSource ds = DataSourceBuilder
+                .url(dsDescriptor.getDataSourceUrl())
+                .driver(dsDescriptor.getJdbcDriver())
+                .userName(dsDescriptor.getUserName())
+                .password(dsDescriptor.getPassword())
+                .pool(dsDescriptor.getMinConnections(), dsDescriptor.getMaxConnections())
                 .build();
 
         // "cayenne-ALL.xml" is a special synthetic project file that includes all test DataMaps
-        COMMON_SCHEMA = new DbSchemaManager("cayenne-ALL.xml", dataSource);
+        COMMON_SCHEMA = new DbSchemaManager("cayenne-ALL.xml", dsDescriptor, ds);
         COMMON_SCHEMA.rebuildSchema();
     }
 
@@ -263,10 +258,6 @@ public DbCleaner dbCleaner() {
         return dbCleaner;
     }
 
-    public DataSourceDescriptor dataSourceDescriptor() {
-        return INJECTOR.getInstance(DataSourceDescriptor.class);
-    }
-
     public SQLTemplateCustomizer sqlTemplateCustomizer() {
         return SQLTemplateCustomizer.of(dataNode().getAdapter());
     }

…e/unit/runtime/ConnectionProperties.java …e/cayenne/unit/ConnectionProperties.javacayenne/src/test/java/org/apache/cayenne/unit/runtime/ConnectionProperties.java renamed to cayenne/src/test/java/org/apache/cayenne/unit/ConnectionProperties.java cayenne/src/test/java/org/apache/cayenne/unit/runtime/ConnectionProperties.java renamed to cayenne/src/test/java/org/apache/cayenne/unit/ConnectionProperties.java

@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.unit.runtime;
+package org.apache.cayenne.unit;
 
 import java.util.ArrayList;
 import java.util.HashMap;

cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java

@@ -21,6 +21,7 @@
 
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.configuration.DataSourceDescriptor;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbAttribute;
@@ -61,13 +62,15 @@ public class DbSchemaManager {
     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 DataSourceDescriptor dataSourceDescriptor;
     private final DataSource dataSource;
     private final TestDbAdapter testDbAdapter;
     private final DataDomain domain;
     private final List<DataMap> dataMapsInSchemaSetupOrder;
 
-    public DbSchemaManager(String project, DataSource dataSource) {
+    public DbSchemaManager(String project, DataSourceDescriptor dataSourceDescriptor, DataSource dataSource) {
 
+        this.dataSourceDescriptor = dataSourceDescriptor;
         this.dataSource = dataSource;
         this.domain = CayenneRuntime.builder()
                 .addConfig(project)
@@ -96,6 +99,10 @@ public DataSource dataSource() {
         return dataSource;
     }
 
+    public DataSourceDescriptor dataSourceDescriptor() {
+        return dataSourceDescriptor;
+    }
+
     /**
      * Rebuilds the test schema, combining all DataMaps that require schema support. Schema generation is done like that
      * instead of on-demand per-DataMap  to avoid conflicts when dropping and generating PK objects.