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
The following commit(s) were added to refs/heads/master by this push:
new 10057404e tests cleanup
10057404e is described below
commit 10057404ecd68d31f08001fc74598857204f7677
Author: Andrus Adamchik <[email protected]>
AuthorDate: Fri May 15 19:14:07 2026 -0400
tests cleanup
further unwinding weird tests injection
---
.../cayenne/runtime/CayenneRuntimeBuilderIT.java | 186 ++++++++++-----------
.../unit/{runtime => }/AllTestsSchemaManager.java | 3 +-
.../org/apache/cayenne/unit/CayenneTestsEnv.java | 1 -
.../org/apache/cayenne/unit/runtime/DbCleaner.java | 1 +
4 files changed, 94 insertions(+), 97 deletions(-)
diff --git
a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java
b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java
index 13be85b4f..1eefe1d6b 100644
---
a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java
@@ -18,138 +18,136 @@
****************************************************************/
package org.apache.cayenne.runtime;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-
-import java.util.List;
-
-import javax.sql.DataSource;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.configuration.DataSourceDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.query.SQLSelect;
-import org.apache.cayenne.test.jdbc.TableHelper;
-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.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-@SuppressWarnings("deprecation")
-public class CayenneRuntimeBuilderIT {
+import javax.sql.DataSource;
+import java.util.List;
- @RegisterExtension
- static final CayenneTestsEnv env =
CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
+import static org.junit.jupiter.api.Assertions.*;
- private CayenneRuntime runtime;
- private DataSourceDescriptor dsi;
+public class CayenneRuntimeBuilderIT {
- private CayenneRuntime localRuntime;
- private DataSource dataSource;
+ @RegisterExtension
+ static final CayenneTestsEnv env =
CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
- @AfterEach
- public void stopLocalRuntime() {
+ private DataSourceDescriptor dsi;
+ private CayenneRuntime localRuntime;
+ private DataSource dataSource;
- // even though we don't supply real configs here, we sometimes
access
- // DataDomain, and this starts EventManager threads that need
to be
- // shutdown
- if (localRuntime != null) {
- localRuntime.shutdown();
- }
- }
+ @AfterEach
+ public void stopLocalRuntime() {
- @BeforeEach
- public void setUp() throws Exception {
- runtime = env.runtime();
- dsi = env.dataSourceDescriptor();
- TableHelper tArtist = env.table("ARTIST", "ARTIST_ID",
"ARTIST_NAME");
- tArtist.insert(33001, "AA1");
- tArtist.insert(33002, "AA2");
+ // even though we don't supply real configs here, we sometimes access
+ // DataDomain, and this starts EventManager threads that need to be
+ // shutdown
+ if (localRuntime != null) {
+ localRuntime.shutdown();
+ }
+ }
- this.dataSource = runtime.getDataSource("testmap");
- }
+ @BeforeEach
+ public void setUp() throws Exception {
- @Test
- public void configFree_WithDBParams() {
+ this.dsi = env.dataSourceDescriptor();
+ this.dataSource = env.runtime().getDataSource("testmap");
- localRuntime = new
CayenneRuntimeBuilder(null).jdbcDriver(dsi.getJdbcDriver()).url(dsi.getDataSourceUrl())
-
.password(dsi.getPassword()).user(dsi.getUserName()).minConnections(1).maxConnections(2).build();
+ env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME")
+ .insert(33001, "AA1")
+ .insert(33002, "AA2");
+ }
- List<DataRow> result = SQLSelect.dataRowQuery("SELECT * FROM
ARTIST").select(localRuntime.newContext());
- assertEquals(2, result.size());
- }
+ @Test
+ public void configFree_WithDBParams() {
- @Test
- public void configFree_WithDBParams_WithProject() {
+ localRuntime = new CayenneRuntimeBuilder(null)
+ .jdbcDriver(dsi.getJdbcDriver())
+ .url(dsi.getDataSourceUrl())
+ .password(dsi.getPassword())
+ .user(dsi.getUserName())
+ .minConnections(1)
+ .maxConnections(2).build();
- localRuntime = new
CayenneRuntimeBuilder(null).addConfig(CayenneProjects.TESTMAP_PROJECT)
-
.jdbcDriver(dsi.getJdbcDriver()).url(dsi.getDataSourceUrl()).password(dsi.getPassword())
-
.user(dsi.getUserName()).minConnections(1).maxConnections(2).build();
+ List<DataRow> result = SQLSelect.dataRowQuery("SELECT * FROM
ARTIST").select(localRuntime.newContext());
+ assertEquals(2, result.size());
+ }
- DataMap map =
localRuntime.getDataDomain().getDataMap("testmap");
- assertNotNull(map);
+ @Test
+ public void configFree_WithDBParams_WithProject() {
- DataNode node = localRuntime.getDataDomain().getDefaultNode();
- assertNotNull(node);
- assertEquals(1, node.getDataMaps().size());
+ localRuntime = new
CayenneRuntimeBuilder(null).addConfig(CayenneProjects.TESTMAP_PROJECT)
+
.jdbcDriver(dsi.getJdbcDriver()).url(dsi.getDataSourceUrl()).password(dsi.getPassword())
+
.user(dsi.getUserName()).minConnections(1).maxConnections(2).build();
- assertSame(map, node.getDataMap("testmap"));
- }
+ DataMap map = localRuntime.getDataDomain().getDataMap("testmap");
+ assertNotNull(map);
- @Test
- public void configFree_WithDataSource() {
+ DataNode node = localRuntime.getDataDomain().getDefaultNode();
+ assertNotNull(node);
+ assertEquals(1, node.getDataMaps().size());
- localRuntime = new
CayenneRuntimeBuilder(null).dataSource(dataSource).build();
+ assertSame(map, node.getDataMap("testmap"));
+ }
- List<DataRow> result = SQLSelect.dataRowQuery("SELECT * FROM
ARTIST").select(localRuntime.newContext());
- assertEquals(2, result.size());
- }
+ @Test
+ public void configFree_WithDataSource() {
- @Test
- public void noNodeConfig_WithDataSource() {
+ localRuntime = new
CayenneRuntimeBuilder(null).dataSource(dataSource).build();
- localRuntime = new
CayenneRuntimeBuilder(null).addConfig(CayenneProjects.TESTMAP_PROJECT).dataSource(dataSource)
- .build();
+ List<DataRow> result = SQLSelect.dataRowQuery("SELECT * FROM
ARTIST").select(localRuntime.newContext());
+ assertEquals(2, result.size());
+ }
- DataMap map =
localRuntime.getDataDomain().getDataMap("testmap");
- assertNotNull(map);
+ @Test
+ public void noNodeConfig_WithDataSource() {
- DataNode node = localRuntime.getDataDomain().getDefaultNode();
- assertNotNull(node);
- assertEquals(1, node.getDataMaps().size());
+ localRuntime = new
CayenneRuntimeBuilder(null).addConfig(CayenneProjects.TESTMAP_PROJECT).dataSource(dataSource)
+ .build();
- assertSame(map, node.getDataMap("testmap"));
- }
+ DataMap map = localRuntime.getDataDomain().getDataMap("testmap");
+ assertNotNull(map);
- @Test
- public void unnamedDomain_MultiLocation() {
- localRuntime = new
CayenneRuntimeBuilder(null).addConfigs(CayenneProjects.TESTMAP_PROJECT,
- CayenneProjects.EMBEDDABLE_PROJECT).build();
+ DataNode node = localRuntime.getDataDomain().getDefaultNode();
+ assertNotNull(node);
+ assertEquals(1, node.getDataMaps().size());
- assertEquals("cayenne", localRuntime.getDataDomain().getName());
- }
+ assertSame(map, node.getDataMap("testmap"));
+ }
- @Test
- public void namedDomain_MultiLocation() {
- localRuntime = new
CayenneRuntimeBuilder("myd").addConfigs(CayenneProjects.TESTMAP_PROJECT,
- CayenneProjects.EMBEDDABLE_PROJECT).build();
- assertEquals("myd", localRuntime.getDataDomain().getName());
- }
+ @Test
+ public void unnamedDomain_MultiLocation() {
+ localRuntime = new
CayenneRuntimeBuilder(null).addConfigs(CayenneProjects.TESTMAP_PROJECT,
+ CayenneProjects.EMBEDDABLE_PROJECT).build();
- /**
- * Test case for CAY-2265
- */
- @Test
- public void unnamedDomain_CustomNameProjectFile() {
- localRuntime = new
CayenneRuntimeBuilder(null).addConfigs(CayenneProjects.CUSTOM_NAME_PROJECT).build();
- assertEquals("cayenne", localRuntime.getDataDomain().getName());
+ assertEquals("cayenne", localRuntime.getDataDomain().getName());
+ }
- ObjectContext context = localRuntime.newContext();
- assertNotNull(context);
- }
+ @Test
+ public void namedDomain_MultiLocation() {
+ localRuntime = new
CayenneRuntimeBuilder("myd").addConfigs(CayenneProjects.TESTMAP_PROJECT,
+ CayenneProjects.EMBEDDABLE_PROJECT).build();
+ assertEquals("myd", localRuntime.getDataDomain().getName());
+ }
+
+ /**
+ * Test case for CAY-2265
+ */
+ @Test
+ public void unnamedDomain_CustomNameProjectFile() {
+ localRuntime = new
CayenneRuntimeBuilder(null).addConfigs(CayenneProjects.CUSTOM_NAME_PROJECT).build();
+ assertEquals("cayenne", localRuntime.getDataDomain().getName());
+
+ ObjectContext context = localRuntime.newContext();
+ assertNotNull(context);
+ }
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java
b/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java
similarity index 99%
rename from
cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java
rename to
cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java
index b4f8de24a..a11886a50 100644
---
a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.unit.runtime;
+package org.apache.cayenne.unit;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.DataNode;
@@ -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.unit.TestDataSources;
import org.apache.cayenne.unit.dba.TestDbAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 edc224aaf..c94d28069 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
@@ -45,7 +45,6 @@ import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.test.jdbc.DbHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.unit.dba.TestDbAdapter;
-import org.apache.cayenne.unit.runtime.AllTestsSchemaManager;
import org.apache.cayenne.unit.runtime.DbCleaner;
import org.apache.cayenne.unit.runtime.FlavoredDbHelper;
import org.apache.cayenne.unit.runtime.RuntimeCaseModule;
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/DbCleaner.java
b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/DbCleaner.java
index baf6034d7..deb93c12e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/DbCleaner.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/DbCleaner.java
@@ -21,6 +21,7 @@ package org.apache.cayenne.unit.runtime;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.test.jdbc.DbHelper;
+import org.apache.cayenne.unit.AllTestsSchemaManager;
import java.sql.SQLException;
import java.util.Set;
