Backport to branch(3) : Minor fixes to unit tests (#2829)

Co-authored-by: Toshihiro Suzuki <[email protected]>

Author: feeblefakie

core/src/test/java/com/scalar/db/transaction/consensuscommit/CoordinatorGroupCommitterTest.java

@@ -258,8 +258,9 @@ void remove_GivenAllFullTxIds_ShouldRemoveAll() throws Exception {
     }
   }
 
+  @SuppressWarnings("ClassCanBeStatic")
   @Nested
-  static class CoordinatorGroupCommitKeyManipulatorTest {
+  class CoordinatorGroupCommitKeyManipulatorTest {
     private final CoordinatorGroupCommitKeyManipulator keyManipulator =
         new CoordinatorGroupCommitKeyManipulator();
 

core/src/test/java/com/scalar/db/transaction/consensuscommit/ParallelExecutorTest.java

@@ -1,7 +1,9 @@
 package com.scalar.db.transaction.consensuscommit;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.catchException;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atMost;
 import static org.mockito.Mockito.doThrow;
@@ -693,13 +695,24 @@ public void executeTasks_ParallelTrueAndStopOnErrorTrue_ExceptionThrown_ShouldSt
 
     List<ParallelExecutorTask> mixedTasks = Arrays.asList(failingTask1, failingTask2, task);
 
-    // Act Assert
-    assertThatThrownBy(
+    // Act
+    Exception exception =
+        catchException(
             () ->
                 parallelExecutor.executeTasks(
-                    mixedTasks, parallel, noWait, stopOnError, "test", TX_ID))
-        .isEqualTo(executionException1)
-        .hasSuppressedException(executionException2);
+                    mixedTasks, parallel, noWait, stopOnError, "test", TX_ID));
+
+    // Assert
+    assertThat(exception)
+        .satisfiesAnyOf(
+            e ->
+                assertThat(e)
+                    .isEqualTo(executionException1)
+                    .hasSuppressedException(executionException2),
+            e ->
+                assertThat(e)
+                    .isEqualTo(executionException2)
+                    .hasSuppressedException(executionException1));
 
     verify(parallelExecutorService, times(mixedTasks.size())).execute(any());
   }