test: DbTransactionConflictRtxTest.rtx_ltx(): Added commitAsc

project-tsurugi · Feb 20, 2024 · dc68c9d · dc68c9d
1 parent 7f9c8ed
commit dc68c9d
Showing 1 changed file with 23 additions and 27 deletions.
diff --git a/...est/src/test/java/com/tsurugidb/iceaxe/test/transaction/DbTransactionConflictRtxTest.java b/...est/src/test/java/com/tsurugidb/iceaxe/test/transaction/DbTransactionConflictRtxTest.java
@@ -96,47 +96,43 @@ void rtx_occW() throws Exception {
         }
     }
 
-    @Test
-    void rtx_ltx() throws Exception {
-        var session = getSession();
-        try (var selectPs = session.createQuery(SELECT_SQL1, SELECT_MAPPING); //
-                var updatePs2 = session.createStatement(UPDATE_SQL2)) {
-            try (var tx1 = session.createTransaction(RTX)) {
-                var entity11 = tx1.executeAndFindRecord(selectPs).get();
-                assertEquals(BAR_BEFORE, entity11.getBar());
-
-                try (var tx2 = session.createTransaction(LTX)) {
-                    tx2.executeAndGetCount(updatePs2);
-
-                    tx2.commit(TgCommitType.DEFAULT);
-
-                    var entity12 = tx1.executeAndFindRecord(selectPs).get();
-                    assertEquals(BAR_BEFORE, entity12.getBar());
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void rtx_ltx(boolean commitAsc) throws Exception {
+        rtx_ltx(RTX, commitAsc);
+    }
 
-                    tx1.commit(TgCommitType.DEFAULT);
-                }
-            }
-        }
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void rtx_ltx_testByLTX(boolean commitAsc) throws Exception {
+        rtx_ltx(TgTxOption.ofLTX(), commitAsc);
     }
 
-    @Test
-    void rtx_ltx2() throws Exception {
+    private void rtx_ltx(TgTxOption tx1Option, boolean commitAsc) throws Exception {
         var session = getSession();
         try (var selectPs = session.createQuery(SELECT_SQL1, SELECT_MAPPING); //
                 var updatePs2 = session.createStatement(UPDATE_SQL2)) {
-            try (var tx1 = session.createTransaction(LTX)) {
+            try (var tx1 = session.createTransaction(tx1Option)) {
                 var entity11 = tx1.executeAndFindRecord(selectPs).get();
                 assertEquals(BAR_BEFORE, entity11.getBar());
 
                 try (var tx2 = session.createTransaction(LTX)) {
                     tx2.executeAndGetCount(updatePs2);
 
-                    var entity12 = tx1.executeAndFindRecord(selectPs).get();
-                    assertEquals(BAR_BEFORE, entity12.getBar());
+                    if (commitAsc) {
+                        var entity12 = tx1.executeAndFindRecord(selectPs).get();
+                        assertEquals(BAR_BEFORE, entity12.getBar());
 
-                    tx1.commit(TgCommitType.DEFAULT);
+                        tx1.commit(TgCommitType.DEFAULT);
+                        tx2.commit(TgCommitType.DEFAULT);
+                    } else {
+                        tx2.commit(TgCommitType.DEFAULT);
 
-                    tx2.commit(TgCommitType.DEFAULT);
+                        var entity12 = tx1.executeAndFindRecord(selectPs).get();
+                        assertEquals(BAR_BEFORE, entity12.getBar());
+
+                        tx1.commit(TgCommitType.DEFAULT);
+                    }
                 }
             }
         }