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/python-sdk Commit: 5ccbe6791af7e75c166ed877391e8c86bba5fe56 Parents: 6dea099 Author: Stas Levin <stasle...@gmail.com> Authored: Tue Dec 20 17:26:51 2016 +0200 Committer: Kenneth Knowles <k...@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()