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/python-sdk Commit: fce4f6584ca2fd3c2c258405b9f3014be9da3514 Parents: 950aa7e Author: Stas Levin <stasle...@gmail.com> Authored: Tue Dec 20 18:09:30 2016 +0200 Committer: Kenneth Knowles <k...@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++) {
