You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/12/20 19:04:51 UTC
[01/17] incubator-beam git commit: Migrated the beam-examples-java
module to TestPipeline as a JUnit rule.
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 <st...@gmail.com>
Authored: Sun Dec 18 18:25:33 2016 +0200
Committer: Stas Levin <st...@gmail.com>
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()));
[16/17] incubator-beam git commit: Migrated the
beam-sdks-java-io-kinesis module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-io-kinesis 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/950aa7e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/950aa7e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/950aa7e1
Branch: refs/heads/master
Commit: 950aa7e1d9c50167933eb192a16e15700e483377
Parents: 12be8b1
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 17:44:15 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:46 2016 -0800
----------------------------------------------------------------------
.../org/apache/beam/sdk/io/kinesis/KinesisMockReadTest.java | 7 +++++--
.../java/org/apache/beam/sdk/io/kinesis/KinesisReaderIT.java | 6 ++++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/950aa7e1/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisMockReadTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisMockReadTest.java b/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisMockReadTest.java
index f0ab46c..075805e 100644
--- a/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisMockReadTest.java
+++ b/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisMockReadTest.java
@@ -22,19 +22,23 @@ import static com.google.common.collect.Lists.newArrayList;
import com.amazonaws.services.kinesis.clientlibrary.lib.worker.InitialPositionInStream;
import com.google.common.collect.Iterables;
import java.util.List;
-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.DoFn;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.PCollection;
import org.joda.time.DateTime;
+import org.junit.Rule;
import org.junit.Test;
/**
* Tests {@link AmazonKinesisMock}.
*/
public class KinesisMockReadTest {
+
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Test
public void readsDataFromMockKinesis() {
int noOfShards = 3;
@@ -42,7 +46,6 @@ public class KinesisMockReadTest {
List<List<AmazonKinesisMock.TestData>> testData =
provideTestData(noOfShards, noOfEventsPerShard);
- final Pipeline p = TestPipeline.create();
PCollection<AmazonKinesisMock.TestData> result = p.
apply(
KinesisIO.Read.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/950aa7e1/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisReaderIT.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisReaderIT.java b/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisReaderIT.java
index 73a2455..690cc11 100644
--- a/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisReaderIT.java
+++ b/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisReaderIT.java
@@ -31,7 +31,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.PipelineResult;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.testing.PAssert;
@@ -43,6 +42,7 @@ import org.apache.commons.lang.RandomStringUtils;
import org.joda.time.Duration;
import org.joda.time.Instant;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
/**
@@ -53,6 +53,8 @@ public class KinesisReaderIT {
private static final long PIPELINE_STARTUP_TIME = TimeUnit.SECONDS.toMillis(10);
private ExecutorService singleThreadExecutor = newSingleThreadExecutor();
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
@Ignore
@Test
@@ -76,7 +78,7 @@ public class KinesisReaderIT {
private Future<?> startTestPipeline(List<String> testData, KinesisTestOptions options)
throws InterruptedException {
- final Pipeline p = TestPipeline.create();
+
PCollection<String> result = p.
apply(KinesisIO.Read.
from(options.getAwsKinesisStream(), Instant.now()).
[15/17] incubator-beam git commit: Migrated the
beam-sdks-java-io-java8tests module to TestPipeline as a JUnit rule + fixed
WithTimestampsJava8Test.withTimestampsLambdaShouldApplyTimestamps.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-io-java8tests module to TestPipeline as a JUnit rule + fixed WithTimestampsJava8Test.withTimestampsLambdaShouldApplyTimestamps.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/4b23d42c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/4b23d42c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/4b23d42c
Branch: refs/heads/master
Commit: 4b23d42c31c95bed0d64bfc393fa193311e93498
Parents: fce4f65
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 18:57:57 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:46 2016 -0800
----------------------------------------------------------------------
.../apache/beam/sdk/transforms/CombineJava8Test.java | 8 +++-----
.../apache/beam/sdk/transforms/DistinctJava8Test.java | 5 +++--
.../apache/beam/sdk/transforms/FilterJava8Test.java | 9 +++------
.../beam/sdk/transforms/FlatMapElementsJava8Test.java | 7 ++++---
.../beam/sdk/transforms/MapElementsJava8Test.java | 9 ++++++---
.../beam/sdk/transforms/PartitionJava8Test.java | 7 ++++---
.../apache/beam/sdk/transforms/WithKeysJava8Test.java | 6 ++++--
.../beam/sdk/transforms/WithTimestampsJava8Test.java | 14 ++++++++++----
8 files changed, 37 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4b23d42c/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/CombineJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/CombineJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/CombineJava8Test.java
index 98d99ce..a0f7ce6 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/CombineJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/CombineJava8Test.java
@@ -23,7 +23,6 @@ import static org.hamcrest.Matchers.not;
import com.google.common.collect.Iterables;
import java.io.Serializable;
-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.display.DisplayData;
@@ -45,6 +44,9 @@ import org.junit.runners.JUnit4;
public class CombineJava8Test implements Serializable {
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
/**
@@ -65,7 +67,6 @@ public class CombineJava8Test implements Serializable {
*/
@Test
public void testCombineGloballyLambda() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3, 4))
@@ -86,7 +87,6 @@ public class CombineJava8Test implements Serializable {
*/
@Test
public void testCombineGloballyInstanceMethodReference() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3, 4))
@@ -101,7 +101,6 @@ public class CombineJava8Test implements Serializable {
*/
@Test
public void testCombinePerKeyLambda() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> output = pipeline
.apply(Create.of(KV.of("a", 1), KV.of("b", 2), KV.of("a", 3), KV.of("c", 4)))
@@ -125,7 +124,6 @@ public class CombineJava8Test implements Serializable {
*/
@Test
public void testCombinePerKeyInstanceMethodReference() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> output = pipeline
.apply(Create.of(KV.of("a", 1), KV.of("b", 2), KV.of("a", 3), KV.of("c", 4)))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4b23d42c/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/DistinctJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/DistinctJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/DistinctJava8Test.java
index 99ef232..790f51e 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/DistinctJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/DistinctJava8Test.java
@@ -44,11 +44,13 @@ import org.junit.runners.JUnit4;
public class DistinctJava8Test {
@Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
+ @Rule
public ExpectedException thrown = ExpectedException.none();
@Test
public void withLambdaRepresentativeValuesFnAndTypeDescriptorShouldApplyFn() {
- TestPipeline p = TestPipeline.create();
Multimap<Integer, String> predupedContents = HashMultimap.create();
predupedContents.put(3, "foo");
@@ -76,7 +78,6 @@ public class DistinctJava8Test {
@Test
public void withLambdaRepresentativeValuesFnNoTypeDescriptorShouldThrow() {
- TestPipeline p = TestPipeline.create();
Multimap<Integer, String> predupedContents = HashMultimap.create();
predupedContents.put(3, "foo");
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4b23d42c/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FilterJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FilterJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FilterJava8Test.java
index afd1c8b..f91371e 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FilterJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FilterJava8Test.java
@@ -18,7 +18,6 @@
package org.apache.beam.sdk.transforms;
import java.io.Serializable;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.CannotProvideCoderException;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.RunnableOnService;
@@ -39,12 +38,14 @@ import org.junit.runners.JUnit4;
public class FilterJava8Test implements Serializable {
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
@Test
@Category(RunnableOnService.class)
public void testIdentityFilterByPredicate() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(591, 11789, 1257, 24578, 24799, 307))
@@ -56,7 +57,6 @@ public class FilterJava8Test implements Serializable {
@Test
public void testNoFilterByPredicate() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 4, 5))
@@ -69,7 +69,6 @@ public class FilterJava8Test implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFilterByPredicate() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3, 4, 5, 6, 7))
@@ -85,7 +84,6 @@ public class FilterJava8Test implements Serializable {
*/
@Test
public void testFilterParDoOutputTypeDescriptorRaw() throws Exception {
- Pipeline pipeline = TestPipeline.create();
@SuppressWarnings({"unchecked", "rawtypes"})
PCollection<String> output = pipeline
@@ -99,7 +97,6 @@ public class FilterJava8Test implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFilterByMethodReference() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3, 4, 5, 6, 7))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4b23d42c/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsJava8Test.java
index 70cc04d..471724d 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsJava8Test.java
@@ -20,7 +20,6 @@ package org.apache.beam.sdk.transforms;
import com.google.common.collect.ImmutableList;
import java.io.Serializable;
import java.util.List;
-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.values.PCollection;
@@ -38,6 +37,9 @@ import org.junit.runners.JUnit4;
public class FlatMapElementsJava8Test implements Serializable {
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
/**
@@ -46,7 +48,6 @@ public class FlatMapElementsJava8Test implements Serializable {
*/
@Test
public void testFlatMapBasic() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
.apply(FlatMapElements
@@ -63,7 +64,7 @@ public class FlatMapElementsJava8Test implements Serializable {
*/
@Test
public void testFlatMapMethodReference() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
.apply(FlatMapElements
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4b23d42c/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/MapElementsJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/MapElementsJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/MapElementsJava8Test.java
index 9b556b9..ce0f111 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/MapElementsJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/MapElementsJava8Test.java
@@ -18,11 +18,11 @@
package org.apache.beam.sdk.transforms;
import java.io.Serializable;
-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.values.PCollection;
import org.apache.beam.sdk.values.TypeDescriptor;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -33,13 +33,16 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class MapElementsJava8Test implements Serializable {
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
/**
* Basic test of {@link MapElements} with a lambda (which is instantiated as a
* {@link SerializableFunction}).
*/
@Test
public void testMapBasic() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
.apply(MapElements
@@ -56,7 +59,7 @@ public class MapElementsJava8Test implements Serializable {
*/
@Test
public void testMapMethodReference() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
.apply(MapElements
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4b23d42c/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/PartitionJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/PartitionJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/PartitionJava8Test.java
index 0aeb41f..7d97740 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/PartitionJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/PartitionJava8Test.java
@@ -20,7 +20,6 @@ package org.apache.beam.sdk.transforms;
import static org.junit.Assert.assertEquals;
import java.io.Serializable;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.CannotProvideCoderException;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.TestPipeline;
@@ -39,11 +38,14 @@ import org.junit.runners.JUnit4;
public class PartitionJava8Test implements Serializable {
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
@Test
public void testModPartition() {
- Pipeline pipeline = TestPipeline.create();
+
PCollectionList<Integer> outputs = pipeline
.apply(Create.of(1, 2, 4, 5))
@@ -61,7 +63,6 @@ public class PartitionJava8Test implements Serializable {
*/
@Test
public void testPartitionFnOutputTypeDescriptorRaw() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollectionList<String> output = pipeline
.apply(Create.of("hello"))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4b23d42c/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithKeysJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithKeysJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithKeysJava8Test.java
index a5b9cb1..6ba41fa 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithKeysJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithKeysJava8Test.java
@@ -39,12 +39,15 @@ import org.junit.runners.JUnit4;
public class WithKeysJava8Test {
@Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
+ @Rule
public ExpectedException thrown = ExpectedException.none();
@Test
@Category(RunnableOnService.class)
public void withLambdaAndTypeDescriptorShouldSucceed() {
- TestPipeline p = TestPipeline.create();
+
PCollection<String> values = p.apply(Create.of("1234", "3210", "0", "-12"));
PCollection<KV<Integer, String>> kvs = values.apply(
@@ -59,7 +62,6 @@ public class WithKeysJava8Test {
@Test
public void withLambdaAndNoTypeDescriptorShouldThrow() {
- TestPipeline p = TestPipeline.create();
PCollection<String> values = p.apply(Create.of("1234", "3210", "0", "-12"));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4b23d42c/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsJava8Test.java
index 5f1e74b..a0c6370 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsJava8Test.java
@@ -24,6 +24,7 @@ import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -34,15 +35,18 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class WithTimestampsJava8Test implements Serializable {
+
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void withTimestampsLambdaShouldApplyTimestamps() {
- TestPipeline p = TestPipeline.create();
- String yearTwoThousand = "946684800000";
+ final String yearTwoThousand = "946684800000";
PCollection<String> timestamped =
p.apply(Create.of("1234", "0", Integer.toString(Integer.MAX_VALUE), yearTwoThousand))
- .apply(WithTimestamps.of((String input) -> new Instant(Long.valueOf(yearTwoThousand))));
+ .apply(WithTimestamps.of((String input) -> new Instant(Long.valueOf(input))));
PCollection<KV<String, Instant>> timestampedVals =
timestamped.apply(ParDo.of(new DoFn<String, KV<String, Instant>>() {
@@ -58,8 +62,10 @@ public class WithTimestampsJava8Test implements Serializable {
PAssert.that(timestampedVals)
.containsInAnyOrder(
KV.of("0", new Instant(0)),
- KV.of("1234", new Instant("1234")),
+ KV.of("1234", new Instant(Long.valueOf("1234"))),
KV.of(Integer.toString(Integer.MAX_VALUE), new Instant(Integer.MAX_VALUE)),
KV.of(yearTwoThousand, new Instant(Long.valueOf(yearTwoThousand))));
+
+ p.run();
}
}
[17/17] incubator-beam git commit: This closes #1664: [BEAM-1176]
Migrating tests to use TestPipeline as a JUnit rule
Posted by ke...@apache.org.
This closes #1664: [BEAM-1176] Migrating tests to use TestPipeline as a JUnit rule
Migrated the beam-sdks-java-io-java8tests module to TestPipeline as a JUnit rule + fixed WithTimestampsJava8Test.withTimestampsLambdaShouldApplyTimestamps.
Migrated the beam-sdks-java-io-mongodb module to TestPipeline as a JUnit rule.
Migrated the beam-sdks-java-io-kinesis module to TestPipeline as a JUnit rule.
Migrated the beam-sdks-java-io-kafka module to TestPipeline as a JUnit rule.
Migrated the beam-sdks-java-io-jms module to TestPipeline as a JUnit rule.
Migrated the beam-sdks-java-io-jdbc module to TestPipeline as a JUnit rule.
Migrated the beam-sdks-java-io-google-cloud-platform module to TestPipeline as a JUnit rule.
Migrated the beam-sdks-java-extensions-sorter module to TestPipeline as a JUnit rule.
Migrated the beam-sdks-java-extensions-join-library module to TestPipeline as a JUnit rule.
Migrated the beam-sdks-java-core module to TestPipeline as a JUnit rule. Plus, fixed some checkstyle errors from previous modules' migration.
Migrated the beam-runners-direct-java module to TestPipeline as a JUnit rule.
Migrated the beam-runners-core module to TestPipeline as a JUnit rule.
Migrated the beam-examples-java8 module to TestPipeline as a JUnit rule.
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/22e25a47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/22e25a47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/22e25a47
Branch: refs/heads/master
Commit: 22e25a47e2edc7b7f702eaca12630f6de7195657
Parents: b3de17b 4b23d42
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Dec 20 09:55:57 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:57 2016 -0800
----------------------------------------------------------------------
.../org/apache/beam/examples/WordCountTest.java | 7 +-
.../examples/complete/AutoCompleteTest.java | 11 +-
.../beam/examples/complete/TfIdfTest.java | 6 +-
.../complete/TopWikipediaSessionsTest.java | 7 +-
.../examples/cookbook/DistinctExampleTest.java | 9 +-
.../examples/cookbook/JoinExamplesTest.java | 6 +-
.../examples/cookbook/TriggerExampleTest.java | 6 +-
.../examples/MinimalWordCountJava8Test.java | 6 +-
.../examples/complete/game/GameStatsTest.java | 7 +-
.../complete/game/HourlyTeamScoreTest.java | 5 +-
.../examples/complete/game/LeaderBoardTest.java | 11 +-
.../examples/complete/game/UserScoreTest.java | 10 +-
.../core/PushbackSideInputDoFnRunnerTest.java | 5 +-
.../beam/runners/core/SplittableParDoTest.java | 10 +-
.../UnboundedReadFromBoundedSourceTest.java | 6 +-
.../direct/BoundedReadEvaluatorFactoryTest.java | 13 +-
.../direct/CloningBundleFactoryTest.java | 8 +-
.../runners/direct/CommittedResultTest.java | 6 +-
.../CopyOnAccessInMemoryStateInternalsTest.java | 7 +-
.../runners/direct/DirectGraphVisitorTest.java | 3 +-
.../runners/direct/EvaluationContextTest.java | 7 +-
.../direct/FlattenEvaluatorFactoryTest.java | 6 +-
.../direct/GroupByKeyEvaluatorFactoryTest.java | 5 +-
.../GroupByKeyOnlyEvaluatorFactoryTest.java | 5 +-
.../ImmutabilityCheckingBundleFactoryTest.java | 4 +-
.../ImmutabilityEnforcementFactoryTest.java | 3 +-
.../direct/ImmutableListBundleFactoryTest.java | 14 ++-
.../direct/KeyedPValueTrackingVisitorTest.java | 6 +-
.../beam/runners/direct/ParDoEvaluatorTest.java | 5 +-
.../runners/direct/SideInputContainerTest.java | 5 +-
.../StatefulParDoEvaluatorFactoryTest.java | 7 +-
.../runners/direct/StepTransformResultTest.java | 5 +-
.../direct/TestStreamEvaluatorFactoryTest.java | 5 +-
.../runners/direct/TransformExecutorTest.java | 4 +-
.../UnboundedReadEvaluatorFactoryTest.java | 9 +-
.../direct/ViewEvaluatorFactoryTest.java | 5 +-
.../direct/WatermarkCallbackExecutorTest.java | 5 +-
.../runners/direct/WatermarkManagerTest.java | 6 +-
.../direct/WindowEvaluatorFactoryTest.java | 5 +-
.../direct/WriteWithShardingFactoryTest.java | 14 +--
.../java/org/apache/beam/sdk/PipelineTest.java | 37 +++---
.../apache/beam/sdk/coders/AvroCoderTest.java | 11 +-
.../beam/sdk/coders/CoderRegistryTest.java | 6 +-
.../beam/sdk/coders/SerializableCoderTest.java | 7 +-
.../java/org/apache/beam/sdk/io/AvroIOTest.java | 16 +--
.../io/BoundedReadFromUnboundedSourceTest.java | 6 +-
.../beam/sdk/io/CompressedSourceTest.java | 12 +-
.../apache/beam/sdk/io/CountingInputTest.java | 12 +-
.../apache/beam/sdk/io/CountingSourceTest.java | 13 +-
.../apache/beam/sdk/io/FileBasedSourceTest.java | 4 +-
.../beam/sdk/io/PubsubUnboundedSinkTest.java | 10 +-
.../beam/sdk/io/PubsubUnboundedSourceTest.java | 12 +-
.../java/org/apache/beam/sdk/io/TextIOTest.java | 29 +++--
.../java/org/apache/beam/sdk/io/WriteTest.java | 2 +-
.../org/apache/beam/sdk/io/XmlSourceTest.java | 10 +-
.../sdk/options/ProxyInvocationHandlerTest.java | 5 +-
.../sdk/runners/TransformHierarchyTest.java | 6 +-
.../beam/sdk/runners/TransformTreeTest.java | 11 +-
.../beam/sdk/testing/GatherAllPanesTest.java | 7 +-
.../apache/beam/sdk/testing/PAssertTest.java | 32 ++---
.../apache/beam/sdk/testing/TestStreamTest.java | 7 +-
.../transforms/ApproximateQuantilesTest.java | 12 +-
.../sdk/transforms/ApproximateUniqueTest.java | 6 +-
.../beam/sdk/transforms/CombineFnsTest.java | 5 +-
.../apache/beam/sdk/transforms/CombineTest.java | 25 +---
.../apache/beam/sdk/transforms/CountTest.java | 13 +-
.../apache/beam/sdk/transforms/CreateTest.java | 27 +----
.../beam/sdk/transforms/DistinctTest.java | 12 +-
.../apache/beam/sdk/transforms/DoFnTest.java | 4 +-
.../beam/sdk/transforms/DoFnTesterTest.java | 6 +-
.../apache/beam/sdk/transforms/FilterTest.java | 18 +--
.../sdk/transforms/FlatMapElementsTest.java | 10 +-
.../apache/beam/sdk/transforms/FlattenTest.java | 35 +-----
.../beam/sdk/transforms/GroupByKeyTest.java | 30 ++---
.../apache/beam/sdk/transforms/KeysTest.java | 9 +-
.../apache/beam/sdk/transforms/KvSwapTest.java | 9 +-
.../apache/beam/sdk/transforms/LatestTest.java | 12 +-
.../beam/sdk/transforms/MapElementsTest.java | 14 +--
.../beam/sdk/transforms/ParDoLifecycleTest.java | 17 +--
.../apache/beam/sdk/transforms/ParDoTest.java | 118 +++++++------------
.../beam/sdk/transforms/PartitionTest.java | 8 +-
.../apache/beam/sdk/transforms/RegexTest.java | 25 +---
.../apache/beam/sdk/transforms/SampleTest.java | 34 +++---
.../beam/sdk/transforms/SplittableDoFnTest.java | 12 +-
.../org/apache/beam/sdk/transforms/TopTest.java | 15 ++-
.../apache/beam/sdk/transforms/ValuesTest.java | 7 +-
.../apache/beam/sdk/transforms/ViewTest.java | 84 ++++---------
.../beam/sdk/transforms/WithKeysTest.java | 8 +-
.../beam/sdk/transforms/WithTimestampsTest.java | 9 +-
.../sdk/transforms/join/CoGroupByKeyTest.java | 11 +-
.../sdk/transforms/windowing/WindowTest.java | 22 ++--
.../sdk/transforms/windowing/WindowingTest.java | 11 +-
.../org/apache/beam/sdk/util/ReshuffleTest.java | 11 +-
.../beam/sdk/values/PCollectionTupleTest.java | 12 +-
.../org/apache/beam/sdk/values/PDoneTest.java | 9 +-
.../apache/beam/sdk/values/TypedPValueTest.java | 10 +-
.../extensions/joinlibrary/InnerJoinTest.java | 9 +-
.../joinlibrary/OuterLeftJoinTest.java | 10 +-
.../joinlibrary/OuterRightJoinTest.java | 10 +-
.../sdk/extensions/sorter/SortValuesTest.java | 7 +-
.../sdk/io/gcp/bigquery/BigQueryIOTest.java | 25 ++--
.../sdk/io/gcp/bigtable/BigtableIOTest.java | 13 +-
.../org/apache/beam/sdk/io/jdbc/JdbcIOTest.java | 8 +-
.../org/apache/beam/sdk/io/jms/JmsIOTest.java | 9 +-
.../apache/beam/sdk/io/kafka/KafkaIOTest.java | 25 ++--
.../sdk/io/kinesis/KinesisMockReadTest.java | 7 +-
.../beam/sdk/io/kinesis/KinesisReaderIT.java | 6 +-
.../sdk/io/mongodb/MongoDBGridFSIOTest.java | 9 +-
.../beam/sdk/io/mongodb/MongoDbIOTest.java | 7 +-
.../beam/sdk/transforms/CombineJava8Test.java | 8 +-
.../beam/sdk/transforms/DistinctJava8Test.java | 5 +-
.../beam/sdk/transforms/FilterJava8Test.java | 9 +-
.../transforms/FlatMapElementsJava8Test.java | 7 +-
.../sdk/transforms/MapElementsJava8Test.java | 9 +-
.../beam/sdk/transforms/PartitionJava8Test.java | 7 +-
.../beam/sdk/transforms/WithKeysJava8Test.java | 6 +-
.../sdk/transforms/WithTimestampsJava8Test.java | 14 ++-
117 files changed, 640 insertions(+), 769 deletions(-)
----------------------------------------------------------------------
[11/17] incubator-beam git commit: Migrated the
beam-sdks-java-io-google-cloud-platform module to TestPipeline as a JUnit
rule.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-io-google-cloud-platform 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/6dea0992
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6dea0992
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6dea0992
Branch: refs/heads/master
Commit: 6dea0992d9976b39232cf846906831feaa25ec43
Parents: 63331aa
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 13:26:07 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../sdk/io/gcp/bigquery/BigQueryIOTest.java | 25 +++++++++++++-------
.../sdk/io/gcp/bigtable/BigtableIOTest.java | 13 ++++++----
2 files changed, 25 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6dea0992/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
index dc566d2..4ddfdea 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
@@ -643,6 +643,7 @@ public class BigQueryIOTest implements Serializable {
}
}
+ @Rule public final transient TestPipeline p = TestPipeline.create();
@Rule public transient ExpectedException thrown = ExpectedException.none();
@Rule public transient ExpectedLogs logged = ExpectedLogs.none(BigQueryIO.class);
@Rule public transient TemporaryFolder testFolder = new TemporaryFolder();
@@ -1370,7 +1371,7 @@ public class BigQueryIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testBuildWriteWithoutTable() {
- Pipeline p = TestPipeline.create();
+
thrown.expect(IllegalStateException.class);
thrown.expectMessage("must set the table reference");
p.apply(Create.<TableRow>of().withCoder(TableRowJsonCoder.of()))
@@ -1591,9 +1592,11 @@ public class BigQueryIOTest implements Serializable {
@Test
public void testWriteValidateFailsCreateNoSchema() {
+ p.enableAbandonedNodeEnforcement(false);
+
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("no schema was provided");
- TestPipeline.create()
+ p
.apply(Create.<TableRow>of())
.apply(BigQueryIO.Write
.to("dataset.table")
@@ -1602,9 +1605,11 @@ public class BigQueryIOTest implements Serializable {
@Test
public void testWriteValidateFailsTableAndTableSpec() {
+ p.enableAbandonedNodeEnforcement(false);
+
thrown.expect(IllegalStateException.class);
thrown.expectMessage("Cannot set both a table reference and a table function");
- TestPipeline.create()
+ p
.apply(Create.<TableRow>of())
.apply(BigQueryIO.Write
.to("dataset.table")
@@ -1618,9 +1623,11 @@ public class BigQueryIOTest implements Serializable {
@Test
public void testWriteValidateFailsNoTableAndNoTableSpec() {
+ p.enableAbandonedNodeEnforcement(false);
+
thrown.expect(IllegalStateException.class);
thrown.expectMessage("must set the table reference of a BigQueryIO.Write transform");
- TestPipeline.create()
+ p
.apply(Create.<TableRow>of())
.apply("name", BigQueryIO.Write.withoutValidation());
}
@@ -1950,7 +1957,6 @@ public class BigQueryIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testPassThroughThenCleanup() throws Exception {
- Pipeline p = TestPipeline.create();
PCollection<Integer> output = p
.apply(Create.of(1, 2, 3))
@@ -1968,7 +1974,6 @@ public class BigQueryIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testPassThroughThenCleanupExecuted() throws Exception {
- Pipeline p = TestPipeline.create();
p.apply(Create.<Integer>of())
.apply(new PassThroughThenCleanup<Integer>(new CleanupOperation() {
@@ -2025,6 +2030,8 @@ public class BigQueryIOTest implements Serializable {
private void testWritePartition(long numFiles, long fileSize, long expectedNumPartitions)
throws Exception {
+ p.enableAbandonedNodeEnforcement(false);
+
List<Long> expectedPartitionIds = Lists.newArrayList();
for (long i = 1; i <= expectedNumPartitions; ++i) {
expectedPartitionIds.add(i);
@@ -2044,7 +2051,7 @@ public class BigQueryIOTest implements Serializable {
new TupleTag<KV<Long, List<String>>>("singlePartitionTag") {};
PCollectionView<Iterable<KV<String, Long>>> filesView = PCollectionViews.iterableView(
- TestPipeline.create(),
+ p,
WindowingStrategy.globalDefault(),
KvCoder.of(StringUtf8Coder.of(), VarLongCoder.of()));
@@ -2164,6 +2171,8 @@ public class BigQueryIOTest implements Serializable {
@Test
public void testWriteRename() throws Exception {
+ p.enableAbandonedNodeEnforcement(false);
+
FakeBigQueryServices fakeBqServices = new FakeBigQueryServices()
.withJobService(new FakeJobService()
.startJobReturns("done", "done")
@@ -2179,7 +2188,7 @@ public class BigQueryIOTest implements Serializable {
}
PCollectionView<Iterable<String>> tempTablesView = PCollectionViews.iterableView(
- TestPipeline.create(),
+ p,
WindowingStrategy.globalDefault(),
StringUtf8Coder.of());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6dea0992/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 98215df..e3d1f47 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
@@ -106,6 +106,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class BigtableIOTest {
+ @Rule public final transient TestPipeline p = TestPipeline.create();
@Rule public ExpectedException thrown = ExpectedException.none();
@Rule public ExpectedLogs logged = ExpectedLogs.none(BigtableIO.class);
@@ -140,7 +141,7 @@ public class BigtableIOTest {
service = new FakeBigtableService();
defaultRead = defaultRead.withBigtableService(service);
defaultWrite = defaultWrite.withBigtableService(service);
- bigtableCoder = TestPipeline.create().getCoderRegistry().getCoder(BIGTABLE_WRITE_TYPE);
+ bigtableCoder = p.getCoderRegistry().getCoder(BIGTABLE_WRITE_TYPE);
}
@Test
@@ -261,6 +262,8 @@ public class BigtableIOTest {
/** Tests that when reading from a non-existent table, the read fails. */
@Test
public void testReadingFailsTableDoesNotExist() throws Exception {
+ p.enableAbandonedNodeEnforcement(false);
+
final String table = "TEST-TABLE";
BigtableIO.Read read =
@@ -273,7 +276,7 @@ public class BigtableIOTest {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage(String.format("Table %s does not exist", table));
- TestPipeline.create().apply(read);
+ p.apply(read);
}
/** Tests that when reading from an empty table, the read succeeds. */
@@ -589,7 +592,6 @@ public class BigtableIOTest {
service.createTable(table);
- TestPipeline p = TestPipeline.create();
p.apply("single row", Create.of(makeWrite(key, value)).withCoder(bigtableCoder))
.apply("write", defaultWrite.withTableId(table));
p.run();
@@ -606,10 +608,12 @@ public class BigtableIOTest {
/** Tests that when writing to a non-existent table, the write fails. */
@Test
public void testWritingFailsTableDoesNotExist() throws Exception {
+ p.enableAbandonedNodeEnforcement(false);
+
final String table = "TEST-TABLE";
PCollection<KV<ByteString, Iterable<Mutation>>> emptyInput =
- TestPipeline.create().apply(Create.<KV<ByteString, Iterable<Mutation>>>of());
+ p.apply(Create.<KV<ByteString, Iterable<Mutation>>>of());
// Exception will be thrown by write.validate() when write is applied.
thrown.expect(IllegalArgumentException.class);
@@ -625,7 +629,6 @@ public class BigtableIOTest {
final String key = "KEY";
service.createTable(table);
- TestPipeline p = TestPipeline.create();
p.apply(Create.of(makeBadWrite(key)).withCoder(bigtableCoder))
.apply(defaultWrite.withTableId(table));
[04/17] incubator-beam git commit: Migrated the
beam-sdks-java-io-jdbc module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-io-jdbc 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/5ccbe679
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/5ccbe679
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/5ccbe679
Branch: refs/heads/master
Commit: 5ccbe6791af7e75c166ed877391e8c86bba5fe56
Parents: 6dea099
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 17:26:51 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../test/java/org/apache/beam/sdk/io/jdbc/JdbcIOTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5ccbe679/sdks/java/io/jdbc/src/test/java/org/apache/beam/sdk/io/jdbc/JdbcIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/jdbc/src/test/java/org/apache/beam/sdk/io/jdbc/JdbcIOTest.java b/sdks/java/io/jdbc/src/test/java/org/apache/beam/sdk/io/jdbc/JdbcIOTest.java
index aa93a22..eec7cb8 100644
--- a/sdks/java/io/jdbc/src/test/java/org/apache/beam/sdk/io/jdbc/JdbcIOTest.java
+++ b/sdks/java/io/jdbc/src/test/java/org/apache/beam/sdk/io/jdbc/JdbcIOTest.java
@@ -48,6 +48,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
@@ -64,6 +65,9 @@ public class JdbcIOTest implements Serializable {
private static int port;
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
@BeforeClass
public static void startDatabase() throws Exception {
ServerSocket socket = new ServerSocket(0);
@@ -207,7 +211,6 @@ public class JdbcIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testRead() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> output = pipeline.apply(
JdbcIO.<KV<String, Integer>>read()
@@ -245,7 +248,6 @@ public class JdbcIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testReadWithSingleStringParameter() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> output = pipeline.apply(
JdbcIO.<KV<String, Integer>>read()
@@ -278,7 +280,6 @@ public class JdbcIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testWrite() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
ArrayList<KV<Integer, String>> data = new ArrayList<>();
for (int i = 0; i < 1000; i++) {
@@ -316,7 +317,6 @@ public class JdbcIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testWriteWithEmptyPCollection() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
pipeline.apply(Create.of(new ArrayList<KV<Integer, String>>()))
.apply(JdbcIO.<KV<Integer, String>>write()
[06/17] incubator-beam git commit: Migrated the beam-runners-core
module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-runners-core 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/b6710251
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/b6710251
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/b6710251
Branch: refs/heads/master
Commit: b6710251d8bb5d1968aea2258ce5878b43368dd5
Parents: 7106e88
Author: Stas Levin <st...@gmail.com>
Authored: Sun Dec 18 18:51:31 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../runners/core/PushbackSideInputDoFnRunnerTest.java | 5 ++++-
.../org/apache/beam/runners/core/SplittableParDoTest.java | 10 ++++++++--
.../runners/core/UnboundedReadFromBoundedSourceTest.java | 5 +++--
3 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b6710251/runners/core-java/src/test/java/org/apache/beam/runners/core/PushbackSideInputDoFnRunnerTest.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/PushbackSideInputDoFnRunnerTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/PushbackSideInputDoFnRunnerTest.java
index a1cdbf6..251c7c2 100644
--- a/runners/core-java/src/test/java/org/apache/beam/runners/core/PushbackSideInputDoFnRunnerTest.java
+++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/PushbackSideInputDoFnRunnerTest.java
@@ -47,6 +47,7 @@ import org.apache.beam.sdk.values.PCollectionView;
import org.hamcrest.Matchers;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -63,10 +64,12 @@ public class PushbackSideInputDoFnRunnerTest {
private TestDoFnRunner<Integer, Integer> underlying;
private PCollectionView<Integer> singletonView;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- TestPipeline p = TestPipeline.create();
PCollection<Integer> created = p.apply(Create.of(1, 2, 3));
singletonView =
created
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b6710251/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java
index cf96b66..0f0b106 100644
--- a/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java
+++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java
@@ -57,6 +57,7 @@ import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.TupleTagList;
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.JUnit4;
@@ -132,9 +133,13 @@ public class SplittableParDoTest {
return ParDo.of(fn).withOutputTags(MAIN_OUTPUT_TAG, TupleTagList.empty());
}
+ @Rule
+ public TestPipeline pipeline = TestPipeline.create();
+
@Test
public void testBoundednessForBoundedFn() {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
+
DoFn<Integer, String> boundedFn = new BoundedFakeFn();
assertEquals(
"Applying a bounded SDF to a bounded collection produces a bounded collection",
@@ -154,7 +159,8 @@ public class SplittableParDoTest {
@Test
public void testBoundednessForUnboundedFn() {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
+
DoFn<Integer, String> unboundedFn = new UnboundedFakeFn();
assertEquals(
"Applying an unbounded SDF to a bounded collection produces a bounded collection",
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b6710251/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java
index 7fd8807..86450f2 100644
--- a/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java
+++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java
@@ -78,6 +78,9 @@ public class UnboundedReadFromBoundedSourceTest {
@Rule
public transient ExpectedException thrown = ExpectedException.none();
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Test
public void testCheckpointCoderNulls() throws Exception {
CheckpointCoder<String> coder = new CheckpointCoder<>(StringUtf8Coder.of());
@@ -97,8 +100,6 @@ public class UnboundedReadFromBoundedSourceTest {
UnboundedSource<Long, Checkpoint<Long>> unboundedSource =
new BoundedToUnboundedSourceAdapter<>(boundedSource);
- Pipeline p = TestPipeline.create();
-
PCollection<Long> output =
p.apply(Read.from(unboundedSource).withMaxNumRecords(numElements));
[14/17] incubator-beam git commit: Migrated the
beam-sdks-java-io-mongodb module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-io-mongodb 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/fce4f658
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/fce4f658
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/fce4f658
Branch: refs/heads/master
Commit: fce4f6584ca2fd3c2c258405b9f3014be9da3514
Parents: 950aa7e
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 18:09:30 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:46 2016 -0800
----------------------------------------------------------------------
.../org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java | 9 ++++-----
.../java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java | 7 ++++---
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/fce4f658/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java
index df05c93..994be87 100644
--- a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java
+++ b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java
@@ -55,7 +55,6 @@ import java.util.List;
import java.util.Random;
import java.util.Scanner;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.coders.VarIntCoder;
@@ -79,6 +78,7 @@ import org.joda.time.Duration;
import org.joda.time.Instant;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
@@ -100,6 +100,9 @@ public class MongoDBGridFSIOTest implements Serializable {
private static int port;
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
@BeforeClass
public static void setup() throws Exception {
try (ServerSocket serverSocket = new ServerSocket(0)) {
@@ -182,7 +185,6 @@ public class MongoDBGridFSIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testFullRead() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
PCollection<String> output = pipeline.apply(
MongoDbGridFSIO.<String>read()
@@ -212,7 +214,6 @@ public class MongoDBGridFSIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testReadWithParser() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> output = pipeline.apply(
MongoDbGridFSIO.<KV<String, Integer>>read()
@@ -297,8 +298,6 @@ public class MongoDBGridFSIOTest implements Serializable {
@Category(NeedsRunner.class)
public void testWriteMessage() throws Exception {
- Pipeline pipeline = TestPipeline.create();
-
ArrayList<String> data = new ArrayList<>(100);
ArrayList<Integer> intData = new ArrayList<>(100);
for (int i = 0; i < 1000; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/fce4f658/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java
index 5faa618..e7ff712 100644
--- a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java
+++ b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDbIOTest.java
@@ -57,6 +57,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
@@ -80,6 +81,9 @@ public class MongoDbIOTest implements Serializable {
private static int port;
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
/**
* Looking for an available network port.
*/
@@ -143,7 +147,6 @@ public class MongoDbIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testFullRead() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
PCollection<Document> output = pipeline.apply(
MongoDbIO.read()
@@ -177,7 +180,6 @@ public class MongoDbIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testReadWithFilter() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
PCollection<Document> output = pipeline.apply(
MongoDbIO.read()
@@ -195,7 +197,6 @@ public class MongoDbIOTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testWrite() throws Exception {
- TestPipeline pipeline = TestPipeline.create();
ArrayList<Document> data = new ArrayList<>();
for (int i = 0; i < 10000; i++) {
[12/17] incubator-beam git commit: Migrated the
beam-sdks-java-extensions-join-library module to TestPipeline as a JUnit
rule.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-extensions-join-library 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/24ad1831
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/24ad1831
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/24ad1831
Branch: refs/heads/master
Commit: 24ad18319248a128a1c5db4f2bef8861f7361d9f
Parents: 75a4c91
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 00:01:31 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../beam/sdk/extensions/joinlibrary/InnerJoinTest.java | 9 ++++++---
.../sdk/extensions/joinlibrary/OuterLeftJoinTest.java | 10 +++++++---
.../sdk/extensions/joinlibrary/OuterRightJoinTest.java | 10 +++++++---
3 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/24ad1831/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/InnerJoinTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/InnerJoinTest.java b/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/InnerJoinTest.java
index 423ab9c..1c120c2 100644
--- a/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/InnerJoinTest.java
+++ b/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/InnerJoinTest.java
@@ -19,13 +19,13 @@ package org.apache.beam.sdk.extensions.joinlibrary;
import java.util.ArrayList;
import java.util.List;
-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;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
/**
@@ -33,15 +33,16 @@ import org.junit.Test;
*/
public class InnerJoinTest {
- Pipeline p;
List<KV<String, Long>> leftListOfKv;
List<KV<String, String>> listRightOfKv;
List<KV<String, KV<Long, String>>> expectedResult;
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Before
public void setup() {
- p = TestPipeline.create();
leftListOfKv = new ArrayList<>();
listRightOfKv = new ArrayList<>();
@@ -131,11 +132,13 @@ public class InnerJoinTest {
@Test(expected = NullPointerException.class)
public void testJoinLeftCollectionNull() {
+ p.enableAbandonedNodeEnforcement(false);
Join.innerJoin(null, p.apply(Create.of(listRightOfKv)));
}
@Test(expected = NullPointerException.class)
public void testJoinRightCollectionNull() {
+ p.enableAbandonedNodeEnforcement(false);
Join.innerJoin(p.apply(Create.of(leftListOfKv)), null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/24ad1831/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterLeftJoinTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterLeftJoinTest.java b/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterLeftJoinTest.java
index c32163f..81f4fa3 100644
--- a/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterLeftJoinTest.java
+++ b/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterLeftJoinTest.java
@@ -19,13 +19,13 @@ package org.apache.beam.sdk.extensions.joinlibrary;
import java.util.ArrayList;
import java.util.List;
-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;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
@@ -34,15 +34,16 @@ import org.junit.Test;
*/
public class OuterLeftJoinTest {
- Pipeline p;
List<KV<String, Long>> leftListOfKv;
List<KV<String, String>> listRightOfKv;
List<KV<String, KV<Long, String>>> expectedResult;
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Before
public void setup() {
- p = TestPipeline.create();
leftListOfKv = new ArrayList<>();
listRightOfKv = new ArrayList<>();
@@ -133,16 +134,19 @@ public class OuterLeftJoinTest {
@Test(expected = NullPointerException.class)
public void testJoinLeftCollectionNull() {
+ p.enableAbandonedNodeEnforcement(false);
Join.leftOuterJoin(null, p.apply(Create.of(listRightOfKv)), "");
}
@Test(expected = NullPointerException.class)
public void testJoinRightCollectionNull() {
+ p.enableAbandonedNodeEnforcement(false);
Join.leftOuterJoin(p.apply(Create.of(leftListOfKv)), null, "");
}
@Test(expected = NullPointerException.class)
public void testJoinNullValueIsNull() {
+ p.enableAbandonedNodeEnforcement(false);
Join.leftOuterJoin(
p.apply("CreateLeft", Create.of(leftListOfKv)),
p.apply("CreateRight", Create.of(listRightOfKv)),
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/24ad1831/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterRightJoinTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterRightJoinTest.java b/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterRightJoinTest.java
index 5a45f73..249cea3 100644
--- a/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterRightJoinTest.java
+++ b/sdks/java/extensions/join-library/src/test/java/org/apache/beam/sdk/extensions/joinlibrary/OuterRightJoinTest.java
@@ -19,13 +19,13 @@ package org.apache.beam.sdk.extensions.joinlibrary;
import java.util.ArrayList;
import java.util.List;
-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;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
@@ -34,15 +34,16 @@ import org.junit.Test;
*/
public class OuterRightJoinTest {
- Pipeline p;
List<KV<String, Long>> leftListOfKv;
List<KV<String, String>> listRightOfKv;
List<KV<String, KV<Long, String>>> expectedResult;
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Before
public void setup() {
- p = TestPipeline.create();
leftListOfKv = new ArrayList<>();
listRightOfKv = new ArrayList<>();
@@ -133,16 +134,19 @@ public class OuterRightJoinTest {
@Test(expected = NullPointerException.class)
public void testJoinLeftCollectionNull() {
+ p.enableAbandonedNodeEnforcement(false);
Join.rightOuterJoin(null, p.apply(Create.of(listRightOfKv)), "");
}
@Test(expected = NullPointerException.class)
public void testJoinRightCollectionNull() {
+ p.enableAbandonedNodeEnforcement(false);
Join.rightOuterJoin(p.apply(Create.of(leftListOfKv)), null, -1L);
}
@Test(expected = NullPointerException.class)
public void testJoinNullValueIsNull() {
+ p.enableAbandonedNodeEnforcement(false);
Join.rightOuterJoin(
p.apply("CreateLeft", Create.of(leftListOfKv)),
p.apply("CreateRight", Create.of(listRightOfKv)),
[07/17] incubator-beam git commit: Migrated the
beam-runners-direct-java module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-runners-direct-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/09c404a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/09c404a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/09c404a6
Branch: refs/heads/master
Commit: 09c404a6c407898fcbc2fd22797cba4da8839b93
Parents: b671025
Author: Stas Levin <st...@gmail.com>
Authored: Mon Dec 19 10:20:16 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../direct/BoundedReadEvaluatorFactoryTest.java | 13 ++++++-------
.../beam/runners/direct/CloningBundleFactoryTest.java | 8 ++------
.../beam/runners/direct/CommittedResultTest.java | 6 +++++-
.../CopyOnAccessInMemoryStateInternalsTest.java | 11 +++++++++--
.../beam/runners/direct/DirectGraphVisitorTest.java | 3 ++-
.../beam/runners/direct/EvaluationContextTest.java | 7 ++++---
.../runners/direct/FlattenEvaluatorFactoryTest.java | 6 ++++--
.../direct/GroupByKeyEvaluatorFactoryTest.java | 5 ++++-
.../direct/GroupByKeyOnlyEvaluatorFactoryTest.java | 5 ++++-
.../direct/ImmutabilityCheckingBundleFactoryTest.java | 4 +++-
.../direct/ImmutabilityEnforcementFactoryTest.java | 3 ++-
.../direct/ImmutableListBundleFactoryTest.java | 14 +++++++++++---
.../direct/KeyedPValueTrackingVisitorTest.java | 6 +++---
.../beam/runners/direct/ParDoEvaluatorTest.java | 5 ++++-
.../beam/runners/direct/SideInputContainerTest.java | 5 +++--
.../direct/StatefulParDoEvaluatorFactoryTest.java | 7 +++++--
.../beam/runners/direct/StepTransformResultTest.java | 5 ++++-
.../direct/TestStreamEvaluatorFactoryTest.java | 5 ++++-
.../beam/runners/direct/TransformExecutorTest.java | 4 +++-
.../direct/UnboundedReadEvaluatorFactoryTest.java | 9 ++++-----
.../beam/runners/direct/ViewEvaluatorFactoryTest.java | 5 ++++-
.../runners/direct/WatermarkCallbackExecutorTest.java | 5 ++++-
.../beam/runners/direct/WatermarkManagerTest.java | 6 ++++--
.../runners/direct/WindowEvaluatorFactoryTest.java | 5 ++++-
.../runners/direct/WriteWithShardingFactoryTest.java | 14 +++++++-------
25 files changed, 109 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java
index acb1444..97eae27 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/BoundedReadEvaluatorFactoryTest.java
@@ -62,6 +62,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.hamcrest.Matchers;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -82,11 +83,13 @@ public class BoundedReadEvaluatorFactoryTest {
private BundleFactory bundleFactory;
private AppliedPTransform<?, ?, ?> longsProducer;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
source = CountingSource.upTo(10L);
- TestPipeline p = TestPipeline.create();
longs = p.apply(Read.from(source));
factory =
@@ -142,7 +145,7 @@ public class BoundedReadEvaluatorFactoryTest {
elems[i] = (long) i;
}
PCollection<Long> read =
- TestPipeline.create().apply(Read.from(new TestSource<>(VarLongCoder.of(), 5, elems)));
+ p.apply(Read.from(new TestSource<>(VarLongCoder.of(), 5, elems)));
AppliedPTransform<?, ?, ?> transform = DirectGraphs.getProducer(read);
Collection<CommittedBundle<?>> unreadInputs =
new BoundedReadEvaluatorFactory.InputProvider(context).getInitialInputs(transform, 1);
@@ -191,8 +194,7 @@ public class BoundedReadEvaluatorFactoryTest {
BoundedReadEvaluatorFactory factory = new BoundedReadEvaluatorFactory(context, 0L);
PCollection<Long> read =
- TestPipeline.create()
- .apply(Read.from(SourceTestUtils.toUnsplittableSource(CountingSource.upTo(10L))));
+ p.apply(Read.from(SourceTestUtils.toUnsplittableSource(CountingSource.upTo(10L))));
AppliedPTransform<?, ?, ?> transform = DirectGraphs.getProducer(read);
when(context.createRootBundle()).thenReturn(bundleFactory.createRootBundle());
@@ -298,8 +300,6 @@ public class BoundedReadEvaluatorFactoryTest {
@Test
public void boundedSourceEvaluatorClosesReader() throws Exception {
TestSource<Long> source = new TestSource<>(BigEndianLongCoder.of(), 1L, 2L, 3L);
-
- TestPipeline p = TestPipeline.create();
PCollection<Long> pcollection = p.apply(Read.from(source));
AppliedPTransform<?, ?, ?> sourceTransform = DirectGraphs.getProducer(pcollection);
@@ -320,7 +320,6 @@ public class BoundedReadEvaluatorFactoryTest {
public void boundedSourceEvaluatorNoElementsClosesReader() throws Exception {
TestSource<Long> source = new TestSource<>(BigEndianLongCoder.of());
- TestPipeline p = TestPipeline.create();
PCollection<Long> pcollection = p.apply(Read.from(source));
AppliedPTransform<?, ?, ?> sourceTransform = DirectGraphs.getProducer(pcollection);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
index bafab59..e5299a2 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
@@ -62,6 +62,8 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class CloningBundleFactoryTest {
@Rule public ExpectedException thrown = ExpectedException.none();
+ @Rule public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
private CloningBundleFactory factory = CloningBundleFactory.create();
@Test
@@ -76,7 +78,6 @@ public class CloningBundleFactoryTest {
@Test
public void bundleWorkingCoderSucceedsClonesOutput() {
- TestPipeline p = TestPipeline.create();
PCollection<Integer> created = p.apply(Create.of(1, 3).withCoder(VarIntCoder.of()));
PCollection<KV<String, Integer>> kvs =
created
@@ -101,7 +102,6 @@ public class CloningBundleFactoryTest {
@Test
public void keyedBundleWorkingCoderSucceedsClonesOutput() {
- TestPipeline p = TestPipeline.create();
PCollection<Integer> created = p.apply(Create.of(1, 3).withCoder(VarIntCoder.of()));
PCollection<KV<String, Iterable<Integer>>> keyed =
@@ -130,7 +130,6 @@ public class CloningBundleFactoryTest {
@Test
public void bundleEncodeFailsAddFails() {
- TestPipeline p = TestPipeline.create();
PCollection<Record> pc = p.apply(Create.<Record>of().withCoder(new RecordNoEncodeCoder()));
UncommittedBundle<Record> bundle = factory.createBundle(pc);
@@ -142,7 +141,6 @@ public class CloningBundleFactoryTest {
@Test
public void bundleDecodeFailsAddFails() {
- TestPipeline p = TestPipeline.create();
PCollection<Record> pc = p.apply(Create.<Record>of().withCoder(new RecordNoDecodeCoder()));
UncommittedBundle<Record> bundle = factory.createBundle(pc);
@@ -154,7 +152,6 @@ public class CloningBundleFactoryTest {
@Test
public void keyedBundleEncodeFailsAddFails() {
- TestPipeline p = TestPipeline.create();
PCollection<Record> pc = p.apply(Create.<Record>of().withCoder(new RecordNoEncodeCoder()));
UncommittedBundle<Record> bundle =
factory.createKeyedBundle(StructuralKey.of("foo", StringUtf8Coder.of()), pc);
@@ -167,7 +164,6 @@ public class CloningBundleFactoryTest {
@Test
public void keyedBundleDecodeFailsAddFails() {
- TestPipeline p = TestPipeline.create();
PCollection<Record> pc = p.apply(Create.<Record>of().withCoder(new RecordNoDecodeCoder()));
UncommittedBundle<Record> bundle =
factory.createKeyedBundle(StructuralKey.of("foo", StringUtf8Coder.of()), pc);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CommittedResultTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CommittedResultTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CommittedResultTest.java
index c6986c0..736f554 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CommittedResultTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CommittedResultTest.java
@@ -38,6 +38,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PDone;
import org.hamcrest.Matchers;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -47,7 +48,10 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class CommittedResultTest implements Serializable {
- private transient TestPipeline p = TestPipeline.create();
+
+ @Rule
+ public transient TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
private transient PCollection<Integer> created = p.apply(Create.of(1, 2));
private transient AppliedPTransform<?, ?, ?> transform =
AppliedPTransform.of("foo", p.begin(), PDone.in(p), new PTransform<PBegin, PDone>() {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java
index deefc68..35245f4 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java
@@ -61,8 +61,15 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class CopyOnAccessInMemoryStateInternalsTest {
+
+ @Rule public TestPipeline pipeline = TestPipeline.create();
@Rule public ExpectedException thrown = ExpectedException.none();
private String key = "foo";
+
+ public CopyOnAccessInMemoryStateInternalsTest() {
+ pipeline = TestPipeline.create();
+ }
+
@Test
public void testGetWithEmpty() {
CopyOnAccessInMemoryStateInternals<String> internals =
@@ -167,7 +174,7 @@ public class CopyOnAccessInMemoryStateInternalsTest {
CombineFn<Long, long[], Long> sumLongFn = new Sum.SumLongFn();
StateNamespace namespace = new StateNamespaceForTest("foo");
- CoderRegistry reg = TestPipeline.create().getCoderRegistry();
+ CoderRegistry reg = pipeline.getCoderRegistry();
StateTag<Object, AccumulatorCombiningState<Long, long[], Long>> stateTag =
StateTags.combiningValue("summer",
sumLongFn.getAccumulatorCoder(reg, reg.getDefaultCoder(Long.class)), sumLongFn);
@@ -197,7 +204,7 @@ public class CopyOnAccessInMemoryStateInternalsTest {
KeyedCombineFn<String, Long, long[], Long> sumLongFn = new Sum.SumLongFn().asKeyedFn();
StateNamespace namespace = new StateNamespaceForTest("foo");
- CoderRegistry reg = TestPipeline.create().getCoderRegistry();
+ CoderRegistry reg = pipeline.getCoderRegistry();
StateTag<String, AccumulatorCombiningState<Long, long[], Long>> stateTag =
StateTags.keyedCombiningValue(
"summer",
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectGraphVisitorTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectGraphVisitorTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectGraphVisitorTest.java
index b88c9a4..c3bbe2d 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectGraphVisitorTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectGraphVisitorTest.java
@@ -60,8 +60,9 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class DirectGraphVisitorTest implements Serializable {
@Rule public transient ExpectedException thrown = ExpectedException.none();
+ @Rule public transient TestPipeline p = TestPipeline.create()
+ .enableAbandonedNodeEnforcement(false);
- private transient TestPipeline p = TestPipeline.create();
private transient DirectGraphVisitor visitor = new DirectGraphVisitor();
@Test
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java
index f11c370..bf36204 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java
@@ -68,6 +68,7 @@ import org.apache.beam.sdk.values.PCollectionView;
import org.hamcrest.Matchers;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -77,7 +78,6 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class EvaluationContextTest {
- private TestPipeline p;
private EvaluationContext context;
private PCollection<Integer> created;
@@ -92,13 +92,14 @@ public class EvaluationContextTest {
private AppliedPTransform<?, ?, ?> viewProducer;
private AppliedPTransform<?, ?, ?> unboundedProducer;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
DirectRunner runner =
DirectRunner.fromOptions(PipelineOptionsFactory.create());
- p = TestPipeline.create();
-
created = p.apply(Create.of(1, 2, 3));
downstream = created.apply(WithKeys.<String, Integer>of("foo"));
view = created.apply(View.<Integer>asIterable());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/FlattenEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/FlattenEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/FlattenEvaluatorFactoryTest.java
index 9e22c36..cda68f0 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/FlattenEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/FlattenEvaluatorFactoryTest.java
@@ -37,6 +37,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionList;
import org.hamcrest.Matchers;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -48,9 +49,11 @@ import org.junit.runners.JUnit4;
public class FlattenEvaluatorFactoryTest {
private BundleFactory bundleFactory = ImmutableListBundleFactory.create();
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Test
public void testFlattenInMemoryEvaluator() throws Exception {
- TestPipeline p = TestPipeline.create();
PCollection<Integer> left = p.apply("left", Create.of(1, 2, 4));
PCollection<Integer> right = p.apply("right", Create.of(-1, 2, -4));
PCollectionList<Integer> list = PCollectionList.of(left).and(right);
@@ -118,7 +121,6 @@ public class FlattenEvaluatorFactoryTest {
@Test
public void testFlattenInMemoryEvaluatorWithEmptyPCollectionList() throws Exception {
- TestPipeline p = TestPipeline.create();
PCollectionList<Integer> list = PCollectionList.empty(p);
PCollection<Integer> flattened = list.apply(Flatten.<Integer>pCollections());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyEvaluatorFactoryTest.java
index f0b29f0..fefafd0 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyEvaluatorFactoryTest.java
@@ -41,6 +41,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -52,9 +53,11 @@ import org.junit.runners.JUnit4;
public class GroupByKeyEvaluatorFactoryTest {
private BundleFactory bundleFactory = ImmutableListBundleFactory.create();
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Test
public void testInMemoryEvaluator() throws Exception {
- TestPipeline p = TestPipeline.create();
KV<String, Integer> firstFoo = KV.of("foo", -1);
KV<String, Integer> secondFoo = KV.of("foo", 1);
KV<String, Integer> thirdFoo = KV.of("foo", 3);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyOnlyEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyOnlyEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyOnlyEvaluatorFactoryTest.java
index 7efdb3d..94514ad 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyOnlyEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/GroupByKeyOnlyEvaluatorFactoryTest.java
@@ -41,6 +41,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -52,9 +53,11 @@ import org.junit.runners.JUnit4;
public class GroupByKeyOnlyEvaluatorFactoryTest {
private BundleFactory bundleFactory = ImmutableListBundleFactory.create();
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Test
public void testInMemoryEvaluator() throws Exception {
- TestPipeline p = TestPipeline.create();
KV<String, Integer> firstFoo = KV.of("foo", -1);
KV<String, Integer> secondFoo = KV.of("foo", 1);
KV<String, Integer> thirdFoo = KV.of("foo", 3);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java
index 6ab8aea..2448078 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java
@@ -46,14 +46,16 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class ImmutabilityCheckingBundleFactoryTest {
+
+ @Rule public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
@Rule public ExpectedException thrown = ExpectedException.none();
private ImmutabilityCheckingBundleFactory factory;
private PCollection<byte[]> created;
private PCollection<byte[]> transformed;
+
@Before
public void setup() {
- TestPipeline p = TestPipeline.create();
created = p.apply(Create.<byte[]>of().withCoder(ByteArrayCoder.of()));
transformed = created.apply(ParDo.of(new IdentityDoFn<byte[]>()));
DirectGraphVisitor visitor = new DirectGraphVisitor();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityEnforcementFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityEnforcementFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityEnforcementFactoryTest.java
index 1ad6ba6..cd3e9b4 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityEnforcementFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityEnforcementFactoryTest.java
@@ -42,6 +42,8 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class ImmutabilityEnforcementFactoryTest implements Serializable {
+ @Rule public transient TestPipeline p =
+ TestPipeline.create().enableAbandonedNodeEnforcement(false);
@Rule public transient ExpectedException thrown = ExpectedException.none();
private transient ImmutabilityEnforcementFactory factory;
private transient BundleFactory bundleFactory;
@@ -52,7 +54,6 @@ public class ImmutabilityEnforcementFactoryTest implements Serializable {
public void setup() {
factory = new ImmutabilityEnforcementFactory();
bundleFactory = ImmutableListBundleFactory.create();
- TestPipeline p = TestPipeline.create();
pcollection =
p.apply(Create.of("foo".getBytes(), "spamhameggs".getBytes()))
.apply(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java
index a36c408..46f02cd 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java
@@ -57,6 +57,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class ImmutableListBundleFactoryTest {
+ @Rule public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
@Rule public ExpectedException thrown = ExpectedException.none();
private ImmutableListBundleFactory bundleFactory = ImmutableListBundleFactory.create();
@@ -66,13 +67,12 @@ public class ImmutableListBundleFactoryTest {
@Before
public void setup() {
- TestPipeline p = TestPipeline.create();
created = p.apply(Create.of(1, 2, 3));
downstream = created.apply(WithKeys.<String, Integer>of("foo"));
}
private <T> void createKeyedBundle(Coder<T> coder, T key) throws Exception {
- PCollection<Integer> pcollection = TestPipeline.create().apply(Create.of(1));
+ PCollection<Integer> pcollection = p.apply("Create", Create.of(1));
StructuralKey<?> skey = StructuralKey.of(key, coder);
UncommittedBundle<Integer> inFlightBundle = bundleFactory.createKeyedBundle(skey, pcollection);
@@ -87,9 +87,17 @@ public class ImmutableListBundleFactoryTest {
}
@Test
- public void keyedWithKeyShouldCreateKeyedBundle() throws Exception {
+ public void keyedWithStringKeyShouldCreateKeyedBundle() throws Exception {
createKeyedBundle(StringUtf8Coder.of(), "foo");
+ }
+
+ @Test
+ public void keyedWithVarIntKeyShouldCreateKeyedBundle() throws Exception {
createKeyedBundle(VarIntCoder.of(), 1234);
+ }
+
+ @Test
+ public void keyedWithByteArrayKeyShouldCreateKeyedBundle() throws Exception {
createKeyedBundle(ByteArrayCoder.of(), new byte[] {0, 2, 4, 99});
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/KeyedPValueTrackingVisitorTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/KeyedPValueTrackingVisitorTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/KeyedPValueTrackingVisitorTest.java
index 0852cd3..eef3375 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/KeyedPValueTrackingVisitorTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/KeyedPValueTrackingVisitorTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertThat;
import com.google.common.collect.ImmutableSet;
import java.util.Collections;
import java.util.Set;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.IterableCoder;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.VarIntCoder;
@@ -53,11 +52,12 @@ public class KeyedPValueTrackingVisitorTest {
@Rule public ExpectedException thrown = ExpectedException.none();
private KeyedPValueTrackingVisitor visitor;
- private Pipeline p;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
@Before
public void setup() {
- p = TestPipeline.create();
+
@SuppressWarnings("rawtypes")
Set<Class<? extends PTransform>> producesKeyed =
ImmutableSet.<Class<? extends PTransform>>of(PrimitiveKeyer.class, CompositeKeyer.class);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java
index d48ac14..1a3207b 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java
@@ -54,6 +54,7 @@ import org.apache.beam.sdk.values.TupleTagList;
import org.hamcrest.Matchers;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -72,10 +73,12 @@ public class ParDoEvaluatorTest {
private List<TupleTag<?>> sideOutputTags;
private BundleFactory bundleFactory;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- TestPipeline p = TestPipeline.create();
inputPc = p.apply(Create.of(1, 2, 3));
mainOutputTag = new TupleTag<Integer>() {};
sideOutputTags = TupleTagList.empty().getAll();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/SideInputContainerTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/SideInputContainerTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/SideInputContainerTest.java
index cc7d88a..183decd 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/SideInputContainerTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/SideInputContainerTest.java
@@ -96,12 +96,14 @@ public class SideInputContainerTest {
};
@Rule
+ public TestPipeline pipeline = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
+ @Rule
public ExpectedException thrown = ExpectedException.none();
@Mock
private EvaluationContext context;
- private TestPipeline pipeline;
private SideInputContainer container;
@@ -114,7 +116,6 @@ public class SideInputContainerTest {
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- pipeline = TestPipeline.create();
PCollection<Integer> create =
pipeline.apply("forBaseCollection", Create.<Integer>of(1, 2, 3, 4));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java
index 326310b..d312aa3 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java
@@ -67,6 +67,7 @@ import org.apache.beam.sdk.values.PCollectionView;
import org.joda.time.Duration;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -91,6 +92,10 @@ public class StatefulParDoEvaluatorFactoryTest implements Serializable {
private static final BundleFactory BUNDLE_FACTORY = ImmutableListBundleFactory.create();
+ @Rule
+ public transient TestPipeline pipeline =
+ TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
@@ -106,7 +111,6 @@ public class StatefulParDoEvaluatorFactoryTest implements Serializable {
public void windowCleanupScheduled() throws Exception {
// To test the factory, first we set up a pipeline and then we use the constructed
// pipeline to create the right parameters to pass to the factory
- TestPipeline pipeline = TestPipeline.create();
final String stateId = "my-state-id";
@@ -208,7 +212,6 @@ public class StatefulParDoEvaluatorFactoryTest implements Serializable {
public void testUnprocessedElements() throws Exception {
// To test the factory, first we set up a pipeline and then we use the constructed
// pipeline to create the right parameters to pass to the factory
- TestPipeline pipeline = TestPipeline.create();
final String stateId = "my-state-id";
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StepTransformResultTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StepTransformResultTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StepTransformResultTest.java
index d3a2cca..0d94b7a 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StepTransformResultTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StepTransformResultTest.java
@@ -31,6 +31,7 @@ import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.values.PCollection;
import org.hamcrest.Matchers;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -44,9 +45,11 @@ public class StepTransformResultTest {
private BundleFactory bundleFactory;
private PCollection<Integer> pc;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
- TestPipeline p = TestPipeline.create();
pc = p.apply(Create.of(1, 2, 3));
transform = DirectGraphs.getGraph(p).getProducer(pc);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TestStreamEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TestStreamEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TestStreamEvaluatorFactoryTest.java
index 6bb8623..c5b3b3d 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TestStreamEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TestStreamEvaluatorFactoryTest.java
@@ -41,6 +41,7 @@ import org.hamcrest.Matchers;
import org.joda.time.Duration;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -52,6 +53,9 @@ public class TestStreamEvaluatorFactoryTest {
private BundleFactory bundleFactory;
private EvaluationContext context;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
context = mock(EvaluationContext.class);
@@ -62,7 +66,6 @@ public class TestStreamEvaluatorFactoryTest {
/** Demonstrates that returned evaluators produce elements in sequence. */
@Test
public void producesElementsInSequence() throws Exception {
- TestPipeline p = TestPipeline.create();
PCollection<Integer> streamVals =
p.apply(
TestStream.create(VarIntCoder.of())
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TransformExecutorTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TransformExecutorTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TransformExecutorTest.java
index 4ad22bc..e66ffcf 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TransformExecutorTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/TransformExecutorTest.java
@@ -73,6 +73,9 @@ public class TransformExecutorTest {
@Mock private EvaluationContext evaluationContext;
@Mock private TransformEvaluatorRegistry registry;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
@@ -85,7 +88,6 @@ public class TransformExecutorTest {
evaluatorCompleted = new CountDownLatch(1);
completionCallback = new RegisteringCompletionCallback(evaluatorCompleted);
- TestPipeline p = TestPipeline.create();
created = p.apply(Create.of("foo", "spam", "third"));
PCollection<KV<Integer, String>> downstream = created.apply(WithKeys.<Integer, String>of(3));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/UnboundedReadEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/UnboundedReadEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/UnboundedReadEvaluatorFactoryTest.java
index dd36a2f..92d668e 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/UnboundedReadEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/UnboundedReadEvaluatorFactoryTest.java
@@ -72,6 +72,7 @@ import org.joda.time.DateTime;
import org.joda.time.Instant;
import org.joda.time.ReadableInstant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -93,10 +94,12 @@ public class UnboundedReadEvaluatorFactoryTest {
private UnboundedSource<Long, ?> source;
private DirectGraph graph;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
source = CountingSource.unboundedWithTimestampFn(new LongToInstantFn());
- TestPipeline p = TestPipeline.create();
longs = p.apply(Read.from(source));
context = mock(EvaluationContext.class);
@@ -190,7 +193,6 @@ public class UnboundedReadEvaluatorFactoryTest {
new TestUnboundedSource<>(BigEndianLongCoder.of(), outputs);
source.dedupes = true;
- TestPipeline p = TestPipeline.create();
PCollection<Long> pcollection = p.apply(Read.from(source));
AppliedPTransform<?, ?, ?> sourceTransform = getProducer(pcollection);
@@ -231,7 +233,6 @@ public class UnboundedReadEvaluatorFactoryTest {
@Test
public void noElementsAvailableReaderIncludedInResidual() throws Exception {
- TestPipeline p = TestPipeline.create();
// Read with a very slow rate so by the second read there are no more elements
PCollection<Long> pcollection =
p.apply(Read.from(new TestUnboundedSource<>(VarLongCoder.of(), 1L)));
@@ -291,7 +292,6 @@ public class UnboundedReadEvaluatorFactoryTest {
TestUnboundedSource<Long> source =
new TestUnboundedSource<>(BigEndianLongCoder.of(), elems.toArray(new Long[0]));
- TestPipeline p = TestPipeline.create();
PCollection<Long> pcollection = p.apply(Read.from(source));
DirectGraph graph = DirectGraphs.getGraph(p);
AppliedPTransform<?, ?, ?> sourceTransform =
@@ -337,7 +337,6 @@ public class UnboundedReadEvaluatorFactoryTest {
TestUnboundedSource<Long> source =
new TestUnboundedSource<>(BigEndianLongCoder.of(), elems.toArray(new Long[0]));
- TestPipeline p = TestPipeline.create();
PCollection<Long> pcollection = p.apply(Read.from(source));
AppliedPTransform<?, ?, ?> sourceTransform =
DirectGraphs.getGraph(p).getProducer(pcollection);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ViewEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ViewEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ViewEvaluatorFactoryTest.java
index 7c08009..6baf55a 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ViewEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ViewEvaluatorFactoryTest.java
@@ -41,6 +41,7 @@ import org.apache.beam.sdk.util.WindowedValue;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionView;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -52,9 +53,11 @@ import org.junit.runners.JUnit4;
public class ViewEvaluatorFactoryTest {
private BundleFactory bundleFactory = ImmutableListBundleFactory.create();
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Test
public void testInMemoryEvaluator() throws Exception {
- TestPipeline p = TestPipeline.create();
PCollection<String> input = p.apply(Create.of("foo", "bar"));
CreatePCollectionView<String, Iterable<String>> createView =
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkCallbackExecutorTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkCallbackExecutorTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkCallbackExecutorTest.java
index acdabb6..8d6e73f 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkCallbackExecutorTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkCallbackExecutorTest.java
@@ -37,6 +37,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.joda.time.Duration;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -51,9 +52,11 @@ public class WatermarkCallbackExecutorTest {
private AppliedPTransform<?, ?, ?> create;
private AppliedPTransform<?, ?, ?> sum;
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
- TestPipeline p = TestPipeline.create();
PCollection<Integer> created = p.apply(Create.of(1, 2, 3));
PCollection<Integer> summed = created.apply(Sum.integersGlobally());
DirectGraph graph = DirectGraphs.getGraph(p);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
index eb4d0cd..abc8a28 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
@@ -70,6 +70,7 @@ import org.hamcrest.Matchers;
import org.joda.time.Instant;
import org.joda.time.ReadableInstant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -94,9 +95,11 @@ public class WatermarkManagerTest implements Serializable {
private transient BundleFactory bundleFactory;
private DirectGraph graph;
+ @Rule
+ public transient TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
- TestPipeline p = TestPipeline.create();
createdInts = p.apply("createdInts", Create.of(1, 2, 3));
@@ -278,7 +281,6 @@ public class WatermarkManagerTest implements Serializable {
*/
@Test
public void getWatermarkMultiIdenticalInput() {
- TestPipeline p = TestPipeline.create();
PCollection<Integer> created = p.apply(Create.of(1, 2, 3));
PCollection<Integer> multiConsumer =
PCollectionList.of(created).and(created).apply(Flatten.<Integer>pCollections());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WindowEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WindowEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WindowEvaluatorFactoryTest.java
index 66c28ce..9d0c68d 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WindowEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WindowEvaluatorFactoryTest.java
@@ -52,6 +52,7 @@ import org.hamcrest.Matchers;
import org.joda.time.Duration;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -96,10 +97,12 @@ public class WindowEvaluatorFactoryTest {
ImmutableList.of(GlobalWindow.INSTANCE, intervalWindow1, intervalWindow2),
PaneInfo.NO_FIRING);
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- TestPipeline p = TestPipeline.create();
input = p.apply(Create.of(1L, 2L, 3L));
bundleFactory = ImmutableListBundleFactory.create();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/09c404a6/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
index aeb75ed..a8c4c02 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
@@ -69,6 +69,7 @@ public class WriteWithShardingFactoryTest {
public static final int INPUT_SIZE = 10000;
@Rule public TemporaryFolder tmp = new TemporaryFolder();
private WriteWithShardingFactory<Object> factory = new WriteWithShardingFactory<>();
+ @Rule public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
@Test
public void dynamicallyReshardedWrite() throws Exception {
@@ -81,7 +82,6 @@ public class WriteWithShardingFactoryTest {
String fileName = "resharded_write";
String outputPath = tmp.getRoot().getAbsolutePath();
String targetLocation = IOChannelUtils.resolve(outputPath, fileName);
- TestPipeline p = TestPipeline.create();
// TextIO is implemented in terms of the Write PTransform. When sharding is not specified,
// resharding should be automatically applied
p.apply(Create.of(strs)).apply(TextIO.Write.to(targetLocation));
@@ -134,7 +134,7 @@ public class WriteWithShardingFactoryTest {
public void keyBasedOnCountFnWithOneElement() throws Exception {
PCollectionView<Long> elementCountView =
PCollectionViews.singletonView(
- TestPipeline.create(), WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
+ p, WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
KeyBasedOnCountFn<String> fn = new KeyBasedOnCountFn<>(elementCountView, 0);
DoFnTester<String, KV<Integer, String>> fnTester = DoFnTester.of(fn);
@@ -149,7 +149,7 @@ public class WriteWithShardingFactoryTest {
public void keyBasedOnCountFnWithTwoElements() throws Exception {
PCollectionView<Long> elementCountView =
PCollectionViews.singletonView(
- TestPipeline.create(), WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
+ p, WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
KeyBasedOnCountFn<String> fn = new KeyBasedOnCountFn<>(elementCountView, 0);
DoFnTester<String, KV<Integer, String>> fnTester = DoFnTester.of(fn);
@@ -167,7 +167,7 @@ public class WriteWithShardingFactoryTest {
public void keyBasedOnCountFnFewElementsThreeShards() throws Exception {
PCollectionView<Long> elementCountView =
PCollectionViews.singletonView(
- TestPipeline.create(), WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
+ p, WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
KeyBasedOnCountFn<String> fn = new KeyBasedOnCountFn<>(elementCountView, 0);
DoFnTester<String, KV<Integer, String>> fnTester = DoFnTester.of(fn);
@@ -191,7 +191,7 @@ public class WriteWithShardingFactoryTest {
public void keyBasedOnCountFnManyElements() throws Exception {
PCollectionView<Long> elementCountView =
PCollectionViews.singletonView(
- TestPipeline.create(), WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
+ p, WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
KeyBasedOnCountFn<String> fn = new KeyBasedOnCountFn<>(elementCountView, 0);
DoFnTester<String, KV<Integer, String>> fnTester = DoFnTester.of(fn);
@@ -214,7 +214,7 @@ public class WriteWithShardingFactoryTest {
public void keyBasedOnCountFnFewElementsExtraShards() throws Exception {
PCollectionView<Long> elementCountView =
PCollectionViews.singletonView(
- TestPipeline.create(), WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
+ p, WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
KeyBasedOnCountFn<String> fn = new KeyBasedOnCountFn<>(elementCountView, 10);
DoFnTester<String, KV<Integer, String>> fnTester = DoFnTester.of(fn);
@@ -238,7 +238,7 @@ public class WriteWithShardingFactoryTest {
public void keyBasedOnCountFnManyElementsExtraShards() throws Exception {
PCollectionView<Long> elementCountView =
PCollectionViews.singletonView(
- TestPipeline.create(), WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
+ p, WindowingStrategy.globalDefault(), true, 0L, VarLongCoder.of());
KeyBasedOnCountFn<String> fn = new KeyBasedOnCountFn<>(elementCountView, 3);
DoFnTester<String, KV<Integer, String>> fnTester = DoFnTester.of(fn);
[05/17] incubator-beam git commit: Migrated the beam-sdks-java-io-jms
module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-io-jms 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/8d478c0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/8d478c0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/8d478c0f
Branch: refs/heads/master
Commit: 8d478c0f38c656d3533d590a65c6ed95da229f81
Parents: 5ccbe67
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 17:31:23 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8d478c0f/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java b/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java
index 4c3be6d..7259ce8 100644
--- a/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java
+++ b/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java
@@ -28,7 +28,6 @@ import javax.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.TestPipeline;
@@ -38,6 +37,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -55,6 +55,9 @@ public class JmsIOTest {
private BrokerService broker;
private ConnectionFactory connectionFactory;
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
@Before
public void startBroker() throws Exception {
broker = new BrokerService();
@@ -92,8 +95,6 @@ public class JmsIOTest {
session.close();
connection.close();
- Pipeline pipeline = TestPipeline.create();
-
// read from the queue
PCollection<JmsRecord> output = pipeline.apply(
JmsIO.read()
@@ -117,8 +118,6 @@ public class JmsIOTest {
@Category(NeedsRunner.class)
public void testWriteMessage() throws Exception {
- Pipeline pipeline = TestPipeline.create();
-
ArrayList<String> data = new ArrayList<>();
for (int i = 0; i < 100; i++) {
data.add("Message " + i);
[02/17] incubator-beam git commit: Migrated the beam-examples-java8
module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-examples-java8 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/7106e880
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7106e880
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7106e880
Branch: refs/heads/master
Commit: 7106e8806f32089eab36e6feee4928026bf52714
Parents: 8306899
Author: Stas Levin <st...@gmail.com>
Authored: Sun Dec 18 18:38:11 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:44 2016 -0800
----------------------------------------------------------------------
.../apache/beam/examples/MinimalWordCountJava8Test.java | 6 ++++--
.../beam/examples/complete/game/GameStatsTest.java | 7 ++++---
.../beam/examples/complete/game/HourlyTeamScoreTest.java | 5 +++--
.../beam/examples/complete/game/LeaderBoardTest.java | 11 +++++------
.../beam/examples/complete/game/UserScoreTest.java | 10 +++++-----
5 files changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7106e880/examples/java8/src/test/java/org/apache/beam/examples/MinimalWordCountJava8Test.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/test/java/org/apache/beam/examples/MinimalWordCountJava8Test.java b/examples/java8/src/test/java/org/apache/beam/examples/MinimalWordCountJava8Test.java
index f373343..c2f3efe 100644
--- a/examples/java8/src/test/java/org/apache/beam/examples/MinimalWordCountJava8Test.java
+++ b/examples/java8/src/test/java/org/apache/beam/examples/MinimalWordCountJava8Test.java
@@ -26,7 +26,6 @@ import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.Arrays;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.io.TextIO;
import org.apache.beam.sdk.options.GcsOptions;
import org.apache.beam.sdk.testing.TestPipeline;
@@ -38,6 +37,7 @@ import org.apache.beam.sdk.util.GcsUtil;
import org.apache.beam.sdk.util.gcsfs.GcsPath;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.TypeDescriptors;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -52,12 +52,14 @@ import org.mockito.stubbing.Answer;
@RunWith(JUnit4.class)
public class MinimalWordCountJava8Test implements Serializable {
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
/**
* A basic smoke test that ensures there is no crash at pipeline construction time.
*/
@Test
public void testMinimalWordCountJava8() throws Exception {
- Pipeline p = TestPipeline.create();
p.getOptions().as(GcsOptions.class).setGcsUtil(buildMockGcsUtil());
p.apply(TextIO.Read.from("gs://apache-beam-samples/shakespeare/*"))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7106e880/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
index 8e12c46..da2bb91 100644
--- a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
+++ b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/GameStatsTest.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
import org.apache.beam.examples.complete.game.GameStats.CalculateSpammyUsers;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.RunnableOnService;
@@ -29,6 +28,7 @@ import org.apache.beam.sdk.testing.TestPipeline;
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;
@@ -58,12 +58,13 @@ public class GameStatsTest implements Serializable {
static final List<KV<String, Integer>> SPAMMERS = Arrays.asList(
KV.of("Robot-2", 66), KV.of("Robot-1", 116));
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
/** Test the calculation of 'spammy users'. */
@Test
@Category(RunnableOnService.class)
public void testCalculateSpammyUsers() throws Exception {
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input = p.apply(Create.of(USER_SCORES));
PCollection<KV<String, Integer>> output = input.apply(new CalculateSpammyUsers());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7106e880/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
index cc42d52..34a0744 100644
--- a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
+++ b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.beam.examples.complete.game.UserScore.GameActionInfo;
import org.apache.beam.examples.complete.game.UserScore.ParseEventFn;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.testing.PAssert;
@@ -36,6 +35,7 @@ import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.TypeDescriptors;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -81,12 +81,13 @@ public class HourlyTeamScoreTest implements Serializable {
KV.of("user18_BananaEmu", 1), KV.of("user18_ApricotCaneToad", 14)
};
+ @Rule
+ public TestPipeline p = TestPipeline.create();
/** Test the filtering. */
@Test
@Category(RunnableOnService.class)
public void testUserScoresFilter() throws Exception {
- Pipeline p = TestPipeline.create();
final Instant startMinTimestamp = new Instant(1447965680000L);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7106e880/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
index 2b51da1..745c210 100644
--- a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
+++ b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
@@ -41,6 +41,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.JUnit4;
@@ -54,6 +55,8 @@ public class LeaderBoardTest implements Serializable {
private static final Duration TEAM_WINDOW_DURATION = Duration.standardMinutes(20);
private Instant baseTime = new Instant(0);
+ @Rule
+ public TestPipeline p = TestPipeline.create();
/**
* Some example users, on two separate teams.
*/
@@ -84,7 +87,6 @@ public class LeaderBoardTest implements Serializable {
*/
@Test
public void testTeamScoresOnTime() {
- TestPipeline p = TestPipeline.create();
TestStream<GameActionInfo> createEvents = TestStream.create(AvroCoder.of(GameActionInfo.class))
// Start at the epoch
@@ -120,7 +122,6 @@ public class LeaderBoardTest implements Serializable {
*/
@Test
public void testTeamScoresSpeculative() {
- TestPipeline p = TestPipeline.create();
TestStream<GameActionInfo> createEvents = TestStream.create(AvroCoder.of(GameActionInfo.class))
// Start at the epoch
@@ -170,7 +171,6 @@ public class LeaderBoardTest implements Serializable {
*/
@Test
public void testTeamScoresUnobservablyLate() {
- TestPipeline p = TestPipeline.create();
BoundedWindow window = new IntervalWindow(baseTime, TEAM_WINDOW_DURATION);
TestStream<GameActionInfo> createEvents = TestStream.create(AvroCoder.of(GameActionInfo.class))
@@ -208,7 +208,6 @@ public class LeaderBoardTest implements Serializable {
*/
@Test
public void testTeamScoresObservablyLate() {
- TestPipeline p = TestPipeline.create();
Instant firstWindowCloses = baseTime.plus(ALLOWED_LATENESS).plus(TEAM_WINDOW_DURATION);
TestStream<GameActionInfo> createEvents = TestStream.create(AvroCoder.of(GameActionInfo.class))
@@ -268,7 +267,6 @@ public class LeaderBoardTest implements Serializable {
*/
@Test
public void testTeamScoresDroppablyLate() {
- TestPipeline p = TestPipeline.create();
BoundedWindow window = new IntervalWindow(baseTime, TEAM_WINDOW_DURATION);
TestStream<GameActionInfo> infos = TestStream.create(AvroCoder.of(GameActionInfo.class))
@@ -299,6 +297,8 @@ public class LeaderBoardTest implements Serializable {
// No elements are added before the watermark passes the end of the window plus the allowed
// lateness, so no refinement should be emitted
PAssert.that(teamScores).inFinalPane(window).empty();
+
+ p.run().waitUntilFinish();
}
/**
@@ -308,7 +308,6 @@ public class LeaderBoardTest implements Serializable {
*/
@Test
public void testUserScore() {
- TestPipeline p = TestPipeline.create();
TestStream<GameActionInfo> infos =
TestStream.create(AvroCoder.of(GameActionInfo.class))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7106e880/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
index 39de333..3b77b26 100644
--- a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
+++ b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.beam.examples.complete.game.UserScore.ExtractAndSumScore;
import org.apache.beam.examples.complete.game.UserScore.GameActionInfo;
import org.apache.beam.examples.complete.game.UserScore.ParseEventFn;
-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;
@@ -36,6 +35,7 @@ import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.TypeDescriptors;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -81,7 +81,10 @@ public class UserScoreTest implements Serializable {
KV.of("AndroidGreenKookaburra", 23),
KV.of("BisqueBilby", 14));
- /** Test the {@link ParseEventFn} {@link DoFn}. */
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
+ /** Test the {@link ParseEventFn} {@link org.apache.beam.sdk.transforms.DoFn}. */
@Test
public void testParseEventFn() throws Exception {
DoFnTester<String, GameActionInfo> parseEventFn =
@@ -98,7 +101,6 @@ public class UserScoreTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testUserScoreSums() throws Exception {
- Pipeline p = TestPipeline.create();
PCollection<String> input = p.apply(Create.of(GAME_EVENTS).withCoder(StringUtf8Coder.of()));
@@ -117,7 +119,6 @@ public class UserScoreTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testTeamScoreSums() throws Exception {
- Pipeline p = TestPipeline.create();
PCollection<String> input = p.apply(Create.of(GAME_EVENTS).withCoder(StringUtf8Coder.of()));
@@ -136,7 +137,6 @@ public class UserScoreTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testUserScoresBadInput() throws Exception {
- Pipeline p = TestPipeline.create();
PCollection<String> input = p.apply(Create.of(GAME_EVENTS2).withCoder(StringUtf8Coder.of()));
[08/17] incubator-beam git commit: Migrated the beam-sdks-java-core
module to TestPipeline as a JUnit rule. Plus,
fixed some checkstyle errors from previous modules' migration.
Posted by ke...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java
index 3bf63fd..1d8b32c 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java
@@ -84,12 +84,14 @@ public class ViewTest implements Serializable {
// anonymous inner classes inside the non-static test methods.
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
@Test
@Category(RunnableOnService.class)
public void testSingletonSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Integer> view =
pipeline.apply("Create47", Create.of(47)).apply(View.<Integer>asSingleton());
@@ -112,7 +114,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedSingletonSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Integer> view =
pipeline.apply("Create47", Create.timestamped(
@@ -143,7 +144,6 @@ public class ViewTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testEmptySingletonSideInput() throws Exception {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Integer> view =
pipeline.apply("CreateEmptyIntegers", Create.<Integer>of().withCoder(VarIntCoder.of()))
@@ -169,7 +169,6 @@ public class ViewTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testNonSingletonSideInput() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> oneTwoThree = pipeline.apply(Create.<Integer>of(1, 2, 3));
final PCollectionView<Integer> view = oneTwoThree.apply(View.<Integer>asSingleton());
@@ -194,7 +193,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testListSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<List<Integer>> view =
pipeline.apply("CreateSideInput", Create.of(11, 13, 17, 23)).apply(View.<Integer>asList());
@@ -221,7 +219,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedListSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<List<Integer>> view =
pipeline.apply("CreateSideInput", Create.timestamped(
@@ -262,7 +259,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmptyListSideInput() throws Exception {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<List<Integer>> view =
pipeline.apply("CreateEmptyView", Create.<Integer>of().withCoder(VarIntCoder.of()))
@@ -289,7 +285,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testListSideInputIsImmutable() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<List<Integer>> view =
pipeline.apply("CreateSideInput", Create.of(11)).apply(View.<Integer>asList());
@@ -335,7 +330,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testIterableSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Iterable<Integer>> view =
pipeline.apply("CreateSideInput", Create.of(11, 13, 17, 23))
@@ -361,7 +355,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedIterableSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Iterable<Integer>> view =
pipeline.apply("CreateSideInput", Create.timestamped(
@@ -401,7 +394,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmptyIterableSideInput() throws Exception {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Iterable<Integer>> view =
pipeline.apply("CreateEmptyView", Create.<Integer>of().withCoder(VarIntCoder.of()))
@@ -427,7 +419,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testIterableSideInputIsImmutable() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Iterable<Integer>> view =
pipeline.apply("CreateSideInput", Create.of(11)).apply(View.<Integer>asIterable());
@@ -459,7 +450,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMultimapSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateSideInput", Create.of(KV.of("a", 1), KV.of("a", 2), KV.of("b", 3)))
@@ -487,7 +477,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMultimapAsEntrySetSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateSideInput", Create.of(KV.of("a", 1), KV.of("a", 2), KV.of("b", 3)))
@@ -539,7 +528,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMultimapSideInputWithNonDeterministicKeyCoder() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateSideInput",
@@ -569,7 +557,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedMultimapSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateSideInput", Create.timestamped(
@@ -608,7 +595,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedMultimapAsEntrySetSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateSideInput", Create.timestamped(
@@ -651,7 +637,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedMultimapSideInputWithNonDeterministicKeyCoder() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateSideInput",
@@ -691,7 +676,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmptyMultimapSideInput() throws Exception {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateEmptyView", Create.<KV<String, Integer>>of().withCoder(
@@ -720,7 +704,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmptyMultimapSideInputWithNonDeterministicKeyCoder() throws Exception {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateEmptyView",
@@ -750,7 +733,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMultimapSideInputIsImmutable() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Iterable<Integer>>> view =
pipeline.apply("CreateSideInput", Create.of(KV.of("a", 1)))
@@ -798,7 +780,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMapSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateSideInput", Create.of(KV.of("a", 1), KV.of("b", 3)))
@@ -825,7 +806,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMapAsEntrySetSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateSideInput", Create.of(KV.of("a", 1), KV.of("b", 3)))
@@ -855,7 +835,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMapSideInputWithNonDeterministicKeyCoder() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateSideInput",
@@ -884,7 +863,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedMapSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateSideInput", Create.timestamped(
@@ -922,7 +900,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedMapAsEntrySetSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateSideInput", Create.timestamped(
@@ -964,7 +941,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedMapSideInputWithNonDeterministicKeyCoder() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateSideInput",
@@ -1004,7 +980,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmptyMapSideInput() throws Exception {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateEmptyView", Create.<KV<String, Integer>>of().withCoder(
@@ -1033,7 +1008,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmptyMapSideInputWithNonDeterministicKeyCoder() throws Exception {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateEmptyView", Create.<KV<String, Integer>>of().withCoder(
@@ -1062,7 +1036,6 @@ public class ViewTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testMapSideInputWithNullValuesCatchesDuplicates() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline
@@ -1098,7 +1071,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMapSideInputIsImmutable() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateSideInput", Create.of(KV.of("a", 1)))
@@ -1145,7 +1117,6 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testCombinedMapSideInput() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Map<String, Integer>> view =
pipeline.apply("CreateSideInput", Create.of(KV.of("a", 1), KV.of("a", 20), KV.of("b", 3)))
@@ -1172,10 +1143,9 @@ public class ViewTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedSideInputFixedToFixed() {
- Pipeline p = TestPipeline.create();
final PCollectionView<Integer> view =
- p.apply(
+ pipeline.apply(
"CreateSideInput",
Create.timestamped(TimestampedValue.of(1, new Instant(1)),
TimestampedValue.of(2, new Instant(11)), TimestampedValue.of(3, new Instant(13))))
@@ -1184,7 +1154,7 @@ public class ViewTest implements Serializable {
.apply(View.<Integer>asSingleton());
PCollection<String> output =
- p.apply("CreateMainInput", Create.timestamped(
+ pipeline.apply("CreateMainInput", Create.timestamped(
TimestampedValue.of("A", new Instant(4)),
TimestampedValue.of("B", new Instant(15)),
TimestampedValue.of("C", new Instant(7))))
@@ -1199,16 +1169,15 @@ public class ViewTest implements Serializable {
PAssert.that(output).containsInAnyOrder("A1", "B5", "C1");
- p.run();
+ pipeline.run();
}
@Test
@Category(RunnableOnService.class)
public void testWindowedSideInputFixedToGlobal() {
- Pipeline p = TestPipeline.create();
final PCollectionView<Integer> view =
- p.apply(
+ pipeline.apply(
"CreateSideInput",
Create.timestamped(TimestampedValue.of(1, new Instant(1)),
TimestampedValue.of(2, new Instant(11)), TimestampedValue.of(3, new Instant(13))))
@@ -1217,7 +1186,7 @@ public class ViewTest implements Serializable {
.apply(View.<Integer>asSingleton());
PCollection<String> output =
- p.apply("CreateMainInput", Create.timestamped(
+ pipeline.apply("CreateMainInput", Create.timestamped(
TimestampedValue.of("A", new Instant(4)),
TimestampedValue.of("B", new Instant(15)),
TimestampedValue.of("C", new Instant(7))))
@@ -1232,23 +1201,22 @@ public class ViewTest implements Serializable {
PAssert.that(output).containsInAnyOrder("A6", "B6", "C6");
- p.run();
+ pipeline.run();
}
@Test
@Category(RunnableOnService.class)
public void testWindowedSideInputFixedToFixedWithDefault() {
- Pipeline p = TestPipeline.create();
final PCollectionView<Integer> view =
- p.apply("CreateSideInput", Create.timestamped(
+ pipeline.apply("CreateSideInput", Create.timestamped(
TimestampedValue.of(2, new Instant(11)),
TimestampedValue.of(3, new Instant(13))))
.apply("WindowSideInput", Window.<Integer>into(FixedWindows.of(Duration.millis(10))))
.apply(Sum.integersGlobally().asSingletonView());
PCollection<String> output =
- p.apply("CreateMainInput", Create.timestamped(
+ pipeline.apply("CreateMainInput", Create.timestamped(
TimestampedValue.of("A", new Instant(4)),
TimestampedValue.of("B", new Instant(15)),
TimestampedValue.of("C", new Instant(7))))
@@ -1263,16 +1231,15 @@ public class ViewTest implements Serializable {
PAssert.that(output).containsInAnyOrder("A0", "B5", "C0");
- p.run();
+ pipeline.run();
}
@Test
@Category(RunnableOnService.class)
public void testSideInputWithNullDefault() {
- Pipeline p = TestPipeline.create();
final PCollectionView<Void> view =
- p.apply("CreateSideInput", Create.of((Void) null).withCoder(VoidCoder.of()))
+ pipeline.apply("CreateSideInput", Create.of((Void) null).withCoder(VoidCoder.of()))
.apply(Combine.globally(new SerializableFunction<Iterable<Void>, Void>() {
@Override
public Void apply(Iterable<Void> input) {
@@ -1281,7 +1248,7 @@ public class ViewTest implements Serializable {
}).asSingletonView());
PCollection<String> output =
- p.apply("CreateMainInput", Create.of(""))
+ pipeline.apply("CreateMainInput", Create.of(""))
.apply(
"OutputMainAndSideInputs",
ParDo.withSideInputs(view).of(new DoFn<String, String>() {
@@ -1293,13 +1260,12 @@ public class ViewTest implements Serializable {
PAssert.that(output).containsInAnyOrder("null");
- p.run();
+ pipeline.run();
}
@Test
@Category(RunnableOnService.class)
public void testSideInputWithNestedIterables() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Iterable<Integer>> view1 =
pipeline.apply("CreateVoid1", Create.of((Void) null).withCoder(VoidCoder.of()))
.apply("OutputOneInteger", ParDo.of(new DoFn<Void, Integer>() {
@@ -1386,51 +1352,51 @@ public class ViewTest implements Serializable {
@Test
public void testViewUnboundedAsSingletonDirect() {
- testViewUnbounded(TestPipeline.create(), View.<KV<String, Integer>>asSingleton());
+ testViewUnbounded(pipeline, View.<KV<String, Integer>>asSingleton());
}
@Test
public void testViewUnboundedAsIterableDirect() {
- testViewUnbounded(TestPipeline.create(), View.<KV<String, Integer>>asIterable());
+ testViewUnbounded(pipeline, View.<KV<String, Integer>>asIterable());
}
@Test
public void testViewUnboundedAsListDirect() {
- testViewUnbounded(TestPipeline.create(), View.<KV<String, Integer>>asList());
+ testViewUnbounded(pipeline, View.<KV<String, Integer>>asList());
}
@Test
public void testViewUnboundedAsMapDirect() {
- testViewUnbounded(TestPipeline.create(), View.<String, Integer>asMap());
+ testViewUnbounded(pipeline, View.<String, Integer>asMap());
}
@Test
public void testViewUnboundedAsMultimapDirect() {
- testViewUnbounded(TestPipeline.create(), View.<String, Integer>asMultimap());
+ testViewUnbounded(pipeline, View.<String, Integer>asMultimap());
}
@Test
public void testViewNonmergingAsSingletonDirect() {
- testViewNonmerging(TestPipeline.create(), View.<KV<String, Integer>>asSingleton());
+ testViewNonmerging(pipeline, View.<KV<String, Integer>>asSingleton());
}
@Test
public void testViewNonmergingAsIterableDirect() {
- testViewNonmerging(TestPipeline.create(), View.<KV<String, Integer>>asIterable());
+ testViewNonmerging(pipeline, View.<KV<String, Integer>>asIterable());
}
@Test
public void testViewNonmergingAsListDirect() {
- testViewNonmerging(TestPipeline.create(), View.<KV<String, Integer>>asList());
+ testViewNonmerging(pipeline, View.<KV<String, Integer>>asList());
}
@Test
public void testViewNonmergingAsMapDirect() {
- testViewNonmerging(TestPipeline.create(), View.<String, Integer>asMap());
+ testViewNonmerging(pipeline, View.<String, Integer>asMap());
}
@Test
public void testViewNonmergingAsMultimapDirect() {
- testViewNonmerging(TestPipeline.create(), View.<String, Integer>asMultimap());
+ testViewNonmerging(pipeline, View.<String, Integer>asMultimap());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithKeysTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithKeysTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithKeysTest.java
index f958807..8abbf1a 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithKeysTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithKeysTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
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.NeedsRunner;
import org.apache.beam.sdk.testing.PAssert;
@@ -29,6 +28,7 @@ import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.TypeDescriptor;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -63,10 +63,12 @@ public class WithKeysTest {
KV.of(100, "bbb")
);
+ @Rule
+ public final TestPipeline p = TestPipeline.create();
+
@Test
@Category(NeedsRunner.class)
public void testExtractKeys() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(Create.of(Arrays.asList(COLLECTION)).withCoder(
@@ -83,7 +85,6 @@ public class WithKeysTest {
@Test
@Category(NeedsRunner.class)
public void testConstantKeys() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(Create.of(Arrays.asList(COLLECTION)).withCoder(
@@ -105,7 +106,6 @@ public class WithKeysTest {
@Test
@Category(NeedsRunner.class)
public void testWithKeysWithUnneededWithKeyTypeSucceeds() {
- TestPipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(Create.of(Arrays.asList(COLLECTION)).withCoder(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsTest.java
index 923b97c..67a2658 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/WithTimestampsTest.java
@@ -41,13 +41,16 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class WithTimestampsTest implements Serializable {
+
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Rule
public transient ExpectedException thrown = ExpectedException.none();
@Test
@Category(RunnableOnService.class)
public void withTimestampsShouldApplyTimestamps() {
- TestPipeline p = TestPipeline.create();
SerializableFunction<String, Instant> timestampFn =
new SerializableFunction<String, Instant>() {
@@ -86,7 +89,6 @@ public class WithTimestampsTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void withTimestampsBackwardsInTimeShouldThrow() {
- TestPipeline p = TestPipeline.create();
SerializableFunction<String, Instant> timestampFn =
new SerializableFunction<String, Instant>() {
@@ -120,7 +122,6 @@ public class WithTimestampsTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void withTimestampsBackwardsInTimeAndWithAllowedTimestampSkewShouldSucceed() {
- TestPipeline p = TestPipeline.create();
SerializableFunction<String, Instant> timestampFn =
new SerializableFunction<String, Instant>() {
@@ -181,7 +182,6 @@ public class WithTimestampsTest implements Serializable {
}
};
- TestPipeline p = TestPipeline.create();
String yearTwoThousand = "946684800000";
p.apply(Create.of("1234", "0", Integer.toString(Integer.MAX_VALUE), yearTwoThousand))
.apply(WithTimestamps.of(timestampFn));
@@ -197,7 +197,6 @@ public class WithTimestampsTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void withTimestampsWithNullFnShouldThrowOnConstruction() {
- TestPipeline p = TestPipeline.create();
SerializableFunction<String, Instant> timestampFn = null;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/join/CoGroupByKeyTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/join/CoGroupByKeyTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/join/CoGroupByKeyTest.java
index e8c8b15..0e5c177 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/join/CoGroupByKeyTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/join/CoGroupByKeyTest.java
@@ -47,6 +47,7 @@ import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.TupleTag;
import org.joda.time.Duration;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -118,14 +119,15 @@ public class CoGroupByKeyTest implements Serializable {
return coGbkResults;
}
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testCoGroupByKeyGetOnly() {
final TupleTag<String> tag1 = new TupleTag<>();
final TupleTag<String> tag2 = new TupleTag<>();
- Pipeline p = TestPipeline.create();
-
PCollection<KV<Integer, CoGbkResult>> coGbkResults =
buildGetOnlyGbk(p, tag1, tag2);
@@ -264,7 +266,6 @@ public class CoGroupByKeyTest implements Serializable {
final TupleTag<String> addressesTag = new TupleTag<>();
final TupleTag<String> purchasesTag = new TupleTag<>();
- Pipeline p = TestPipeline.create();
PCollection<KV<Integer, CoGbkResult>> coGbkResults =
buildPurchasesCoGbk(p, purchasesTag, addressesTag, namesTag);
@@ -456,8 +457,6 @@ public class CoGroupByKeyTest implements Serializable {
TupleTag<String> addressesTag = new TupleTag<>();
TupleTag<String> purchasesTag = new TupleTag<>();
- Pipeline p = TestPipeline.create();
-
PCollection<KV<Integer, CoGbkResult>> coGbkResults =
buildPurchasesCoGbk(p, purchasesTag, addressesTag, namesTag);
@@ -486,8 +485,6 @@ public class CoGroupByKeyTest implements Serializable {
TupleTag<String> clicksTag = new TupleTag<>();
TupleTag<String> purchasesTag = new TupleTag<>();
- Pipeline p = TestPipeline.create();
-
PCollection<KV<Integer, CoGbkResult>> coGbkResults =
buildPurchasesCoGbkWithWindowing(p, clicksTag, purchasesTag);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
index 3125ae8..e21668e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import java.io.Serializable;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.Coder.NonDeterministicException;
import org.apache.beam.sdk.coders.StringUtf8Coder;
@@ -62,11 +61,15 @@ import org.mockito.Mockito;
public class WindowTest implements Serializable {
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create()
+ .enableAbandonedNodeEnforcement(false);
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
@Test
public void testWindowIntoSetWindowfn() {
- WindowingStrategy<?, ?> strategy = TestPipeline.create()
+ WindowingStrategy<?, ?> strategy = pipeline
.apply(Create.of("hello", "world").withCoder(StringUtf8Coder.of()))
.apply(Window.<String>into(FixedWindows.of(Duration.standardMinutes(10))))
.getWindowingStrategy();
@@ -79,7 +82,7 @@ public class WindowTest implements Serializable {
public void testWindowIntoTriggersAndAccumulating() {
FixedWindows fixed10 = FixedWindows.of(Duration.standardMinutes(10));
Repeatedly trigger = Repeatedly.forever(AfterPane.elementCountAtLeast(5));
- WindowingStrategy<?, ?> strategy = TestPipeline.create()
+ WindowingStrategy<?, ?> strategy = pipeline
.apply(Create.of("hello", "world").withCoder(StringUtf8Coder.of()))
.apply(Window.<String>into(fixed10)
.triggering(trigger)
@@ -96,7 +99,7 @@ public class WindowTest implements Serializable {
public void testWindowPropagatesEachPart() {
FixedWindows fixed10 = FixedWindows.of(Duration.standardMinutes(10));
Repeatedly trigger = Repeatedly.forever(AfterPane.elementCountAtLeast(5));
- WindowingStrategy<?, ?> strategy = TestPipeline.create()
+ WindowingStrategy<?, ?> strategy = pipeline
.apply(Create.of("hello", "world").withCoder(StringUtf8Coder.of()))
.apply("Mode", Window.<String>accumulatingFiredPanes())
.apply("Lateness", Window.<String>withAllowedLateness(Duration.standardDays(1)))
@@ -112,9 +115,10 @@ public class WindowTest implements Serializable {
@Test
public void testWindowIntoPropagatesLateness() {
+
FixedWindows fixed10 = FixedWindows.of(Duration.standardMinutes(10));
FixedWindows fixed25 = FixedWindows.of(Duration.standardMinutes(25));
- WindowingStrategy<?, ?> strategy = TestPipeline.create()
+ WindowingStrategy<?, ?> strategy = pipeline
.apply(Create.of("hello", "world").withCoder(StringUtf8Coder.of()))
.apply("WindowInto10", Window.<String>into(fixed10)
.withAllowedLateness(Duration.standardDays(1))
@@ -157,7 +161,7 @@ public class WindowTest implements Serializable {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("requires that the accumulation mode");
- TestPipeline.create()
+ pipeline
.apply(Create.of("hello", "world").withCoder(StringUtf8Coder.of()))
.apply("Window", Window.<String>into(fixed10))
.apply("Lateness", Window.<String>withAllowedLateness(Duration.standardDays(1)))
@@ -171,7 +175,7 @@ public class WindowTest implements Serializable {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("requires that the allowed lateness");
- TestPipeline.create()
+ pipeline
.apply(Create.of("hello", "world").withCoder(StringUtf8Coder.of()))
.apply("Mode", Window.<String>accumulatingFiredPanes())
.apply("Window", Window.<String>into(fixed10))
@@ -185,7 +189,7 @@ public class WindowTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testOutputTimeFnDefault() {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(true);
pipeline
.apply(
@@ -219,7 +223,7 @@ public class WindowTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testOutputTimeFnEndOfWindow() {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(true);
pipeline.apply(
Create.timestamped(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java
index d4fab17..f7ae5d8 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.io.Serializable;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.io.TextIO;
import org.apache.beam.sdk.testing.NeedsRunner;
@@ -50,6 +49,10 @@ import org.junit.runners.JUnit4;
/** Unit tests for bucketing. */
@RunWith(JUnit4.class)
public class WindowingTest implements Serializable {
+
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Rule
public transient TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -88,7 +91,6 @@ public class WindowingTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testPartitioningWindowing() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(
Create.timestamped(
@@ -114,7 +116,6 @@ public class WindowingTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testNonPartitioningWindowing() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(
Create.timestamped(
@@ -140,7 +141,6 @@ public class WindowingTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMergingWindowing() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(
Create.timestamped(
@@ -162,7 +162,6 @@ public class WindowingTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowPreservation() {
- Pipeline p = TestPipeline.create();
PCollection<String> input1 = p.apply("Create12",
Create.timestamped(
TimestampedValue.of("a", new Instant(1)),
@@ -190,7 +189,6 @@ public class WindowingTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testEmptyInput() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(Create.<String>timestamped()
.withCoder(StringUtf8Coder.of()));
@@ -218,7 +216,6 @@ public class WindowingTest implements Serializable {
writer.println("d 11");
}
- Pipeline p = TestPipeline.create();
PCollection<String> output = p.begin()
.apply("ReadLines", TextIO.Read.from(filename))
.apply(ParDo.of(new ExtractWordsWithTimestampsFn()))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReshuffleTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReshuffleTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReshuffleTest.java
index d990ee0..d47cddc 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReshuffleTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ReshuffleTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
import com.google.common.collect.ImmutableList;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.coders.VarIntCoder;
@@ -36,6 +35,7 @@ import org.apache.beam.sdk.transforms.windowing.Window;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.joda.time.Duration;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -65,10 +65,12 @@ public class ReshuffleTest {
KV.of("k1", (Iterable<Integer>) ImmutableList.of(3)),
KV.of("k2", (Iterable<Integer>) ImmutableList.of(4)));
+ @Rule
+ public final TestPipeline pipeline = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testJustReshuffle() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> input = pipeline
.apply(Create.of(ARBITRARY_KVS)
@@ -89,7 +91,6 @@ public class ReshuffleTest {
@Test
@Category(RunnableOnService.class)
public void testReshuffleAfterSessionsAndGroupByKey() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Iterable<Integer>>> input = pipeline
.apply(Create.of(GBK_TESTABLE_KVS)
@@ -113,7 +114,6 @@ public class ReshuffleTest {
@Test
@Category(RunnableOnService.class)
public void testReshuffleAfterFixedWindowsAndGroupByKey() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Iterable<Integer>>> input = pipeline
.apply(Create.of(GBK_TESTABLE_KVS)
@@ -137,7 +137,6 @@ public class ReshuffleTest {
@Test
@Category(RunnableOnService.class)
public void testReshuffleAfterSlidingWindowsAndGroupByKey() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Iterable<Integer>>> input = pipeline
.apply(Create.of(GBK_TESTABLE_KVS)
@@ -161,7 +160,6 @@ public class ReshuffleTest {
@Test
@Category(RunnableOnService.class)
public void testReshuffleAfterFixedWindows() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> input = pipeline
.apply(Create.of(ARBITRARY_KVS)
@@ -185,7 +183,6 @@ public class ReshuffleTest {
@Test
@Category(RunnableOnService.class)
public void testReshuffleAfterSlidingWindows() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> input = pipeline
.apply(Create.of(ARBITRARY_KVS)
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PCollectionTupleTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PCollectionTupleTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PCollectionTupleTest.java
index 1467ae8..b5351da 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PCollectionTupleTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PCollectionTupleTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
-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;
@@ -33,6 +32,7 @@ import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.util.WindowingStrategy;
import org.apache.beam.sdk.values.PCollection.IsBounded;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -41,9 +41,14 @@ import org.junit.runners.JUnit4;
/** Unit tests for {@link PCollectionTuple}. */
@RunWith(JUnit4.class)
public final class PCollectionTupleTest implements Serializable {
+
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create()
+ .enableAbandonedNodeEnforcement(false);
+
@Test
public void testOfThenHas() {
- Pipeline pipeline = TestPipeline.create();
+
PCollection<Object> pCollection = PCollection.createPrimitiveOutputInternal(
pipeline, WindowingStrategy.globalDefault(), IsBounded.BOUNDED);
TupleTag<Object> tag = new TupleTag<>();
@@ -53,7 +58,6 @@ public final class PCollectionTupleTest implements Serializable {
@Test
public void testEmpty() {
- Pipeline pipeline = TestPipeline.create();
TupleTag<Object> tag = new TupleTag<>();
assertFalse(PCollectionTuple.empty(pipeline).has(tag));
}
@@ -61,7 +65,7 @@ public final class PCollectionTupleTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testComposePCollectionTuple() {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(true);
List<Integer> inputs = Arrays.asList(3, -42, 666);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PDoneTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PDoneTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PDoneTest.java
index e5f2019..ba7477d 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PDoneTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/values/PDoneTest.java
@@ -20,7 +20,6 @@ package org.apache.beam.sdk.values;
import static org.apache.beam.sdk.TestUtils.LINES;
import java.io.File;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.io.TextIO;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.RunnableOnService;
@@ -40,6 +39,10 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class PDoneTest {
+
+ @Rule
+ public final TestPipeline p = TestPipeline.create();
+
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -78,8 +81,6 @@ public class PDoneTest {
@Test
@Category(RunnableOnService.class)
public void testEmptyTransform() {
- Pipeline p = TestPipeline.create();
-
p.begin().apply(new EmptyTransform());
p.run();
@@ -94,8 +95,6 @@ public class PDoneTest {
File tmpFile = tmpFolder.newFile("file.txt");
String filename = tmpFile.getPath();
- Pipeline p = TestPipeline.create();
-
p.begin().apply(new SimpleTransform(filename));
p.run();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/values/TypedPValueTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/values/TypedPValueTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/values/TypedPValueTest.java
index f33b3a2..8381f12 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/values/TypedPValueTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/values/TypedPValueTest.java
@@ -22,7 +22,6 @@ import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.VarIntCoder;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.transforms.Create;
@@ -40,6 +39,10 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class TypedPValueTest {
+
+ @Rule
+ public final TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -51,9 +54,8 @@ public class TypedPValueTest {
}
}
- private static PCollectionTuple buildPCollectionTupleWithTags(
+ private PCollectionTuple buildPCollectionTupleWithTags(
TupleTag<Integer> mainOutputTag, TupleTag<Integer> sideOutputTag) {
- Pipeline p = TestPipeline.create();
PCollection<Integer> input = p.apply(Create.of(1, 2, 3));
PCollectionTuple tuple = input.apply(
ParDo
@@ -138,7 +140,6 @@ public class TypedPValueTest {
@Test
public void testParDoWithNoSideOutputsErrorDoesNotMentionTupleTag() {
- Pipeline p = TestPipeline.create();
PCollection<EmptyClass> input =
p.apply(Create.of(1, 2, 3)).apply(ParDo.of(new EmptyClassDoFn()));
@@ -158,7 +159,6 @@ public class TypedPValueTest {
@Test
public void testFinishSpecifyingShouldFailIfNoCoderInferrable() {
- Pipeline p = TestPipeline.create();
PCollection<EmptyClass> unencodable =
p.apply(Create.of(1, 2, 3)).apply(ParDo.of(new EmptyClassDoFn()));
[10/17] incubator-beam git commit: Migrated the beam-sdks-java-core
module to TestPipeline as a JUnit rule. Plus,
fixed some checkstyle errors from previous modules' migration.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-core module to TestPipeline as a JUnit rule.
Plus, fixed some checkstyle errors from previous modules' migration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/75a4c918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/75a4c918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/75a4c918
Branch: refs/heads/master
Commit: 75a4c918346b5a04213a54bf7d1bf6507655342a
Parents: 09c404a
Author: Stas Levin <st...@gmail.com>
Authored: Mon Dec 19 23:54:47 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../UnboundedReadFromBoundedSourceTest.java | 1 -
.../direct/CloningBundleFactoryTest.java | 2 +-
.../CopyOnAccessInMemoryStateInternalsTest.java | 6 +-
.../ImmutabilityCheckingBundleFactoryTest.java | 2 +-
.../direct/ImmutableListBundleFactoryTest.java | 2 +-
.../direct/WriteWithShardingFactoryTest.java | 2 +-
.../java/org/apache/beam/sdk/PipelineTest.java | 37 +++---
.../apache/beam/sdk/coders/AvroCoderTest.java | 11 +-
.../beam/sdk/coders/CoderRegistryTest.java | 6 +-
.../beam/sdk/coders/SerializableCoderTest.java | 7 +-
.../java/org/apache/beam/sdk/io/AvroIOTest.java | 16 +--
.../io/BoundedReadFromUnboundedSourceTest.java | 6 +-
.../beam/sdk/io/CompressedSourceTest.java | 12 +-
.../apache/beam/sdk/io/CountingInputTest.java | 12 +-
.../apache/beam/sdk/io/CountingSourceTest.java | 13 +-
.../apache/beam/sdk/io/FileBasedSourceTest.java | 4 +-
.../beam/sdk/io/PubsubUnboundedSinkTest.java | 10 +-
.../beam/sdk/io/PubsubUnboundedSourceTest.java | 12 +-
.../java/org/apache/beam/sdk/io/TextIOTest.java | 29 +++--
.../java/org/apache/beam/sdk/io/WriteTest.java | 2 +-
.../org/apache/beam/sdk/io/XmlSourceTest.java | 10 +-
.../sdk/options/ProxyInvocationHandlerTest.java | 5 +-
.../sdk/runners/TransformHierarchyTest.java | 6 +-
.../beam/sdk/runners/TransformTreeTest.java | 11 +-
.../beam/sdk/testing/GatherAllPanesTest.java | 7 +-
.../apache/beam/sdk/testing/PAssertTest.java | 32 ++---
.../apache/beam/sdk/testing/TestStreamTest.java | 7 +-
.../transforms/ApproximateQuantilesTest.java | 12 +-
.../sdk/transforms/ApproximateUniqueTest.java | 6 +-
.../beam/sdk/transforms/CombineFnsTest.java | 5 +-
.../apache/beam/sdk/transforms/CombineTest.java | 25 +---
.../apache/beam/sdk/transforms/CountTest.java | 13 +-
.../apache/beam/sdk/transforms/CreateTest.java | 27 +----
.../beam/sdk/transforms/DistinctTest.java | 12 +-
.../apache/beam/sdk/transforms/DoFnTest.java | 4 +-
.../beam/sdk/transforms/DoFnTesterTest.java | 6 +-
.../apache/beam/sdk/transforms/FilterTest.java | 18 +--
.../sdk/transforms/FlatMapElementsTest.java | 10 +-
.../apache/beam/sdk/transforms/FlattenTest.java | 35 +-----
.../beam/sdk/transforms/GroupByKeyTest.java | 30 ++---
.../apache/beam/sdk/transforms/KeysTest.java | 9 +-
.../apache/beam/sdk/transforms/KvSwapTest.java | 9 +-
.../apache/beam/sdk/transforms/LatestTest.java | 12 +-
.../beam/sdk/transforms/MapElementsTest.java | 14 +--
.../beam/sdk/transforms/ParDoLifecycleTest.java | 17 +--
.../apache/beam/sdk/transforms/ParDoTest.java | 118 +++++++------------
.../beam/sdk/transforms/PartitionTest.java | 8 +-
.../apache/beam/sdk/transforms/RegexTest.java | 25 +---
.../apache/beam/sdk/transforms/SampleTest.java | 34 +++---
.../beam/sdk/transforms/SplittableDoFnTest.java | 12 +-
.../org/apache/beam/sdk/transforms/TopTest.java | 15 ++-
.../apache/beam/sdk/transforms/ValuesTest.java | 7 +-
.../apache/beam/sdk/transforms/ViewTest.java | 84 ++++---------
.../beam/sdk/transforms/WithKeysTest.java | 8 +-
.../beam/sdk/transforms/WithTimestampsTest.java | 9 +-
.../sdk/transforms/join/CoGroupByKeyTest.java | 11 +-
.../sdk/transforms/windowing/WindowTest.java | 22 ++--
.../sdk/transforms/windowing/WindowingTest.java | 11 +-
.../org/apache/beam/sdk/util/ReshuffleTest.java | 11 +-
.../beam/sdk/values/PCollectionTupleTest.java | 12 +-
.../org/apache/beam/sdk/values/PDoneTest.java | 9 +-
.../apache/beam/sdk/values/TypedPValueTest.java | 10 +-
62 files changed, 353 insertions(+), 587 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java
index 86450f2..0f09cd1 100644
--- a/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java
+++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java
@@ -36,7 +36,6 @@ import java.util.Random;
import org.apache.beam.runners.core.UnboundedReadFromBoundedSource.BoundedToUnboundedSourceAdapter;
import org.apache.beam.runners.core.UnboundedReadFromBoundedSource.BoundedToUnboundedSourceAdapter.Checkpoint;
import org.apache.beam.runners.core.UnboundedReadFromBoundedSource.BoundedToUnboundedSourceAdapter.CheckpointCoder;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.SerializableCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
index e5299a2..505d3a2 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
@@ -62,7 +62,7 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class CloningBundleFactoryTest {
@Rule public ExpectedException thrown = ExpectedException.none();
- @Rule public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+ @Rule public final TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
private CloningBundleFactory factory = CloningBundleFactory.create();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java
index 35245f4..12ef66c 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CopyOnAccessInMemoryStateInternalsTest.java
@@ -62,14 +62,10 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class CopyOnAccessInMemoryStateInternalsTest {
- @Rule public TestPipeline pipeline = TestPipeline.create();
+ @Rule public final TestPipeline pipeline = TestPipeline.create();
@Rule public ExpectedException thrown = ExpectedException.none();
private String key = "foo";
- public CopyOnAccessInMemoryStateInternalsTest() {
- pipeline = TestPipeline.create();
- }
-
@Test
public void testGetWithEmpty() {
CopyOnAccessInMemoryStateInternals<String> internals =
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java
index 2448078..eccb3a6 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutabilityCheckingBundleFactoryTest.java
@@ -47,7 +47,7 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class ImmutabilityCheckingBundleFactoryTest {
- @Rule public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+ @Rule public final TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
@Rule public ExpectedException thrown = ExpectedException.none();
private ImmutabilityCheckingBundleFactory factory;
private PCollection<byte[]> created;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java
index 46f02cd..3327ccd 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ImmutableListBundleFactoryTest.java
@@ -57,7 +57,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class ImmutableListBundleFactoryTest {
- @Rule public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+ @Rule public final TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
@Rule public ExpectedException thrown = ExpectedException.none();
private ImmutableListBundleFactory bundleFactory = ImmutableListBundleFactory.create();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
index a8c4c02..7432e61 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
@@ -69,7 +69,7 @@ public class WriteWithShardingFactoryTest {
public static final int INPUT_SIZE = 10000;
@Rule public TemporaryFolder tmp = new TemporaryFolder();
private WriteWithShardingFactory<Object> factory = new WriteWithShardingFactory<>();
- @Rule public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+ @Rule public final TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
@Test
public void dynamicallyReshardedWrite() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java
index fea1554..d8e4ef4 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java
@@ -62,6 +62,7 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class PipelineTest {
+ @Rule public final TestPipeline pipeline = TestPipeline.create();
@Rule public ExpectedLogs logged = ExpectedLogs.none(Pipeline.class);
@Rule public ExpectedException thrown = ExpectedException.none();
@@ -128,8 +129,7 @@ public class PipelineTest {
PTransform<PCollection<? extends String>, PCollection<String>> myTransform =
addSuffix("+");
- Pipeline p = TestPipeline.create();
- PCollection<String> input = p.apply(Create.<String>of(ImmutableList.of("a", "b")));
+ PCollection<String> input = pipeline.apply(Create.<String>of(ImmutableList.of("a", "b")));
PCollection<String> left = input.apply("Left1", myTransform).apply("Left2", myTransform);
PCollection<String> right = input.apply("Right", myTransform);
@@ -139,7 +139,7 @@ public class PipelineTest {
PAssert.that(both).containsInAnyOrder("a++", "b++", "a+", "b+");
- p.run();
+ pipeline.run();
}
private static PTransform<PCollection<? extends String>, PCollection<String>> addSuffix(
@@ -162,35 +162,36 @@ public class PipelineTest {
@Test
public void testStableUniqueNameOff() {
- Pipeline p = TestPipeline.create();
- p.getOptions().setStableUniqueNames(CheckEnabled.OFF);
+ pipeline.enableAbandonedNodeEnforcement(false);
+
+ pipeline.getOptions().setStableUniqueNames(CheckEnabled.OFF);
- p.apply(Create.of(5, 6, 7));
- p.apply(Create.of(5, 6, 7));
+ pipeline.apply(Create.of(5, 6, 7));
+ pipeline.apply(Create.of(5, 6, 7));
logged.verifyNotLogged("does not have a stable unique name.");
}
@Test
public void testStableUniqueNameWarning() {
- Pipeline p = TestPipeline.create();
- p.getOptions().setStableUniqueNames(CheckEnabled.WARNING);
+ pipeline.enableAbandonedNodeEnforcement(false);
- p.apply(Create.of(5, 6, 7));
- p.apply(Create.of(5, 6, 7));
+ pipeline.getOptions().setStableUniqueNames(CheckEnabled.WARNING);
+
+ pipeline.apply(Create.of(5, 6, 7));
+ pipeline.apply(Create.of(5, 6, 7));
logged.verifyWarn("does not have a stable unique name.");
}
@Test
public void testStableUniqueNameError() {
- Pipeline p = TestPipeline.create();
- p.getOptions().setStableUniqueNames(CheckEnabled.ERROR);
+ pipeline.getOptions().setStableUniqueNames(CheckEnabled.ERROR);
- p.apply(Create.of(5, 6, 7));
+ pipeline.apply(Create.of(5, 6, 7));
thrown.expectMessage("does not have a stable unique name.");
- p.apply(Create.of(5, 6, 7));
+ pipeline.apply(Create.of(5, 6, 7));
}
/**
@@ -199,7 +200,6 @@ public class PipelineTest {
@Test
@Category(RunnableOnService.class)
public void testIdentityTransform() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.<Integer>of(1, 2, 3, 4))
@@ -223,8 +223,6 @@ public class PipelineTest {
@Test
@Category(RunnableOnService.class)
public void testTupleProjectionTransform() throws Exception {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<Integer> input = pipeline
.apply(Create.<Integer>of(1, 2, 3, 4));
@@ -258,8 +256,6 @@ public class PipelineTest {
@Test
@Category(RunnableOnService.class)
public void testTupleInjectionTransform() throws Exception {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<Integer> input = pipeline
.apply(Create.<Integer>of(1, 2, 3, 4));
@@ -292,7 +288,6 @@ public class PipelineTest {
@Test
@Category(NeedsRunner.class)
public void testEmptyPipeline() throws Exception {
- Pipeline pipeline = TestPipeline.create();
pipeline.run();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
index adfa0d2..60dc07a 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
@@ -55,7 +55,6 @@ import org.apache.avro.reflect.Stringable;
import org.apache.avro.reflect.Union;
import org.apache.avro.specific.SpecificData;
import org.apache.avro.util.Utf8;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder.Context;
import org.apache.beam.sdk.coders.Coder.NonDeterministicException;
import org.apache.beam.sdk.testing.CoderProperties;
@@ -73,6 +72,7 @@ import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -143,6 +143,9 @@ public class AvroCoderTest {
}
}
+ @Rule
+ public TestPipeline pipeline = TestPipeline.create();
+
@Test
public void testAvroCoderEncoding() throws Exception {
AvroCoder<Pojo> coder = AvroCoder.of(Pojo.class);
@@ -287,17 +290,15 @@ public class AvroCoderTest {
@Test
@Category(NeedsRunner.class)
public void testDefaultCoder() throws Exception {
- Pipeline p = TestPipeline.create();
-
// Use MyRecord as input and output types without explicitly specifying
// a coder (this uses the default coders, which may not be AvroCoder).
PCollection<String> output =
- p.apply(Create.of(new Pojo("hello", 1), new Pojo("world", 2)))
+ pipeline.apply(Create.of(new Pojo("hello", 1), new Pojo("world", 2)))
.apply(ParDo.of(new GetTextFn()));
PAssert.that(output)
.containsInAnyOrder("hello", "world");
- p.run();
+ pipeline.run();
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java
index d7badab..8c0e584 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java
@@ -35,7 +35,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.CoderRegistry.IncompatibleCoderException;
import org.apache.beam.sdk.coders.protobuf.ProtoCoder;
import org.apache.beam.sdk.testing.NeedsRunner;
@@ -63,6 +62,9 @@ import org.junit.runners.JUnit4;
public class CoderRegistryTest {
@Rule
+ public TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public ExpectedException thrown = ExpectedException.none();
public static CoderRegistry getStandardRegistry() {
@@ -414,7 +416,6 @@ public class CoderRegistryTest {
@Test
@Category(NeedsRunner.class)
public void testSpecializedButIgnoredGenericInPipeline() throws Exception {
- Pipeline pipeline = TestPipeline.create();
pipeline
.apply(Create.of("hello", "goodbye"))
@@ -443,7 +444,6 @@ public class CoderRegistryTest {
@Test
@Category(NeedsRunner.class)
public void testIgnoredGenericInPipeline() throws Exception {
- Pipeline pipeline = TestPipeline.create();
pipeline
.apply(Create.of("hello", "goodbye"))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java
index 8d344de..296ddc9 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.testing.CoderProperties;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.PAssert;
@@ -40,6 +39,7 @@ import org.apache.beam.sdk.util.Serializer;
import org.apache.beam.sdk.values.PCollection;
import org.hamcrest.Matchers;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -98,6 +98,9 @@ public class SerializableCoderTest implements Serializable {
"To be,",
"or not to be");
+ @Rule
+ public TestPipeline p = TestPipeline.create().enableAbandonedNodeEnforcement(false);
+
@Test
public void testSerializableCoder() throws Exception {
IterableCoder<MyRecord> coder = IterableCoder
@@ -136,7 +139,7 @@ public class SerializableCoderTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testDefaultCoder() throws Exception {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(true);
// Use MyRecord as input and output types without explicitly specifying
// a coder (this uses the default coders, which may not be
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroIOTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroIOTest.java
index 41a630f..b669968 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroIOTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroIOTest.java
@@ -74,6 +74,10 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class AvroIOTest {
+
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -135,7 +139,6 @@ public class AvroIOTest {
@Test
@Category(NeedsRunner.class)
public void testAvroIOWriteAndReadASingleFile() throws Throwable {
- TestPipeline p = TestPipeline.create();
List<GenericClass> values = ImmutableList.of(new GenericClass(3, "hi"),
new GenericClass(5, "bar"));
File outputFile = tmpFolder.newFile("output.avro");
@@ -146,7 +149,6 @@ public class AvroIOTest {
.withSchema(GenericClass.class));
p.run();
- p = TestPipeline.create();
PCollection<GenericClass> input = p
.apply(AvroIO.Read.from(outputFile.getAbsolutePath()).withSchema(GenericClass.class));
@@ -158,7 +160,6 @@ public class AvroIOTest {
@SuppressWarnings("unchecked")
@Category(NeedsRunner.class)
public void testAvroIOCompressedWriteAndReadASingleFile() throws Throwable {
- TestPipeline p = TestPipeline.create();
List<GenericClass> values = ImmutableList.of(new GenericClass(3, "hi"),
new GenericClass(5, "bar"));
File outputFile = tmpFolder.newFile("output.avro");
@@ -170,7 +171,6 @@ public class AvroIOTest {
.withSchema(GenericClass.class));
p.run();
- p = TestPipeline.create();
PCollection<GenericClass> input = p
.apply(AvroIO.Read
.from(outputFile.getAbsolutePath())
@@ -187,7 +187,6 @@ public class AvroIOTest {
@SuppressWarnings("unchecked")
@Category(NeedsRunner.class)
public void testAvroIONullCodecWriteAndReadASingleFile() throws Throwable {
- TestPipeline p = TestPipeline.create();
List<GenericClass> values = ImmutableList.of(new GenericClass(3, "hi"),
new GenericClass(5, "bar"));
File outputFile = tmpFolder.newFile("output.avro");
@@ -199,7 +198,6 @@ public class AvroIOTest {
.withCodec(CodecFactory.nullCodec()));
p.run();
- p = TestPipeline.create();
PCollection<GenericClass> input = p
.apply(AvroIO.Read
.from(outputFile.getAbsolutePath())
@@ -257,7 +255,6 @@ public class AvroIOTest {
@Test
@Category(NeedsRunner.class)
public void testAvroIOWriteAndReadSchemaUpgrade() throws Throwable {
- TestPipeline p = TestPipeline.create();
List<GenericClass> values = ImmutableList.of(new GenericClass(3, "hi"),
new GenericClass(5, "bar"));
File outputFile = tmpFolder.newFile("output.avro");
@@ -270,7 +267,7 @@ public class AvroIOTest {
List<GenericClassV2> expected = ImmutableList.of(new GenericClassV2(3, "hi", null),
new GenericClassV2(5, "bar", null));
- p = TestPipeline.create();
+
PCollection<GenericClassV2> input = p
.apply(AvroIO.Read.from(outputFile.getAbsolutePath()).withSchema(GenericClassV2.class));
@@ -321,7 +318,6 @@ public class AvroIOTest {
@SuppressWarnings("unchecked")
@Category(NeedsRunner.class)
public void testMetdata() throws Exception {
- TestPipeline p = TestPipeline.create();
List<GenericClass> values = ImmutableList.of(new GenericClass(3, "hi"),
new GenericClass(5, "bar"));
File outputFile = tmpFolder.newFile("output.avro");
@@ -348,7 +344,7 @@ public class AvroIOTest {
private void runTestWrite(String[] expectedElements, int numShards) throws IOException {
File baseOutputFile = new File(tmpFolder.getRoot(), "prefix");
String outputFilePrefix = baseOutputFile.getAbsolutePath();
- TestPipeline p = TestPipeline.create();
+
Bound<String> write = AvroIO.Write.to(outputFilePrefix).withSchema(String.class);
if (numShards > 1) {
write = write.withNumShards(numShards);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
index 4d7814c..d49873e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.runners.dataflow.TestCountingSource;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.RunnableOnService;
@@ -36,6 +35,7 @@ import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.joda.time.Duration;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -46,6 +46,9 @@ import org.junit.runners.JUnit4;
public class BoundedReadFromUnboundedSourceTest implements Serializable{
private static final int NUM_RECORDS = 100;
+ @Rule
+ public transient TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testNoDedup() throws Exception {
@@ -112,7 +115,6 @@ public class BoundedReadFromUnboundedSourceTest implements Serializable{
}
private void test(boolean dedup, boolean timeBound) throws Exception {
- Pipeline p = TestPipeline.create();
TestCountingSource source = new TestCountingSource(Integer.MAX_VALUE).withoutSplitting();
if (dedup) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
index f8769ea..3871159 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
@@ -47,7 +47,6 @@ import java.util.NoSuchElementException;
import java.util.Random;
import java.util.zip.GZIPOutputStream;
import javax.annotation.Nullable;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.SerializableCoder;
import org.apache.beam.sdk.io.BoundedSource.BoundedReader;
@@ -80,6 +79,10 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class CompressedSourceTest {
+
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -199,8 +202,6 @@ public class CompressedSourceTest {
os.write(totalGz);
}
- Pipeline p = TestPipeline.create();
-
CompressedSource<Byte> source =
CompressedSource.from(new ByteSource(tmpFile.getAbsolutePath(), 1))
.withDecompression(CompressionMode.GZIP);
@@ -274,8 +275,6 @@ public class CompressedSourceTest {
String filePattern = new File(tmpFolder.getRoot().toString(), baseName + ".*").toString();
- Pipeline p = TestPipeline.create();
-
CompressedSource<Byte> source =
CompressedSource.from(new ByteSource(filePattern, 1));
PCollection<Byte> output = p.apply(Read.from(source));
@@ -395,8 +394,6 @@ public class CompressedSourceTest {
expected.addAll(Bytes.asList(generated));
}
- Pipeline p = TestPipeline.create();
-
CompressedSource<Byte> source =
CompressedSource.from(new ByteSource(filePattern, 1))
.withDecompression(CompressionMode.GZIP);
@@ -476,7 +473,6 @@ public class CompressedSourceTest {
private void verifyReadContents(byte[] expected, File inputFile,
@Nullable DecompressingChannelFactory decompressionFactory) {
- Pipeline p = TestPipeline.create();
CompressedSource<Byte> source =
CompressedSource.from(new ByteSource(inputFile.toPath().toString(), 1));
if (decompressionFactory != null) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingInputTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingInputTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingInputTest.java
index dfc4919..f23ee76 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingInputTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingInputTest.java
@@ -21,7 +21,6 @@ import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisp
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.io.CountingInput.UnboundedCountingInput;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.PAssert;
@@ -39,6 +38,7 @@ import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.values.PCollection;
import org.joda.time.Duration;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -66,10 +66,12 @@ public class CountingInputTest {
.isEqualTo(end - 1);
}
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testBoundedInput() {
- Pipeline p = TestPipeline.create();
long numElements = 1000;
PCollection<Long> input = p.apply(CountingInput.upTo(numElements));
@@ -80,7 +82,6 @@ public class CountingInputTest {
@Test
@Category(RunnableOnService.class)
public void testEmptyBoundedInput() {
- Pipeline p = TestPipeline.create();
PCollection<Long> input = p.apply(CountingInput.upTo(0));
PAssert.that(input).empty();
@@ -90,7 +91,6 @@ public class CountingInputTest {
@Test
@Category(RunnableOnService.class)
public void testEmptyBoundedInputSubrange() {
- Pipeline p = TestPipeline.create();
PCollection<Long> input = p.apply(CountingInput.forSubrange(42, 42));
PAssert.that(input).empty();
@@ -101,7 +101,6 @@ public class CountingInputTest {
@Test
@Category(RunnableOnService.class)
public void testBoundedInputSubrange() {
- Pipeline p = TestPipeline.create();
long start = 10;
long end = 1000;
PCollection<Long> input = p.apply(CountingInput.forSubrange(start, end));
@@ -128,7 +127,6 @@ public class CountingInputTest {
@Test
@Category(RunnableOnService.class)
public void testUnboundedInput() {
- Pipeline p = TestPipeline.create();
long numElements = 1000;
PCollection<Long> input = p.apply(CountingInput.unbounded().withMaxNumRecords(numElements));
@@ -140,7 +138,6 @@ public class CountingInputTest {
@Test
@Category(NeedsRunner.class)
public void testUnboundedInputRate() {
- Pipeline p = TestPipeline.create();
long numElements = 5000;
long elemsPerPeriod = 10L;
@@ -169,7 +166,6 @@ public class CountingInputTest {
@Test
@Category(RunnableOnService.class)
public void testUnboundedInputTimestamps() {
- Pipeline p = TestPipeline.create();
long numElements = 1000;
PCollection<Long> input =
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingSourceTest.java
index 5eccde6..dfd0949 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CountingSourceTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.io.BoundedSource.BoundedReader;
import org.apache.beam.sdk.io.CountingSource.CounterMark;
import org.apache.beam.sdk.io.CountingSource.UnboundedCountingSource;
@@ -48,6 +47,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionList;
import org.joda.time.Duration;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -79,10 +79,12 @@ public class CountingSourceTest {
.isEqualTo(numElements - 1);
}
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testBoundedSource() {
- Pipeline p = TestPipeline.create();
long numElements = 1000;
PCollection<Long> input = p.apply(Read.from(CountingSource.upTo(numElements)));
@@ -93,7 +95,6 @@ public class CountingSourceTest {
@Test
@Category(RunnableOnService.class)
public void testEmptyBoundedSource() {
- Pipeline p = TestPipeline.create();
PCollection<Long> input = p.apply(Read.from(CountingSource.upTo(0)));
PAssert.that(input).empty();
@@ -103,7 +104,6 @@ public class CountingSourceTest {
@Test
@Category(RunnableOnService.class)
public void testBoundedSourceSplits() throws Exception {
- Pipeline p = TestPipeline.create();
long numElements = 1000;
long numSplits = 10;
long splitSizeBytes = numElements * 8 / numSplits; // 8 bytes per long element.
@@ -157,7 +157,6 @@ public class CountingSourceTest {
@Test
@Category(RunnableOnService.class)
public void testUnboundedSource() {
- Pipeline p = TestPipeline.create();
long numElements = 1000;
PCollection<Long> input = p
@@ -177,7 +176,6 @@ public class CountingSourceTest {
@Test
@Category(RunnableOnService.class)
public void testUnboundedSourceTimestamps() {
- Pipeline p = TestPipeline.create();
long numElements = 1000;
PCollection<Long> input = p.apply(
@@ -197,7 +195,6 @@ public class CountingSourceTest {
@Test
@Category(NeedsRunner.class)
public void testUnboundedSourceWithRate() {
- Pipeline p = TestPipeline.create();
Duration period = Duration.millis(5);
long numElements = 1000L;
@@ -232,7 +229,6 @@ public class CountingSourceTest {
@Test
@Category(RunnableOnService.class)
public void testUnboundedSourceSplits() throws Exception {
- Pipeline p = TestPipeline.create();
long numElements = 1000;
int numSplits = 10;
@@ -257,7 +253,6 @@ public class CountingSourceTest {
@Test
@Category(NeedsRunner.class)
public void testUnboundedSourceRateSplits() throws Exception {
- Pipeline p = TestPipeline.create();
int elementsPerPeriod = 10;
Duration period = Duration.millis(5);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSourceTest.java
index f4b8574..f709e22 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSourceTest.java
@@ -42,7 +42,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Random;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.io.FileBasedSource.FileBasedReader;
@@ -73,6 +72,7 @@ public class FileBasedSourceTest {
Random random = new Random(0L);
+ @Rule public final TestPipeline p = TestPipeline.create();
@Rule public TemporaryFolder tempFolder = new TemporaryFolder();
@Rule public ExpectedException thrown = ExpectedException.none();
@@ -719,7 +719,6 @@ public class FileBasedSourceTest {
@Test
@Category(NeedsRunner.class)
public void testDataflowFile() throws IOException {
- Pipeline p = TestPipeline.create();
List<String> data = createStringDataset(3, 50);
String fileName = "file";
@@ -735,7 +734,6 @@ public class FileBasedSourceTest {
@Test
@Category(NeedsRunner.class)
public void testDataflowFilePattern() throws IOException {
- Pipeline p = TestPipeline.create();
List<String> data1 = createStringDataset(3, 50);
File file1 = createFileWithData("file1", data1);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSinkTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSinkTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSinkTest.java
index 518136f..5bc1664 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSinkTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSinkTest.java
@@ -39,6 +39,7 @@ import org.apache.beam.sdk.util.PubsubTestClient;
import org.apache.beam.sdk.util.PubsubTestClient.PubsubTestClientFactory;
import org.joda.time.Duration;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -67,6 +68,9 @@ public class PubsubUnboundedSinkTest {
return Hashing.murmur3_128().hashBytes(data.getBytes()).toString();
}
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Test
public void saneCoder() throws Exception {
OutgoingMessage message = new OutgoingMessage(DATA.getBytes(), TIMESTAMP, getRecordId(DATA));
@@ -88,7 +92,7 @@ public class PubsubUnboundedSinkTest {
new PubsubUnboundedSink<>(factory, StaticValueProvider.of(TOPIC), StringUtf8Coder.of(),
TIMESTAMP_LABEL, ID_LABEL, NUM_SHARDS, batchSize, batchBytes,
Duration.standardSeconds(2), RecordIdMethod.DETERMINISTIC);
- TestPipeline p = TestPipeline.create();
+
p.apply(Create.of(ImmutableList.of(DATA)))
.apply(ParDo.of(new Stamp()))
.apply(sink);
@@ -117,7 +121,7 @@ public class PubsubUnboundedSinkTest {
new PubsubUnboundedSink<>(factory, StaticValueProvider.of(TOPIC), StringUtf8Coder.of(),
TIMESTAMP_LABEL, ID_LABEL, NUM_SHARDS, batchSize, batchBytes,
Duration.standardSeconds(2), RecordIdMethod.DETERMINISTIC);
- TestPipeline p = TestPipeline.create();
+
p.apply(Create.of(data))
.apply(ParDo.of(new Stamp()))
.apply(sink);
@@ -153,7 +157,7 @@ public class PubsubUnboundedSinkTest {
StringUtf8Coder.of(), TIMESTAMP_LABEL, ID_LABEL,
NUM_SHARDS, batchSize, batchBytes, Duration.standardSeconds(2),
RecordIdMethod.DETERMINISTIC);
- TestPipeline p = TestPipeline.create();
+
p.apply(Create.of(data))
.apply(ParDo.of(new Stamp()))
.apply(sink);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSourceTest.java
index f6165c5..601e2c8 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/PubsubUnboundedSourceTest.java
@@ -57,6 +57,7 @@ import org.apache.beam.sdk.util.PubsubTestClient;
import org.apache.beam.sdk.util.PubsubTestClient.PubsubTestClientFactory;
import org.joda.time.Instant;
import org.junit.After;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -82,6 +83,9 @@ public class PubsubUnboundedSourceTest {
private PubsubTestClientFactory factory;
private PubsubSource<String> primSource;
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
private void setupOneMessage(Iterable<IncomingMessage> incoming) {
now = new AtomicLong(REQ_TIME);
clock = new Clock() {
@@ -124,7 +128,6 @@ public class PubsubUnboundedSourceTest {
@Test
public void readOneMessage() throws IOException {
setupOneMessage();
- TestPipeline p = TestPipeline.create();
PubsubReader<String> reader = primSource.createReader(p.getOptions(), null);
// Read one message.
assertTrue(reader.start());
@@ -139,7 +142,6 @@ public class PubsubUnboundedSourceTest {
@Test
public void timeoutAckAndRereadOneMessage() throws IOException {
setupOneMessage();
- TestPipeline p = TestPipeline.create();
PubsubReader<String> reader = primSource.createReader(p.getOptions(), null);
PubsubTestClient pubsubClient = (PubsubTestClient) reader.getPubsubClient();
assertTrue(reader.start());
@@ -160,7 +162,6 @@ public class PubsubUnboundedSourceTest {
@Test
public void extendAck() throws IOException {
setupOneMessage();
- TestPipeline p = TestPipeline.create();
PubsubReader<String> reader = primSource.createReader(p.getOptions(), null);
PubsubTestClient pubsubClient = (PubsubTestClient) reader.getPubsubClient();
// Pull the first message but don't take a checkpoint for it.
@@ -183,7 +184,6 @@ public class PubsubUnboundedSourceTest {
@Test
public void timeoutAckExtensions() throws IOException {
setupOneMessage();
- TestPipeline p = TestPipeline.create();
PubsubReader<String> reader = primSource.createReader(p.getOptions(), null);
PubsubTestClient pubsubClient = (PubsubTestClient) reader.getPubsubClient();
// Pull the first message but don't take a checkpoint for it.
@@ -220,7 +220,6 @@ public class PubsubUnboundedSourceTest {
incoming.add(new IncomingMessage(data.getBytes(), TIMESTAMP, 0, ackid, RECORD_ID));
}
setupOneMessage(incoming);
- TestPipeline p = TestPipeline.create();
PubsubReader<String> reader = primSource.createReader(p.getOptions(), null);
// Consume two messages, only read one.
assertTrue(reader.start());
@@ -281,7 +280,6 @@ public class PubsubUnboundedSourceTest {
}
setupOneMessage(incoming);
- TestPipeline p = TestPipeline.create();
PubsubReader<String> reader = primSource.createReader(p.getOptions(), null);
PubsubTestClient pubsubClient = (PubsubTestClient) reader.getPubsubClient();
@@ -342,7 +340,6 @@ public class PubsubUnboundedSourceTest {
null);
assertThat(source.getSubscription(), nullValue());
- TestPipeline.create().apply(source);
assertThat(source.getSubscription(), nullValue());
PipelineOptions options = PipelineOptionsFactory.create();
@@ -373,7 +370,6 @@ public class PubsubUnboundedSourceTest {
null);
assertThat(source.getSubscription(), nullValue());
- TestPipeline.create().apply(source);
assertThat(source.getSubscription(), nullValue());
PipelineOptions options = PipelineOptionsFactory.create();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java
index 472399a..b8b28eb 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java
@@ -147,6 +147,9 @@ public class TextIOTest {
private static File largeZip;
@Rule
+ public TestPipeline p = TestPipeline.create();
+
+ @Rule
public ExpectedException expectedException = ExpectedException.none();
private static File writeToFile(String[] lines, String filename, CompressionType compression)
@@ -224,8 +227,6 @@ public class TextIOTest {
}
}
- Pipeline p = TestPipeline.create();
-
TextIO.Read.Bound<T> read;
if (coder.equals(StringUtf8Coder.of())) {
TextIO.Read.Bound<String> readStrings = TextIO.Read.from(filename);
@@ -273,7 +274,7 @@ public class TextIOTest {
@Test
public void testReadNamed() throws Exception {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
assertEquals(
"TextIO.Read/Read.out",
@@ -330,8 +331,6 @@ public class TextIOTest {
Path baseDir = Files.createTempDirectory(tempFolder, "testwrite");
String baseFilename = baseDir.resolve(outputName).toString();
- Pipeline p = TestPipeline.create();
-
PCollection<T> input = p.apply(Create.of(Arrays.asList(elems)).withCoder(coder));
TextIO.Write.Bound<T> write;
@@ -511,7 +510,6 @@ public class TextIOTest {
Coder<String> coder = StringUtf8Coder.of();
String outputName = "file.txt";
Path baseDir = Files.createTempDirectory(tempFolder, "testwrite");
- Pipeline p = TestPipeline.create();
PCollection<String> input = p.apply(Create.of(Arrays.asList(LINES2_ARRAY)).withCoder(coder));
@@ -601,11 +599,10 @@ public class TextIOTest {
@Test
public void testUnsupportedFilePattern() throws IOException {
+ p.enableAbandonedNodeEnforcement(false);
// Windows doesn't like resolving paths with * in them.
String filename = tempFolder.resolve("output@5").toString();
- Pipeline p = TestPipeline.create();
-
PCollection<String> input =
p.apply(Create.of(Arrays.asList(LINES_ARRAY))
.withCoder(StringUtf8Coder.of()));
@@ -621,13 +618,13 @@ public class TextIOTest {
*/
@Test
public void testBadWildcardRecursive() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
// Check that applying does fail.
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("wildcard");
- pipeline.apply(TextIO.Read.from("gs://bucket/foo**/baz"));
+ p.apply(TextIO.Read.from("gs://bucket/foo**/baz"));
}
/** Options for testing. */
@@ -641,9 +638,11 @@ public class TextIOTest {
@Test
public void testRuntimeOptionsNotCalledInApply() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
+
RuntimeTestOptions options = PipelineOptionsFactory.as(RuntimeTestOptions.class);
- pipeline
+
+ p
.apply(TextIO.Read.from(options.getInput()).withoutValidation())
.apply(TextIO.Write.to(options.getOutput()).withoutValidation());
}
@@ -686,12 +685,12 @@ public class TextIOTest {
* Helper method that runs TextIO.Read.from(filename).withCompressionType(compressionType)
* and asserts that the results match the given expected output.
*/
- private static void assertReadingCompressedFileMatchesExpected(
+ private void assertReadingCompressedFileMatchesExpected(
File file, CompressionType compressionType, String[] expected) {
- Pipeline p = TestPipeline.create();
+
TextIO.Read.Bound<String> read =
TextIO.Read.from(file.getPath()).withCompressionType(compressionType);
- PCollection<String> output = p.apply(read);
+ PCollection<String> output = p.apply("Read_" + file + "_" + compressionType.toString(), read);
PAssert.that(output).containsInAnyOrder(expected);
p.run();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
index 5a7c994..79f4c4b 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
@@ -79,6 +79,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class WriteTest {
+ @Rule public final TestPipeline p = TestPipeline.create();
@Rule public ExpectedException thrown = ExpectedException.none();
// Static store that can be accessed within the writer
@@ -294,7 +295,6 @@ public class WriteTest {
@Test
public void testWriteUnbounded() {
- TestPipeline p = TestPipeline.create();
PCollection<String> unbounded = p.apply(CountingInput.unbounded())
.apply(MapElements.via(new ToStringFn()));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/io/XmlSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/XmlSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/XmlSourceTest.java
index 1f154d5..d6898d5 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/XmlSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/XmlSourceTest.java
@@ -40,7 +40,6 @@ import java.util.List;
import java.util.Random;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.io.Source.Reader;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -64,6 +63,10 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class XmlSourceTest {
+
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
@@ -566,8 +569,6 @@ public class XmlSourceTest {
@Test
@Category(NeedsRunner.class)
public void testReadXMLSmallPipeline() throws IOException {
- Pipeline p = TestPipeline.create();
-
File file = tempFolder.newFile("trainXMLSmall");
Files.write(file.toPath(), trainXML.getBytes(StandardCharsets.UTF_8));
@@ -661,7 +662,6 @@ public class XmlSourceTest {
List<Train> trains = generateRandomTrainList(100);
File file = createRandomTrainXML(fileName, trains);
- Pipeline p = TestPipeline.create();
XmlSource<Train> source =
XmlSource.<Train>from(file.toPath().toString())
.withRootElement("trains")
@@ -808,8 +808,6 @@ public class XmlSourceTest {
generateRandomTrainList(8);
createRandomTrainXML("otherfile.xml", trains1);
- Pipeline p = TestPipeline.create();
-
XmlSource<Train> source =
XmlSource.<Train>from(file.getParent() + "/" + "temp*.xml")
.withRootElement("trains")
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java
index 5e97eed..4e257f1 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java
@@ -50,7 +50,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.transforms.Create;
@@ -90,6 +89,9 @@ public class ProxyInvocationHandlerTest {
void setString(String value);
}
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Test
public void testPropertySettingAndGetting() throws Exception {
ProxyInvocationHandler handler = new ProxyInvocationHandler(Maps.<String, Object>newHashMap());
@@ -785,7 +787,6 @@ public class ProxyInvocationHandlerTest {
}
};
- Pipeline p = TestPipeline.create();
p.getOptions().as(ObjectPipelineOptions.class).setValue(brokenValueType);
p.apply(Create.of(1, 2, 3));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformHierarchyTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformHierarchyTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformHierarchyTest.java
index b0c17d8..2327459 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformHierarchyTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformHierarchyTest.java
@@ -51,14 +51,16 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class TransformHierarchyTest {
+
+ @Rule public final TestPipeline pipeline = TestPipeline.create();
@Rule public ExpectedException thrown = ExpectedException.none();
+
private TransformHierarchy hierarchy;
- private TestPipeline pipeline;
+
@Before
public void setup() {
hierarchy = new TransformHierarchy();
- pipeline = TestPipeline.create();
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java
index d70aa2f..6a6e0fc 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/TransformTreeTest.java
@@ -55,6 +55,8 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class TransformTreeTest {
+
+ @Rule public final TestPipeline p = TestPipeline.create();
@Rule public TemporaryFolder tmpFolder = new TemporaryFolder();
enum TransformsSeen {
@@ -112,11 +114,11 @@ public class TransformTreeTest {
// visits the nodes and verifies that the hierarchy was captured.
@Test
public void testCompositeCapture() throws Exception {
+ p.enableAbandonedNodeEnforcement(false);
+
File inputFile = tmpFolder.newFile();
File outputFile = tmpFolder.newFile();
- Pipeline p = TestPipeline.create();
-
p.apply("ReadMyFile", TextIO.Read.from(inputFile.getPath()))
.apply(Sample.<String>any(10))
.apply("WriteMyFile", TextIO.Write.to(outputFile.getPath()));
@@ -170,18 +172,15 @@ public class TransformTreeTest {
@Test(expected = IllegalArgumentException.class)
public void testOutputChecking() throws Exception {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
p.apply(new InvalidCompositeTransform());
-
p.traverseTopologically(new Pipeline.PipelineVisitor.Defaults() {});
}
@Test
@Category(NeedsRunner.class)
public void testMultiGraphSetup() {
- Pipeline p = TestPipeline.create();
-
PCollection<Integer> input = p.begin()
.apply(Create.of(1, 2, 3));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/GatherAllPanesTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/GatherAllPanesTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/GatherAllPanesTest.java
index 417147f..a96e3f8 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/GatherAllPanesTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/GatherAllPanesTest.java
@@ -37,6 +37,7 @@ import org.apache.beam.sdk.values.PCollectionList;
import org.apache.beam.sdk.values.TypeDescriptor;
import org.joda.time.Duration;
import org.joda.time.Instant;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -45,10 +46,12 @@ import org.junit.runners.JUnit4;
/** Tests for {@link GatherAllPanes}. */
@RunWith(JUnit4.class)
public class GatherAllPanesTest implements Serializable {
+
+ @Rule public transient TestPipeline p = TestPipeline.create();
+
@Test
@Category(NeedsRunner.class)
public void singlePaneSingleReifiedPane() {
- TestPipeline p = TestPipeline.create();
PCollection<Iterable<ValueInSingleWindow<Iterable<Long>>>> accumulatedPanes =
p.apply(CountingInput.upTo(20000))
.apply(
@@ -91,8 +94,6 @@ public class GatherAllPanesTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void multiplePanesMultipleReifiedPane() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Long> someElems = p.apply("someLongs", CountingInput.upTo(20000));
PCollection<Long> otherElems = p.apply("otherLongs", CountingInput.upTo(20000));
PCollection<Iterable<ValueInSingleWindow<Iterable<Long>>>> accumulatedPanes =
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
----------------------------------------------------------------------
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 be8924f..1997bbe 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
@@ -59,6 +59,10 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class PAssertTest implements Serializable {
+
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
@Rule
public transient ExpectedException thrown = ExpectedException.none();
@@ -116,8 +120,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testContainsInAnyOrderNotSerializable() throws Exception {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<NotSerializableObject> pcollection = pipeline
.apply(Create.of(
new NotSerializableObject(),
@@ -139,8 +141,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testSerializablePredicate() throws Exception {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<NotSerializableObject> pcollection = pipeline
.apply(Create.of(
new NotSerializableObject(),
@@ -166,8 +166,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedSerializablePredicate() throws Exception {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<NotSerializableObject> pcollection = pipeline
.apply(Create.timestamped(
TimestampedValue.of(new NotSerializableObject(), new Instant(250L)),
@@ -207,7 +205,6 @@ public class PAssertTest implements Serializable {
thrown.expect(UnsupportedOperationException.class);
thrown.expectMessage("isEqualTo");
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection = pipeline.apply(Create.of(42));
PAssert.thatSingleton(pcollection).equals(42);
}
@@ -222,7 +219,6 @@ public class PAssertTest implements Serializable {
thrown.expect(UnsupportedOperationException.class);
thrown.expectMessage("containsInAnyOrder");
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection = pipeline.apply(Create.of(42));
PAssert.that(pcollection).equals(42);
}
@@ -237,7 +233,6 @@ public class PAssertTest implements Serializable {
thrown.expect(UnsupportedOperationException.class);
thrown.expectMessage(".hashCode() is not supported.");
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection = pipeline.apply(Create.of(42));
PAssert.thatSingleton(pcollection).hashCode();
}
@@ -252,7 +247,6 @@ public class PAssertTest implements Serializable {
thrown.expect(UnsupportedOperationException.class);
thrown.expectMessage(".hashCode() is not supported.");
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection = pipeline.apply(Create.of(42));
PAssert.that(pcollection).hashCode();
}
@@ -263,7 +257,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testIsEqualTo() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection = pipeline.apply(Create.of(43));
PAssert.thatSingleton(pcollection).isEqualTo(43);
pipeline.run();
@@ -275,7 +268,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedIsEqualTo() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection =
pipeline.apply(Create.timestamped(TimestampedValue.of(43, new Instant(250L)),
TimestampedValue.of(22, new Instant(-250L))))
@@ -295,7 +287,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testNotEqualTo() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection = pipeline.apply(Create.of(43));
PAssert.thatSingleton(pcollection).notEqualTo(42);
pipeline.run();
@@ -307,7 +298,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testContainsInAnyOrder() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection = pipeline.apply(Create.of(1, 2, 3, 4));
PAssert.that(pcollection).containsInAnyOrder(2, 1, 4, 3);
pipeline.run();
@@ -319,7 +309,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testGlobalWindowContainsInAnyOrder() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection = pipeline.apply(Create.of(1, 2, 3, 4));
PAssert.that(pcollection).inWindow(GlobalWindow.INSTANCE).containsInAnyOrder(2, 1, 4, 3);
pipeline.run();
@@ -331,7 +320,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedContainsInAnyOrder() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> pcollection =
pipeline.apply(Create.timestamped(TimestampedValue.of(1, new Instant(100L)),
TimestampedValue.of(2, new Instant(200L)),
@@ -361,13 +349,12 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmpty() {
- Pipeline p = TestPipeline.create();
PCollection<Long> vals =
- p.apply(Create.<Long>of().withCoder(VarLongCoder.of()));
+ pipeline.apply(Create.<Long>of().withCoder(VarLongCoder.of()));
PAssert.that(vals).empty();
- p.run();
+ pipeline.run();
}
/**
@@ -376,8 +363,6 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testContainsInAnyOrderFalse() throws Exception {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<Integer> pcollection = pipeline
.apply(Create.of(1, 2, 3, 4));
@@ -399,11 +384,10 @@ public class PAssertTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmptyFalse() throws Exception {
- Pipeline p = TestPipeline.create();
- PCollection<Long> vals = p.apply(CountingInput.upTo(5L));
+ PCollection<Long> vals = pipeline.apply(CountingInput.upTo(5L));
PAssert.that(vals).empty();
- Throwable thrown = runExpectingAssertionFailure(p);
+ Throwable thrown = runExpectingAssertionFailure(pipeline);
assertThat(thrown.getMessage(), containsString("Expected: iterable over [] in any order"));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/TestStreamTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/TestStreamTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/TestStreamTest.java
index a1b4e4a..64aeca3 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/TestStreamTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/TestStreamTest.java
@@ -65,6 +65,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class TestStreamTest implements Serializable {
+ @Rule public transient TestPipeline p = TestPipeline.create();
@Rule public transient ExpectedException thrown = ExpectedException.none();
@Test
@@ -85,7 +86,6 @@ public class TestStreamTest implements Serializable {
TimestampedValue.of(-3, instant))
.advanceWatermarkToInfinity();
- TestPipeline p = TestPipeline.create();
PCollection<Integer> windowed = p
.apply(source)
.apply(Window.<Integer>into(FixedWindows.of(Duration.standardMinutes(5))).triggering(
@@ -146,7 +146,6 @@ public class TestStreamTest implements Serializable {
.advanceProcessingTime(Duration.standardMinutes(6))
.advanceWatermarkToInfinity();
- TestPipeline p = TestPipeline.create();
PCollection<Long> sum = p.apply(source)
.apply(Window.<Long>triggering(AfterWatermark.pastEndOfWindow()
.withEarlyFirings(AfterProcessingTime.pastFirstElementInPane()
@@ -175,7 +174,6 @@ public class TestStreamTest implements Serializable {
TimestampedValue.of("alsoFinalLatePane", new Instant(250)))
.advanceWatermarkToInfinity();
- TestPipeline p = TestPipeline.create();
FixedWindows windowFn = FixedWindows.of(Duration.millis(1000L));
Duration allowedLateness = Duration.millis(5000L);
PCollection<String> values =
@@ -220,7 +218,6 @@ public class TestStreamTest implements Serializable {
.addElements(TimestampedValue.of("onTime", new Instant(100)))
.advanceWatermarkToInfinity();
- TestPipeline p = TestPipeline.create();
FixedWindows windowFn = FixedWindows.of(Duration.millis(1000L));
Duration allowedLateness = Duration.millis(5000L);
PCollection<String> values = p.apply(stream)
@@ -249,7 +246,6 @@ public class TestStreamTest implements Serializable {
TimestampedValue.of("bar", endOfGlobalWindow))
.advanceWatermarkToInfinity();
- TestPipeline p = TestPipeline.create();
FixedWindows windows = FixedWindows.of(Duration.standardHours(6));
PCollection<String> windowedValues = p.apply(stream)
.apply(Window.<String>into(windows))
@@ -274,7 +270,6 @@ public class TestStreamTest implements Serializable {
TestStream<Integer> other =
TestStream.create(VarIntCoder.of()).addElements(1, 2, 3, 4).advanceWatermarkToInfinity();
- TestPipeline p = TestPipeline.create();
PCollection<String> createStrings =
p.apply("CreateStrings", stream)
.apply("WindowStrings",
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateQuantilesTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateQuantilesTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateQuantilesTest.java
index ab13946..cd7898b 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateQuantilesTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateQuantilesTest.java
@@ -42,6 +42,7 @@ import org.hamcrest.CoreMatchers;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -63,6 +64,9 @@ public class ApproximateQuantilesTest {
KV.of("b", 100)
);
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
public PCollection<KV<String, Integer>> createInputTable(Pipeline p) {
return p.apply(Create.of(TABLE).withCoder(
KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
@@ -71,8 +75,6 @@ public class ApproximateQuantilesTest {
@Test
@Category(NeedsRunner.class)
public void testQuantilesGlobally() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> input = intRangeCollection(p, 101);
PCollection<List<Integer>> quantiles =
input.apply(ApproximateQuantiles.<Integer>globally(5));
@@ -85,8 +87,6 @@ public class ApproximateQuantilesTest {
@Test
@Category(NeedsRunner.class)
public void testQuantilesGobally_comparable() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> input = intRangeCollection(p, 101);
PCollection<List<Integer>> quantiles =
input.apply(
@@ -100,8 +100,6 @@ public class ApproximateQuantilesTest {
@Test
@Category(NeedsRunner.class)
public void testQuantilesPerKey() {
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input = createInputTable(p);
PCollection<KV<String, List<Integer>>> quantiles = input.apply(
ApproximateQuantiles.<String, Integer>perKey(2));
@@ -117,8 +115,6 @@ public class ApproximateQuantilesTest {
@Test
@Category(NeedsRunner.class)
public void testQuantilesPerKey_reversed() {
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input = createInputTable(p);
PCollection<KV<String, List<Integer>>> quantiles = input.apply(
ApproximateQuantiles.<String, Integer, DescendingIntComparator>perKey(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateUniqueTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateUniqueTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateUniqueTest.java
index b63c73d..3afc759 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateUniqueTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ApproximateUniqueTest.java
@@ -40,6 +40,7 @@ import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionView;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -52,6 +53,9 @@ import org.junit.runners.JUnit4;
public class ApproximateUniqueTest implements Serializable {
// implements Serializable just to make it easy to use anonymous inner DoFn subclasses
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Test
public void testEstimationErrorToSampleSize() {
assertEquals(40000, ApproximateUnique.sampleSizeFromEstimationError(0.01));
@@ -67,8 +71,6 @@ public class ApproximateUniqueTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testApproximateUniqueWithSmallInput() {
- Pipeline p = TestPipeline.create();
-
PCollection<Integer> input = p.apply(
Create.of(Arrays.asList(1, 2, 3, 3)));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
index 8862531..cdd4707 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
@@ -28,7 +28,6 @@ import java.io.OutputStream;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
@@ -62,6 +61,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class CombineFnsTest {
+ @Rule public final TestPipeline p = TestPipeline.create();
@Rule public ExpectedException expectedException = ExpectedException.none();
@Test
@@ -123,7 +123,6 @@ public class CombineFnsTest {
@Test
@Category(RunnableOnService.class)
public void testComposedCombine() {
- Pipeline p = TestPipeline.create();
p.getCoderRegistry().registerCoder(UserString.class, UserStringCoder.of());
PCollection<KV<String, KV<Integer, UserString>>> perKeyInput = p.apply(
@@ -178,7 +177,6 @@ public class CombineFnsTest {
@Test
@Category(RunnableOnService.class)
public void testComposedCombineWithContext() {
- Pipeline p = TestPipeline.create();
p.getCoderRegistry().registerCoder(UserString.class, UserStringCoder.of());
PCollectionView<String> view = p
@@ -240,7 +238,6 @@ public class CombineFnsTest {
@Test
@Category(RunnableOnService.class)
public void testComposedCombineNullValues() {
- Pipeline p = TestPipeline.create();
p.getCoderRegistry().registerCoder(UserString.class, NullableCoder.of(UserStringCoder.of()));
p.getCoderRegistry().registerCoder(String.class, NullableCoder.of(StringUtf8Coder.of()));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
index 671f00e..0ac9502 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
@@ -82,6 +82,7 @@ import org.apache.beam.sdk.values.PCollectionView;
import org.apache.beam.sdk.values.POutput;
import org.hamcrest.Matchers;
import org.joda.time.Duration;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -108,6 +109,9 @@ public class CombineTest implements Serializable {
@Mock private DoFn<?, ?>.ProcessContext processContext;
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
PCollection<KV<String, Integer>> createInput(Pipeline p,
List<KV<String, Integer>> table) {
return p.apply(Create.of(table).withCoder(
@@ -117,7 +121,6 @@ public class CombineTest implements Serializable {
private void runTestSimpleCombine(List<KV<String, Integer>> table,
int globalSum,
List<KV<String, String>> perKeyCombines) {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> input = createInput(pipeline, table);
PCollection<Integer> sum = input
@@ -138,7 +141,6 @@ public class CombineTest implements Serializable {
int globalSum,
List<KV<String, String>> perKeyCombines,
String[] globallyCombines) {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> perKeyInput = createInput(pipeline, table);
PCollection<Integer> globallyInput = perKeyInput.apply(Values.<Integer>create());
@@ -197,7 +199,6 @@ public class CombineTest implements Serializable {
private void runTestBasicCombine(List<KV<String, Integer>> table,
Set<Integer> globalUnique,
List<KV<String, Set<Integer>>> perKeyUnique) {
- Pipeline pipeline = TestPipeline.create();
pipeline.getCoderRegistry().registerCoder(Set.class, SetCoder.class);
PCollection<KV<String, Integer>> input = createInput(pipeline, table);
@@ -233,7 +234,6 @@ public class CombineTest implements Serializable {
private void runTestAccumulatingCombine(List<KV<String, Integer>> table,
Double globalMean,
List<KV<String, Double>> perKeyMeans) {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> input = createInput(pipeline, table);
PCollection<Double> mean = input
@@ -253,8 +253,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFixedWindowsCombine() {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
pipeline.apply(Create.timestamped(TABLE, Arrays.asList(0L, 1L, 6L, 7L, 8L))
.withCoder(KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())))
@@ -279,8 +277,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFixedWindowsCombineWithContext() {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<KV<String, Integer>> perKeyInput =
pipeline.apply(Create.timestamped(TABLE, Arrays.asList(0L, 1L, 6L, 7L, 8L))
.withCoder(KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())))
@@ -316,8 +312,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testSlidingWindowsCombineWithContext() {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<KV<String, Integer>> perKeyInput =
pipeline.apply(Create.timestamped(TABLE, Arrays.asList(2L, 3L, 8L, 9L, 10L))
.withCoder(KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())))
@@ -365,7 +359,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testGlobalCombineWithDefaultsAndTriggers() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> input = pipeline.apply(Create.of(1, 1));
PCollection<String> output = input
@@ -392,8 +385,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testSessionsCombine() {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
pipeline.apply(Create.timestamped(TABLE, Arrays.asList(0L, 4L, 7L, 10L, 16L))
.withCoder(KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())))
@@ -417,8 +408,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testSessionsCombineWithContext() {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<KV<String, Integer>> perKeyInput =
pipeline.apply(Create.timestamped(TABLE, Arrays.asList(0L, 4L, 7L, 10L, 16L))
.withCoder(KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
@@ -459,8 +448,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowedCombineEmpty() {
- Pipeline pipeline = TestPipeline.create();
-
PCollection<Double> mean = pipeline
.apply(Create.<Integer>of().withCoder(BigEndianIntegerCoder.of()))
.apply(Window.<Integer>into(FixedWindows.of(Duration.millis(1))))
@@ -517,7 +504,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testHotKeyCombining() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> input = copy(createInput(pipeline, TABLE), 10);
KeyedCombineFn<String, Integer, ?, Double> mean =
@@ -552,7 +538,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testHotKeyCombiningWithAccumulationMode() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> input = pipeline.apply(Create.of(1, 2, 3, 4, 5));
PCollection<Integer> output = input
@@ -577,7 +562,6 @@ public class CombineTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testBinaryCombineFn() {
- Pipeline pipeline = TestPipeline.create();
PCollection<KV<String, Integer>> input = copy(createInput(pipeline, TABLE), 2);
PCollection<KV<String, Integer>> intProduct = input
.apply("IntProduct", Combine.<String, Integer, Integer>perKey(new TestProdInt()));
@@ -632,7 +616,6 @@ public class CombineTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testCombineGloballyAsSingletonView() {
- Pipeline pipeline = TestPipeline.create();
final PCollectionView<Integer> view = pipeline
.apply("CreateEmptySideInput", Create.<Integer>of().withCoder(BigEndianIntegerCoder.of()))
.apply(Sum.integersGlobally().asSingletonView());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CountTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CountTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CountTest.java
index 7f77ae7..eafb12d 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CountTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CountTest.java
@@ -22,13 +22,13 @@ import static org.junit.Assert.assertEquals;
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;
import org.apache.beam.sdk.testing.TestPipeline;
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;
@@ -45,12 +45,13 @@ public class CountTest {
static final List<String> WORDS = Arrays.asList(WORDS_ARRAY);
+ @Rule
+ public TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
@SuppressWarnings("unchecked")
public void testCountPerElementBasic() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> input = p.apply(Create.of(WORDS));
PCollection<KV<String, Long>> output =
@@ -71,8 +72,6 @@ public class CountTest {
@Category(RunnableOnService.class)
@SuppressWarnings("unchecked")
public void testCountPerElementEmpty() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> input = p.apply(Create.of(NO_LINES).withCoder(StringUtf8Coder.of()));
PCollection<KV<String, Long>> output =
@@ -85,8 +84,6 @@ public class CountTest {
@Test
@Category(RunnableOnService.class)
public void testCountGloballyBasic() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> input = p.apply(Create.of(WORDS));
PCollection<Long> output =
@@ -100,8 +97,6 @@ public class CountTest {
@Test
@Category(RunnableOnService.class)
public void testCountGloballyEmpty() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> input = p.apply(Create.of(NO_LINES).withCoder(StringUtf8Coder.of()));
PCollection<Long> output =
[13/17] incubator-beam git commit: Migrated the
beam-sdks-java-extensions-sorter module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-extensions-sorter 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/63331aa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/63331aa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/63331aa8
Branch: refs/heads/master
Commit: 63331aa8aa6314e8469c23a4f4a89fbf287cbc5a
Parents: 24ad183
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 09:54:57 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../org/apache/beam/sdk/extensions/sorter/SortValuesTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/63331aa8/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/SortValuesTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/SortValuesTest.java b/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/SortValuesTest.java
index ebfbd0e..4f77100 100644
--- a/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/SortValuesTest.java
+++ b/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/SortValuesTest.java
@@ -24,7 +24,6 @@ import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import java.util.Arrays;
-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;
@@ -35,6 +34,7 @@ import org.apache.beam.sdk.values.PCollection;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -43,10 +43,11 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class SortValuesTest {
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Test
public void testSecondaryKeySorting() throws Exception {
- Pipeline p = TestPipeline.create();
-
// Create a PCollection of <Key, <SecondaryKey, Value>> pairs.
PCollection<KV<String, KV<String, Integer>>> input =
p.apply(
[03/17] incubator-beam git commit: Migrated the
beam-sdks-java-io-kafka module to TestPipeline as a JUnit rule.
Posted by ke...@apache.org.
Migrated the beam-sdks-java-io-kafka 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/12be8b1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/12be8b1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/12be8b1e
Branch: refs/heads/master
Commit: 12be8b1e6adf342e2b482aa37d5a9577e13802c5
Parents: 8d478c0
Author: Stas Levin <st...@gmail.com>
Authored: Tue Dec 20 17:38:38 2016 +0200
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 09:55:45 2016 -0800
----------------------------------------------------------------------
.../apache/beam/sdk/io/kafka/KafkaIOTest.java | 25 +++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/12be8b1e/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java
index cc1ef26..071deea 100644
--- a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java
+++ b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java
@@ -39,7 +39,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.Pipeline.PipelineExecutionException;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.BigEndianLongCoder;
@@ -95,6 +94,9 @@ public class KafkaIOTest {
*/
@Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
+ @Rule
public ExpectedException thrown = ExpectedException.none();
// Update mock consumer with records distributed among the given topics, each with given number
@@ -268,7 +270,6 @@ public class KafkaIOTest {
@Test
@Category(NeedsRunner.class)
public void testUnboundedSource() {
- Pipeline p = TestPipeline.create();
int numElements = 1000;
PCollection<Long> input = p
@@ -283,7 +284,6 @@ public class KafkaIOTest {
@Test
@Category(NeedsRunner.class)
public void testUnboundedSourceWithExplicitPartitions() {
- Pipeline p = TestPipeline.create();
int numElements = 1000;
List<String> topics = ImmutableList.of("test");
@@ -322,7 +322,7 @@ public class KafkaIOTest {
@Test
@Category(NeedsRunner.class)
public void testUnboundedSourceTimestamps() {
- Pipeline p = TestPipeline.create();
+
int numElements = 1000;
PCollection<Long> input = p
@@ -350,7 +350,7 @@ public class KafkaIOTest {
@Test
@Category(NeedsRunner.class)
public void testUnboundedSourceSplits() throws Exception {
- Pipeline p = TestPipeline.create();
+
int numElements = 1000;
int numSplits = 10;
@@ -514,10 +514,9 @@ public class KafkaIOTest {
ProducerSendCompletionThread completionThread = new ProducerSendCompletionThread().start();
- Pipeline pipeline = TestPipeline.create();
String topic = "test";
- pipeline
+ p
.apply(mkKafkaReadTransform(numElements, new ValueAsTimestampFn())
.withoutMetadata())
.apply(KafkaIO.write()
@@ -527,7 +526,7 @@ public class KafkaIOTest {
.withValueCoder(BigEndianLongCoder.of())
.withProducerFactoryFn(new ProducerFactoryFn()));
- pipeline.run();
+ p.run();
completionThread.shutdown();
@@ -547,10 +546,9 @@ public class KafkaIOTest {
ProducerSendCompletionThread completionThread = new ProducerSendCompletionThread().start();
- Pipeline pipeline = TestPipeline.create();
String topic = "test";
- pipeline
+ p
.apply(mkKafkaReadTransform(numElements, new ValueAsTimestampFn())
.withoutMetadata())
.apply(Values.<Long>create()) // there are no keys
@@ -562,7 +560,7 @@ public class KafkaIOTest {
.withProducerFactoryFn(new ProducerFactoryFn())
.values());
- pipeline.run();
+ p.run();
completionThread.shutdown();
@@ -588,13 +586,12 @@ public class KafkaIOTest {
MOCK_PRODUCER.clear();
- Pipeline pipeline = TestPipeline.create();
String topic = "test";
ProducerSendCompletionThread completionThreadWithErrors =
new ProducerSendCompletionThread(10, 100).start();
- pipeline
+ p
.apply(mkKafkaReadTransform(numElements, new ValueAsTimestampFn())
.withoutMetadata())
.apply(KafkaIO.write()
@@ -605,7 +602,7 @@ public class KafkaIOTest {
.withProducerFactoryFn(new ProducerFactoryFn()));
try {
- pipeline.run();
+ p.run();
} catch (PipelineExecutionException e) {
// throwing inner exception helps assert that first exception is thrown from the Sink
throw e.getCause().getCause();
[09/17] incubator-beam git commit: Migrated the beam-sdks-java-core
module to TestPipeline as a JUnit rule. Plus,
fixed some checkstyle errors from previous modules' migration.
Posted by ke...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CreateTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CreateTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CreateTest.java
index 2a89a18..3bc0a65 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CreateTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CreateTest.java
@@ -38,7 +38,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Random;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.AtomicCoder;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.Coder;
@@ -76,12 +75,12 @@ import org.junit.runners.JUnit4;
@SuppressWarnings("unchecked")
public class CreateTest {
@Rule public final ExpectedException thrown = ExpectedException.none();
+ @Rule public final TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testCreate() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> output =
p.apply(Create.of(LINES));
@@ -93,8 +92,6 @@ public class CreateTest {
@Test
@Category(RunnableOnService.class)
public void testCreateEmpty() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> output =
p.apply(Create.of(NO_LINES)
.withCoder(StringUtf8Coder.of()));
@@ -106,7 +103,7 @@ public class CreateTest {
@Test
public void testCreateEmptyInfersCoder() {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
PCollection<Object> output =
p.apply(Create.of());
@@ -126,8 +123,6 @@ public class CreateTest {
thrown.expectMessage(
Matchers.containsString("Unable to infer a coder"));
- Pipeline p = TestPipeline.create();
-
// Create won't infer a default coder in this case.
p.apply(Create.of(new Record(), new Record2()));
@@ -137,8 +132,6 @@ public class CreateTest {
@Test
@Category(RunnableOnService.class)
public void testCreateWithNullsAndValues() throws Exception {
- Pipeline p = TestPipeline.create();
-
PCollection<String> output =
p.apply(Create.of(null, "test1", null, "test2", null)
.withCoder(SerializableCoder.of(String.class)));
@@ -150,8 +143,6 @@ public class CreateTest {
@Test
@Category(NeedsRunner.class)
public void testCreateParameterizedType() throws Exception {
- Pipeline p = TestPipeline.create();
-
PCollection<TimestampedValue<String>> output =
p.apply(Create.of(
TimestampedValue.of("a", new Instant(0)),
@@ -216,7 +207,6 @@ public class CreateTest {
Create.Values<UnserializableRecord> create =
Create.of(elements).withCoder(new UnserializableRecord.UnserializableRecordCoder());
- TestPipeline p = TestPipeline.create();
PAssert.that(p.apply(create))
.containsInAnyOrder(
new UnserializableRecord("foo"),
@@ -235,8 +225,6 @@ public class CreateTest {
@Test
@Category(RunnableOnService.class)
public void testCreateTimestamped() {
- Pipeline p = TestPipeline.create();
-
List<TimestampedValue<String>> data = Arrays.asList(
TimestampedValue.of("a", new Instant(1L)),
TimestampedValue.of("b", new Instant(2L)),
@@ -254,8 +242,6 @@ public class CreateTest {
@Test
@Category(RunnableOnService.class)
public void testCreateTimestampedEmpty() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> output = p
.apply(Create.timestamped(new ArrayList<TimestampedValue<String>>())
.withCoder(StringUtf8Coder.of()));
@@ -266,7 +252,7 @@ public class CreateTest {
@Test
public void testCreateTimestampedEmptyInfersCoder() {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
PCollection<Object> output = p
.apply(Create.timestamped());
@@ -280,8 +266,6 @@ public class CreateTest {
thrown.expectMessage(
Matchers.containsString("Unable to infer a coder"));
- Pipeline p = TestPipeline.create();
-
// Create won't infer a default coder in this case.
PCollection<Record> c = p.apply(Create.timestamped(
TimestampedValue.of(new Record(), new Instant(0)),
@@ -295,7 +279,6 @@ public class CreateTest {
@Test
@Category(RunnableOnService.class)
public void testCreateWithVoidType() throws Exception {
- Pipeline p = TestPipeline.create();
PCollection<Void> output = p.apply(Create.of((Void) null, (Void) null));
PAssert.that(output).containsInAnyOrder((Void) null, (Void) null);
p.run();
@@ -304,8 +287,6 @@ public class CreateTest {
@Test
@Category(RunnableOnService.class)
public void testCreateWithKVVoidType() throws Exception {
- Pipeline p = TestPipeline.create();
-
PCollection<KV<Void, Void>> output = p.apply(Create.of(
KV.of((Void) null, (Void) null),
KV.of((Void) null, (Void) null)));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DistinctTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DistinctTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DistinctTest.java
index 257b364..b3b3925 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DistinctTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DistinctTest.java
@@ -24,13 +24,13 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-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;
import org.apache.beam.sdk.testing.TestPipeline;
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;
@@ -41,6 +41,10 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class DistinctTest {
+
+ @Rule
+ public final TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testDistinct() {
@@ -53,8 +57,6 @@ public class DistinctTest {
"k2",
"k3");
- Pipeline p = TestPipeline.create();
-
PCollection<String> input =
p.apply(Create.of(strings)
.withCoder(StringUtf8Coder.of()));
@@ -72,8 +74,6 @@ public class DistinctTest {
public void testDistinctEmpty() {
List<String> strings = Arrays.asList();
- Pipeline p = TestPipeline.create();
-
PCollection<String> input =
p.apply(Create.of(strings)
.withCoder(StringUtf8Coder.of()));
@@ -115,8 +115,6 @@ public class DistinctTest {
KV.of("k1", "v2"),
KV.of("k2", "v1"));
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, String>> input = p.apply(Create.of(strings));
PCollection<KV<String, String>> output =
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java
index e5f5cb6..19b7c51 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTest.java
@@ -40,6 +40,9 @@ import org.junit.runners.JUnit4;
/** Tests for {@link DoFn}. */
@RunWith(JUnit4.class)
public class DoFnTest implements Serializable {
+
+ @Rule public final transient TestPipeline pipeline = TestPipeline.create();
+
@Rule
public transient ExpectedException thrown = ExpectedException.none();
@@ -200,7 +203,6 @@ public class DoFnTest implements Serializable {
* Initialize a test pipeline with the specified {@link DoFn}.
*/
private <InputT, OutputT> TestPipeline createTestPipeline(DoFn<InputT, OutputT> fn) {
- TestPipeline pipeline = TestPipeline.create();
pipeline.apply(Create.of((InputT) null))
.apply(ParDo.of(fn));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTesterTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTesterTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTesterTest.java
index 2dafa27..3859c9f 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTesterTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTesterTest.java
@@ -52,6 +52,8 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class DoFnTesterTest {
+
+ @Rule public final TestPipeline p = TestPipeline.create();
@Rule public ExpectedException thrown = ExpectedException.none();
@Test
@@ -324,7 +326,7 @@ public class DoFnTesterTest {
public void fnWithSideInputDefault() throws Exception {
final PCollectionView<Integer> value =
PCollectionViews.singletonView(
- TestPipeline.create(), WindowingStrategy.globalDefault(), true, 0, VarIntCoder.of());
+ p, WindowingStrategy.globalDefault(), true, 0, VarIntCoder.of());
try (DoFnTester<Integer, Integer> tester = DoFnTester.of(new SideInputDoFn(value))) {
tester.processElement(1);
@@ -339,7 +341,7 @@ public class DoFnTesterTest {
public void fnWithSideInputExplicit() throws Exception {
final PCollectionView<Integer> value =
PCollectionViews.singletonView(
- TestPipeline.create(), WindowingStrategy.globalDefault(), true, 0, VarIntCoder.of());
+ p, WindowingStrategy.globalDefault(), true, 0, VarIntCoder.of());
try (DoFnTester<Integer, Integer> tester = DoFnTester.of(new SideInputDoFn(value))) {
tester.setSideInput(value, GlobalWindow.INSTANCE, -2);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FilterTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FilterTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FilterTest.java
index 5221f75..81e1d02 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FilterTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FilterTest.java
@@ -26,6 +26,7 @@ import org.apache.beam.sdk.testing.RunnableOnService;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.transforms.display.DisplayData;
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;
@@ -57,11 +58,12 @@ public class FilterTest implements Serializable {
}
}
+ @Rule
+ public final TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testIdentityFilterByPredicate() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> output = p
.apply(Create.of(591, 11789, 1257, 24578, 24799, 307))
.apply(Filter.by(new TrivialFn(true)));
@@ -73,8 +75,6 @@ public class FilterTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testNoFilterByPredicate() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> output = p
.apply(Create.of(1, 2, 4, 5))
.apply(Filter.by(new TrivialFn(false)));
@@ -86,8 +86,6 @@ public class FilterTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFilterByPredicate() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> output = p
.apply(Create.of(1, 2, 3, 4, 5, 6, 7))
.apply(Filter.by(new EvenFn()));
@@ -99,8 +97,6 @@ public class FilterTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFilterLessThan() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> output = p
.apply(Create.of(1, 2, 3, 4, 5, 6, 7))
.apply(Filter.lessThan(4));
@@ -112,8 +108,6 @@ public class FilterTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFilterGreaterThan() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> output = p
.apply(Create.of(1, 2, 3, 4, 5, 6, 7))
.apply(Filter.greaterThan(4));
@@ -125,8 +119,6 @@ public class FilterTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFilterLessThanEq() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> output = p
.apply(Create.of(1, 2, 3, 4, 5, 6, 7))
.apply(Filter.lessThanEq(4));
@@ -138,8 +130,6 @@ public class FilterTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFilterGreaterThanEq() {
- TestPipeline p = TestPipeline.create();
-
PCollection<Integer> output = p
.apply(Create.of(1, 2, 3, 4, 5, 6, 7))
.apply(Filter.greaterThanEq(4));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsTest.java
index bb2877e..b24071e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlatMapElementsTest.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.TestPipeline;
@@ -49,6 +48,9 @@ import org.junit.runners.JUnit4;
public class FlatMapElementsTest implements Serializable {
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
/**
@@ -57,7 +59,6 @@ public class FlatMapElementsTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testFlatMapBasic() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
@@ -82,7 +83,6 @@ public class FlatMapElementsTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testFlatMapFnOutputTypeDescriptor() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<String> output = pipeline
.apply(Create.of("hello"))
.apply(FlatMapElements.via(new SimpleFunction<String, Set<String>>() {
@@ -117,7 +117,8 @@ public class FlatMapElementsTest implements Serializable {
*/
@Test
public void testPolymorphicSimpleFunction() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
+
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
@@ -168,7 +169,6 @@ public class FlatMapElementsTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testVoidValues() throws Exception {
- Pipeline pipeline = TestPipeline.create();
pipeline
.apply(Create.of("hello"))
.apply(WithKeys.<String, String>of("k"))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlattenTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlattenTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlattenTest.java
index d4686a4..48251bc 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlattenTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/FlattenTest.java
@@ -65,6 +65,9 @@ import org.junit.runners.JUnit4;
public class FlattenTest implements Serializable {
@Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
@@ -74,8 +77,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenPCollectionList() {
- Pipeline p = TestPipeline.create();
-
List<List<String>> inputs = Arrays.asList(
LINES, NO_LINES, LINES2, NO_LINES, LINES, NO_LINES);
@@ -90,8 +91,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenPCollectionListThenParDo() {
- Pipeline p = TestPipeline.create();
-
List<List<String>> inputs = Arrays.asList(
LINES, NO_LINES, LINES2, NO_LINES, LINES, NO_LINES);
@@ -107,8 +106,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenPCollectionListEmpty() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> output =
PCollectionList.<String>empty(p)
.apply(Flatten.<String>pCollections()).setCoder(StringUtf8Coder.of());
@@ -120,8 +117,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenInputMultipleCopies() {
- Pipeline p = TestPipeline.create();
-
int count = 5;
PCollection<Long> longs = p.apply("mkLines", CountingInput.upTo(count));
PCollection<Long> biggerLongs =
@@ -154,8 +149,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testEmptyFlattenAsSideInput() {
- Pipeline p = TestPipeline.create();
-
final PCollectionView<Iterable<String>> view =
PCollectionList.<String>empty(p)
.apply(Flatten.<String>pCollections()).setCoder(StringUtf8Coder.of())
@@ -179,9 +172,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenPCollectionListEmptyThenParDo() {
-
- Pipeline p = TestPipeline.create();
-
PCollection<String> output =
PCollectionList.<String>empty(p)
.apply(Flatten.<String>pCollections()).setCoder(StringUtf8Coder.of())
@@ -198,8 +188,6 @@ public class FlattenTest implements Serializable {
thrown.expect(IllegalStateException.class);
thrown.expectMessage("cannot provide a Coder for empty");
- Pipeline p = TestPipeline.create();
-
PCollectionList.<ClassWithoutCoder>empty(p)
.apply(Flatten.<ClassWithoutCoder>pCollections());
@@ -211,8 +199,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenIterables() {
- Pipeline p = TestPipeline.create();
-
PCollection<Iterable<String>> input = p
.apply(Create.<Iterable<String>>of(LINES)
.withCoder(IterableCoder.of(StringUtf8Coder.of())));
@@ -229,8 +215,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenIterablesLists() {
- Pipeline p = TestPipeline.create();
-
PCollection<List<String>> input =
p.apply(Create.<List<String>>of(LINES).withCoder(ListCoder.of(StringUtf8Coder.of())));
@@ -244,8 +228,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenIterablesSets() {
- Pipeline p = TestPipeline.create();
-
Set<String> linesSet = ImmutableSet.copyOf(LINES);
PCollection<Set<String>> input =
@@ -261,9 +243,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenIterablesCollections() {
-
- Pipeline p = TestPipeline.create();
-
Set<String> linesSet = ImmutableSet.copyOf(LINES);
PCollection<Collection<String>> input =
@@ -280,8 +259,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFlattenIterablesEmpty() {
- Pipeline p = TestPipeline.create();
-
PCollection<Iterable<String>> input = p
.apply(Create.<Iterable<String>>of(NO_LINES)
.withCoder(IterableCoder.of(StringUtf8Coder.of())));
@@ -300,8 +277,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testEqualWindowFnPropagation() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> input1 =
p.apply("CreateInput1", Create.of("Input1"))
.apply("Window1", Window.<String>into(FixedWindows.of(Duration.standardMinutes(1))));
@@ -322,8 +297,6 @@ public class FlattenTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testCompatibleWindowFnPropagation() {
- Pipeline p = TestPipeline.create();
-
PCollection<String> input1 =
p.apply("CreateInput1", Create.of("Input1"))
.apply("Window1",
@@ -345,7 +318,7 @@ public class FlattenTest implements Serializable {
@Test
public void testIncompatibleWindowFnPropagationFailure() {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
PCollection<String> input1 =
p.apply("CreateInput1", Create.of("Input1"))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java
index ebde110..f4bec3a 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java
@@ -39,7 +39,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.AtomicCoder;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.Coder;
@@ -81,6 +80,9 @@ import org.junit.runners.JUnit4;
public class GroupByKeyTest {
@Rule
+ public final TestPipeline p = TestPipeline.create();
+
+ @Rule
public ExpectedException thrown = ExpectedException.none();
@Test
@@ -95,8 +97,6 @@ public class GroupByKeyTest {
KV.of("k2", -33),
KV.of("k3", 0));
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
p.apply(Create.of(ungroupedPairs)
.withCoder(KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
@@ -137,8 +137,6 @@ public class GroupByKeyTest {
KV.of("k2", -33), // window [5, 10)
KV.of("k3", 0)); // window [5, 10)
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
p.apply(Create.timestamped(ungroupedPairs, Arrays.asList(1L, 2L, 3L, 4L, 5L, 6L, 7L))
.withCoder(KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
@@ -174,8 +172,6 @@ public class GroupByKeyTest {
public void testGroupByKeyEmpty() {
List<KV<String, Integer>> ungroupedPairs = Arrays.asList();
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
p.apply(Create.of(ungroupedPairs)
.withCoder(KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
@@ -193,8 +189,6 @@ public class GroupByKeyTest {
List<KV<Map<String, String>, Integer>> ungroupedPairs = Arrays.asList();
- Pipeline p = TestPipeline.create();
-
PCollection<KV<Map<String, String>, Integer>> input =
p.apply(Create.of(ungroupedPairs)
.withCoder(
@@ -209,7 +203,6 @@ public class GroupByKeyTest {
@Test
@Category(NeedsRunner.class)
public void testIdentityWindowFnPropagation() {
- Pipeline p = TestPipeline.create();
List<KV<String, Integer>> ungroupedPairs = Arrays.asList();
@@ -230,7 +223,6 @@ public class GroupByKeyTest {
@Test
@Category(NeedsRunner.class)
public void testWindowFnInvalidation() {
- Pipeline p = TestPipeline.create();
List<KV<String, Integer>> ungroupedPairs = Arrays.asList();
@@ -255,7 +247,6 @@ public class GroupByKeyTest {
@Test
public void testInvalidWindowsDirect() {
- Pipeline p = TestPipeline.create();
List<KV<String, Integer>> ungroupedPairs = Arrays.asList();
@@ -275,7 +266,6 @@ public class GroupByKeyTest {
@Test
@Category(NeedsRunner.class)
public void testRemerge() {
- Pipeline p = TestPipeline.create();
List<KV<String, Integer>> ungroupedPairs = Arrays.asList();
@@ -300,7 +290,6 @@ public class GroupByKeyTest {
@Test
public void testGroupByKeyDirectUnbounded() {
- Pipeline p = TestPipeline.create();
PCollection<KV<String, Integer>> input =
p.apply(
@@ -331,9 +320,8 @@ public class GroupByKeyTest {
@Test
@Category(RunnableOnService.class)
public void testOutputTimeFnEarliest() {
- Pipeline pipeline = TestPipeline.create();
- pipeline.apply(
+ p.apply(
Create.timestamped(
TimestampedValue.of(KV.of(0, "hello"), new Instant(0)),
TimestampedValue.of(KV.of(0, "goodbye"), new Instant(10))))
@@ -342,7 +330,7 @@ public class GroupByKeyTest {
.apply(GroupByKey.<Integer, String>create())
.apply(ParDo.of(new AssertTimestamp(new Instant(0))));
- pipeline.run();
+ p.run();
}
@@ -353,9 +341,7 @@ public class GroupByKeyTest {
@Test
@Category(RunnableOnService.class)
public void testOutputTimeFnLatest() {
- Pipeline pipeline = TestPipeline.create();
-
- pipeline.apply(
+ p.apply(
Create.timestamped(
TimestampedValue.of(KV.of(0, "hello"), new Instant(0)),
TimestampedValue.of(KV.of(0, "goodbye"), new Instant(10))))
@@ -364,7 +350,7 @@ public class GroupByKeyTest {
.apply(GroupByKey.<Integer, String>create())
.apply(ParDo.of(new AssertTimestamp(new Instant(10))));
- pipeline.run();
+ p.run();
}
private static class AssertTimestamp<K, V> extends DoFn<KV<K, V>, Void> {
@@ -408,8 +394,6 @@ public class GroupByKeyTest {
final int numValues = 10;
final int numKeys = 5;
- Pipeline p = TestPipeline.create();
-
p.getCoderRegistry().registerCoder(BadEqualityKey.class, DeterministicKeyCoder.class);
// construct input data
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KeysTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KeysTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KeysTest.java
index fce5b2f..2a19802 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KeysTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KeysTest.java
@@ -18,7 +18,6 @@
package org.apache.beam.sdk.transforms;
import java.util.Arrays;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
@@ -27,6 +26,7 @@ import org.apache.beam.sdk.testing.RunnableOnService;
import org.apache.beam.sdk.testing.TestPipeline;
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;
@@ -50,11 +50,12 @@ public class KeysTest {
static final KV<String, Integer>[] EMPTY_TABLE = new KV[] {
};
+ @Rule
+ public final TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testKeys() {
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
p.apply(Create.of(Arrays.asList(TABLE)).withCoder(
KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
@@ -69,8 +70,6 @@ public class KeysTest {
@Test
@Category(RunnableOnService.class)
public void testKeysEmpty() {
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
p.apply(Create.of(Arrays.asList(EMPTY_TABLE)).withCoder(
KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java
index 3598198..24186ed 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java
@@ -18,7 +18,6 @@
package org.apache.beam.sdk.transforms;
import java.util.Arrays;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
@@ -27,6 +26,7 @@ import org.apache.beam.sdk.testing.RunnableOnService;
import org.apache.beam.sdk.testing.TestPipeline;
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;
@@ -50,11 +50,12 @@ public class KvSwapTest {
static final KV<String, Integer>[] EMPTY_TABLE = new KV[] {
};
+ @Rule
+ public final TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testKvSwap() {
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
p.apply(Create.of(Arrays.asList(TABLE)).withCoder(
KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
@@ -75,8 +76,6 @@ public class KvSwapTest {
@Test
@Category(RunnableOnService.class)
public void testKvSwapEmpty() {
- Pipeline p = TestPipeline.create();
-
PCollection<KV<String, Integer>> input =
p.apply(Create.of(Arrays.asList(EMPTY_TABLE)).withCoder(
KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/LatestTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/LatestTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/LatestTest.java
index ce9ae37..f71b813 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/LatestTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/LatestTest.java
@@ -51,12 +51,13 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class LatestTest implements Serializable {
+
+ @Rule public final transient TestPipeline p = TestPipeline.create();
@Rule public transient ExpectedException thrown = ExpectedException.none();
@Test
@Category(NeedsRunner.class)
public void testGloballyEventTimestamp() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.timestamped(
TimestampedValue.of("foo", new Instant(100)),
@@ -71,7 +72,8 @@ public class LatestTest implements Serializable {
@Test
public void testGloballyOutputCoder() {
- TestPipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
+
BigEndianLongCoder inputCoder = BigEndianLongCoder.of();
PCollection<Long> output =
@@ -86,7 +88,6 @@ public class LatestTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testGloballyEmptyCollection() {
- TestPipeline p = TestPipeline.create();
PCollection<Long> emptyInput = p.apply(Create.<Long>of()
// Explicitly set coder such that then runner enforces encodability.
.withCoder(VarLongCoder.of()));
@@ -99,7 +100,6 @@ public class LatestTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testPerKeyEventTimestamp() {
- TestPipeline p = TestPipeline.create();
PCollection<KV<String, String>> output =
p.apply(Create.timestamped(
TimestampedValue.of(KV.of("A", "foo"), new Instant(100)),
@@ -114,7 +114,8 @@ public class LatestTest implements Serializable {
@Test
public void testPerKeyOutputCoder() {
- TestPipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
+
KvCoder<String, Long> inputCoder = KvCoder.of(
AvroCoder.of(String.class), AvroCoder.of(Long.class));
@@ -128,7 +129,6 @@ public class LatestTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testPerKeyEmptyCollection() {
- TestPipeline p = TestPipeline.create();
PCollection<KV<String, String>> output =
p.apply(Create.<KV<String, String>>of().withCoder(KvCoder.of(
StringUtf8Coder.of(), StringUtf8Coder.of())))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/MapElementsTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/MapElementsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/MapElementsTest.java
index ac3444b..47d0b87 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/MapElementsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/MapElementsTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertThat;
import java.io.Serializable;
import java.util.Set;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.RunnableOnService;
@@ -48,6 +47,9 @@ import org.junit.runners.JUnit4;
public class MapElementsTest implements Serializable {
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
/**
@@ -79,7 +81,6 @@ public class MapElementsTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testMapBasic() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
.apply(MapElements.via(new SimpleFunction<Integer, Integer>() {
@@ -98,7 +99,8 @@ public class MapElementsTest implements Serializable {
*/
@Test
public void testPolymorphicSimpleFunction() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
+
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
@@ -120,7 +122,8 @@ public class MapElementsTest implements Serializable {
*/
@Test
public void testNestedPolymorphicSimpleFunction() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
+
PCollection<Integer> output =
pipeline
.apply(Create.of(1, 2, 3))
@@ -149,7 +152,6 @@ public class MapElementsTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testMapBasicSerializableFunction() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> output = pipeline
.apply(Create.of(1, 2, 3))
.apply(MapElements.via(new SerializableFunction<Integer, Integer>() {
@@ -170,7 +172,6 @@ public class MapElementsTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testSimpleFunctionOutputTypeDescriptor() throws Exception {
- Pipeline pipeline = TestPipeline.create();
PCollection<String> output = pipeline
.apply(Create.of("hello"))
.apply(MapElements.via(new SimpleFunction<String, String>() {
@@ -191,7 +192,6 @@ public class MapElementsTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testVoidValues() throws Exception {
- Pipeline pipeline = TestPipeline.create();
pipeline
.apply(Create.of("hello"))
.apply(WithKeys.<String, String>of("k"))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoLifecycleTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoLifecycleTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoLifecycleTest.java
index 9bc8a64..2c3a735 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoLifecycleTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoLifecycleTest.java
@@ -33,6 +33,7 @@ import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.values.PCollectionList;
import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.TupleTagList;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -43,10 +44,13 @@ import org.junit.runners.JUnit4;
*/
@RunWith(JUnit4.class)
public class ParDoLifecycleTest implements Serializable {
+
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testOldFnCallSequence() {
- TestPipeline p = TestPipeline.create();
PCollectionList.of(p.apply("Impolite", Create.of(1, 2, 4)))
.and(p.apply("Polite", Create.of(3, 5, 6, 7)))
.apply(Flatten.<Integer>pCollections())
@@ -58,7 +62,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testOldFnCallSequenceMulti() {
- TestPipeline p = TestPipeline.create();
PCollectionList.of(p.apply("Impolite", Create.of(1, 2, 4)))
.and(p.apply("Polite", Create.of(3, 5, 6, 7)))
.apply(Flatten.<Integer>pCollections())
@@ -127,7 +130,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFnCallSequence() {
- TestPipeline p = TestPipeline.create();
PCollectionList.of(p.apply("Impolite", Create.of(1, 2, 4)))
.and(p.apply("Polite", Create.of(3, 5, 6, 7)))
.apply(Flatten.<Integer>pCollections())
@@ -139,7 +141,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testFnCallSequenceMulti() {
- TestPipeline p = TestPipeline.create();
PCollectionList.of(p.apply("Impolite", Create.of(1, 2, 4)))
.and(p.apply("Polite", Create.of(3, 5, 6, 7)))
.apply(Flatten.<Integer>pCollections())
@@ -206,7 +207,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testTeardownCalledAfterExceptionInSetup() {
- TestPipeline p = TestPipeline.create();
ExceptionThrowingOldFn fn = new ExceptionThrowingOldFn(MethodForException.SETUP);
p
.apply(Create.of(1, 2, 3))
@@ -227,7 +227,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testTeardownCalledAfterExceptionInStartBundle() {
- TestPipeline p = TestPipeline.create();
ExceptionThrowingOldFn fn = new ExceptionThrowingOldFn(MethodForException.START_BUNDLE);
p
.apply(Create.of(1, 2, 3))
@@ -246,7 +245,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testTeardownCalledAfterExceptionInProcessElement() {
- TestPipeline p = TestPipeline.create();
ExceptionThrowingOldFn fn = new ExceptionThrowingOldFn(MethodForException.PROCESS_ELEMENT);
p
.apply(Create.of(1, 2, 3))
@@ -265,7 +263,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testTeardownCalledAfterExceptionInFinishBundle() {
- TestPipeline p = TestPipeline.create();
ExceptionThrowingOldFn fn = new ExceptionThrowingOldFn(MethodForException.FINISH_BUNDLE);
p
.apply(Create.of(1, 2, 3))
@@ -284,7 +281,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testWithContextTeardownCalledAfterExceptionInSetup() {
- TestPipeline p = TestPipeline.create();
ExceptionThrowingOldFn fn = new ExceptionThrowingOldFn(MethodForException.SETUP);
p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
try {
@@ -300,7 +296,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testWithContextTeardownCalledAfterExceptionInStartBundle() {
- TestPipeline p = TestPipeline.create();
ExceptionThrowingOldFn fn = new ExceptionThrowingOldFn(MethodForException.START_BUNDLE);
p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
try {
@@ -316,7 +311,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testWithContextTeardownCalledAfterExceptionInProcessElement() {
- TestPipeline p = TestPipeline.create();
ExceptionThrowingOldFn fn = new ExceptionThrowingOldFn(MethodForException.PROCESS_ELEMENT);
p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
try {
@@ -332,7 +326,6 @@ public class ParDoLifecycleTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testWithContextTeardownCalledAfterExceptionInFinishBundle() {
- TestPipeline p = TestPipeline.create();
ExceptionThrowingOldFn fn = new ExceptionThrowingOldFn(MethodForException.FINISH_BUNDLE);
p.apply(Create.of(1, 2, 3)).apply(ParDo.of(fn));
try {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
index 4a3e2dd..3a47fc7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
@@ -47,7 +47,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.AtomicCoder;
import org.apache.beam.sdk.coders.CoderException;
import org.apache.beam.sdk.coders.VarIntCoder;
@@ -107,6 +106,9 @@ public class ParDoTest implements Serializable {
// anonymous inner classes inside the non-static test methods.
@Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
+ @Rule
public transient ExpectedException thrown = ExpectedException.none();
private static class PrintingDoFn extends DoFn<String, String> {
@@ -302,7 +304,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDo() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -319,7 +320,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDo2() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -336,7 +336,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDoEmpty() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList();
@@ -354,8 +353,6 @@ public class ParDoTest implements Serializable {
@Category(RunnableOnService.class)
public void testParDoEmptyOutputs() {
- Pipeline pipeline = TestPipeline.create();
-
List<Integer> inputs = Arrays.asList();
PCollection<String> output = pipeline
@@ -370,7 +367,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDoWithSideOutputs() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -413,7 +409,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDoEmptyWithSideOutputs() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList();
@@ -454,7 +449,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDoWithEmptySideOutputs() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList();
@@ -482,7 +476,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDoWithOnlySideOutputs() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -507,7 +500,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoWritingToUndeclaredSideOutput() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -529,7 +521,7 @@ public class ParDoTest implements Serializable {
// TODO: The exception thrown is runner-specific, even if the behavior is general
@Category(NeedsRunner.class)
public void testParDoUndeclaredSideOutputLimit() {
- Pipeline pipeline = TestPipeline.create();
+
PCollection<Integer> input = pipeline.apply(Create.of(Arrays.asList(3)));
// Success for a total of 1000 outputs.
@@ -566,7 +558,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDoWithSideInputs() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -598,7 +589,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDoWithSideInputsIsCumulative() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -632,7 +622,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMultiOutputParDoWithSideInputs() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -670,7 +659,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testMultiOutputParDoWithSideInputsIsCumulative() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -708,7 +696,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoReadingFromUnknownSideInput() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -746,7 +733,6 @@ public class ParDoTest implements Serializable {
// on an input where the element is in multiple windows. The complication is
// that side inputs are per-window, so the runner has to make sure
// to process each window individually.
- Pipeline p = TestPipeline.create();
MutableDateTime mutableNow = Instant.now().toMutableDateTime();
mutableNow.setMillisOfSecond(0);
@@ -754,9 +740,9 @@ public class ParDoTest implements Serializable {
SlidingWindows windowFn =
SlidingWindows.of(Duration.standardSeconds(5)).every(Duration.standardSeconds(1));
- PCollectionView<Integer> view = p.apply(Create.of(1)).apply(View.<Integer>asSingleton());
+ PCollectionView<Integer> view = pipeline.apply(Create.of(1)).apply(View.<Integer>asSingleton());
PCollection<String> res =
- p.apply(Create.timestamped(TimestampedValue.of("a", now)))
+ pipeline.apply(Create.timestamped(TimestampedValue.of("a", now)))
.apply(Window.<String>into(windowFn))
.apply(ParDo.of(new FnWithSideInputs(view)).withSideInputs(view));
@@ -766,14 +752,12 @@ public class ParDoTest implements Serializable {
PAssert.that(res).inWindow(window).containsInAnyOrder("a:1");
}
- p.run();
+ pipeline.run();
}
@Test
@Category(NeedsRunner.class)
public void testParDoWithErrorInStartBatch() {
- Pipeline pipeline = TestPipeline.create();
-
List<Integer> inputs = Arrays.asList(3, -42, 666);
pipeline.apply(Create.of(inputs))
@@ -787,7 +771,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoWithErrorInProcessElement() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -802,7 +785,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoWithErrorInFinishBatch() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -816,23 +798,27 @@ public class ParDoTest implements Serializable {
@Test
public void testParDoOutputNameBasedOnDoFnWithTrimmedSuffix() {
- Pipeline p = TestPipeline.create();
- PCollection<String> output = p.apply(Create.of(1)).apply(ParDo.of(new TestDoFn()));
+ pipeline.enableAbandonedNodeEnforcement(false);
+
+ PCollection<String> output = pipeline.apply(Create.of(1)).apply(ParDo.of(new TestDoFn()));
assertThat(output.getName(), containsString("ParDo(Test)"));
}
@Test
public void testParDoOutputNameBasedOnLabel() {
- Pipeline p = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
+
PCollection<String> output =
- p.apply(Create.of(1)).apply("MyParDo", ParDo.of(new TestDoFn()));
+ pipeline.apply(Create.of(1)).apply("MyParDo", ParDo.of(new TestDoFn()));
assertThat(output.getName(), containsString("MyParDo"));
}
@Test
public void testParDoOutputNameBasedDoFnWithoutMatchingSuffix() {
- Pipeline p = TestPipeline.create();
- PCollection<String> output = p.apply(Create.of(1)).apply(ParDo.of(new StrangelyNamedDoer()));
+ pipeline.enableAbandonedNodeEnforcement(false);
+
+ PCollection<String> output =
+ pipeline.apply(Create.of(1)).apply(ParDo.of(new StrangelyNamedDoer()));
assertThat(output.getName(), containsString("ParDo(StrangelyNamedDoer)"));
}
@@ -850,7 +836,7 @@ public class ParDoTest implements Serializable {
@Test
public void testParDoWithSideOutputsName() {
- Pipeline p = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
TupleTag<String> mainOutputTag = new TupleTag<String>("main"){};
TupleTag<String> sideOutputTag1 = new TupleTag<String>("side1"){};
@@ -858,7 +844,7 @@ public class ParDoTest implements Serializable {
TupleTag<String> sideOutputTag3 = new TupleTag<String>("side3"){};
TupleTag<String> sideOutputTagUnwritten = new TupleTag<String>("sideUnwritten"){};
- PCollectionTuple outputs = p
+ PCollectionTuple outputs = pipeline
.apply(Create.of(Arrays.asList(3, -42, 666))).setName("MyInput")
.apply("MyParDo", ParDo
.of(new TestDoFn(
@@ -880,7 +866,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testParDoInCustomTransform() {
- Pipeline pipeline = TestPipeline.create();
List<Integer> inputs = Arrays.asList(3, -42, 666);
@@ -904,7 +889,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testMultiOutputChaining() {
- Pipeline pipeline = TestPipeline.create();
PCollectionTuple filters = pipeline
.apply(Create.of(Arrays.asList(3, 4, 5, 6)))
@@ -1106,7 +1090,7 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testSideOutputUnknownCoder() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+
PCollection<Integer> input = pipeline
.apply(Create.of(Arrays.asList(1, 2, 3)));
@@ -1122,7 +1106,8 @@ public class ParDoTest implements Serializable {
@Test
public void testSideOutputUnregisteredExplicitCoder() throws Exception {
- Pipeline pipeline = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
+
PCollection<Integer> input = pipeline
.apply(Create.of(Arrays.asList(1, 2, 3)));
@@ -1144,7 +1129,7 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testMainOutputUnregisteredExplicitCoder() {
- Pipeline pipeline = TestPipeline.create();
+
PCollection<Integer> input = pipeline
.apply(Create.of(Arrays.asList(1, 2, 3)));
@@ -1165,7 +1150,6 @@ public class ParDoTest implements Serializable {
// should not cause a crash based on lack of a coder for the
// side output.
- Pipeline pipeline = TestPipeline.create();
final TupleTag<TestDummy> mainOutputTag = new TupleTag<TestDummy>("main");
final TupleTag<TestDummy> sideOutputTag = new TupleTag<TestDummy>("side");
PCollectionTuple tuple = pipeline
@@ -1204,7 +1188,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoOutputWithTimestamp() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> input =
pipeline.apply(Create.of(Arrays.asList(3, 42, 6)));
@@ -1226,7 +1209,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoSideOutputWithTimestamp() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> input =
pipeline.apply(Create.of(Arrays.asList(3, 42, 6)));
@@ -1258,7 +1240,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoShiftTimestamp() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> input =
pipeline.apply(Create.of(Arrays.asList(3, 42, 6)));
@@ -1281,7 +1262,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoShiftTimestampInvalid() {
- Pipeline pipeline = TestPipeline.create();
pipeline.apply(Create.of(Arrays.asList(3, 42, 6)))
.apply(ParDo.of(new TestOutputTimestampDoFn()))
@@ -1300,7 +1280,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testParDoShiftTimestampInvalidZeroAllowed() {
- Pipeline pipeline = TestPipeline.create();
pipeline.apply(Create.of(Arrays.asList(3, 42, 6)))
.apply(ParDo.of(new TestOutputTimestampDoFn()))
@@ -1353,7 +1332,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(RunnableOnService.class)
public void testWindowingInStartAndFinishBundle() {
- Pipeline pipeline = TestPipeline.create();
PCollection<String> output =
pipeline
@@ -1391,7 +1369,6 @@ public class ParDoTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testWindowingInStartBundleException() {
- Pipeline pipeline = TestPipeline.create();
pipeline
.apply(Create.timestamped(TimestampedValue.of("elem", new Instant(1))))
@@ -1477,13 +1454,12 @@ public class ParDoTest implements Serializable {
}
};
- Pipeline p = TestPipeline.create();
PCollection<Integer> output =
- p.apply(Create.of(KV.of("hello", 42), KV.of("hello", 97), KV.of("hello", 84)))
+ pipeline.apply(Create.of(KV.of("hello", 42), KV.of("hello", 97), KV.of("hello", 84)))
.apply(ParDo.of(fn));
PAssert.that(output).containsInAnyOrder(0, 1, 2);
- p.run();
+ pipeline.run();
}
@Test
@@ -1514,9 +1490,8 @@ public class ParDoTest implements Serializable {
}
};
- Pipeline p = TestPipeline.create();
PCollectionTuple output =
- p.apply(
+ pipeline.apply(
Create.of(
KV.of("hello", 42),
KV.of("hello", 97),
@@ -1534,7 +1509,7 @@ public class ParDoTest implements Serializable {
// There are 1 and 3 from "hello" and just "1" from "goodbye"
PAssert.that(odds).containsInAnyOrder(1, 3, 1);
- p.run();
+ pipeline.run();
}
@Test
@@ -1562,24 +1537,23 @@ public class ParDoTest implements Serializable {
}
};
- Pipeline p = TestPipeline.create();
PCollection<List<Integer>> output =
- p.apply(
+ pipeline.apply(
Create.of(
KV.of("hello", 97), KV.of("hello", 42), KV.of("hello", 84), KV.of("hello", 12)))
.apply(ParDo.of(fn));
PAssert.that(output).containsInAnyOrder(Lists.newArrayList(12, 42, 84, 97));
- p.run();
+ pipeline.run();
}
@Test
@Category({RunnableOnService.class, UsesStatefulParDo.class})
public void testBagStateSideInput() {
- Pipeline p = TestPipeline.create();
final PCollectionView<List<Integer>> listView =
- p.apply("Create list for side input", Create.of(2, 1, 0)).apply(View.<Integer>asList());
+ pipeline
+ .apply("Create list for side input", Create.of(2, 1, 0)).apply(View.<Integer>asList());
final String stateId = "foo";
DoFn<KV<String, Integer>, List<Integer>> fn =
@@ -1607,7 +1581,7 @@ public class ParDoTest implements Serializable {
};
PCollection<List<Integer>> output =
- p.apply(
+ pipeline.apply(
"Create main input",
Create.of(
KV.of("hello", 97), KV.of("hello", 42), KV.of("hello", 84), KV.of("hello", 12)))
@@ -1616,7 +1590,7 @@ public class ParDoTest implements Serializable {
PAssert.that(output).containsInAnyOrder(
Lists.newArrayList(12, 42, 84, 97),
Lists.newArrayList(0, 1, 2));
- p.run();
+ pipeline.run();
}
/**
@@ -1658,11 +1632,9 @@ public class ParDoTest implements Serializable {
}
};
- Pipeline p = TestPipeline.create();
-
- PCollection<Integer> output = p.apply(Create.of(KV.of("hello", 37))).apply(ParDo.of(fn));
+ PCollection<Integer> output = pipeline.apply(Create.of(KV.of("hello", 37))).apply(ParDo.of(fn));
PAssert.that(output).containsInAnyOrder(3, 42);
- p.run();
+ pipeline.run();
}
@Test
@@ -1704,7 +1676,6 @@ public class ParDoTest implements Serializable {
@Test
public void testRejectsWrongWindowType() {
- Pipeline p = TestPipeline.create();
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage(GlobalWindow.class.getSimpleName());
@@ -1712,7 +1683,8 @@ public class ParDoTest implements Serializable {
thrown.expectMessage("window type");
thrown.expectMessage("not a supertype");
- p.apply(Create.of(1, 2, 3))
+ pipeline
+ .apply(Create.of(1, 2, 3))
.apply(
ParDo.of(
new DoFn<Integer, Integer>() {
@@ -1735,9 +1707,8 @@ public class ParDoTest implements Serializable {
public void testMultipleWindowSubtypesOK() {
final String timerId = "gobbledegook";
- Pipeline p = TestPipeline.create();
-
- p.apply(Create.of(1, 2, 3))
+ pipeline
+ .apply(Create.of(1, 2, 3))
.apply(Window.<Integer>into(FixedWindows.of(Duration.standardSeconds(10))))
.apply(
ParDo.of(
@@ -1759,26 +1730,25 @@ public class ParDoTest implements Serializable {
public void testRejectsSplittableDoFnByDefault() {
// ParDo with a splittable DoFn must be overridden by the runner.
// Without an override, applying it directly must fail.
- Pipeline p = TestPipeline.create();
thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage(p.getRunner().getClass().getName());
+ thrown.expectMessage(pipeline.getRunner().getClass().getName());
thrown.expectMessage("does not support Splittable DoFn");
- p.apply(Create.of(1, 2, 3)).apply(ParDo.of(new TestSplittableDoFn()));
+ pipeline.apply(Create.of(1, 2, 3)).apply(ParDo.of(new TestSplittableDoFn()));
}
@Test
public void testMultiRejectsSplittableDoFnByDefault() {
// ParDo with a splittable DoFn must be overridden by the runner.
// Without an override, applying it directly must fail.
- Pipeline p = TestPipeline.create();
thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage(p.getRunner().getClass().getName());
+ thrown.expectMessage(pipeline.getRunner().getClass().getName());
thrown.expectMessage("does not support Splittable DoFn");
- p.apply(Create.of(1, 2, 3))
+ pipeline
+ .apply(Create.of(1, 2, 3))
.apply(
ParDo.of(new TestSplittableDoFn())
.withOutputTags(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/PartitionTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/PartitionTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/PartitionTest.java
index 1cbe344..87d7460 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/PartitionTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/PartitionTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.testing.NeedsRunner;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.RunnableOnService;
@@ -47,6 +46,7 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class PartitionTest implements Serializable {
+ @Rule public final transient TestPipeline pipeline = TestPipeline.create();
@Rule public transient ExpectedException thrown = ExpectedException.none();
static class ModFn implements PartitionFn<Integer> {
@@ -63,10 +63,10 @@ public class PartitionTest implements Serializable {
}
}
+
@Test
@Category(RunnableOnService.class)
public void testEvenOddPartition() {
- Pipeline pipeline = TestPipeline.create();
PCollectionList<Integer> outputs = pipeline
.apply(Create.of(591, 11789, 1257, 24578, 24799, 307))
@@ -81,7 +81,6 @@ public class PartitionTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testModPartition() {
- Pipeline pipeline = TestPipeline.create();
PCollectionList<Integer> outputs = pipeline
.apply(Create.of(1, 2, 4, 5))
@@ -96,7 +95,6 @@ public class PartitionTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testOutOfBoundsPartitions() {
- Pipeline pipeline = TestPipeline.create();
pipeline
.apply(Create.of(-1))
@@ -110,7 +108,6 @@ public class PartitionTest implements Serializable {
@Test
public void testZeroNumPartitions() {
- Pipeline pipeline = TestPipeline.create();
PCollection<Integer> input = pipeline.apply(Create.of(591));
@@ -122,7 +119,6 @@ public class PartitionTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testDroppedPartition() {
- Pipeline pipeline = TestPipeline.create();
// Compute the set of integers either 1 or 2 mod 3, the hard way.
PCollectionList<Integer> outputs = pipeline
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/RegexTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/RegexTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/RegexTest.java
index 6e196b4..cd707da 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/RegexTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/RegexTest.java
@@ -25,6 +25,7 @@ import org.apache.beam.sdk.testing.TestPipeline;
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;
@@ -33,11 +34,13 @@ import org.junit.runners.JUnit4;
/** Tests for {@link Regex}. */
@RunWith(JUnit4.class)
public class RegexTest implements Serializable {
+
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Test
@Category(NeedsRunner.class)
public void testFind() {
- TestPipeline p = TestPipeline.create();
-
PCollection<String> output =
p.apply(Create.of("aj", "xj", "yj", "zj")).apply(Regex.find("[xyz]"));
@@ -48,8 +51,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testFindGroup() {
- TestPipeline p = TestPipeline.create();
-
PCollection<String> output =
p.apply(Create.of("aj", "xj", "yj", "zj")).apply(Regex.find("([xyz])", 1));
@@ -60,8 +61,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testFindNone() {
- TestPipeline p = TestPipeline.create();
-
PCollection<String> output = p.apply(Create.of("a", "b", "c", "d")).apply(Regex.find("[xyz]"));
PAssert.that(output).empty();
@@ -71,7 +70,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testKVFind() {
- TestPipeline p = TestPipeline.create();
PCollection<KV<String, String>> output =
p.apply(Create.of("a b c")).apply(Regex.findKV("a (b) (c)", 1, 2));
@@ -83,7 +81,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testKVFindNone() {
- TestPipeline p = TestPipeline.create();
PCollection<KV<String, String>> output =
p.apply(Create.of("x y z")).apply(Regex.findKV("a (b) (c)", 1, 2));
@@ -95,7 +92,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testMatches() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("a", "x", "y", "z")).apply(Regex.matches("[xyz]"));
@@ -107,7 +103,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testMatchesNone() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("a", "b", "c", "d")).apply(Regex.matches("[xyz]"));
@@ -119,7 +114,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testMatchesGroup() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("a", "x xxx", "x yyy", "x zzz")).apply(Regex.matches("x ([xyz]*)", 1));
@@ -131,7 +125,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testKVMatches() {
- TestPipeline p = TestPipeline.create();
PCollection<KV<String, String>> output =
p.apply(Create.of("a b c")).apply(Regex.matchesKV("a (b) (c)", 1, 2));
@@ -143,7 +136,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testKVMatchesNone() {
- TestPipeline p = TestPipeline.create();
PCollection<KV<String, String>> output =
p.apply(Create.of("x y z")).apply(Regex.matchesKV("a (b) (c)", 1, 2));
@@ -154,7 +146,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testReplaceAll() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("xj", "yj", "zj")).apply(Regex.replaceAll("[xyz]", "new"));
@@ -166,7 +157,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testReplaceAllMixed() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("abc", "xj", "yj", "zj", "def")).apply(Regex.replaceAll("[xyz]", "new"));
@@ -178,7 +168,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testReplaceFirst() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("xjx", "yjy", "zjz")).apply(Regex.replaceFirst("[xyz]", "new"));
@@ -190,7 +179,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testReplaceFirstMixed() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("abc", "xjx", "yjy", "zjz", "def"))
@@ -203,7 +191,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testSplits() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("The quick brown fox jumps over the lazy dog"))
@@ -217,7 +204,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testSplitsWithEmpty() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("The quick brown fox jumps over the lazy dog"))
@@ -235,7 +221,6 @@ public class RegexTest implements Serializable {
@Test
@Category(NeedsRunner.class)
public void testSplitsWithoutEmpty() {
- TestPipeline p = TestPipeline.create();
PCollection<String> output =
p.apply(Create.of("The quick brown fox jumps over the lazy dog"))
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SampleTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SampleTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SampleTest.java
index a0555fa..9cc12d4 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SampleTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SampleTest.java
@@ -32,6 +32,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
@@ -41,6 +42,7 @@ import org.apache.beam.sdk.testing.RunnableOnService;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.transforms.display.DisplayData;
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;
@@ -102,71 +104,70 @@ public class SampleTest {
}
}
+ @Rule
+ public final transient TestPipeline pipeline = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testSample() {
- Pipeline p = TestPipeline.create();
- PCollection<Integer> input = p.apply(Create.of(DATA)
+ PCollection<Integer> input = pipeline.apply(Create.of(DATA)
.withCoder(BigEndianIntegerCoder.of()));
PCollection<Iterable<Integer>> output = input.apply(
Sample.<Integer>fixedSizeGlobally(3));
PAssert.thatSingletonIterable(output)
.satisfies(new VerifyCorrectSample<>(3, DATA));
- p.run();
+ pipeline.run();
}
@Test
@Category(RunnableOnService.class)
public void testSampleEmpty() {
- Pipeline p = TestPipeline.create();
- PCollection<Integer> input = p.apply(Create.of(EMPTY)
+ PCollection<Integer> input = pipeline.apply(Create.of(EMPTY)
.withCoder(BigEndianIntegerCoder.of()));
PCollection<Iterable<Integer>> output = input.apply(
Sample.<Integer>fixedSizeGlobally(3));
PAssert.thatSingletonIterable(output)
.satisfies(new VerifyCorrectSample<>(0, EMPTY));
- p.run();
+ pipeline.run();
}
@Test
@Category(RunnableOnService.class)
public void testSampleZero() {
- Pipeline p = TestPipeline.create();
- PCollection<Integer> input = p.apply(Create.of(DATA)
+ PCollection<Integer> input = pipeline.apply(Create.of(DATA)
.withCoder(BigEndianIntegerCoder.of()));
PCollection<Iterable<Integer>> output = input.apply(
Sample.<Integer>fixedSizeGlobally(0));
PAssert.thatSingletonIterable(output)
.satisfies(new VerifyCorrectSample<>(0, DATA));
- p.run();
+ pipeline.run();
}
@Test
@Category(RunnableOnService.class)
public void testSampleInsufficientElements() {
- Pipeline p = TestPipeline.create();
- PCollection<Integer> input = p.apply(Create.of(DATA)
+ PCollection<Integer> input = pipeline.apply(Create.of(DATA)
.withCoder(BigEndianIntegerCoder.of()));
PCollection<Iterable<Integer>> output = input.apply(
Sample.<Integer>fixedSizeGlobally(10));
PAssert.thatSingletonIterable(output)
.satisfies(new VerifyCorrectSample<>(5, DATA));
- p.run();
+ pipeline.run();
}
@Test(expected = IllegalArgumentException.class)
public void testSampleNegative() {
- Pipeline p = TestPipeline.create();
+ pipeline.enableAbandonedNodeEnforcement(false);
- PCollection<Integer> input = p.apply(Create.of(DATA)
+ PCollection<Integer> input = pipeline.apply(Create.of(DATA)
.withCoder(BigEndianIntegerCoder.of()));
input.apply(Sample.<Integer>fixedSizeGlobally(-1));
}
@@ -174,9 +175,8 @@ public class SampleTest {
@Test
@Category(RunnableOnService.class)
public void testSampleMultiplicity() {
- Pipeline p = TestPipeline.create();
- PCollection<Integer> input = p.apply(Create.of(REPEATED_DATA)
+ PCollection<Integer> input = pipeline.apply(Create.of(REPEATED_DATA)
.withCoder(BigEndianIntegerCoder.of()));
// At least one value must be selected with multiplicity.
PCollection<Iterable<Integer>> output = input.apply(
@@ -184,7 +184,7 @@ public class SampleTest {
PAssert.thatSingletonIterable(output)
.satisfies(new VerifyCorrectSample<>(6, REPEATED_DATA));
- p.run();
+ pipeline.run();
}
private static class VerifyAnySample implements SerializableFunction<Iterable<String>, Void> {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SplittableDoFnTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SplittableDoFnTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SplittableDoFnTest.java
index 022c2e5..e3b58b7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SplittableDoFnTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SplittableDoFnTest.java
@@ -29,7 +29,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
@@ -54,6 +53,7 @@ import org.apache.beam.sdk.values.TupleTagList;
import org.joda.time.Duration;
import org.joda.time.Instant;
import org.joda.time.MutableDateTime;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -151,10 +151,13 @@ public class SplittableDoFnTest {
}
}
+ @Rule
+ public final transient TestPipeline p = TestPipeline.create();
+
@Test
@Category({RunnableOnService.class, UsesSplittableParDo.class})
public void testPairWithIndexBasic() {
- Pipeline p = TestPipeline.create();
+
PCollection<KV<String, Integer>> res =
p.apply(Create.of("a", "bb", "ccccc"))
.apply(ParDo.of(new PairStringWithIndexToLength()))
@@ -180,7 +183,6 @@ public class SplittableDoFnTest {
public void testPairWithIndexWindowedTimestamped() {
// Tests that Splittable DoFn correctly propagates windowing strategy, windows and timestamps
// of elements in the input collection.
- Pipeline p = TestPipeline.create();
MutableDateTime mutableNow = Instant.now().toMutableDateTime();
mutableNow.setMillisOfSecond(0);
@@ -277,7 +279,6 @@ public class SplittableDoFnTest {
@Test
@Category({RunnableOnService.class, UsesSplittableParDo.class})
public void testOutputAfterCheckpoint() throws Exception {
- Pipeline p = TestPipeline.create();
PCollection<Integer> outputs = p.apply(Create.of("foo"))
.apply(ParDo.of(new SDFWithMultipleOutputsPerBlock()));
PAssert.thatSingleton(outputs.apply(Count.<Integer>globally()))
@@ -317,7 +318,6 @@ public class SplittableDoFnTest {
@Test
@Category({RunnableOnService.class, UsesSplittableParDo.class})
public void testSideInputsAndOutputs() throws Exception {
- Pipeline p = TestPipeline.create();
PCollectionView<String> sideInput =
p.apply("side input", Create.of("foo")).apply(View.<String>asSingleton());
@@ -344,7 +344,6 @@ public class SplittableDoFnTest {
@Test
@Category({RunnableOnService.class, UsesSplittableParDo.class})
public void testLateData() throws Exception {
- Pipeline p = TestPipeline.create();
Instant base = Instant.now();
@@ -439,7 +438,6 @@ public class SplittableDoFnTest {
@Test
@Category({RunnableOnService.class, UsesSplittableParDo.class})
public void testLifecycleMethods() throws Exception {
- Pipeline p = TestPipeline.create();
PCollection<String> res =
p.apply(Create.of("a", "b", "c")).apply(ParDo.of(new SDFWithLifecycle()));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/TopTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/TopTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/TopTest.java
index b624252..d011197 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/TopTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/TopTest.java
@@ -53,6 +53,9 @@ import org.junit.runners.JUnit4;
public class TopTest {
@Rule
+ public final TestPipeline p = TestPipeline.create();
+
+ @Rule
public ExpectedException expectedEx = ExpectedException.none();
@SuppressWarnings("unchecked")
@@ -93,7 +96,6 @@ public class TopTest {
@Category(NeedsRunner.class)
@SuppressWarnings("unchecked")
public void testTop() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(Create.of(Arrays.asList(COLLECTION))
.withCoder(StringUtf8Coder.of()));
@@ -125,7 +127,6 @@ public class TopTest {
@Category(NeedsRunner.class)
@SuppressWarnings("unchecked")
public void testTopEmpty() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(Create.of(Arrays.asList(EMPTY_COLLECTION))
.withCoder(StringUtf8Coder.of()));
@@ -151,7 +152,8 @@ public class TopTest {
@Test
public void testTopEmptyWithIncompatibleWindows() {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
+
Bound<String> windowingFn = Window.<String>into(FixedWindows.of(Duration.standardDays(10L)));
PCollection<String> input =
p.apply(Create.timestamped(Collections.<String>emptyList(), Collections.<Long>emptyList()))
@@ -170,7 +172,6 @@ public class TopTest {
@Category(NeedsRunner.class)
@SuppressWarnings("unchecked")
public void testTopZero() {
- Pipeline p = TestPipeline.create();
PCollection<String> input =
p.apply(Create.of(Arrays.asList(COLLECTION))
.withCoder(StringUtf8Coder.of()));
@@ -202,7 +203,8 @@ public class TopTest {
// This is a purely compile-time test. If the code compiles, then it worked.
@Test
public void testPerKeySerializabilityRequirement() {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
+
p.apply("CreateCollection", Create.of(Arrays.asList(COLLECTION))
.withCoder(StringUtf8Coder.of()));
@@ -218,7 +220,8 @@ public class TopTest {
@Test
public void testCountConstraint() {
- Pipeline p = TestPipeline.create();
+ p.enableAbandonedNodeEnforcement(false);
+
PCollection<String> input =
p.apply(Create.of(Arrays.asList(COLLECTION))
.withCoder(StringUtf8Coder.of()));
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/75a4c918/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ValuesTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ValuesTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ValuesTest.java
index 0bf2e2e..5e27552 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ValuesTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ValuesTest.java
@@ -20,7 +20,6 @@ package org.apache.beam.sdk.transforms;
import static org.junit.Assert.assertEquals;
import java.util.Arrays;
-import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
@@ -29,6 +28,7 @@ import org.apache.beam.sdk.testing.RunnableOnService;
import org.apache.beam.sdk.testing.TestPipeline;
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;
@@ -52,10 +52,12 @@ public class ValuesTest {
static final KV<String, Integer>[] EMPTY_TABLE = new KV[] {
};
+ @Rule
+ public final TestPipeline p = TestPipeline.create();
+
@Test
@Category(RunnableOnService.class)
public void testValues() {
- Pipeline p = TestPipeline.create();
PCollection<KV<String, Integer>> input =
p.apply(Create.of(Arrays.asList(TABLE)).withCoder(
@@ -72,7 +74,6 @@ public class ValuesTest {
@Test
@Category(RunnableOnService.class)
public void testValuesEmpty() {
- Pipeline p = TestPipeline.create();
PCollection<KV<String, Integer>> input =
p.apply(Create.of(Arrays.asList(EMPTY_TABLE)).withCoder(