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 5e7438647 Unwinding CayenneTestsEnv.getInstance() to specific getters
5e7438647 is described below
commit 5e7438647a10e2ed71bf7cf7a71de2ce944b5501
Author: Andrus Adamchik <[email protected]>
AuthorDate: Wed May 13 18:41:21 2026 -0400
Unwinding CayenneTestsEnv.getInstance() to specific getters
... test-scoped stack elements can be taken diretcly from "runtime"
---
.../apache/cayenne/access/DataContextExtrasIT.java | 14 ++---------
.../access/DataContextPerformQueryAPIIT.java | 27 ++++++++--------------
.../access/DataContextProcedureQueryIT.java | 26 +++++++++------------
.../cayenne/access/DataContextSerializationIT.java | 14 +++--------
.../org/apache/cayenne/access/DataDomainIT.java | 16 +++----------
.../org/apache/cayenne/access/DbGeneratorIT.java | 15 ++++--------
.../cayenne/dba/oracle/OraclePkGeneratorIT.java | 3 ---
.../org/apache/cayenne/query/MappedQueryIT.java | 6 ++---
.../org/apache/cayenne/query/ProcedureCallIT.java | 6 ++---
.../cayenne/tx/TransactionCustomConnectionIT.java | 14 ++++-------
.../org/apache/cayenne/tx/TransactionThreadIT.java | 7 +++---
.../org/apache/cayenne/tx/UserTransactionIT.java | 5 ++--
.../cayenne/unit/di/runtime/CayenneTestsEnv.java | 7 +-----
13 files changed, 47 insertions(+), 113 deletions(-)
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
index a816cedea..a3e6a5ab9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
@@ -29,7 +29,6 @@ import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.JdbcPkGenerator;
import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.di.AdhocObjectFactory;
-import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.query.SQLTemplate;
@@ -39,21 +38,14 @@ import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
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.sql.Types;
import java.util.Date;
import java.util.List;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
public class DataContextExtrasIT {
@@ -61,7 +53,6 @@ public class DataContextExtrasIT {
static final CayenneTestsEnv env =
CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
protected DataContext context;
- protected JdbcEventLogger logger;
protected AdhocObjectFactory objectFactory;
protected TableHelper tArtist;
@@ -70,7 +61,6 @@ public class DataContextExtrasIT {
@BeforeEach
public void setUp() throws Exception {
context = env.context();
- logger = env.jdbcEventLogger();
objectFactory = env.adhocObjectFactory();
tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME");
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
index 58ff74056..b4de81748 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.access;
import org.apache.cayenne.Cayenne;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -33,8 +33,8 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
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.Types;
@@ -46,33 +46,27 @@ import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class DataContextPerformQueryAPIIT {
+public class DataContextPerformQueryAPIIT {
@RegisterExtension
static final CayenneTestsEnv env =
CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
- private DataContext context;
-
- private DataContext context2;
+ private DataContext context;
+ private DataContext context2;
-
- private UnitDbAdapter accessStackAdapter;
-
- private DataChannelInterceptor queryInterceptor;
-
- private JdbcEventLogger jdbcEventLogger;
+ private UnitDbAdapter accessStackAdapter;
+ private DataChannelInterceptor queryInterceptor;
private TableHelper tArtist;
private TableHelper tPainting;
-
+
@BeforeEach
public void setUp() throws Exception {
context = env.context();
context2 = (DataContext) env.runtime().newContext();
accessStackAdapter = env.unitDbAdapter();
queryInterceptor = env.dataChannelInterceptor();
- jdbcEventLogger = env.jdbcEventLogger();
tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME");
tPainting = env.table("PAINTING").setColumns("PAINTING_ID",
"ARTIST_ID", "PAINTING_TITLE", "ESTIMATED_PRICE").setColumnTypes(
@@ -130,9 +124,8 @@ public class DataContextPerformQueryAPIIT {
List<?> artists;
- // Sybase blows whenever a transaction wraps a SP, so turn of
- // transactions
- Transaction t = new ExternalTransaction(jdbcEventLogger);
+ // Sybase blows whenever a transaction wraps a SP, so turn of
transactions
+ Transaction t = new
ExternalTransaction(NoopJdbcEventLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
artists = context.performQuery("ProcedureQuery", parameters, true);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
index 3d4a829d0..9c9fb4b86 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
@@ -19,15 +19,9 @@
package org.apache.cayenne.access;
-import java.math.BigDecimal;
-import java.sql.Types;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.ObjectSelect;
@@ -37,16 +31,18 @@ import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.tx.BaseTransaction;
import org.apache.cayenne.tx.ExternalTransaction;
-import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.math.BigDecimal;
+import java.sql.Types;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static org.junit.jupiter.api.Assertions.*;
public class DataContextProcedureQueryIT {
@@ -73,7 +69,7 @@ public class DataContextProcedureQueryIT {
// since stored procedure commits its stuff, we must use an explicit
// non-committing transaction
- BaseTransaction t = new ExternalTransaction(env.jdbcEventLogger());
+ BaseTransaction t = new
ExternalTransaction(NoopJdbcEventLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
@@ -109,7 +105,7 @@ public class DataContextProcedureQueryIT {
// since stored procedure commits its stuff, we must use an explicit
// non-committing transaction
- BaseTransaction t = new ExternalTransaction(env.jdbcEventLogger());
+ BaseTransaction t = new
ExternalTransaction(NoopJdbcEventLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
@@ -384,7 +380,7 @@ public class DataContextProcedureQueryIT {
// e.g.
//
http://stackoverflow.com/questions/16921942/porting-apache-cayenne-from-oracle-to-postgresql
- BaseTransaction t = new ExternalTransaction(env.jdbcEventLogger());
+ BaseTransaction t = new
ExternalTransaction(NoopJdbcEventLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
index 3402b92b5..bce23e3d5 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java
@@ -23,29 +23,23 @@ import org.apache.cayenne.Cayenne;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.test.jdbc.TableHelper;
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.junit.jupiter.api.extension.RegisterExtension;
import org.apache.cayenne.util.Util;
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;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
public class DataContextSerializationIT {
@@ -54,7 +48,6 @@ public class DataContextSerializationIT {
protected DataContext context;
protected CayenneRuntime runtime;
- protected JdbcEventLogger logger;
protected TableHelper tArtist;
@@ -63,7 +56,6 @@ public class DataContextSerializationIT {
public void setUp() throws Exception {
context = env.context();
runtime = env.runtime();
- logger = env.jdbcEventLogger();
CayenneRuntime.bindThreadInjector(runtime.getInjector());
tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME");
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataDomainIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataDomainIT.java
index 3e2c19f09..fbc84e927 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataDomainIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataDomainIT.java
@@ -25,10 +25,8 @@ import org.apache.cayenne.Persistent;
import org.apache.cayenne.annotation.PostAdd;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.event.DefaultEventManager;
-import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Exhibit;
import org.apache.cayenne.testdo.testmap.Gallery;
@@ -36,19 +34,14 @@ import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.testdo.testmap.annotations.Tag1;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
-import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
public class DataDomainIT {
@@ -111,11 +104,9 @@ public class DataDomainIT {
DataDomain domain = new DataDomain("dom1");
assertEquals(0, domain.getDataNodes().size());
DataNode node = new DataNode("1");
- node.setJdbcEventLogger(env.jdbcEventLogger());
domain.addNode(node);
assertEquals(1, domain.getDataNodes().size());
node = new DataNode("2");
- node.setJdbcEventLogger(env.jdbcEventLogger());
domain.addNode(node);
assertEquals(2, domain.getDataNodes().size());
}
@@ -126,7 +117,6 @@ public class DataDomainIT {
assertNull(domain.getDataMap("map"));
DataNode node = new DataNode("1");
- node.setJdbcEventLogger(env.jdbcEventLogger());
node.addDataMap(new DataMap("map"));
domain.addNode(node);
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
index fb9d8a89e..f7501d35e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
@@ -20,20 +20,17 @@
package org.apache.cayenne.access;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
-import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
public class DbGeneratorIT {
@@ -42,19 +39,15 @@ public class DbGeneratorIT {
private DbAdapter adapter;
private CayenneRuntime runtime;
- private JdbcEventLogger logger;
-
private DbGenerator generator;
-
@BeforeEach
public void setUp() throws Exception {
adapter = env.dbAdapter();
runtime = env.runtime();
- logger = env.jdbcEventLogger();
generator = new DbGenerator(adapter, runtime
.getDataDomain()
- .getDataMap("testmap"), logger);
+ .getDataMap("testmap"), NoopJdbcEventLogger.getInstance());
}
@Test
diff --git
a/cayenne/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
b/cayenne/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
index c562ac994..ab8256126 100644
---
a/cayenne/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorIT.java
@@ -20,7 +20,6 @@
package org.apache.cayenne.dba.oracle;
import org.apache.cayenne.di.AdhocObjectFactory;
-import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbKeyGenerator;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
@@ -36,14 +35,12 @@ public class OraclePkGeneratorIT {
@RegisterExtension
static final CayenneTestsEnv env =
CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
- protected JdbcEventLogger logger;
protected AdhocObjectFactory objectFactory;
private OraclePkGenerator pkGenerator;
@BeforeEach
public void setUp() throws Exception {
- logger = env.jdbcEventLogger();
objectFactory = env.adhocObjectFactory();
OracleAdapter adapter = objectFactory.newInstance(OracleAdapter.class,
OracleAdapter.class.getName());
pkGenerator = new OraclePkGenerator(adapter);
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
b/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
index 5b3521b93..1d226ca9c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
@@ -21,14 +21,12 @@ package org.apache.cayenne.query;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.ResultBatchIterator;
-import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.tx.BaseTransaction;
import org.apache.cayenne.tx.ExternalTransaction;
-import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
import org.junit.jupiter.api.Test;
@@ -177,7 +175,7 @@ public class MappedQueryIT {
// e.g.
//
http://stackoverflow.com/questions/16921942/porting-apache-cayenne-from-oracle-to-postgresql
- BaseTransaction t = new ExternalTransaction(env.jdbcEventLogger());
+ BaseTransaction t = new
ExternalTransaction(NoopJdbcEventLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
b/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
index f5552f0fd..0da619993 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
@@ -20,14 +20,12 @@ package org.apache.cayenne.query;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ProcedureResult;
-import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.tx.BaseTransaction;
import org.apache.cayenne.tx.ExternalTransaction;
-import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
import org.junit.jupiter.api.Test;
@@ -278,7 +276,7 @@ public class ProcedureCallIT {
// e.g.
//
http://stackoverflow.com/questions/16921942/porting-apache-cayenne-from-oracle-to-postgresql
- BaseTransaction t = new ExternalTransaction(env.jdbcEventLogger());
+ BaseTransaction t = new
ExternalTransaction(NoopJdbcEventLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
index ca9aee0e0..e8937a972 100644
---
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.tx;
import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -29,15 +29,13 @@ import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
@@ -52,11 +50,8 @@ public class TransactionCustomConnectionIT {
@RegisterExtension
static final CayenneTestsEnv env =
CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
- private final Logger logger =
LoggerFactory.getLogger(TransactionIsolationIT.class);
-
DataContext context;
CayenneRuntime runtime;
- private JdbcEventLogger jdbcEventLogger;
TransactionManager manager;
private static boolean firstReadonlyCondition;
@@ -65,7 +60,6 @@ public class TransactionCustomConnectionIT {
public void initTransactionManager() {
context = env.context();
runtime = env.runtime();
- jdbcEventLogger = env.jdbcEventLogger();
// no binding in test container, get it from runtime
manager = runtime.getInjector().getInstance(TransactionManager.class);
}
@@ -79,7 +73,7 @@ public class TransactionCustomConnectionIT {
*/
@Test
public void connectionDecorationWithListeners() {
- Transaction t = new CayenneTransaction(jdbcEventLogger);
+ Transaction t = new
CayenneTransaction(NoopJdbcEventLogger.getInstance());
//add listeners which will check if connection object will be changed
after every decorate call
List<TransactionListener> listeners =
addAndGetListenersWithCustomReadonlyTo(t);
BaseTransaction.bindThreadTransaction(t);
@@ -186,7 +180,7 @@ public class TransactionCustomConnectionIT {
@Test
public void defaultConnectionInDescriptor() {
- Transaction t = new CayenneTransaction(jdbcEventLogger);
+ Transaction t = new
CayenneTransaction(NoopJdbcEventLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
ObjectSelect.query(Artist.class).select(context);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionThreadIT.java
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionThreadIT.java
index 3911a27ce..9f30f8044 100644
--- a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionThreadIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionThreadIT.java
@@ -19,8 +19,7 @@
package org.apache.cayenne.tx;
-import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
@@ -36,9 +35,9 @@ public class TransactionThreadIT {
static final CayenneTestsEnv env =
CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT);
@Test
- public void threadConnectionReuseOnSelect() throws Exception {
+ public void threadConnectionReuseOnSelect() {
- Transaction t = new CayenneTransaction(env.jdbcEventLogger());
+ Transaction t = new
CayenneTransaction(NoopJdbcEventLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
diff --git a/cayenne/src/test/java/org/apache/cayenne/tx/UserTransactionIT.java
b/cayenne/src/test/java/org/apache/cayenne/tx/UserTransactionIT.java
index 6f0a3627d..677197757 100644
--- a/cayenne/src/test/java/org/apache/cayenne/tx/UserTransactionIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/tx/UserTransactionIT.java
@@ -19,8 +19,7 @@
package org.apache.cayenne.tx;
-import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv;
@@ -45,7 +44,7 @@ public class UserTransactionIT {
Artist a = env.context().newObject(Artist.class);
a.setArtistName("AAA");
- TxWrapper t = new TxWrapper(new
CayenneTransaction(env.jdbcEventLogger()));
+ TxWrapper t = new TxWrapper(new
CayenneTransaction(NoopJdbcEventLogger.getInstance()));
BaseTransaction.bindThreadTransaction(t);
try {
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 bdad866ac..4232e3044 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
@@ -31,7 +31,6 @@ 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.EntityResolver;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.test.jdbc.DBHelper;
@@ -174,11 +173,7 @@ public class CayenneTestsEnv implements
BeforeEachCallback, AfterEachCallback {
}
public AdhocObjectFactory adhocObjectFactory() {
- return INJECTOR.getInstance(AdhocObjectFactory.class);
- }
-
- public JdbcEventLogger jdbcEventLogger() {
- return INJECTOR.getInstance(JdbcEventLogger.class);
+ return runtime.getInjector().getInstance(AdhocObjectFactory.class);
}
public RuntimeCaseDataSourceFactory dataSourceFactory() {
