This is an automated email from the ASF dual-hosted git repository. xtsong pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 840a5198df7c548ab92b050282a3b09bfb3b08d3 Author: Weijie Guo <[email protected]> AuthorDate: Wed Oct 26 12:26:58 2022 +0800 [hotfix] Migrate ResultPartitionFactoryTest to JUnit5 and AssertJ. --- .../partition/ResultPartitionFactoryTest.java | 69 +++++++++++----------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/ResultPartitionFactoryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/ResultPartitionFactoryTest.java index a7d1b04dacb..62420fabdcd 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/ResultPartitionFactoryTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/ResultPartitionFactoryTest.java @@ -26,113 +26,110 @@ import org.apache.flink.runtime.io.network.partition.hybrid.HsResultPartition; import org.apache.flink.runtime.shuffle.PartitionDescriptorBuilder; import org.apache.flink.runtime.util.EnvironmentInformation; import org.apache.flink.runtime.util.NettyShuffleDescriptorBuilder; -import org.apache.flink.util.TestLogger; +import org.apache.flink.util.TestLoggerExtension; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -import java.util.Arrays; import java.util.concurrent.Executors; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; /** Tests for the {@link ResultPartitionFactory}. */ @SuppressWarnings("StaticVariableUsedBeforeInitialization") -public class ResultPartitionFactoryTest extends TestLogger { +@ExtendWith(TestLoggerExtension.class) +class ResultPartitionFactoryTest { private static final String tempDir = EnvironmentInformation.getTemporaryFileDirectory(); private static final int SEGMENT_SIZE = 64; private static FileChannelManager fileChannelManager; - @BeforeClass - public static void setUp() { + @BeforeAll + static void setUp() { fileChannelManager = new FileChannelManagerImpl(new String[] {tempDir}, "testing"); } - @AfterClass - public static void shutdown() throws Exception { + @AfterAll + static void shutdown() throws Exception { fileChannelManager.close(); } @Test - public void testBoundedBlockingSubpartitionsCreated() { + void testBoundedBlockingSubpartitionsCreated() { final BoundedBlockingResultPartition resultPartition = (BoundedBlockingResultPartition) createResultPartition(ResultPartitionType.BLOCKING); - Arrays.stream(resultPartition.subpartitions) - .forEach(sp -> assertThat(sp, instanceOf(BoundedBlockingSubpartition.class))); + assertThat(resultPartition.subpartitions) + .allSatisfy((sp) -> assertThat(sp).isInstanceOf(BoundedBlockingSubpartition.class)); } @Test - public void testPipelinedSubpartitionsCreated() { + void testPipelinedSubpartitionsCreated() { final PipelinedResultPartition resultPartition = (PipelinedResultPartition) createResultPartition(ResultPartitionType.PIPELINED); - Arrays.stream(resultPartition.subpartitions) - .forEach(sp -> assertThat(sp, instanceOf(PipelinedSubpartition.class))); + assertThat(resultPartition.subpartitions) + .allSatisfy((sp) -> assertThat(sp).isInstanceOf(PipelinedSubpartition.class)); } @Test - public void testSortMergePartitionCreated() { + void testSortMergePartitionCreated() { ResultPartition resultPartition = createResultPartition(ResultPartitionType.BLOCKING, 1); - assertTrue(resultPartition instanceof SortMergeResultPartition); + assertThat(resultPartition).isInstanceOf(SortMergeResultPartition.class); } @Test - public void testHybridFullResultPartitionCreated() { + void testHybridFullResultPartitionCreated() { ResultPartition resultPartition = createResultPartition(ResultPartitionType.HYBRID_FULL); - assertTrue(resultPartition instanceof HsResultPartition); + assertThat(resultPartition).isInstanceOf(HsResultPartition.class); } @Test - public void testHybridSelectiveResultPartitionCreated() { + void testHybridSelectiveResultPartitionCreated() { ResultPartition resultPartition = createResultPartition(ResultPartitionType.HYBRID_SELECTIVE); - assertTrue(resultPartition instanceof HsResultPartition); + assertThat(resultPartition).isInstanceOf(HsResultPartition.class); } @Test - public void testNoReleaseOnConsumptionForBoundedBlockingPartition() { + void testNoReleaseOnConsumptionForBoundedBlockingPartition() { final ResultPartition resultPartition = createResultPartition(ResultPartitionType.BLOCKING); resultPartition.onConsumedSubpartition(0); - assertFalse(resultPartition.isReleased()); + assertThat(resultPartition.isReleased()).isFalse(); } @Test - public void testNoReleaseOnConsumptionForSortMergePartition() { + void testNoReleaseOnConsumptionForSortMergePartition() { final ResultPartition resultPartition = createResultPartition(ResultPartitionType.BLOCKING, 1); resultPartition.onConsumedSubpartition(0); - assertFalse(resultPartition.isReleased()); + assertThat(resultPartition.isReleased()).isFalse(); } @Test - public void testNoReleaseOnConsumptionForHybridFullPartition() { + void testNoReleaseOnConsumptionForHybridFullPartition() { final ResultPartition resultPartition = createResultPartition(ResultPartitionType.HYBRID_FULL); resultPartition.onConsumedSubpartition(0); - assertFalse(resultPartition.isReleased()); + assertThat(resultPartition.isReleased()).isFalse(); } @Test - public void testNoReleaseOnConsumptionForHybridSelectivePartition() { + void testNoReleaseOnConsumptionForHybridSelectivePartition() { final ResultPartition resultPartition = createResultPartition(ResultPartitionType.HYBRID_SELECTIVE); resultPartition.onConsumedSubpartition(0); - assertFalse(resultPartition.isReleased()); + assertThat(resultPartition.isReleased()).isFalse(); } private static ResultPartition createResultPartition(ResultPartitionType partitionType) { @@ -171,7 +168,7 @@ public class ResultPartitionFactoryTest extends TestLogger { 1); // guard our test assumptions - assertEquals(1, descriptor.getNumberOfSubpartitions()); + assertThat(descriptor.getNumberOfSubpartitions()).isEqualTo(1); final ResultPartition partition = factory.create("test", 0, descriptor); manager.registerResultPartition(partition);
