[
https://issues.apache.org/jira/browse/BEAM-4176?focusedWorklogId=151847&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-151847
]
ASF GitHub Bot logged work on BEAM-4176:
----------------------------------------
Author: ASF GitHub Bot
Created on: 05/Oct/18 20:18
Start Date: 05/Oct/18 20:18
Worklog Time Spent: 10m
Work Description: tweise closed pull request #6534: [BEAM-4176] Filtering
Metrics and Splittable ParDo tests for Portable Runner
URL: https://github.com/apache/beam/pull/6534
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 5b4154d957d..076ad88bdff 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -209,12 +209,21 @@ class BeamModulePlugin implements Plugin<Project> {
includeCategories 'org.apache.beam.sdk.testing.ValidatesRunner'
excludeCategories
'org.apache.beam.sdk.testing.FlattenWithHeterogeneousCoders'
excludeCategories 'org.apache.beam.sdk.testing.LargeKeys$Above100MB'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesAttemptedMetrics'
excludeCategories 'org.apache.beam.sdk.testing.UsesCommittedMetrics'
- excludeCategories 'org.apache.beam.sdk.testing.UsesGaugeMetrics'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesCounterMetrics'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesCustomWindowMerging'
excludeCategories 'org.apache.beam.sdk.testing.UsesDistributionMetrics'
- excludeCategories 'org.apache.beam.sdk.testing.UsesAttemptedMetrics'
- excludeCategories 'org.apache.beam.sdk.testing.UsesTimersInParDo'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesFailureMessage'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesGaugeMetrics'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesParDoLifecycle'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesStatefulParDo'
excludeCategories 'org.apache.beam.sdk.testing.UsesTestStream'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesTimersInParDo'
+ //SplitableDoFnTests
+ excludeCategories
'org.apache.beam.sdk.testing.UsesBoundedSplittableParDo'
+ excludeCategories
'org.apache.beam.sdk.testing.UsesSplittableParDoWithWindowedSideInputs'
+ excludeCategories
'org.apache.beam.sdk.testing.UsesUnboundedSplittableParDo'
}
// Configuration for the classpath when running the test.
Configuration testClasspathConfiguration
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesFailureMessage.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesFailureMessage.java
new file mode 100644
index 00000000000..85d62909f2e
--- /dev/null
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesFailureMessage.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beam.sdk.testing;
+
+/**
+ * Category tag for tests which validate that currect failure message is
provided by failed
+ * pipeline.
+ */
+public interface UsesFailureMessage extends NeedsRunner {}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
index c4aa9cae103..bedbb5da4e9 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
@@ -335,7 +335,7 @@ public void testNotEqualTo() throws Exception {
/** Test that we throw an error for false assertion on singleton. */
@Test
- @Category(ValidatesRunner.class)
+ @Category({ValidatesRunner.class, UsesFailureMessage.class})
public void testPAssertEqualsSingletonFalse() throws Exception {
PCollection<Integer> pcollection = pipeline.apply(Create.of(42));
PAssert.thatSingleton("The value was not equal to 44",
pcollection).isEqualTo(44);
@@ -351,7 +351,7 @@ public void testPAssertEqualsSingletonFalse() throws
Exception {
/** Test that we throw an error for false assertion on singleton. */
@Test
- @Category(ValidatesRunner.class)
+ @Category({ValidatesRunner.class, UsesFailureMessage.class})
public void testPAssertEqualsSingletonFalseDefaultReasonString() throws
Exception {
PCollection<Integer> pcollection = pipeline.apply(Create.of(42));
PAssert.thatSingleton(pcollection).isEqualTo(44);
@@ -431,7 +431,7 @@ public void testEmpty() {
/** Tests that {@code containsInAnyOrder} fails when and how it should. */
@Test
- @Category(ValidatesRunner.class)
+ @Category({ValidatesRunner.class, UsesFailureMessage.class})
public void testContainsInAnyOrderFalse() throws Exception {
PCollection<Integer> pcollection = pipeline.apply(Create.of(1, 2, 3, 4));
@@ -452,7 +452,7 @@ public void testContainsInAnyOrderFalse() throws Exception {
}
@Test
- @Category(ValidatesRunner.class)
+ @Category({ValidatesRunner.class, UsesFailureMessage.class})
public void testEmptyFalse() throws Exception {
PCollection<Long> vals = pipeline.apply(GenerateSequence.from(0).to(5));
PAssert.that("Vals should have been empty", vals).empty();
@@ -466,7 +466,7 @@ public void testEmptyFalse() throws Exception {
}
@Test
- @Category(ValidatesRunner.class)
+ @Category({ValidatesRunner.class, UsesFailureMessage.class})
public void testEmptyFalseDefaultReasonString() throws Exception {
PCollection<Long> vals = pipeline.apply(GenerateSequence.from(0).to(5));
PAssert.that(vals).empty();
@@ -494,7 +494,7 @@ public void testAssertionSiteIsCaptured() {
}
@Test
- @Category(ValidatesRunner.class)
+ @Category({ValidatesRunner.class, UsesFailureMessage.class})
public void testAssertionSiteIsCapturedWithMessage() throws Exception {
PCollection<Long> vals = pipeline.apply(GenerateSequence.from(0).to(5));
assertThatCollectionIsEmptyWithMessage(vals);
@@ -509,7 +509,7 @@ public void testAssertionSiteIsCapturedWithMessage() throws
Exception {
}
@Test
- @Category(ValidatesRunner.class)
+ @Category({ValidatesRunner.class, UsesFailureMessage.class})
public void testAssertionSiteIsCapturedWithoutMessage() throws Exception {
PCollection<Long> vals = pipeline.apply(GenerateSequence.from(0).to(5));
assertThatCollectionIsEmptyWithoutMessage(vals);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 151847)
Time Spent: 30h 10m (was: 30h)
> Java: Portable batch runner passes all ValidatesRunner tests that
> non-portable runner passes
> --------------------------------------------------------------------------------------------
>
> Key: BEAM-4176
> URL: https://issues.apache.org/jira/browse/BEAM-4176
> Project: Beam
> Issue Type: Bug
> Components: runner-flink
> Reporter: Ben Sidhom
> Assignee: Ankur Goenka
> Priority: Major
> Attachments: 81VxNWtFtke.png, Screen Shot 2018-08-14 at 4.18.31
> PM.png, Screen Shot 2018-09-03 at 11.07.38 AM.png
>
> Time Spent: 30h 10m
> Remaining Estimate: 0h
>
> We need this as a sanity check that runner execution is correct.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
