You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/04/14 06:49:00 UTC
[73/74] incubator-beam git commit: Fix test ordering in
DataflowPipelineTranslatorTest
Fix test ordering in DataflowPipelineTranslatorTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/75a1905e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/75a1905e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/75a1905e
Branch: refs/heads/master
Commit: 75a1905ebe09755da5c464a72aafc67bc982b0bc
Parents: b972445
Author: bchambers <bc...@google.com>
Authored: Wed Apr 13 17:39:34 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Apr 13 21:24:28 2016 -0700
----------------------------------------------------------------------
.../runners/DataflowPipelineTranslatorTest.java | 71 +++++++++++---------
1 file changed, 38 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a1905e/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineTranslatorTest.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineTranslatorTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineTranslatorTest.java
index 97d1a50..1429e5a 100644
--- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineTranslatorTest.java
+++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/sdk/runners/DataflowPipelineTranslatorTest.java
@@ -74,6 +74,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
+import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Rule;
@@ -854,39 +855,43 @@ public class DataflowPipelineTranslatorTest implements Serializable {
Map<String, Object> parDo2Properties = steps.get(2).getProperties();
assertThat(parDo1Properties, hasKey("display_data"));
- Collection<Map<String, String>> fn1displayData =
- (Collection<Map<String, String>>) parDo1Properties.get("display_data");
- Collection<Map<String, String>> fn2displayData =
- (Collection<Map<String, String>>) parDo2Properties.get("display_data");
-
- ImmutableList expectedFn1DisplayData = ImmutableList.of(
- ImmutableMap.<String, String>builder()
- .put("namespace", fn1.getClass().getName())
- .put("key", "foo")
- .put("type", "STRING")
- .put("value", "bar")
- .build(),
- ImmutableMap.<String, String>builder()
- .put("namespace", fn1.getClass().getName())
- .put("key", "foo2")
- .put("type", "JAVA_CLASS")
- .put("value", DataflowPipelineTranslatorTest.class.getName())
- .put("shortValue", DataflowPipelineTranslatorTest.class.getSimpleName())
- .put("label", "Test Class")
- .put("linkUrl", "http://www.google.com")
- .build()
- );
-
- ImmutableList expectedFn2DisplayData = ImmutableList.of(
+
+ @SuppressWarnings("unchecked")
+ Collection<Map<String, Object>> fn1displayData =
+ (Collection<Map<String, Object>>) parDo1Properties.get("display_data");
+ @SuppressWarnings("unchecked")
+ Collection<Map<String, Object>> fn2displayData =
+ (Collection<Map<String, Object>>) parDo2Properties.get("display_data");
+
+ @SuppressWarnings("unchecked")
+ Matcher<Iterable<? extends Map<String, Object>>> fn1expectedData =
+ Matchers.<Map<String, Object>>containsInAnyOrder(
+ ImmutableMap.<String, Object>builder()
+ .put("namespace", fn1.getClass().getName())
+ .put("key", "foo")
+ .put("type", "STRING")
+ .put("value", "bar")
+ .build(),
+ ImmutableMap.<String, Object>builder()
+ .put("namespace", fn1.getClass().getName())
+ .put("key", "foo2")
+ .put("type", "JAVA_CLASS")
+ .put("value", DataflowPipelineTranslatorTest.class.getName())
+ .put("shortValue", DataflowPipelineTranslatorTest.class.getSimpleName())
+ .put("label", "Test Class")
+ .put("linkUrl", "http://www.google.com")
+ .build());
+
+ @SuppressWarnings("unchecked")
+ Matcher<Iterable<? extends Map<String, Object>>> fn2expectedData =
+ Matchers.<Map<String, Object>>contains(
ImmutableMap.<String, Object>builder()
- .put("namespace", fn2.getClass().getName())
- .put("key", "foo3")
- .put("type", "INTEGER")
- .put("value", 1234L)
- .build()
- );
-
- assertEquals(expectedFn1DisplayData, fn1displayData);
- assertEquals(expectedFn2DisplayData, fn2displayData);
+ .put("namespace", fn2.getClass().getName())
+ .put("key", "foo3")
+ .put("type", "INTEGER")
+ .put("value", 1234L)
+ .build());
+ assertThat(fn1displayData, fn1expectedData);
+ assertThat(fn2displayData, fn2expectedData);
}
}