[FLINK-8209][network-tests] Make LocalBufferPoolDestroyTest less implementation dependent
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5cf37782 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5cf37782 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5cf37782 Branch: refs/heads/master Commit: 5cf37782f482f5dd51ad599a083eaa62dfcd805a Parents: 97db0bf Author: Piotr Nowojski <[email protected]> Authored: Mon Dec 4 15:13:06 2017 +0100 Committer: Stefan Richter <[email protected]> Committed: Mon Jan 8 11:46:00 2018 +0100 ---------------------------------------------------------------------- .../buffer/LocalBufferPoolDestroyTest.java | 5 ++-- .../TaskCancelAsyncProducerConsumerITCase.java | 24 +++++--------------- 2 files changed, 8 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/5cf37782/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolDestroyTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolDestroyTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolDestroyTest.java index 6e02542..fcbf9d5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolDestroyTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPoolDestroyTest.java @@ -104,11 +104,10 @@ public class LocalBufferPoolDestroyTest { * @return Flag indicating whether the Thread is in a blocking buffer * request or not */ - private boolean isInBlockingBufferRequest(StackTraceElement[] stackTrace) { + public static boolean isInBlockingBufferRequest(StackTraceElement[] stackTrace) { if (stackTrace.length >= 3) { return stackTrace[0].getMethodName().equals("wait") && - stackTrace[1].getMethodName().equals("requestBuffer") && - stackTrace[2].getMethodName().equals("requestBufferBlocking"); + stackTrace[1].getClassName().equals(LocalBufferPool.class.getName()); } else { return false; } http://git-wip-us.apache.org/repos/asf/flink/blob/5cf37782/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java index b2b118c..1d09ce6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelAsyncProducerConsumerITCase.java @@ -38,15 +38,18 @@ import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages.NotifyWhe import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages.WaitForAllVerticesToBeRunning; import org.apache.flink.types.LongValue; import org.apache.flink.util.TestLogger; + import org.junit.Test; + +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + import scala.concurrent.Await; import scala.concurrent.Future; import scala.concurrent.duration.Deadline; import scala.concurrent.duration.FiniteDuration; -import java.util.Arrays; -import java.util.concurrent.TimeUnit; - +import static org.apache.flink.runtime.io.network.buffer.LocalBufferPoolDestroyTest.isInBlockingBufferRequest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -172,21 +175,6 @@ public class TaskCancelAsyncProducerConsumerITCase extends TestLogger { } /** - * Returns whether the stack trace represents a Thread in a blocking buffer - * request. - * - * @param stackTrace Stack trace of the Thread to check - * - * @return Flag indicating whether the Thread is in a blocking buffer - * request or not - */ - private boolean isInBlockingBufferRequest(StackTraceElement[] stackTrace) { - return stackTrace.length >= 3 && stackTrace[0].getMethodName().equals("wait") && - stackTrace[1].getMethodName().equals("requestBuffer") && - stackTrace[2].getMethodName().equals("requestBufferBlocking"); - } - - /** * Invokable emitting records in a separate Thread (not the main Task * thread). */
