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 9f699da3c7595ee94110476799b092483d2b863a..ff001c219c550ffd343bea49ba33caab3b3e3053 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 { 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 2e5816d7ca8a862ed57092a3dfb41619c16eec34..3b54247c082e37502599409ccb287fc4889b27e6 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 { // --------------------------------------------------------------------------------------------- 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 fb8ed684a32158564eba37808af2facc0f72e314..f9e957f995ead38429e030c4210b19bf50153d18 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 { 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 43ec8b8f0dbf154755dff6f53aa1aa98ae2840e2..c6d4041d8df28f2dd9901a9f7fb8a6ea9c623d14 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; 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 d11413927bd935bf9150064c0f60110837d7a799..b1b86b127a0480769d41082a716a5567a86f7f54 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 { 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 5b154770cfe8081372970b1ec47caed4866cc8d3..1187d66aade2cc733de6156134e79090d4abd1fe 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; *

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. - * - *

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 {