Repository: incubator-beam Updated Branches: refs/heads/master b3de17b3d -> 22e25a47e
Migrated the beam-examples-java module to TestPipeline as a JUnit rule. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/83068990 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/83068990 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/83068990 Branch: refs/heads/master Commit: 83068990d803edabee7aefa32de9542f84d087ac Parents: b3de17b Author: Stas Levin <[email protected]> Authored: Sun Dec 18 18:25:33 2016 +0200 Committer: Stas Levin <[email protected]> Committed: Tue Dec 20 19:21:18 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/beam/examples/WordCountTest.java | 7 ++++--- .../apache/beam/examples/complete/AutoCompleteTest.java | 11 ++++------- .../org/apache/beam/examples/complete/TfIdfTest.java | 6 ++++-- .../beam/examples/complete/TopWikipediaSessionsTest.java | 7 +++++-- .../beam/examples/cookbook/DistinctExampleTest.java | 9 ++++----- .../apache/beam/examples/cookbook/JoinExamplesTest.java | 6 ++++-- .../beam/examples/cookbook/TriggerExampleTest.java | 6 ++++-- 7 files changed, 29 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/83068990/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java ---------------------------------------------------------------------- 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 index c8809de..0f8e4dc 100644 --- a/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java +++ b/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.beam.examples.WordCount.CountWords; import org.apache.beam.examples.WordCount.ExtractWordsFn; import org.apache.beam.examples.WordCount.FormatAsTextFn; -import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.coders.StringUtf8Coder; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.RunnableOnService; @@ -34,6 +33,7 @@ import org.apache.beam.sdk.transforms.MapElements; import org.apache.beam.sdk.values.PCollection; import org.hamcrest.CoreMatchers; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -68,12 +68,13 @@ public class WordCountTest { static final String[] COUNTS_ARRAY = new String[] { "hi: 5", "there: 1", "sue: 2", "bob: 2"}; + @Rule + public TestPipeline p = TestPipeline.create(); + /** Example test that tests a PTransform by using an in-memory input and inspecting the output. */ @Test @Category(RunnableOnService.class) public void testCountWords() throws Exception { - Pipeline p = TestPipeline.create(); - PCollection<String> input = p.apply(Create.of(WORDS).withCoder(StringUtf8Coder.of())); PCollection<String> output = input.apply(new CountWords()) http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/83068990/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java ---------------------------------------------------------------------- diff --git a/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java b/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java index d7d4dc6..ef57da4 100644 --- a/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java +++ b/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.List; import org.apache.beam.examples.complete.AutoComplete.CompletionCandidate; import org.apache.beam.examples.complete.AutoComplete.ComputeTopCompletions; -import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.Create; @@ -40,6 +39,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.TimestampedValue; import org.joda.time.Duration; import org.joda.time.Instant; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -51,6 +51,9 @@ import org.junit.runners.Parameterized; public class AutoCompleteTest implements Serializable { private boolean recursive; + @Rule + public transient TestPipeline p = TestPipeline.create(); + public AutoCompleteTest(Boolean recursive) { this.recursive = recursive; } @@ -77,8 +80,6 @@ public class AutoCompleteTest implements Serializable { "blueberry", "cherry"); - Pipeline p = TestPipeline.create(); - PCollection<String> input = p.apply(Create.of(words)); PCollection<KV<String, List<CompletionCandidate>>> output = @@ -106,8 +107,6 @@ public class AutoCompleteTest implements Serializable { public void testTinyAutoComplete() { List<String> words = Arrays.asList("x", "x", "x", "xy", "xy", "xyz"); - Pipeline p = TestPipeline.create(); - PCollection<String> input = p.apply(Create.of(words)); PCollection<KV<String, List<CompletionCandidate>>> output = @@ -129,8 +128,6 @@ public class AutoCompleteTest implements Serializable { TimestampedValue.of("xB", new Instant(2)), TimestampedValue.of("xB", new Instant(2))); - Pipeline p = TestPipeline.create(); - PCollection<String> input = p .apply(Create.of(words)) .apply(new ReifyTimestamps<String>()); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/83068990/examples/java/src/test/java/org/apache/beam/examples/complete/TfIdfTest.java ---------------------------------------------------------------------- diff --git a/examples/java/src/test/java/org/apache/beam/examples/complete/TfIdfTest.java b/examples/java/src/test/java/org/apache/beam/examples/complete/TfIdfTest.java index fded4c0..0382532 100644 --- a/examples/java/src/test/java/org/apache/beam/examples/complete/TfIdfTest.java +++ b/examples/java/src/test/java/org/apache/beam/examples/complete/TfIdfTest.java @@ -19,7 +19,6 @@ package org.apache.beam.examples.complete; import java.net.URI; import java.util.Arrays; -import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.coders.StringDelegateCoder; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.RunnableOnService; @@ -29,6 +28,7 @@ import org.apache.beam.sdk.transforms.Distinct; import org.apache.beam.sdk.transforms.Keys; 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; @@ -40,11 +40,13 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class TfIdfTest { + @Rule + public TestPipeline pipeline = TestPipeline.create(); + /** Test that the example runs. */ @Test @Category(RunnableOnService.class) public void testTfIdf() throws Exception { - Pipeline pipeline = TestPipeline.create(); pipeline.getCoderRegistry().registerCoder(URI.class, StringDelegateCoder.of(URI.class)); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/83068990/examples/java/src/test/java/org/apache/beam/examples/complete/TopWikipediaSessionsTest.java ---------------------------------------------------------------------- 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 index 154ea73..2c50cf2 100644 --- 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 @@ -19,12 +19,12 @@ package org.apache.beam.examples.complete; import com.google.api.services.bigquery.model.TableRow; import java.util.Arrays; -import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.RunnableOnService; import org.apache.beam.sdk.testing.TestPipeline; 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; @@ -33,10 +33,13 @@ import org.junit.runners.JUnit4; /** Unit tests for {@link TopWikipediaSessions}. */ @RunWith(JUnit4.class) public class TopWikipediaSessionsTest { + + @Rule + public TestPipeline p = TestPipeline.create(); + @Test @Category(RunnableOnService.class) public void testComputeTopUsers() { - Pipeline p = TestPipeline.create(); PCollection<String> output = p.apply(Create.of(Arrays.asList( http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/83068990/examples/java/src/test/java/org/apache/beam/examples/cookbook/DistinctExampleTest.java ---------------------------------------------------------------------- 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 index 6fa66f1..6fadbe5 100644 --- 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 @@ -19,7 +19,6 @@ package org.apache.beam.examples.cookbook; import java.util.Arrays; import java.util.List; -import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.coders.StringUtf8Coder; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.RunnableOnService; @@ -27,6 +26,7 @@ import org.apache.beam.sdk.testing.TestPipeline; 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; @@ -36,6 +36,9 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class DistinctExampleTest { + @Rule + public TestPipeline p = TestPipeline.create(); + @Test @Category(RunnableOnService.class) public void testDistinct() { @@ -48,8 +51,6 @@ public class DistinctExampleTest { "k2", "k3"); - Pipeline p = TestPipeline.create(); - PCollection<String> input = p.apply(Create.of(strings) .withCoder(StringUtf8Coder.of())); @@ -67,8 +68,6 @@ public class DistinctExampleTest { public void testDistinctEmpty() { List<String> strings = Arrays.asList(); - Pipeline p = TestPipeline.create(); - PCollection<String> input = p.apply(Create.of(strings) .withCoder(StringUtf8Coder.of())); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/83068990/examples/java/src/test/java/org/apache/beam/examples/cookbook/JoinExamplesTest.java ---------------------------------------------------------------------- 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 index 6c54aff..43e6d01 100644 --- 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 @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.List; import org.apache.beam.examples.cookbook.JoinExamples.ExtractCountryInfoFn; import org.apache.beam.examples.cookbook.JoinExamples.ExtractEventDataFn; -import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.RunnableOnService; import org.apache.beam.sdk.testing.TestPipeline; @@ -32,6 +31,7 @@ import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.PCollection; import org.hamcrest.CoreMatchers; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -80,6 +80,9 @@ public class JoinExamplesTest { + "url: http://cnn.com"; }; + @Rule + public TestPipeline p = TestPipeline.create(); + @Test public void testExtractEventDataFn() throws Exception { DoFnTester<TableRow, KV<String, String>> extractEventDataFn = @@ -102,7 +105,6 @@ public class JoinExamplesTest { @Test @Category(RunnableOnService.class) public void testJoin() throws java.lang.Exception { - Pipeline p = TestPipeline.create(); PCollection<TableRow> input1 = p.apply("CreateEvent", Create.of(EVENT_ARRAY)); PCollection<TableRow> input2 = p.apply("CreateCC", Create.of(CC_ARRAY)); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/83068990/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleTest.java ---------------------------------------------------------------------- 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 index bdda22c..ec0b9d4 100644 --- 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 @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import org.apache.beam.examples.cookbook.TriggerExample.ExtractFlowInfo; import org.apache.beam.examples.cookbook.TriggerExample.TotalFlow; -import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.RunnableOnService; import org.apache.beam.sdk.testing.TestPipeline; @@ -42,6 +41,7 @@ import org.apache.beam.sdk.values.TimestampedValue; import org.joda.time.Duration; import org.joda.time.Instant; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -93,6 +93,9 @@ public class TriggerExampleTest { .set("timing", "ON_TIME") .set("window", "[1970-01-01T00:00:00.000Z..1970-01-01T00:01:00.000Z)"); + @Rule + public TestPipeline pipeline = TestPipeline.create(); + @Test public void testExtractTotalFlow() throws Exception { DoFnTester<String, KV<String, Integer>> extractFlowInfow = DoFnTester @@ -110,7 +113,6 @@ public class TriggerExampleTest { @Test @Category(RunnableOnService.class) public void testTotalFlow () { - Pipeline pipeline = TestPipeline.create(); PCollection<KV<String, Integer>> flow = pipeline .apply(Create.timestamped(TIME_STAMPED_INPUT)) .apply(ParDo.of(new ExtractFlowInfo()));
