Skip to content

Minor fixes to unit tests #2825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2025
+20 −6
Merged

Minor fixes to unit tests #2825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8efc158
Minor fixes to unit tests
brfrn169 Jul 6, 2025
cfcff7b
Fix based on feedback
brfrn169 Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...rc/test/java/com/scalar/db/transaction/consensuscommit/CoordinatorGroupCommitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,9 @@ void remove_GivenAllFullTxIds_ShouldRemoveAll() throws Exception {
}
}

@SuppressWarnings("ClassCanBeStatic")
@Nested
static class CoordinatorGroupCommitKeyManipulatorTest {
class CoordinatorGroupCommitKeyManipulatorTest {
private final CoordinatorGroupCommitKeyManipulator keyManipulator =
new CoordinatorGroupCommitKeyManipulator();

Expand Down
23 changes: 18 additions & 5 deletions core/src/test/java/com/scalar/db/transaction/consensuscommit/ParallelExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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());
}
Expand Down