This is an automated email from the ASF dual-hosted git repository. sewen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 4c93e684e4233474d0ad596b0e1eefb3de9e543d Author: Stephan Ewen <[email protected]> AuthorDate: Thu Jun 27 17:53:24 2019 +0200 [hotfix] [tests] Remove usage of Assume in BoundedDataTests to avoid warnings during build/testing --- .../runtime/io/network/partition/BoundedDataTestBase.java | 10 ++++++++++ .../io/network/partition/FileChannelBoundedDataTest.java | 9 ++++++--- .../partition/FileChannelMemoryMappedBoundedDataTest.java | 5 +++++ .../io/network/partition/MemoryMappedBoundedDataTest.java | 5 +++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/BoundedDataTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/BoundedDataTestBase.java old mode 100644 new mode 100755 index bd7421c..c71b9df --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/BoundedDataTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/BoundedDataTestBase.java @@ -53,6 +53,8 @@ public abstract class BoundedDataTestBase { // BoundedData Instantiation // ------------------------------------------------------------------------ + protected abstract boolean isRegionBased(); + protected abstract BoundedData createBoundedData(Path tempFilePath) throws IOException; protected abstract BoundedData createBoundedDataWithRegion(Path tempFilePath, int regionSize) throws IOException; @@ -78,6 +80,10 @@ public abstract class BoundedDataTestBase { @Test public void testWriteAndReadDataAcrossRegions() throws Exception { + if (!isRegionBased()) { + return; + } + try (BoundedData bd = createBoundedDataWithRegion(1_276_347)) { testWriteAndReadData(bd); } @@ -125,6 +131,10 @@ public abstract class BoundedDataTestBase { @Test public void testGetSizeMultipleRegions() throws Exception { + if (!isRegionBased()) { + return; + } + try (BoundedData bd = createBoundedDataWithRegion(100_000)) { testGetSize(bd); } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelBoundedDataTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelBoundedDataTest.java old mode 100644 new mode 100755 index dd1c22b..cc499f4 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelBoundedDataTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelBoundedDataTest.java @@ -18,8 +18,6 @@ package org.apache.flink.runtime.io.network.partition; -import org.junit.AssumptionViolatedException; - import java.io.IOException; import java.nio.file.Path; @@ -29,12 +27,17 @@ import java.nio.file.Path; public class FileChannelBoundedDataTest extends BoundedDataTestBase { @Override + protected boolean isRegionBased() { + return false; + } + + @Override protected BoundedData createBoundedData(Path tempFilePath) throws IOException { return FileChannelBoundedData.create(tempFilePath, BUFFER_SIZE); } @Override protected BoundedData createBoundedDataWithRegion(Path tempFilePath, int regionSize) throws IOException { - throw new AssumptionViolatedException("FileChannelBoundedData is not region based"); + throw new UnsupportedOperationException(); } } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelMemoryMappedBoundedDataTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelMemoryMappedBoundedDataTest.java old mode 100644 new mode 100755 index 0fe1f42..4995510 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelMemoryMappedBoundedDataTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelMemoryMappedBoundedDataTest.java @@ -27,6 +27,11 @@ import java.nio.file.Path; public class FileChannelMemoryMappedBoundedDataTest extends BoundedDataTestBase { @Override + protected boolean isRegionBased() { + return true; + } + + @Override protected BoundedData createBoundedData(Path tempFilePath) throws IOException { return FileChannelMemoryMappedBoundedData.create(tempFilePath); } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/MemoryMappedBoundedDataTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/MemoryMappedBoundedDataTest.java old mode 100644 new mode 100755 index 18c5823..000381c --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/MemoryMappedBoundedDataTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/MemoryMappedBoundedDataTest.java @@ -27,6 +27,11 @@ import java.nio.file.Path; public class MemoryMappedBoundedDataTest extends BoundedDataTestBase { @Override + protected boolean isRegionBased() { + return true; + } + + @Override protected BoundedData createBoundedData(Path tempFilePath) throws IOException { return MemoryMappedBoundedData.create(tempFilePath); }
