You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sr...@apache.org on 2018/01/18 14:25:59 UTC
[8/9] flink git commit: [hotfix][tests] replace
InputChannelTestUtils#createMockBuffer() with
TestBufferFactory#createBuffer()
[hotfix][tests] replace InputChannelTestUtils#createMockBuffer() with TestBufferFactory#createBuffer()
This eliminates one more unnecessary buffer mock.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1a5a355a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1a5a355a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1a5a355a
Branch: refs/heads/master
Commit: 1a5a355a873d88d1fe1903503d81140918e0e07e
Parents: b3fc793
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Mon Jan 8 11:48:25 2018 +0100
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Thu Jan 18 15:24:16 2018 +0100
----------------------------------------------------------------------
.../io/network/partition/InputChannelTestUtils.java | 14 +-------------
.../io/network/partition/InputGateConcurrentTest.java | 3 ++-
.../io/network/partition/InputGateFairnessTest.java | 10 +++++-----
3 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1a5a355a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java
index a327838..31effe1 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java
@@ -20,8 +20,8 @@ package org.apache.flink.runtime.io.network.partition;
import org.apache.flink.runtime.io.network.ConnectionID;
import org.apache.flink.runtime.io.network.ConnectionManager;
-import org.apache.flink.runtime.io.network.buffer.Buffer;
import org.apache.flink.runtime.io.network.netty.PartitionRequestClient;
+
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -36,18 +36,6 @@ import static org.mockito.Mockito.when;
class InputChannelTestUtils {
/**
- * Creates a simple Buffer that is not recycled (never will be) of the given size.
- */
- public static Buffer createMockBuffer(int size) {
- final Buffer mockBuffer = mock(Buffer.class);
- when(mockBuffer.isBuffer()).thenReturn(true);
- when(mockBuffer.getSize()).thenReturn(size);
- when(mockBuffer.isRecycled()).thenReturn(false);
-
- return mockBuffer;
- }
-
- /**
* Creates a result partition manager that ignores all IDs, and simply returns the given
* subpartitions in sequence.
*/
http://git-wip-us.apache.org/repos/asf/flink/blob/1a5a355a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateConcurrentTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateConcurrentTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateConcurrentTest.java
index 81788c9..d3a6bfb 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateConcurrentTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateConcurrentTest.java
@@ -27,6 +27,7 @@ import org.apache.flink.runtime.io.network.buffer.Buffer;
import org.apache.flink.runtime.io.network.partition.consumer.LocalInputChannel;
import org.apache.flink.runtime.io.network.partition.consumer.RemoteInputChannel;
import org.apache.flink.runtime.io.network.partition.consumer.SingleInputGate;
+import org.apache.flink.runtime.io.network.util.TestBufferFactory;
import org.apache.flink.runtime.jobgraph.IntermediateDataSetID;
import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID;
import org.apache.flink.runtime.metrics.groups.UnregisteredMetricGroups;
@@ -241,7 +242,7 @@ public class InputGateConcurrentTest {
@Override
public void go() throws Exception {
- final Buffer buffer = InputChannelTestUtils.createMockBuffer(100);
+ final Buffer buffer = TestBufferFactory.createBuffer(100);
int nextYield = numTotal - yieldAfter;
for (int i = numTotal; i > 0;) {
http://git-wip-us.apache.org/repos/asf/flink/blob/1a5a355a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateFairnessTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateFairnessTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateFairnessTest.java
index 4e90265..5690d06 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateFairnessTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputGateFairnessTest.java
@@ -30,6 +30,7 @@ import org.apache.flink.runtime.io.network.partition.consumer.InputChannel;
import org.apache.flink.runtime.io.network.partition.consumer.LocalInputChannel;
import org.apache.flink.runtime.io.network.partition.consumer.RemoteInputChannel;
import org.apache.flink.runtime.io.network.partition.consumer.SingleInputGate;
+import org.apache.flink.runtime.io.network.util.TestBufferFactory;
import org.apache.flink.runtime.jobgraph.IntermediateDataSetID;
import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID;
import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup;
@@ -46,7 +47,6 @@ import java.util.Collections;
import java.util.HashSet;
import static org.apache.flink.runtime.io.network.partition.InputChannelTestUtils.createDummyConnectionManager;
-import static org.apache.flink.runtime.io.network.partition.InputChannelTestUtils.createMockBuffer;
import static org.apache.flink.runtime.io.network.partition.InputChannelTestUtils.createResultPartitionManager;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -62,7 +62,7 @@ public class InputGateFairnessTest {
final int buffersPerChannel = 27;
final ResultPartition resultPartition = mock(ResultPartition.class);
- final Buffer mockBuffer = createMockBuffer(42);
+ final Buffer mockBuffer = TestBufferFactory.createBuffer(42);
// ----- create some source channels and fill them with buffers -----
@@ -122,7 +122,7 @@ public class InputGateFairnessTest {
final int buffersPerChannel = 27;
final ResultPartition resultPartition = mock(ResultPartition.class);
- final Buffer mockBuffer = createMockBuffer(42);
+ final Buffer mockBuffer = TestBufferFactory.createBuffer(42);
// ----- create some source channels and fill them with one buffer each -----
@@ -182,7 +182,7 @@ public class InputGateFairnessTest {
final int numChannels = 37;
final int buffersPerChannel = 27;
- final Buffer mockBuffer = createMockBuffer(42);
+ final Buffer mockBuffer = TestBufferFactory.createBuffer(42);
// ----- create some source channels and fill them with buffers -----
@@ -237,7 +237,7 @@ public class InputGateFairnessTest {
final int numChannels = 37;
final int buffersPerChannel = 27;
- final Buffer mockBuffer = createMockBuffer(42);
+ final Buffer mockBuffer = TestBufferFactory.createBuffer(42);
// ----- create some source channels and fill them with buffers -----