Repository: flink Updated Branches: refs/heads/master beb11976f -> c1665c12b
[FLINK-8241][tests] Remove ResultPartitionWriter-related "@PrepareForTest" annotations This closes #5147. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c5efb1f2 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c5efb1f2 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c5efb1f2 Branch: refs/heads/master Commit: c5efb1f208979fc5a787ba55dc185a7bf2991388 Parents: beb1197 Author: Nico Kruber <[email protected]> Authored: Mon Dec 11 15:31:57 2017 +0100 Committer: zentol <[email protected]> Committed: Tue Dec 12 17:00:59 2017 +0100 ---------------------------------------------------------------------- .../flink/runtime/io/network/api/writer/RecordWriterTest.java | 2 +- .../io/network/api/writer/ResultPartitionWriterTest.java | 5 ----- .../apache/flink/runtime/operators/chaining/ChainTaskTest.java | 3 +-- .../runtime/operators/chaining/ChainedAllReduceDriverTest.java | 3 +-- .../flink/streaming/runtime/io/StreamRecordWriterTest.java | 3 +-- .../flink/streaming/runtime/tasks/StreamTaskTestHarness.java | 3 --- 6 files changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/c5efb1f2/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java index 9f699da..ff001c2 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java @@ -74,7 +74,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@PrepareForTest({ResultPartitionWriter.class, EventSerializer.class}) +@PrepareForTest({EventSerializer.class}) @RunWith(PowerMockRunner.class) public class RecordWriterTest { http://git-wip-us.apache.org/repos/asf/flink/blob/c5efb1f2/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/ResultPartitionWriterTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/ResultPartitionWriterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/ResultPartitionWriterTest.java index 2e5816d..3b54247 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/ResultPartitionWriterTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/ResultPartitionWriterTest.java @@ -30,16 +30,11 @@ import org.apache.flink.runtime.io.network.partition.ResultPartitionManager; import org.apache.flink.runtime.io.network.partition.ResultPartitionType; import org.apache.flink.runtime.taskmanager.TaskActions; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -@PrepareForTest({ResultPartitionWriter.class}) -@RunWith(PowerMockRunner.class) public class ResultPartitionWriterTest { // --------------------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/c5efb1f2/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java index fb8ed68..f9e957f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java @@ -29,7 +29,6 @@ import org.apache.flink.runtime.testutils.recordutils.RecordComparatorFactory; import org.apache.flink.runtime.testutils.recordutils.RecordSerializerFactory; import org.apache.flink.api.common.functions.RichGroupReduceFunction; import org.apache.flink.configuration.Configuration; -import org.apache.flink.runtime.io.network.api.writer.ResultPartitionWriter; import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.BatchTask; import org.apache.flink.runtime.operators.FlatMapDriver; @@ -51,7 +50,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PrepareForTest({Task.class, ResultPartitionWriter.class}) +@PrepareForTest({Task.class}) @PowerMockIgnore({"javax.management.*", "com.sun.jndi.*"}) public class ChainTaskTest extends TaskTestBase { http://git-wip-us.apache.org/repos/asf/flink/blob/c5efb1f2/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java index 43ec8b8..c6d4041 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java @@ -22,7 +22,6 @@ import org.apache.flink.api.common.functions.FlatMapFunction; import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.configuration.Configuration; -import org.apache.flink.runtime.io.network.api.writer.ResultPartitionWriter; import org.apache.flink.runtime.operators.BatchTask; import org.apache.flink.runtime.operators.DriverStrategy; import org.apache.flink.runtime.operators.FlatMapDriver; @@ -46,7 +45,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(PowerMockRunner.class) -@PrepareForTest({Task.class, ResultPartitionWriter.class}) +@PrepareForTest({Task.class}) public class ChainedAllReduceDriverTest extends TaskTestBase { private static final int MEMORY_MANAGER_SIZE = 1024 * 1024 * 3; http://git-wip-us.apache.org/repos/asf/flink/blob/c5efb1f2/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/StreamRecordWriterTest.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/StreamRecordWriterTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/StreamRecordWriterTest.java index d114139..b1b86b1 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/StreamRecordWriterTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/StreamRecordWriterTest.java @@ -41,8 +41,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; /** - * This test uses the PowerMockRunner runner to work around the fact that the - * {@link ResultPartitionWriter} class is final. + * Tests for the {@link StreamRecordWriter}. */ public class StreamRecordWriterTest { http://git-wip-us.apache.org/repos/asf/flink/blob/c5efb1f2/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java index 5b15477..1187d66 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java @@ -58,9 +58,6 @@ import java.util.concurrent.LinkedBlockingQueue; * <p>After setting up everything the Task can be invoked using {@link #invoke()}. This will start * a new Thread to execute the Task. Use {@link #waitForTaskCompletion()} to wait for the Task * thread to finish. - * - * <p>When using this you need to add the following line to your test class to setup Powermock: - * {@code {@literal @}PrepareForTest({ResultPartitionWriter.class})} */ public class StreamTaskTestHarness<OUT> {
