This is an automated email from the ASF dual-hosted git repository. zhuzh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 191e6ceb6bd0e8ea9fb547a83f364fecf2b569c2 Author: JunRuiLee <[email protected]> AuthorDate: Mon Jan 22 15:39:07 2024 +0800 [hotfix][test] Migrate SplitAssignmentTrackerTest to Junit5 and AssertJ. --- .../coordinator/SplitAssignmentTrackerTest.java | 27 ++++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/source/coordinator/SplitAssignmentTrackerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/source/coordinator/SplitAssignmentTrackerTest.java index f177fbff03c..3c8c26047ca 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/source/coordinator/SplitAssignmentTrackerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/source/coordinator/SplitAssignmentTrackerTest.java @@ -20,7 +20,7 @@ package org.apache.flink.runtime.source.coordinator; import org.apache.flink.api.connector.source.mocks.MockSourceSplit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -30,16 +30,13 @@ import java.util.Map; import static org.apache.flink.runtime.source.coordinator.CoordinatorTestUtils.getSplitsAssignment; import static org.apache.flink.runtime.source.coordinator.CoordinatorTestUtils.verifyAssignment; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; /** Unit test for @link {@link SplitAssignmentTracker}. */ -public class SplitAssignmentTrackerTest { +class SplitAssignmentTrackerTest { @Test - public void testRecordIncrementalSplitAssignment() { + void testRecordIncrementalSplitAssignment() { SplitAssignmentTracker<MockSourceSplit> tracker = new SplitAssignmentTracker<>(); tracker.recordSplitAssignment(getSplitsAssignment(3, 0)); tracker.recordSplitAssignment(getSplitsAssignment(2, 6)); @@ -51,7 +48,7 @@ public class SplitAssignmentTrackerTest { } @Test - public void testOnCheckpoint() throws Exception { + void testOnCheckpoint() throws Exception { final long checkpointId = 123L; SplitAssignmentTracker<MockSourceSplit> tracker = new SplitAssignmentTracker<>(); tracker.recordSplitAssignment(getSplitsAssignment(3, 0)); @@ -60,16 +57,16 @@ public class SplitAssignmentTrackerTest { tracker.onCheckpoint(checkpointId); // Verify the uncheckpointed assignments. - assertTrue(tracker.uncheckpointedAssignments().isEmpty()); + assertThat(tracker.uncheckpointedAssignments()).isEmpty(); // verify assignments put into the checkpoints. Map<Long, Map<Integer, LinkedHashSet<MockSourceSplit>>> assignmentsByCheckpoints = tracker.assignmentsByCheckpointId(); - assertEquals(1, assignmentsByCheckpoints.size()); + assertThat(assignmentsByCheckpoints.size()).isOne(); Map<Integer, LinkedHashSet<MockSourceSplit>> assignmentForCheckpoint = assignmentsByCheckpoints.get(checkpointId); - assertNotNull(assignmentForCheckpoint); + assertThat(assignmentForCheckpoint).isNotNull(); verifyAssignment(Arrays.asList("0"), assignmentForCheckpoint.get(0)); verifyAssignment(Arrays.asList("1", "2"), assignmentForCheckpoint.get(1)); @@ -77,7 +74,7 @@ public class SplitAssignmentTrackerTest { } @Test - public void testOnCheckpointComplete() throws Exception { + void testOnCheckpointComplete() throws Exception { final long checkpointId1 = 100L; final long checkpointId2 = 101L; SplitAssignmentTracker<MockSourceSplit> tracker = new SplitAssignmentTracker<>(); @@ -108,7 +105,7 @@ public class SplitAssignmentTrackerTest { // Complete the first checkpoint. tracker.onCheckpointComplete(checkpointId1); - assertNull(tracker.assignmentsByCheckpointId(checkpointId1)); + assertThat(tracker.assignmentsByCheckpointId(checkpointId1)).isNull(); verifyAssignment( Arrays.asList("3"), tracker.assignmentsByCheckpointId(checkpointId2).get(0)); verifyAssignment( @@ -116,7 +113,7 @@ public class SplitAssignmentTrackerTest { } @Test - public void testGetAndRemoveUncheckpointedAssignment() throws Exception { + void testGetAndRemoveUncheckpointedAssignment() throws Exception { final long checkpointId1 = 100L; final long checkpointId2 = 101L; SplitAssignmentTracker<MockSourceSplit> tracker = new SplitAssignmentTracker<>(); @@ -136,7 +133,7 @@ public class SplitAssignmentTrackerTest { } @Test - public void testGetAndRemoveSplitsAfterSomeCheckpoint() throws Exception { + void testGetAndRemoveSplitsAfterSomeCheckpoint() throws Exception { final long checkpointId1 = 100L; final long checkpointId2 = 101L; SplitAssignmentTracker<MockSourceSplit> tracker = new SplitAssignmentTracker<>();
