Remove extraneous/incorrect ValidatesRunner classification from examp…

…les unit tests
apache · Oct 23, 2024 · 5ad0057 · 5ad0057
1 parent 8d22fc2
commit 5ad0057
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 54 deletions.
diff --git a/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java b/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java
@@ -25,15 +25,13 @@
 import org.apache.beam.sdk.coders.StringUtf8Coder;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.PCollection;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -66,7 +64,6 @@ public void testExtractWordsFn() throws Exception {
 
   /** Example test that tests a PTransform by using an in-memory input and inspecting the output. */
   @Test
-  @Category(ValidatesRunner.class)
   public void testCountWords() throws Exception {
     PCollection<String> input = p.apply(Create.of(WORDS).withCoder(StringUtf8Coder.of()));
 

diff --git a/examples/java/src/test/java/org/apache/beam/examples/complete/TopWikipediaSessionsTest.java b/examples/java/src/test/java/org/apache/beam/examples/complete/TopWikipediaSessionsTest.java
@@ -21,12 +21,10 @@
 import java.util.Arrays;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.values.PCollection;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -37,7 +35,6 @@ public class TopWikipediaSessionsTest {
   @Rule public TestPipeline p = TestPipeline.create();
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testComputeTopUsers() {
 
     PCollection<String> output =

diff --git a/examples/java/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java b/examples/java/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
@@ -24,13 +24,11 @@
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -69,7 +67,6 @@ public class GameStatsTest implements Serializable {
 
   /** Test the calculation of 'spammy users'. */
   @Test
-  @Category(ValidatesRunner.class)
   public void testCalculateSpammyUsers() throws Exception {
     PCollection<KV<String, Integer>> input = p.apply(Create.of(USER_SCORES));
     PCollection<KV<String, Integer>> output = input.apply(new CalculateSpammyUsers());

diff --git a/examples/java/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java b/examples/java/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
@@ -26,7 +26,6 @@
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.Filter;
 import org.apache.beam.sdk.transforms.MapElements;
@@ -37,7 +36,6 @@
 import org.joda.time.Instant;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -90,7 +88,6 @@ public class HourlyTeamScoreTest implements Serializable {
 
   /** Test the filtering. */
   @Test
-  @Category(ValidatesRunner.class)
   public void testUserScoresFilter() throws Exception {
 
     final Instant startMinTimestamp = new Instant(1447965680000L);

diff --git a/examples/java/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java b/examples/java/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
@@ -26,7 +26,6 @@
 import org.apache.beam.sdk.coders.StringUtf8Coder;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.ParDo;
@@ -36,7 +35,6 @@
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Lists;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -114,7 +112,6 @@ public void testParseEventFn() throws Exception {
 
   /** Tests ExtractAndSumScore("user"). */
   @Test
-  @Category(ValidatesRunner.class)
   public void testUserScoreSums() throws Exception {
 
     PCollection<String> input = p.apply(Create.of(GAME_EVENTS));
@@ -133,7 +130,6 @@ public void testUserScoreSums() throws Exception {
 
   /** Tests ExtractAndSumScore("team"). */
   @Test
-  @Category(ValidatesRunner.class)
   public void testTeamScoreSums() throws Exception {
 
     PCollection<String> input = p.apply(Create.of(GAME_EVENTS));
@@ -152,7 +148,6 @@ public void testTeamScoreSums() throws Exception {
 
   /** Test that bad input data is dropped appropriately. */
   @Test
-  @Category(ValidatesRunner.class)
   public void testUserScoresBadInput() throws Exception {
 
     PCollection<String> input = p.apply(Create.of(GAME_EVENTS2).withCoder(StringUtf8Coder.of()));

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/BigQueryTornadoesTest.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/BigQueryTornadoesTest.java
@@ -22,7 +22,6 @@
 import org.apache.beam.examples.cookbook.BigQueryTornadoes.FormatCountsFn;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.KV;
@@ -31,7 +30,6 @@
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -41,7 +39,6 @@ public class BigQueryTornadoesTest {
   @Rule public TestPipeline p = TestPipeline.create();
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testExtractTornadoes() {
     TableRow row = new TableRow().set("month", "6").set("tornado", true);
     PCollection<TableRow> input = p.apply(Create.of(ImmutableList.of(row)));
@@ -51,7 +48,6 @@ public void testExtractTornadoes() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testNoTornadoes() {
     TableRow row = new TableRow().set("month", 6).set("tornado", false);
     PCollection<TableRow> inputs = p.apply(Create.of(ImmutableList.of(row)));
@@ -61,7 +57,6 @@ public void testNoTornadoes() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testEmpty() {
     PCollection<KV<Integer, Long>> inputs =
         p.apply(Create.empty(new TypeDescriptor<KV<Integer, Long>>() {}));
@@ -71,7 +66,6 @@ public void testEmpty() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testFormatCounts() {
     PCollection<KV<Integer, Long>> inputs =
         p.apply(Create.of(KV.of(3, 0L), KV.of(4, Long.MAX_VALUE), KV.of(5, Long.MIN_VALUE)));

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/DistinctExampleTest.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/DistinctExampleTest.java
@@ -22,13 +22,11 @@
 import org.apache.beam.sdk.coders.StringUtf8Coder;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.Distinct;
 import org.apache.beam.sdk.values.PCollection;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -39,7 +37,6 @@ public class DistinctExampleTest {
   @Rule public TestPipeline p = TestPipeline.create();
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testDistinct() {
     List<String> strings = Arrays.asList("k1", "k5", "k5", "k2", "k1", "k2", "k3");
 
@@ -52,7 +49,6 @@ public void testDistinct() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testDistinctEmpty() {
     List<String> strings = Arrays.asList();
 

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/FilterExamplesTest.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/FilterExamplesTest.java
@@ -22,13 +22,11 @@
 import org.apache.beam.examples.cookbook.FilterExamples.ProjectionFn;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.PCollection;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -68,7 +66,6 @@ public class FilterExamplesTest {
   @Rule public TestPipeline p = TestPipeline.create();
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testProjectionFn() {
     PCollection<TableRow> input = p.apply(Create.of(row1, row2, row3));
 
@@ -79,7 +76,6 @@ public void testProjectionFn() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testFilterSingleMonthDataFn() {
     PCollection<TableRow> input = p.apply(Create.of(outRow1, outRow2, outRow3));
 

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/JoinExamplesTest.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/JoinExamplesTest.java
@@ -24,14 +24,12 @@
 import org.apache.beam.examples.cookbook.JoinExamples.ExtractEventDataFn;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -107,7 +105,6 @@ public void testExtractCountryInfoFn() throws Exception {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testJoin() throws java.lang.Exception {
     PCollection<TableRow> input1 = p.apply("CreateEvent", Create.of(EVENT_ARRAY));
     PCollection<TableRow> input2 = p.apply("CreateCC", Create.of(CC_ARRAY));

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/MaxPerKeyExamplesTest.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/MaxPerKeyExamplesTest.java
@@ -23,15 +23,13 @@
 import org.apache.beam.examples.cookbook.MaxPerKeyExamples.FormatMaxesFn;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -78,7 +76,6 @@ public class MaxPerKeyExamplesTest {
   @Rule public TestPipeline p = TestPipeline.create();
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testExtractTempFn() {
     PCollection<KV<Integer, Double>> results =
         p.apply(Create.of(TEST_ROWS)).apply(ParDo.of(new ExtractTempFn()));
@@ -87,7 +84,6 @@ public void testExtractTempFn() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testFormatMaxesFn() {
     PCollection<TableRow> results =
         p.apply(Create.of(TEST_KVS)).apply(ParDo.of(new FormatMaxesFn()));

diff --git a/...es/java/src/test/java/org/apache/beam/examples/cookbook/MinimalBigQueryTornadoesTest.java b/...es/java/src/test/java/org/apache/beam/examples/cookbook/MinimalBigQueryTornadoesTest.java
@@ -22,7 +22,6 @@
 import org.apache.beam.examples.cookbook.MinimalBigQueryTornadoes.FormatCountsFn;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.KV;
@@ -31,7 +30,6 @@
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -41,7 +39,6 @@ public class MinimalBigQueryTornadoesTest {
   @Rule public TestPipeline p = TestPipeline.create();
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testExtractTornadoes() {
     TableRow row = new TableRow().set("month", "6").set("tornado", true);
     PCollection<TableRow> input = p.apply(Create.of(ImmutableList.of(row)));
@@ -51,7 +48,6 @@ public void testExtractTornadoes() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testNoTornadoes() {
     TableRow row = new TableRow().set("month", 6).set("tornado", false);
     PCollection<TableRow> inputs = p.apply(Create.of(ImmutableList.of(row)));
@@ -61,7 +57,6 @@ public void testNoTornadoes() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testEmpty() {
     PCollection<KV<Integer, Long>> inputs =
         p.apply(Create.empty(new TypeDescriptor<KV<Integer, Long>>() {}));
@@ -71,7 +66,6 @@ public void testEmpty() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testFormatCounts() {
     PCollection<KV<Integer, Long>> inputs =
         p.apply(Create.of(KV.of(3, 0L), KV.of(4, Long.MAX_VALUE), KV.of(5, Long.MIN_VALUE)));

diff --git a/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleTest.java b/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleTest.java
@@ -27,7 +27,6 @@
 import org.apache.beam.sdk.coders.StringUtf8Coder;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
-import org.apache.beam.sdk.testing.ValidatesRunner;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.ParDo;
@@ -42,7 +41,6 @@
 import org.joda.time.Instant;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -118,7 +116,6 @@ public void testExtractTotalFlow() {
   }
 
   @Test
-  @Category(ValidatesRunner.class)
   public void testTotalFlow() {
     PCollection<KV<String, Integer>> flow =
         pipeline

diff --git a/...ples/kotlin/src/test/java/org/apache/beam/examples/kotlin/cookbook/DistinctExampleTest.kt b/...ples/kotlin/src/test/java/org/apache/beam/examples/kotlin/cookbook/DistinctExampleTest.kt
@@ -39,7 +39,6 @@ class DistinctExampleTest {
     fun pipeline(): TestPipeline = pipeline
 
     @Test
-    @Category(ValidatesRunner::class)
     fun testDistinct() {
         val strings = listOf("k1", "k5", "k5", "k2", "k1", "k2", "k3")
         val input = pipeline.apply(Create.of(strings).withCoder(StringUtf8Coder.of()))
@@ -49,7 +48,6 @@ class DistinctExampleTest {
     }
 
     @Test
-    @Category(ValidatesRunner::class)
     fun testDistinctEmpty() {
         val strings = listOf<String>()
         val input = pipeline.apply(Create.of(strings).withCoder(StringUtf8Coder.of()))

diff --git a/examples/kotlin/src/test/java/org/apache/beam/examples/kotlin/cookbook/FilterExamplesTest.kt b/examples/kotlin/src/test/java/org/apache/beam/examples/kotlin/cookbook/FilterExamplesTest.kt
@@ -64,7 +64,6 @@ class FilterExamplesTest {
     fun pipeline(): TestPipeline = pipeline
 
     @Test
-    @Category(ValidatesRunner::class)
     fun testProjectionFn() {
         val input = pipeline.apply(Create.of(row1, row2, row3))
         val results = input.apply(ParDo.of(ProjectionFn()))
@@ -73,7 +72,6 @@ class FilterExamplesTest {
     }
 
     @Test
-    @Category(ValidatesRunner::class)
     fun testFilterSingleMonthDataFn() {
         val input = pipeline.apply(Create.of(outRow1, outRow2, outRow3))
         val results = input.apply(ParDo.of(FilterSingleMonthDataFn(7)))