Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 64130200B64 for ; Tue, 2 Aug 2016 20:07:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 62CF6160AAC; Tue, 2 Aug 2016 18:07:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8246F160A65 for ; Tue, 2 Aug 2016 20:07:42 +0200 (CEST) Received: (qmail 64493 invoked by uid 500); 2 Aug 2016 18:07:38 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 64423 invoked by uid 99); 2 Aug 2016 18:07:38 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2016 18:07:38 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id DB226185886 for ; Tue, 2 Aug 2016 18:07:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id SMwNXIOxAP9Y for ; Tue, 2 Aug 2016 18:07:35 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 9F9355FBCC for ; Tue, 2 Aug 2016 18:07:34 +0000 (UTC) Received: (qmail 62500 invoked by uid 99); 2 Aug 2016 18:07:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2016 18:07:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A907CE93DB; Tue, 2 Aug 2016 18:07:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dhalperi@apache.org To: commits@beam.incubator.apache.org Date: Tue, 02 Aug 2016 18:07:36 -0000 Message-Id: <5b529013823d4d308b317c59c69ecd87@git.apache.org> In-Reply-To: <89f04c3f5be64c088bd7a006f3ba95de@git.apache.org> References: <89f04c3f5be64c088bd7a006f3ba95de@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] incubator-beam git commit: Some fixups to tests archived-at: Tue, 02 Aug 2016 18:07:43 -0000 Some fixups to 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/ab20823c Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/ab20823c Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/ab20823c Branch: refs/heads/master Commit: ab20823cda024ed3061034774c2a896d2ddc0671 Parents: 70f394b Author: Dan Halperin Authored: Fri Jul 29 16:51:09 2016 -0700 Committer: Dan Halperin Committed: Tue Aug 2 11:07:29 2016 -0700 ---------------------------------------------------------------------- .../dataflow/options/DataflowPipelineOptions.java | 1 - .../beam/runners/dataflow/DataflowRunnerTest.java | 3 ++- .../options/DataflowPipelineOptionsTest.java | 3 +++ .../runners/dataflow/util/GcsPathValidatorTest.java | 15 +++++++++++++-- .../org/apache/beam/sdk/options/GcpOptionsTest.java | 2 ++ 5 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ab20823c/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptions.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptions.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptions.java index 0c5bf47..841741f 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptions.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptions.java @@ -33,7 +33,6 @@ import org.apache.beam.sdk.options.PubsubOptions; import org.apache.beam.sdk.options.StreamingOptions; import org.apache.beam.sdk.options.Validation; import org.apache.beam.sdk.util.IOChannelUtils; -import org.apache.beam.sdk.util.gcsfs.GcsPath; import com.google.common.base.MoreObjects; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ab20823c/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java index a29cdc9..704410d 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java @@ -229,7 +229,7 @@ public class DataflowRunnerTest { DataflowPipelineOptions options = PipelineOptionsFactory.as(DataflowPipelineOptions.class); options.setRunner(DataflowRunner.class); options.setProject(PROJECT_ID); - options.setGcpTempLocation("gs://somebucket/some/path"); + options.setTempLocation("gs://somebucket/some/path"); // Set FILES_PROPERTY to empty to prevent a default value calculated from classpath. options.setFilesToStage(new LinkedList()); options.setDataflowClient(buildMockDataflow(jobCaptor)); @@ -617,6 +617,7 @@ public class DataflowRunnerTest { GcsUtil mockGcsUtil = buildMockGcsUtil(true /* temp bucket exists */, false /* staging bucket exists */); DataflowPipelineOptions options = buildPipelineOptions(jobCaptor); + options.setGcpTempLocation(options.getTempLocation()); // bypass validation for GcpTempLocation options.setGcsUtil(mockGcsUtil); options.setStagingLocation("gs://non-existent-bucket/location"); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ab20823c/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptionsTest.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptionsTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptionsTest.java index b5ee5e9..c0422ee 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptionsTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineOptionsTest.java @@ -25,6 +25,7 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.testing.ResetDateTimeProvider; import org.apache.beam.sdk.testing.RestoreSystemProperties; import org.apache.beam.sdk.util.IOChannelUtils; +import org.apache.beam.sdk.util.NoopPathValidator; import org.junit.Rule; import org.junit.Test; @@ -109,6 +110,7 @@ public class DataflowPipelineOptionsTest { public void testDefaultToTempLocation() { DataflowPipelineOptions options = PipelineOptionsFactory.as(DataflowPipelineOptions.class); IOChannelUtils.registerStandardIOFactories(options); + options.setPathValidatorClass(NoopPathValidator.class); options.setTempLocation("gs://temp_location"); assertEquals("gs://temp_location", options.getGcpTempLocation()); assertEquals("gs://temp_location/staging", options.getStagingLocation()); @@ -118,6 +120,7 @@ public class DataflowPipelineOptionsTest { public void testDefaultToGcpTempLocation() { DataflowPipelineOptions options = PipelineOptionsFactory.as(DataflowPipelineOptions.class); IOChannelUtils.registerStandardIOFactories(options); + options.setPathValidatorClass(NoopPathValidator.class); options.setTempLocation("gs://temp_location"); options.setGcpTempLocation("gs://gcp_temp_location"); assertEquals("gs://gcp_temp_location/staging", options.getStagingLocation()); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ab20823c/sdks/java/core/src/test/java/org/apache/beam/runners/dataflow/util/GcsPathValidatorTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/runners/dataflow/util/GcsPathValidatorTest.java b/sdks/java/core/src/test/java/org/apache/beam/runners/dataflow/util/GcsPathValidatorTest.java index d101627..8913916 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/runners/dataflow/util/GcsPathValidatorTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/runners/dataflow/util/GcsPathValidatorTest.java @@ -21,8 +21,11 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; +import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.options.GcsOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; +import org.apache.beam.sdk.runners.PipelineRunner; import org.apache.beam.sdk.util.GcsPathValidator; import org.apache.beam.sdk.util.GcsUtil; import org.apache.beam.sdk.util.TestCredential; @@ -45,12 +48,20 @@ public class GcsPathValidatorTest { @Mock private GcsUtil mockGcsUtil; private GcsPathValidator validator; + private class FakeRunner extends PipelineRunner { + @Override + public PipelineResult run(Pipeline pipeline) { + throw new UnsupportedOperationException(); + } + } + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); when(mockGcsUtil.bucketExists(any(GcsPath.class))).thenReturn(true); when(mockGcsUtil.isGcsPatternSupported(anyString())).thenCallRealMethod(); GcsOptions options = PipelineOptionsFactory.as(GcsOptions.class); + options.setRunner(FakeRunner.class); options.setGcpCredential(new TestCredential()); options.setGcsUtil(mockGcsUtil); validator = GcsPathValidator.fromOptions(options); @@ -65,7 +76,7 @@ public class GcsPathValidatorTest { public void testInvalidFilePattern() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage( - "DirectRunner expected a valid 'gs://' path but was given '/local/path'"); + "FakeRunner expected a valid 'gs://' path but was given '/local/path'"); validator.validateInputFilePatternSupported("/local/path"); } @@ -87,7 +98,7 @@ public class GcsPathValidatorTest { public void testInvalidOutputPrefix() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage( - "DirectRunner expected a valid 'gs://' path but was given '/local/path'"); + "FakeRunner expected a valid 'gs://' path but was given '/local/path'"); validator.validateOutputFilePrefixSupported("/local/path"); } } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ab20823c/sdks/java/core/src/test/java/org/apache/beam/sdk/options/GcpOptionsTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/GcpOptionsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/GcpOptionsTest.java index c0f65d8..22359dc 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/GcpOptionsTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/GcpOptionsTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import org.apache.beam.sdk.options.GcpOptions.DefaultProjectFactory; import org.apache.beam.sdk.testing.RestoreSystemProperties; +import org.apache.beam.sdk.util.NoopPathValidator; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; @@ -117,6 +118,7 @@ public class GcpOptionsTest { GcpOptions options = PipelineOptionsFactory.as(GcpOptions.class); String tempLocation = "gs://bucket"; options.setTempLocation(tempLocation); + options.as(GcsOptions.class).setPathValidatorClass(NoopPathValidator.class); assertEquals(tempLocation, options.getGcpTempLocation()); }