Use TestPipeline#testingPipelineOptions in IO Tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f73bd73c Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f73bd73c Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f73bd73c Branch: refs/heads/master Commit: f73bd73caa5e8222946cfc20491fd2806edd1d2b Parents: a8a33b1 Author: Thomas Groh <tg...@google.com> Authored: Fri Jun 10 14:41:06 2016 -0700 Committer: Thomas Groh <tg...@google.com> Committed: Fri Jun 10 14:49:33 2016 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/beam/sdk/io/BigQueryIOTest.java | 4 ++-- .../src/test/java/org/apache/beam/sdk/io/WriteTest.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f73bd73c/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BigQueryIOTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BigQueryIOTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BigQueryIOTest.java index 679ae27..2a135ec 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BigQueryIOTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BigQueryIOTest.java @@ -384,7 +384,7 @@ public class BigQueryIOTest implements Serializable { @Before public void setUp() throws IOException { - bqOptions = PipelineOptionsFactory.as(BigQueryOptions.class); + bqOptions = TestPipeline.testingPipelineOptions().as(BigQueryOptions.class); bqOptions.setProject("defaultProject"); bqOptions.setTempLocation(testFolder.newFolder("BigQueryIOTest").getAbsolutePath()); @@ -755,7 +755,7 @@ public class BigQueryIOTest implements Serializable { options.setProject("someproject"); options.setStreaming(streaming); - Pipeline p = Pipeline.create(options); + Pipeline p = TestPipeline.create(options); TableReference tableRef = new TableReference(); tableRef.setDatasetId("somedataset"); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f73bd73c/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 45a4374..abda3a5 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 @@ -19,7 +19,6 @@ package org.apache.beam.sdk.io; import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem; import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom; - import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; @@ -35,9 +34,9 @@ import org.apache.beam.sdk.io.Sink.WriteOperation; import org.apache.beam.sdk.io.Sink.Writer; import org.apache.beam.sdk.options.Description; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.options.PipelineOptionsFactoryTest.TestPipelineOptions; import org.apache.beam.sdk.testing.NeedsRunner; +import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.GroupByKey; @@ -190,9 +189,9 @@ public class WriteTest { private static void runWrite( List<String> inputs, PTransform<PCollection<String>, PCollection<String>> transform) { // Flag to validate that the pipeline options are passed to the Sink - String[] args = {"--testFlag=test_value"}; - PipelineOptions options = PipelineOptionsFactory.fromArgs(args).as(WriteOptions.class); - Pipeline p = Pipeline.create(options); + WriteOptions options = TestPipeline.testingPipelineOptions().as(WriteOptions.class); + options.setTestFlag("test_value"); + Pipeline p = TestPipeline.create(options); // Clear the sink's contents. sinkContents.clear();
