You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/07/07 16:32:28 UTC
[1/2] incubator-beam git commit: Closes #602
Repository: incubator-beam
Updated Branches:
refs/heads/master 33b18b173 -> 1963bde44
Closes #602
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1963bde4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1963bde4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1963bde4
Branch: refs/heads/master
Commit: 1963bde446a798f0971393bb8f0076fc933367cf
Parents: 33b18b1 9c91403
Author: Dan Halperin <dh...@google.com>
Authored: Thu Jul 7 09:32:23 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jul 7 09:32:23 2016 -0700
----------------------------------------------------------------------
.../transforms/display/DisplayDataMatchers.java | 22 ++++++++++++++++++++
.../sdk/transforms/display/DisplayDataTest.java | 13 ++----------
.../beam/sdk/io/gcp/bigtable/BigtableIO.java | 2 +-
.../sdk/io/gcp/bigtable/BigtableIOTest.java | 10 ++++++++-
4 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-beam git commit: Fix BigtableIO display data label
Posted by dh...@apache.org.
Fix BigtableIO display data label
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/9c91403c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/9c91403c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/9c91403c
Branch: refs/heads/master
Commit: 9c91403c7b0b7e45473b30be8019a8e07c66fd1c
Parents: 33b18b1
Author: Scott Wegner <sw...@google.com>
Authored: Thu Jul 7 08:38:14 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jul 7 09:32:23 2016 -0700
----------------------------------------------------------------------
.../transforms/display/DisplayDataMatchers.java | 22 ++++++++++++++++++++
.../sdk/transforms/display/DisplayDataTest.java | 13 ++----------
.../beam/sdk/io/gcp/bigtable/BigtableIO.java | 2 +-
.../sdk/io/gcp/bigtable/BigtableIOTest.java | 10 ++++++++-
4 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9c91403c/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 23cffd4..025a1f7 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
@@ -360,4 +360,26 @@ public class DisplayDataMatchers {
}
};
}
+
+ /**
+ * Creates a matcher that matches if the examined {@link DisplayData.Item} has the specified
+ * label.
+ */
+ public static Matcher<DisplayData.Item<?>> hasLabel(String label) {
+ return hasLabel(Matchers.is(label));
+ }
+
+ /**
+ * Creates a matcher that matches if the examined {@link DisplayData.Item} has a label matching
+ * the specified label matcher.
+ */
+ public static Matcher<DisplayData.Item<?>> hasLabel(Matcher<String> labelMatcher) {
+ return new FeatureMatcher<DisplayData.Item<?>, String>(
+ labelMatcher, "display item with label", "label") {
+ @Override
+ protected String featureValueOf(DisplayData.Item<?> actual) {
+ return actual.getLabel();
+ }
+ };
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9c91403c/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 a1189bb..cafe873 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
@@ -19,6 +19,7 @@ package org.apache.beam.sdk.transforms.display;
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.hasLabel;
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;
@@ -206,7 +207,7 @@ public class DisplayDataTest implements Serializable {
hasType(DisplayData.Type.TIMESTAMP),
hasValue(ISO_FORMATTER.print(value)),
hasShortValue(nullValue(String.class)),
- hasLabel(is("the current instant")),
+ hasLabel("the current instant"),
hasUrl(is("http://time.gov")));
assertThat(item, matchesAllOf);
@@ -1104,16 +1105,6 @@ public class DisplayDataTest implements Serializable {
return hasItem(jsonNode);
}
- private static Matcher<DisplayData.Item<?>> hasLabel(Matcher<String> labelMatcher) {
- return new FeatureMatcher<DisplayData.Item<?>, String>(
- labelMatcher, "display item with label", "label") {
- @Override
- protected String featureValueOf(DisplayData.Item<?> actual) {
- return actual.getLabel();
- }
- };
- }
-
private static Matcher<DisplayData.Item<?>> hasUrl(Matcher<String> urlMatcher) {
return new FeatureMatcher<DisplayData.Item<?>, String>(
urlMatcher, "display item with url", "URL") {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9c91403c/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java
index 47c68dd..dd17abe 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java
@@ -273,7 +273,7 @@ public class BigtableIO {
super.populateDisplayData(builder);
builder.add(DisplayData.item("tableId", tableId)
- .withLinkUrl("Table ID"));
+ .withLabel("Table ID"));
if (options != null) {
builder.add(DisplayData.item("bigtableOptions", options.toString())
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9c91403c/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
index 6a6197e..cd16f54 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
@@ -22,9 +22,14 @@ import static org.apache.beam.sdk.testing.SourceTestUtils.assertSplitAtFractionE
import static org.apache.beam.sdk.testing.SourceTestUtils.assertSplitAtFractionFails;
import static org.apache.beam.sdk.testing.SourceTestUtils.assertSplitAtFractionSucceedsAndConsistent;
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.hasLabel;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasValue;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Verify.verifyNotNull;
+
+import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -424,7 +429,10 @@ public class BigtableIOTest {
DisplayData displayData = DisplayData.from(read);
- assertThat(displayData, hasDisplayItem("tableId", "fooTable"));
+ assertThat(displayData, hasDisplayItem(allOf(
+ hasKey("tableId"),
+ hasLabel("Table ID"),
+ hasValue("fooTable"))));
assertThat(displayData, hasDisplayItem("rowFilter", rowFilter.toString()));
// BigtableIO adds user-agent to options; assert only on key and not value.