This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 8ec216b Mark Test categories as internal and improve categorization
new d616863 Merge pull request #10902 from iemejia/minor-fixes
8ec216b is described below
commit 8ec216b3a2215512737f89b35ad0e328315f115d
Author: Ismaël Mejía <ieme...@gmail.com>
AuthorDate: Wed Feb 19 17:38:19 2020 +0100
Mark Test categories as internal and improve categorization
---
.../core/src/main/java/org/apache/beam/sdk/testing/LargeKeys.java | 3 +++
.../core/src/main/java/org/apache/beam/sdk/testing/NeedsRunner.java | 2 ++
.../java/org/apache/beam/sdk/testing/UsesBoundedSplittableParDo.java | 2 ++
.../main/java/org/apache/beam/sdk/testing/UsesCommittedMetrics.java | 2 ++
.../main/java/org/apache/beam/sdk/testing/UsesCounterMetrics.java | 3 +++
.../org/apache/beam/sdk/testing/UsesCrossLanguageTransforms.java | 3 +++
.../java/org/apache/beam/sdk/testing/UsesCustomWindowMerging.java | 3 +++
.../java/org/apache/beam/sdk/testing/UsesDistributionMetrics.java | 3 +++
.../main/java/org/apache/beam/sdk/testing/UsesFailureMessage.java | 3 +++
.../src/main/java/org/apache/beam/sdk/testing/UsesGaugeMetrics.java | 3 +++
.../core/src/main/java/org/apache/beam/sdk/testing/UsesImpulse.java | 3 +++
.../java/core/src/main/java/org/apache/beam/sdk/testing/UsesKms.java | 3 +++
.../core/src/main/java/org/apache/beam/sdk/testing/UsesMapState.java | 4 +++-
.../src/main/java/org/apache/beam/sdk/testing/UsesMetricsPusher.java | 3 +++
.../main/java/org/apache/beam/sdk/testing/UsesParDoLifecycle.java | 3 +++
.../org/apache/beam/sdk/testing/UsesRequiresTimeSortedInput.java | 2 ++
.../core/src/main/java/org/apache/beam/sdk/testing/UsesSchema.java | 3 +++
.../core/src/main/java/org/apache/beam/sdk/testing/UsesSetState.java | 4 +++-
.../src/main/java/org/apache/beam/sdk/testing/UsesSideInputs.java | 3 +++
.../apache/beam/sdk/testing/UsesSideInputsWithDifferentCoders.java | 5 ++++-
.../beam/sdk/testing/UsesSplittableParDoWithWindowedSideInputs.java | 2 ++
.../src/main/java/org/apache/beam/sdk/testing/UsesStatefulParDo.java | 2 ++
.../java/org/apache/beam/sdk/testing/UsesStrictTimerOrdering.java | 3 +++
.../src/main/java/org/apache/beam/sdk/testing/UsesSystemMetrics.java | 3 +++
.../src/main/java/org/apache/beam/sdk/testing/UsesTestStream.java | 3 +++
.../apache/beam/sdk/testing/UsesTestStreamWithMultipleStages.java | 3 +++
.../apache/beam/sdk/testing/UsesTestStreamWithOutputTimestamp.java | 5 ++++-
.../apache/beam/sdk/testing/UsesTestStreamWithProcessingTime.java | 3 +++
.../core/src/main/java/org/apache/beam/sdk/testing/UsesTimerMap.java | 4 ++++
.../src/main/java/org/apache/beam/sdk/testing/UsesTimersInParDo.java | 2 ++
.../java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java | 3 +++
.../org/apache/beam/sdk/testing/UsesUnboundedSplittableParDo.java | 2 ++
.../src/main/java/org/apache/beam/sdk/testing/ValidatesRunner.java | 3 +++
.../test/java/org/apache/beam/sdk/runners/PipelineRunnerTest.java | 3 ++-
34 files changed, 96 insertions(+), 5 deletions(-)
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/LargeKeys.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/LargeKeys.java
index 922004f..4def3c7 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/LargeKeys.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/LargeKeys.java
@@ -17,7 +17,10 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category tags for tests which validate that a Beam runner can handle keys
up to a given size. */
+@Internal
public interface LargeKeys {
/** Tests if a runner supports 10KB keys. */
interface Above10KB {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/NeedsRunner.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/NeedsRunner.java
index 248ee9a..9ba23fa 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/NeedsRunner.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/NeedsRunner.java
@@ -18,9 +18,11 @@
package org.apache.beam.sdk.testing;
import org.apache.beam.sdk.PipelineRunner;
+import org.apache.beam.sdk.annotations.Internal;
/**
* Category tag for validation tests which utilize {@link TestPipeline} for
execution and expect to
* be executed by a {@link PipelineRunner}.
*/
+@Internal
public interface NeedsRunner {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesBoundedSplittableParDo.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesBoundedSplittableParDo.java
index 28a7060..5dceed4 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesBoundedSplittableParDo.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesBoundedSplittableParDo.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.ParDo;
@@ -24,4 +25,5 @@ import org.apache.beam.sdk.transforms.ParDo;
* Category tag for validation tests which utilize splittable {@link ParDo}
with a {@link
* DoFn.BoundedPerElement} {@link DoFn}.
*/
+@Internal
public interface UsesBoundedSplittableParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCommittedMetrics.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCommittedMetrics.java
index 820e925..3cbb0f9 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCommittedMetrics.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCommittedMetrics.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.metrics.MetricResult;
/**
@@ -24,4 +25,5 @@ import org.apache.beam.sdk.metrics.MetricResult;
* Tests tagged with {@link UsesCommittedMetrics} should be run for runners
which support {@link
* MetricResult#getCommitted()}.
*/
+@Internal
public interface UsesCommittedMetrics {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCounterMetrics.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCounterMetrics.java
index d2c03fb..abb0bef 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCounterMetrics.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCounterMetrics.java
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for validation tests which utilize {@link
org.apache.beam.sdk.metrics.Counter}.
* Tests tagged with {@link UsesCounterMetrics} should be run for runners
which support counters.
*/
+@Internal
public class UsesCounterMetrics {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCrossLanguageTransforms.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCrossLanguageTransforms.java
index b249eed..b53df01 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCrossLanguageTransforms.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCrossLanguageTransforms.java
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for validation tests which use cross-language transforms.
Tests tagged with {@link
* UsesCrossLanguageTransforms} should be run for runners which support
cross-language transforms.
*/
+@Internal
public interface UsesCrossLanguageTransforms {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCustomWindowMerging.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCustomWindowMerging.java
index 5fa8c97..59e151a 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCustomWindowMerging.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesCustomWindowMerging.java
@@ -17,5 +17,8 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category tag for validation tests which utilize custom window merging. */
+@Internal
public interface UsesCustomWindowMerging {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesDistributionMetrics.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesDistributionMetrics.java
index 4966736..ddd4ef1 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesDistributionMetrics.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesDistributionMetrics.java
@@ -17,9 +17,12 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for validation tests which utilize {@link
org.apache.beam.sdk.metrics.Distribution}.
* Tests tagged with {@link UsesDistributionMetrics} should be run for runners
which support
* distributions.
*/
+@Internal
public class UsesDistributionMetrics {}
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
index 85d6290..a8b5d88 100644
---
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
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for tests which validate that currect failure message is
provided by failed
* pipeline.
*/
+@Internal
public interface UsesFailureMessage extends NeedsRunner {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesGaugeMetrics.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesGaugeMetrics.java
index 3c86cda..6f0e775 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesGaugeMetrics.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesGaugeMetrics.java
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for validation tests which utilize {@link
org.apache.beam.sdk.metrics.Gauge}. Tests
* tagged with {@link UsesGaugeMetrics} should be run for runners which
support gauges.
*/
+@Internal
public class UsesGaugeMetrics {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesImpulse.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesImpulse.java
index 3ccbe55..0be0285 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesImpulse.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesImpulse.java
@@ -17,5 +17,8 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category for tests that use {@link org.apache.beam.sdk.transforms.Impulse}
transformations. */
+@Internal
public class UsesImpulse {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesKms.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesKms.java
index f67d647..cf27c30 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesKms.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesKms.java
@@ -17,10 +17,13 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for validation tests which utilize --tempRoot from {@link
TestPipelineOptions} and
* and expect a default KMS key enable for the bucket specified.
*
* <p>Currently only applicable to GCP-based tests.
*/
+@Internal
public interface UsesKms {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesMapState.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesMapState.java
index 0b1bc22..e3844d9 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesMapState.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesMapState.java
@@ -17,7 +17,9 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.state.MapState;
/** Category tag for validation tests which utilize {@link MapState}. */
-public interface UsesMapState {}
+@Internal
+public interface UsesMapState extends UsesStatefulParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesMetricsPusher.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesMetricsPusher.java
index aaa457a..5edc814 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesMetricsPusher.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesMetricsPusher.java
@@ -17,5 +17,8 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category tag for validation tests which utilize the metrics pusher
feature. */
+@Internal
public interface UsesMetricsPusher {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesParDoLifecycle.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesParDoLifecycle.java
index 4a4469b..fdbda02 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesParDoLifecycle.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesParDoLifecycle.java
@@ -17,5 +17,8 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category tag for the ParDoLifecycleTest for exclusion (BEAM-3241). */
+@Internal
public interface UsesParDoLifecycle {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesRequiresTimeSortedInput.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesRequiresTimeSortedInput.java
index 9d32d18..cc8f980 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesRequiresTimeSortedInput.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesRequiresTimeSortedInput.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.ParDo;
@@ -24,4 +25,5 @@ import org.apache.beam.sdk.transforms.ParDo;
* Category tag for validation tests which utilize{@link
DoFn.RequiresTimeSortedInput} in stateful
* {@link ParDo}.
*/
+@Internal
public interface UsesRequiresTimeSortedInput extends UsesTimersInParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSchema.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSchema.java
index d657d2c..7f772b0 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSchema.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSchema.java
@@ -17,5 +17,8 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category tag for validation tests which utilize schemas. */
+@Internal
public interface UsesSchema {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSetState.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSetState.java
index da94e8b..c1b8a97 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSetState.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSetState.java
@@ -17,7 +17,9 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.state.SetState;
/** Category tag for validation tests which utilize {@link SetState}. */
-public interface UsesSetState {}
+@Internal
+public interface UsesSetState extends UsesStatefulParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSideInputs.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSideInputs.java
index 907c13e..9ddbf01 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSideInputs.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSideInputs.java
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for validation tests which use sideinputs. Tests tagged with
{@link UsesSideInputs}
* should be run for runners which support sideinputs.
*/
+@Internal
public interface UsesSideInputs {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSideInputsWithDifferentCoders.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSideInputsWithDifferentCoders.java
index ab50313..922dabe 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSideInputsWithDifferentCoders.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSideInputsWithDifferentCoders.java
@@ -17,5 +17,8 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category tag for validation tests which use multiple side inputs with
different coders. */
-public interface UsesSideInputsWithDifferentCoders {}
+@Internal
+public interface UsesSideInputsWithDifferentCoders extends UsesSideInputs {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSplittableParDoWithWindowedSideInputs.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSplittableParDoWithWindowedSideInputs.java
index 9674c9f..043d5e7 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSplittableParDoWithWindowedSideInputs.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSplittableParDoWithWindowedSideInputs.java
@@ -17,10 +17,12 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.transforms.ParDo;
/**
* Category tag for validation tests which utilize splittable {@link ParDo}
and use windowed side
* inputs.
*/
+@Internal
public interface UsesSplittableParDoWithWindowedSideInputs {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesStatefulParDo.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesStatefulParDo.java
index 5d81d3c..5cd8649 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesStatefulParDo.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesStatefulParDo.java
@@ -17,7 +17,9 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.transforms.ParDo;
/** Category tag for validation tests which utilize stateful {@link ParDo}. */
+@Internal
public interface UsesStatefulParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesStrictTimerOrdering.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesStrictTimerOrdering.java
index ab7de51..2dd606e 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesStrictTimerOrdering.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesStrictTimerOrdering.java
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category for tests that enforce strict event-time ordering of fired timers,
even in situations
* where multiple tests mutually set one another and watermark hops
arbitrarily far to the future.
*/
+@Internal
public interface UsesStrictTimerOrdering extends UsesTimersInParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSystemMetrics.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSystemMetrics.java
index ea71215..7774093 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSystemMetrics.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesSystemMetrics.java
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for tests that use System metrics. These metrics are available
only in portable
* runners.
*/
+@Internal
public interface UsesSystemMetrics {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStream.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStream.java
index 97e7f08..4cd0920 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStream.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStream.java
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for tests that use {@link TestStream}, which is not a part of
the Beam model but a
* special feature currently only implemented by the direct runner and the
Flink Runner (streaming).
*/
+@Internal
public interface UsesTestStream {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithMultipleStages.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithMultipleStages.java
index 55999ce..29b3d15 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithMultipleStages.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithMultipleStages.java
@@ -17,9 +17,12 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Subcategory for {@link UsesTestStream} tests which use {@link TestStream} #
across multiple
* stages. Some Runners do not properly support quiescence in a way that
{@link TestStream} demands
* it.
*/
+@Internal
public interface UsesTestStreamWithMultipleStages extends UsesTestStream {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithOutputTimestamp.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithOutputTimestamp.java
index e498ac8..15087d9 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithOutputTimestamp.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithOutputTimestamp.java
@@ -17,8 +17,11 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for validation tests which use outputTimestamp. Tests tagged
with {@link
* UsesTestStreamWithOutputTimestamp} should be run for runners which support
outputTimestamp.
*/
-public interface UsesTestStreamWithOutputTimestamp {}
+@Internal
+public interface UsesTestStreamWithOutputTimestamp extends UsesTestStream {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithProcessingTime.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithProcessingTime.java
index 164e9fd..0fde876 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithProcessingTime.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTestStreamWithProcessingTime.java
@@ -17,9 +17,12 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Subcategory for {@link UsesTestStream} tests which use the processing time
feature of {@link
* TestStream}. Some Runners do not support setting processing time globally
in a way that {@link
* TestStream} demands it.
*/
+@Internal
public interface UsesTestStreamWithProcessingTime extends UsesTestStream {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTimerMap.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTimerMap.java
index 52e1c99..1c52c66 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTimerMap.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTimerMap.java
@@ -16,8 +16,12 @@
* limitations under the License.
*/
package org.apache.beam.sdk.testing;
+
+import org.apache.beam.sdk.annotations.Internal;
+
/**
* Category tag for validation tests which use timerMap. Tests tagged with
{@link UsesTimerMap}
* should be run for runners which support timerMap.
*/
+@Internal
public interface UsesTimerMap extends UsesTimersInParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTimersInParDo.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTimersInParDo.java
index c848610..f74cce0 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTimersInParDo.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesTimersInParDo.java
@@ -17,7 +17,9 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.transforms.ParDo;
/** Category tag for validation tests which utilize timers in {@link ParDo}. */
+@Internal
public interface UsesTimersInParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java
index d8c53a6..3953835 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedPCollections.java
@@ -17,5 +17,8 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category tag for validation tests which utilize at least one unbounded
{@code PCollection}. */
+@Internal
public interface UsesUnboundedPCollections {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedSplittableParDo.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedSplittableParDo.java
index 836b9bd..9e29a0d 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedSplittableParDo.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/UsesUnboundedSplittableParDo.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.ParDo;
@@ -24,4 +25,5 @@ import org.apache.beam.sdk.transforms.ParDo;
* Category tag for validation tests which utilize splittable {@link ParDo}
with a {@link
* DoFn.UnboundedPerElement} {@link DoFn}.
*/
+@Internal
public interface UsesUnboundedSplittableParDo {}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/ValidatesRunner.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/ValidatesRunner.java
index 0a4f09d..0ee6e6e 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/ValidatesRunner.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/ValidatesRunner.java
@@ -17,5 +17,8 @@
*/
package org.apache.beam.sdk.testing;
+import org.apache.beam.sdk.annotations.Internal;
+
/** Category tag for tests which validate that a Beam runner is correctly
implemented. */
+@Internal
public interface ValidatesRunner extends NeedsRunner {}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/PipelineRunnerTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/PipelineRunnerTest.java
index 0629533..dd65e4f 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/PipelineRunnerTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/PipelineRunnerTest.java
@@ -34,6 +34,7 @@ import org.apache.beam.sdk.testing.CrashingRunner;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.TestPipeline;
+import org.apache.beam.sdk.testing.UsesCommittedMetrics;
import org.apache.beam.sdk.testing.UsesCounterMetrics;
import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.MapElements;
@@ -80,7 +81,7 @@ public class PipelineRunnerTest {
}
@Test
- @Category({NeedsRunner.class, UsesCounterMetrics.class})
+ @Category({NeedsRunner.class, UsesCommittedMetrics.class,
UsesCounterMetrics.class})
public void testRunPTransform() {
final String namespace = PipelineRunnerTest.class.getName();
final Counter counter = Metrics.counter(namespace, "count");
