From 8602b7af0d048139ba90f36162e590da1050891d Mon Sep 17 00:00:00 2001 From: Stephan Ewen Date: Mon, 17 Aug 2015 18:21:20 +0200 Subject: [PATCH] [tests] Minor cleanup removing duplicate mock invokables in various tests. --- .../runtime/io/disk/iomanager/IOManagerITCase.java | 4 ++-- .../iomanager/IOManagerPerformanceBenchmark.java | 6 ++++-- .../memory/MemoryManagerLazyAllocationTest.java | 13 ++----------- .../flink/runtime/memory/MemoryManagerTest.java | 12 +----------- .../flink/runtime/memory/MemorySegmentTest.java | 3 ++- 5 files changed, 11 insertions(+), 27 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java index a0a83562f529d..52908d350d374 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Random; +import org.apache.flink.runtime.operators.testutils.DummyInvokable; import org.junit.Assert; import org.junit.After; import org.junit.Before; @@ -34,7 +35,6 @@ import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; -import org.apache.flink.runtime.memory.MemoryManagerTest; import org.apache.flink.runtime.memorymanager.DefaultMemoryManager; /** @@ -82,7 +82,7 @@ public void afterTest() throws Exception { @SuppressWarnings("unchecked") public void parallelChannelsTest() throws Exception { final Random rnd = new Random(SEED); - final AbstractInvokable memOwner = new MemoryManagerTest.DummyInvokable(); + final AbstractInvokable memOwner = new DummyInvokable(); FileIOChannel.ID[] ids = new FileIOChannel.ID[NUM_CHANNELS]; BlockChannelWriter[] writers = new BlockChannelWriter[NUM_CHANNELS]; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java index c71e181068078..3bdc9bd6a9dbb 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java @@ -31,17 +31,19 @@ import java.nio.channels.FileChannel; import java.util.List; +import org.apache.flink.runtime.operators.testutils.DummyInvokable; import org.apache.flink.types.IntValue; import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.flink.core.memory.InputViewDataInputStreamWrapper; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.OutputViewDataOutputStreamWrapper; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; -import org.apache.flink.runtime.memory.MemoryManagerTest; import org.apache.flink.runtime.memorymanager.DefaultMemoryManager; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -62,7 +64,7 @@ public class IOManagerPerformanceBenchmark { private static final int NUM_INTS_WRITTEN = 100000000; - private static final AbstractInvokable memoryOwner = new MemoryManagerTest.DummyInvokable(); + private static final AbstractInvokable memoryOwner = new DummyInvokable(); private DefaultMemoryManager memManager; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemoryManagerLazyAllocationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemoryManagerLazyAllocationTest.java index e077d08edc823..fc88207a70df3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemoryManagerLazyAllocationTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemoryManagerLazyAllocationTest.java @@ -22,6 +22,8 @@ import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memorymanager.DefaultMemoryManager; import org.apache.flink.runtime.memorymanager.MemoryAllocationException; +import org.apache.flink.runtime.operators.testutils.DummyInvokable; + import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -195,15 +197,4 @@ private boolean allMemorySegmentsFreed(List memSegs) { } return true; } - - /** - * Utility class to serve as owner for the memory. - */ - public static final class DummyInvokable extends AbstractInvokable { - @Override - public void registerInputOutput() {} - - @Override - public void invoke() throws Exception {} - } } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemoryManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemoryManagerTest.java index c21135740d35f..c0f32ca1dd9c8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemoryManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemoryManagerTest.java @@ -27,6 +27,7 @@ import org.apache.flink.runtime.memorymanager.DefaultMemoryManager; import org.apache.flink.runtime.memorymanager.MemoryAllocationException; +import org.apache.flink.runtime.operators.testutils.DummyInvokable; import org.junit.Assert; import org.junit.After; import org.junit.Before; @@ -194,15 +195,4 @@ private boolean allMemorySegmentsFreed(List memSegs) { } return true; } - - /** - * Utility class to serve as owner for the memory. - */ - public static final class DummyInvokable extends AbstractInvokable { - @Override - public void registerInputOutput() {} - - @Override - public void invoke() throws Exception {} - } } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java index f9adb94ee0ec3..990dffa6bc1df 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java @@ -27,6 +27,7 @@ import java.nio.ByteBuffer; import java.util.Random; +import org.apache.flink.runtime.operators.testutils.DummyInvokable; import org.junit.Assert; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.memorymanager.DefaultMemoryManager; @@ -52,7 +53,7 @@ public class MemorySegmentTest { public void setUp() throws Exception{ try { this.manager = new DefaultMemoryManager(MANAGED_MEMORY_SIZE, 1, PAGE_SIZE, true); - this.segment = manager.allocatePages(new MemoryManagerTest.DummyInvokable(), 1).get(0); + this.segment = manager.allocatePages(new DummyInvokable(), 1).get(0); this.random = new Random(RANDOM_SEED); } catch (Exception e) { e.printStackTrace();