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 <[email protected]> Authored: Tue Dec 20 00:01:31 2016 +0200 Committer: Kenneth Knowles <[email protected]> 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)),
