Return-Path: X-Original-To: apmail-beam-commits-archive@minotaur.apache.org Delivered-To: apmail-beam-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D57D19F88 for ; Tue, 5 Apr 2016 20:16:13 +0000 (UTC) Received: (qmail 26515 invoked by uid 500); 5 Apr 2016 20:16:13 -0000 Delivered-To: apmail-beam-commits-archive@beam.apache.org Received: (qmail 26488 invoked by uid 500); 5 Apr 2016 20:16:13 -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 26479 invoked by uid 99); 5 Apr 2016 20:16:12 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2016 20:16:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 8DAE2C01DE for ; Tue, 5 Apr 2016 20:16:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 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=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id F3AdH__PUxB3 for ; Tue, 5 Apr 2016 20:16:10 +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 A7CFF5F202 for ; Tue, 5 Apr 2016 20:16:09 +0000 (UTC) Received: (qmail 26370 invoked by uid 99); 5 Apr 2016 20:16:08 -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, 05 Apr 2016 20:16:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6024DFD9F; Tue, 5 Apr 2016 20:16:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davor@apache.org To: commits@beam.incubator.apache.org Date: Tue, 05 Apr 2016 20:16:08 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-beam git commit: Fix tests marked RunnableOnService that aren't Repository: incubator-beam Updated Branches: refs/heads/master f2f5129e2 -> 2b5544531 Fix tests marked RunnableOnService that aren't Tests that are RunnableOnService should only test parts of the model that are shared between all runners (e.g. PipelineResult, the contents of a PCollection). RunnableOnService tests that expect a specific exception as a result of the pipeline failing are not portable. Remove the RunnableOnService category from DoFnTest, DoFnWithContextTest, and WithTimestampTest tests which expect exceptions. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/2cfc3e44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/2cfc3e44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/2cfc3e44 Branch: refs/heads/master Commit: 2cfc3e44d1fb44f454b267e468129257d73130d4 Parents: f2f5129 Author: Thomas Groh Authored: Tue Apr 5 12:35:10 2016 -0700 Committer: Davor Bonaci Committed: Tue Apr 5 13:15:06 2016 -0700 ---------------------------------------------------------------------- .../java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java | 5 ----- .../cloud/dataflow/sdk/transforms/DoFnWithContextTest.java | 5 ----- .../cloud/dataflow/sdk/transforms/WithTimestampsTest.java | 1 - 3 files changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2cfc3e44/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java index 09886c7..9de7ce7 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThat; import com.google.cloud.dataflow.sdk.Pipeline.PipelineExecutionException; -import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Combine.CombineFn; import com.google.cloud.dataflow.sdk.transforms.Max.MaxIntegerFn; @@ -32,7 +31,6 @@ import com.google.cloud.dataflow.sdk.transforms.display.DisplayData; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -129,7 +127,6 @@ public class DoFnTest implements Serializable { } @Test - @Category(RunnableOnService.class) public void testCreateAggregatorInStartBundleThrows() { TestPipeline p = createTestPipeline(new DoFn() { @Override @@ -148,7 +145,6 @@ public class DoFnTest implements Serializable { } @Test - @Category(RunnableOnService.class) public void testCreateAggregatorInProcessElementThrows() { TestPipeline p = createTestPipeline(new DoFn() { @Override @@ -164,7 +160,6 @@ public class DoFnTest implements Serializable { } @Test - @Category(RunnableOnService.class) public void testCreateAggregatorInFinishBundleThrows() { TestPipeline p = createTestPipeline(new DoFn() { @Override http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2cfc3e44/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java index 5a63171..488bcfc 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java @@ -26,14 +26,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.cloud.dataflow.sdk.Pipeline.PipelineExecutionException; -import com.google.cloud.dataflow.sdk.testing.RunnableOnService; import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Combine.CombineFn; import com.google.cloud.dataflow.sdk.transforms.Max.MaxIntegerFn; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -160,7 +158,6 @@ public class DoFnWithContextTest implements Serializable { } @Test - @Category(RunnableOnService.class) public void testCreateAggregatorInStartBundleThrows() { TestPipeline p = createTestPipeline(new DoFnWithContext() { @StartBundle @@ -179,7 +176,6 @@ public class DoFnWithContextTest implements Serializable { } @Test - @Category(RunnableOnService.class) public void testCreateAggregatorInProcessElementThrows() { TestPipeline p = createTestPipeline(new DoFnWithContext() { @ProcessElement @@ -195,7 +191,6 @@ public class DoFnWithContextTest implements Serializable { } @Test - @Category(RunnableOnService.class) public void testCreateAggregatorInFinishBundleThrows() { TestPipeline p = createTestPipeline(new DoFnWithContext() { @FinishBundle http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2cfc3e44/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java index ca2dd16..54639af 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java @@ -85,7 +85,6 @@ public class WithTimestampsTest implements Serializable { } @Test - @Category(RunnableOnService.class) public void withTimestampsBackwardsInTimeShouldThrow() { TestPipeline p = TestPipeline.create();