[hotfix] [tests] Remove usage of Assume in BoundedDataTests to avoid …

…warnings during build/testing
mbalassi · Jun 29, 2019 · 4c93e68 · 4c93e68
1 parent d88882c
commit 4c93e68
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/...time/src/test/java/org/apache/flink/runtime/io/network/partition/BoundedDataTestBase.java b/...time/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/...c/test/java/org/apache/flink/runtime/io/network/partition/FileChannelBoundedDataTest.java b/...c/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,13 +26,18 @@
  */
 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/...org/apache/flink/runtime/io/network/partition/FileChannelMemoryMappedBoundedDataTest.java b/...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/.../test/java/org/apache/flink/runtime/io/network/partition/MemoryMappedBoundedDataTest.java b/.../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);