(cayenne) 01/02: fixing test failures

[aadamchik]

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 30c8923d9755cf91aaeaf9ba69dab2e3291a6e83
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Fri May 15 18:52:18 2026 -0400

    fixing test failures
---
 .../java/org/apache/cayenne/dbsync/merge/MergeCase.java    | 14 +++++---------
 .../org/apache/cayenne/dbsync/merge/MergerFactoryIT.java   |  6 +++---
 2 files changed, 8 insertions(+), 12 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 1ce7ea345..349ec4443 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
@@ -42,7 +42,6 @@ import org.apache.cayenne.map.DbAttribute;
 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;
@@ -62,6 +61,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public abstract class MergeCase {
 
+    private static final Logger LOGGER = 
LoggerFactory.getLogger(MergeCase.class);
+
     // disable auto-clean: we null out ARTGROUP.PARENT_GROUP_ID before cleanup
     // to avoid FK violations on databases with strict FK enforcement (e.g. 
Postgres)
     @RegisterExtension
@@ -73,8 +74,6 @@ public abstract class MergeCase {
     protected EntityResolver resolver;
     protected DataNode node;
     protected DataMap map;
-    private final Logger logger = LoggerFactory.getLogger(MergeCase.class);
-    private DbHelper dbHelper;
     private CayenneRuntime runtime;
     protected UnitDbAdapter accessStackAdapter;
 
@@ -82,17 +81,14 @@ public abstract class MergeCase {
     public void setUp() throws Exception {
         resolver = env.entityResolver();
         node = env.dataNode();
-        dbHelper = env.dbHelper();
         runtime = env.runtime();
         accessStackAdapter = env.unitDbAdapter();
 
         // break circular FK before DBCleaner.clean()
-        dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, 
Types.INTEGER).execute();
+        env.dbHelper().update("ARTGROUP").set("PARENT_GROUP_ID", null, 
Types.INTEGER).execute();
         env.dbCleaner().clean();
 
-        // this map can't be safely modified in this test, as it is reset by DI
-        // container
-        // on every test
+        // this map can't be safely modified in this test, as it is reset by 
DI container on every test
         map = runtime.getDataDomain().getDataMap("testmap");
 
         filterDataMap();
@@ -280,7 +276,7 @@ public abstract class MergeCase {
             try {
                 executeSql(sql);
             } catch (Exception e) {
-                logger.info("Exception dropping table " + tableName + ", 
probably abscent..");
+                LOGGER.info("Exception dropping table " + tableName + ", 
probably abscent..");
             }
         }
     }
diff --git 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergerFactoryIT.java
 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergerFactoryIT.java
index 607d485cc..b1b5c0d57 100644
--- 
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergerFactoryIT.java
+++ 
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergerFactoryIT.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.*;
 public class MergerFactoryIT extends MergeCase {
 
     @Test
-    public void addAndDropColumnToDb() throws Exception {
+    public void addAndDropColumnToDb() {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
 
@@ -56,7 +56,7 @@ public class MergerFactoryIT extends MergeCase {
     }
 
     @Test
-    public void changeVarcharSizeToDb() throws Exception {
+    public void changeVarcharSizeToDb() {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);
 
@@ -87,7 +87,7 @@ public class MergerFactoryIT extends MergeCase {
     }
 
     @Test
-    public void multipleTokensToDb() throws Exception {
+    public void multipleTokensToDb() {
         DbEntity dbEntity = map.getDbEntity("PAINTING");
         assertNotNull(dbEntity);