You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by bc...@apache.org on 2016/04/26 19:11:57 UTC
[3/4] incubator-beam git commit: Rename DisplayDataMatchers.includes
to includesDisplayData to clarify usage
Rename DisplayDataMatchers.includes to includesDisplayData to clarify usage
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/582befdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/582befdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/582befdc
Branch: refs/heads/master
Commit: 582befdc8aed6dc62bf1d205749d7f46d7894f97
Parents: d299e2c
Author: Scott Wegner <sw...@google.com>
Authored: Mon Apr 25 09:31:13 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Tue Apr 26 09:39:01 2016 -0700
----------------------------------------------------------------------
.../sdk/io/BoundedReadFromUnboundedSourceTest.java | 5 +++--
.../org/apache/beam/sdk/io/CompressedSourceTest.java | 5 +++--
.../test/java/org/apache/beam/sdk/io/ReadTest.java | 6 +++---
.../test/java/org/apache/beam/sdk/io/WriteTest.java | 5 +++--
.../apache/beam/sdk/transforms/CombineFnsTest.java | 6 +++---
.../org/apache/beam/sdk/transforms/CombineTest.java | 4 ++--
.../transforms/IntraBundleParallelizationTest.java | 4 ++--
.../org/apache/beam/sdk/transforms/ParDoTest.java | 8 ++++----
.../sdk/transforms/display/DisplayDataMatchers.java | 14 +++++++-------
.../transforms/display/DisplayDataMatchersTest.java | 4 ++--
.../beam/sdk/transforms/display/DisplayDataTest.java | 6 +++---
.../beam/sdk/transforms/windowing/WindowTest.java | 4 ++--
12 files changed, 37 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
index 30f3eca..f7949e7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
@@ -17,7 +17,8 @@
*/
package org.apache.beam.sdk.io;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
+
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@@ -79,7 +80,7 @@ public class BoundedReadFromUnboundedSourceTest implements Serializable{
};
BoundedReadFromUnboundedSource<KV<Integer, Integer>> read = Read.from(src).withMaxNumRecords(5);
- assertThat(DisplayData.from(read), includes(src));
+ assertThat(DisplayData.from(read), includesDisplayDataFrom(src));
}
private static class Checker
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
index 4ad8904..36ef4b3 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
@@ -19,7 +19,8 @@ package org.apache.beam.sdk.io;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
+
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertFalse;
@@ -355,7 +356,7 @@ public class CompressedSourceTest {
assertThat(compressedSourceDisplayData, hasDisplayItem(hasKey("compressionMode")));
assertThat(gzipDisplayData, hasDisplayItem("compressionMode", CompressionMode.GZIP.toString()));
assertThat(compressedSourceDisplayData, hasDisplayItem("source", inputSource.getClass()));
- assertThat(compressedSourceDisplayData, includes(inputSource));
+ assertThat(compressedSourceDisplayData, includesDisplayDataFrom(inputSource));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java
index bf18a33..dd12bf4 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java
@@ -18,7 +18,7 @@
package org.apache.beam.sdk.io;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -92,11 +92,11 @@ public class ReadTest implements Serializable{
DisplayData boundedDisplayData = DisplayData.from(bounded);
assertThat(boundedDisplayData, hasDisplayItem("source", boundedSource.getClass()));
- assertThat(boundedDisplayData, includes(boundedSource));
+ assertThat(boundedDisplayData, includesDisplayDataFrom(boundedSource));
DisplayData unboundedDisplayData = DisplayData.from(unbounded);
assertThat(unboundedDisplayData, hasDisplayItem("source", unboundedSource.getClass()));
- assertThat(unboundedDisplayData, includes(unboundedSource));
+ assertThat(unboundedDisplayData, includesDisplayDataFrom(unboundedSource));
assertThat(unboundedDisplayData, hasDisplayItem("maxRecords", 1234));
assertThat(unboundedDisplayData, hasDisplayItem("maxReadTime", maxReadTime));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
index 6e66faf..a95ef95 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
@@ -18,7 +18,8 @@
package org.apache.beam.sdk.io;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
+
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.equalTo;
@@ -170,7 +171,7 @@ public class WriteTest {
DisplayData displayData = DisplayData.from(write);
assertThat(displayData, hasDisplayItem("sink", sink.getClass()));
- assertThat(displayData, includes(sink));
+ assertThat(displayData, includesDisplayDataFrom(sink));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
index e66f13a..df5a828 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
@@ -18,7 +18,7 @@
package org.apache.beam.sdk.transforms;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.junit.Assert.assertThat;
@@ -303,8 +303,8 @@ public class CombineFnsTest {
assertThat(displayData, hasDisplayItem("combineFn2", combineFn2.getClass()));
String nsBase = DisplayDataCombineFn.class.getName();
- assertThat(displayData, includes(combineFn1, nsBase + "#1"));
- assertThat(displayData, includes(combineFn2, nsBase + "#2"));
+ assertThat(displayData, includesDisplayDataFrom(combineFn1, nsBase + "#1"));
+ assertThat(displayData, includesDisplayDataFrom(combineFn2, nsBase + "#2"));
}
private static class DisplayDataCombineFn extends Combine.CombineFn<String, String, String> {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
index 9fa148e..e3308e5 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
@@ -19,7 +19,7 @@ package org.apache.beam.sdk.transforms;
import static org.apache.beam.sdk.TestUtils.checkCombineFn;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -711,7 +711,7 @@ public class CombineTest implements Serializable {
assertThat(displayData, hasDisplayItem("combineFn", combineFn.getClass()));
assertThat(displayData, hasDisplayItem("emitDefaultOnEmptyInput", true));
assertThat(displayData, hasDisplayItem("fanout", 1234));
- assertThat(displayData, includes(combineFn));
+ assertThat(displayData, includesDisplayDataFrom(combineFn));
}
////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java
index 80f6188..4810513 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java
@@ -19,7 +19,7 @@ package org.apache.beam.sdk.transforms;
import static org.apache.beam.sdk.testing.SystemNanoTimeSleeper.sleepMillis;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.containsString;
@@ -236,7 +236,7 @@ public class IntraBundleParallelizationTest {
.of(fn);
DisplayData displayData = DisplayData.from(transform);
- assertThat(displayData, includes(fn));
+ assertThat(displayData, includesDisplayDataFrom(fn));
assertThat(displayData, hasDisplayItem("fn", fn.getClass()));
assertThat(displayData, hasDisplayItem("maxParallelism", 1234));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
index 44154e6..fdf3ddf 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
@@ -20,7 +20,7 @@ package org.apache.beam.sdk.transforms;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasType;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.apache.beam.sdk.util.SerializableUtils.serializeToByteArray;
import static org.apache.beam.sdk.util.StringUtils.byteArrayToJsonString;
import static org.apache.beam.sdk.util.StringUtils.jsonStringToByteArray;
@@ -1549,7 +1549,7 @@ public class ParDoTest implements Serializable {
hasType(DisplayData.Type.JAVA_CLASS),
DisplayDataMatchers.hasValue(fn.getClass().getName()))));
- assertThat(displayData, includes(fn));
+ assertThat(displayData, includesDisplayDataFrom(fn));
}
@Test
@@ -1567,7 +1567,7 @@ public class ParDoTest implements Serializable {
Bound<String, String> parDo = ParDo.of(fn);
DisplayData displayData = DisplayData.from(parDo);
- assertThat(displayData, includes(fn));
+ assertThat(displayData, includesDisplayDataFrom(fn));
assertThat(displayData, hasDisplayItem("fn", fn.getClass()));
}
@@ -1588,7 +1588,7 @@ public class ParDoTest implements Serializable {
.of(fn);
DisplayData displayData = DisplayData.from(parDo);
- assertThat(displayData, includes(fn));
+ assertThat(displayData, includesDisplayDataFrom(fn));
assertThat(displayData, hasDisplayItem("fn", fn.getClass()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java
index abdc350..90e4441 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java
@@ -149,22 +149,22 @@ public class DisplayDataMatchers {
}
}
- /** @see #includes(HasDisplayData, String) */
- public static Matcher<DisplayData> includes(HasDisplayData subComponent) {
- return includes(subComponent, subComponent.getClass());
+ /** @see #includesDisplayDataFrom(HasDisplayData, String) */
+ public static Matcher<DisplayData> includesDisplayDataFrom(HasDisplayData subComponent) {
+ return includesDisplayDataFrom(subComponent, subComponent.getClass());
}
- /** @see #includes(HasDisplayData, String) */
- public static Matcher<DisplayData> includes(
+ /** @see #includesDisplayDataFrom(HasDisplayData, String) */
+ public static Matcher<DisplayData> includesDisplayDataFrom(
HasDisplayData subComponent, Class<? extends HasDisplayData> namespace) {
- return includes(subComponent, namespace.getName());
+ return includesDisplayDataFrom(subComponent, namespace.getName());
}
/**
* Create a matcher that matches if the examined {@link DisplayData} contains all display data
* registered from the specified subcomponent and namespace.
*/
- public static Matcher<DisplayData> includes(
+ public static Matcher<DisplayData> includesDisplayDataFrom(
final HasDisplayData subComponent, final String namespace) {
return new CustomTypeSafeMatcher<DisplayData>("includes subcomponent") {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java
index 5165e1a..8bb65cc 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java
@@ -22,7 +22,7 @@ import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasNamespace;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasType;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasValue;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.core.StringStartsWith.startsWith;
@@ -129,7 +129,7 @@ public class DisplayDataMatchersTest {
builder.add("foo", "bar");
}
};
- Matcher<DisplayData> matcher = includes(subComponent);
+ Matcher<DisplayData> matcher = includesDisplayDataFrom(subComponent);
assertFalse(matcher.matches(DisplayData.from(sameKeyDifferentNamespace)));
assertThat(DisplayData.from(hasSubcomponent), matcher);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java
index 05d0f6f..98604c7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java
@@ -22,7 +22,7 @@ import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasNamespace;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasType;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasValue;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.empty;
@@ -304,7 +304,7 @@ public class DisplayDataTest {
}
});
- assertThat(data, includes(subComponent));
+ assertThat(data, includesDisplayDataFrom(subComponent));
}
@Test
@@ -329,7 +329,7 @@ public class DisplayDataTest {
}
});
- assertThat(data, includes(subComponent, namespaceOverride.getClass()));
+ assertThat(data, includesDisplayDataFrom(subComponent, namespaceOverride.getClass()));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
index 6be6df8..91bd846 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
@@ -19,7 +19,7 @@ package org.apache.beam.sdk.transforms.windowing;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.isOneOf;
@@ -250,7 +250,7 @@ public class WindowTest implements Serializable {
DisplayData displayData = DisplayData.from(window);
assertThat(displayData, hasDisplayItem("windowFn", windowFn.getClass()));
- assertThat(displayData, includes(windowFn));
+ assertThat(displayData, includesDisplayDataFrom(windowFn));
assertThat(displayData, hasDisplayItem("trigger", triggerBuilder.toString()));
assertThat(displayData,