refactor: Added assertEqualsMessage()

project-tsurugi · May 30, 2024 · 046f119 · 046f119
1 parent 7276c18
commit 046f119
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/...s/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/connector/DbConnectErrorTest.java b/...s/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/connector/DbConnectErrorTest.java
@@ -13,7 +13,6 @@
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
 
 import com.tsurugidb.iceaxe.TsurugiConnector;
 import com.tsurugidb.iceaxe.session.TgSessionOption;
@@ -36,12 +35,7 @@ void connectError() throws Exception {
             thread.start();
 
             var e = assertThrowsExactly(IOException.class, () -> connect(port));
-            try {
-                assertEquals("lost connection", e.getMessage());
-            } catch (AssertionFailedError t) {
-                t.addSuppressed(e);
-                throw t;
-            }
+            assertEqualsMessage("lost connection", e);
         }
     }
 
@@ -77,11 +71,7 @@ void recvIllegalMessage() throws Exception {
             thread.start();
 
             var e = assertThrowsExactly(IOException.class, () -> connect(port));
-            try {
-                assertEquals("lost connection", e.getMessage());
-            } catch (AssertionFailedError t) {
-                throw e;
-            }
+            assertEqualsMessage("lost connection", e);
         }
     }
 
@@ -138,7 +128,7 @@ void sendIllegalMessage() throws Exception {
                         int len = is.read(buf);
                         assertEquals(-1, len);
                     } catch (SocketException e) {
-                        assertEquals("Connection reset", e.getMessage());
+                        assertEqualsMessage("Connection reset", e);
                     }
                 }
             }

diff --git a/...les/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/error/DbGeneratedRowidTest.java b/...les/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/error/DbGeneratedRowidTest.java
@@ -212,7 +212,7 @@ void selectAsGeneratedRowid() throws Exception {
                 var e = assertThrowsExactly(IllegalArgumentException.class, () -> {
                     entity.getInt(GENERATED_KEY);
                 });
-                assertEquals("not found column. name=__generated_rowid___test", e.getMessage());
+                assertEqualsMessage("not found column. name=__generated_rowid___test", e);
             }
         }
     }

diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/select/DbResultRecordTest.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/select/DbResultRecordTest.java
@@ -1,6 +1,5 @@
 package com.tsurugidb.iceaxe.test.select;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 
 import org.junit.jupiter.api.BeforeAll;
@@ -44,7 +43,7 @@ void getInt_null() throws Exception {
                     transaction.executeAndFindRecord(ps);
                 });
             });
-            assertEquals("TsurugiResultRecord.getInt(foo) is null", e.getMessage());
+            assertEqualsMessage("TsurugiResultRecord.getInt(foo) is null", e);
         }
     }
 
@@ -61,7 +60,7 @@ void nextInt_null() throws Exception {
                     transaction.executeAndFindRecord(ps);
                 });
             });
-            assertEquals("TsurugiResultRecord.nextInt(0) is null", e.getMessage());
+            assertEqualsMessage("TsurugiResultRecord.nextInt(0) is null", e);
         }
     }
 }
diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/select/DbSelectErrorTest.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/select/DbSelectErrorTest.java
@@ -1,6 +1,5 @@
 package com.tsurugidb.iceaxe.test.select;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 
@@ -133,7 +132,7 @@ private void ps0ExecuteAfterTxClose(boolean getLow) throws IOException, Interrup
                 transaction.executeAndGetList(ps);
             });
             assertEqualsCode(IceaxeErrorCode.TX_ALREADY_CLOSED, e);
-            assertEquals("transaction already closed", e.getMessage());
+            assertEqualsMessage("transaction already closed", e);
         }
     }
 
@@ -150,7 +149,7 @@ void selectAfterTransactionClose() throws Exception {
             var e = assertThrowsExactly(IOException.class, () -> {
                 result.getRecordList();
             });
-            assertEquals("resultSet already closed", e.getMessage());
+            assertEqualsMessage("resultSet already closed", e);
         }
     }
 
@@ -170,7 +169,7 @@ void selectInTransactionClose() throws Exception {
                             i.next();
                         }
                     });
-                    assertEquals("resultSet already closed", e.getMessage());
+                    assertEqualsMessage("resultSet already closed", e);
                 }
             }
         }

diff --git a/...les/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/session/DbMultiSessionTest.java b/...les/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/session/DbMultiSessionTest.java
@@ -45,7 +45,7 @@ void limit() throws Exception {
                 try {
                     session = DbTestConnector.createSession();
                 } catch (IOException e) {
-                    assertEquals("the server has declined the connection request", e.getMessage());
+                    assertEqualsMessage("the server has declined the connection request", e);
                     int count = sessionList.size();
                     if (count < EXPECTED_SESSION_SIZE) {
                         fail(MessageFormat.format("less session.size expected: {1} but was: {0}", count, EXPECTED_SESSION_SIZE));

diff --git a/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/util/DbTestTableTester.java b/modules/iceaxe-dbtest/src/test/java/com/tsurugidb/iceaxe/test/util/DbTestTableTester.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
+import org.opentest4j.AssertionFailedError;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -580,6 +581,15 @@ protected static void assertMatches(String expectedRegexp, String actual) {
         assertEquals(expectedRegexp, actual, "unmatched");
     }
 
+    protected static void assertEqualsMessage(String expected, Throwable actual) {
+        try {
+            assertEquals(expected, actual.getMessage());
+        } catch (AssertionFailedError e) {
+            e.addSuppressed(actual);
+            throw e;
+        }
+    }
+
     protected static void assertUpdateCount(int expected, int actual) {
         assertEquals(expected, actual);
     }