From 4c93e684e4233474d0ad596b0e1eefb3de9e543d Mon Sep 17 00:00:00 2001 From: Stephan Ewen Date: Thu, 27 Jun 2019 17:53:24 +0200 Subject: [PATCH] [hotfix] [tests] Remove usage of Assume in BoundedDataTests to avoid warnings during build/testing --- .../io/network/partition/BoundedDataTestBase.java | 10 ++++++++++ .../network/partition/FileChannelBoundedDataTest.java | 9 ++++++--- .../FileChannelMemoryMappedBoundedDataTest.java | 5 +++++ .../network/partition/MemoryMappedBoundedDataTest.java | 5 +++++ 4 files changed, 26 insertions(+), 3 deletions(-) mode change 100644 => 100755 flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/BoundedDataTestBase.java mode change 100644 => 100755 flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelBoundedDataTest.java mode change 100644 => 100755 flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/FileChannelMemoryMappedBoundedDataTest.java mode change 100644 => 100755 flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/MemoryMappedBoundedDataTest.java 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 bd7421cf5590f..c71b9dfdebb63 --- 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 void testWriteAndReadData() throws Exception { @Test public void testWriteAndReadDataAcrossRegions() throws Exception { + if (!isRegionBased()) { + return; + } + try (BoundedData bd = createBoundedDataWithRegion(1_276_347)) { testWriteAndReadData(bd); } @@ -125,6 +131,10 @@ public void testGetSizeSingleRegion() throws Exception { @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 dd1c22bf12d43..cc499f4fae199 --- 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; @@ -28,6 +26,11 @@ */ 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); @@ -35,6 +38,6 @@ protected BoundedData createBoundedData(Path tempFilePath) throws IOException { @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 0fe1f42fb70dc..4995510513dd4 --- 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 @@ -26,6 +26,11 @@ */ 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 18c582370bb2c..000381c9215fd --- 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 @@ -26,6 +26,11 @@ */ public class MemoryMappedBoundedDataTest extends BoundedDataTestBase { + @Override + protected boolean isRegionBased() { + return true; + } + @Override protected BoundedData createBoundedData(Path tempFilePath) throws IOException { return MemoryMappedBoundedData.create(tempFilePath);