You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/08/24 03:13:29 UTC
[2/2] incubator-beam git commit: JUnit tests: add @RunWith annotation
JUnit tests: add @RunWith annotation
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/3b221732
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/3b221732
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/3b221732
Branch: refs/heads/master
Commit: 3b221732a298111e0612caa61b7acf69d13dd2d2
Parents: 835f601
Author: Dan Halperin <dh...@google.com>
Authored: Tue Aug 23 19:32:34 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Aug 23 20:13:11 2016 -0700
----------------------------------------------------------------------
.../org/apache/beam/runners/direct/AggregatorContainerTest.java | 5 +++++
.../apache/beam/runners/direct/DoFnLifecycleManagerTest.java | 3 +++
.../beam/runners/direct/WriteWithShardingFactoryTest.java | 3 +++
.../java/org/apache/beam/sdk/testing/WindowSupplierTest.java | 3 +++
.../apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java | 3 +++
.../test/java/org/apache/beam/sdk/util/PubsubClientTest.java | 3 +++
.../java/org/apache/beam/sdk/util/PubsubGrpcClientTest.java | 4 ++++
.../java/org/apache/beam/sdk/util/PubsubJsonClientTest.java | 3 +++
.../java/org/apache/beam/sdk/util/PubsubTestClientTest.java | 3 +++
9 files changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/runners/direct-java/src/test/java/org/apache/beam/runners/direct/AggregatorContainerTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/AggregatorContainerTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/AggregatorContainerTest.java
index 035a1b0..b131b4c 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/AggregatorContainerTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/AggregatorContainerTest.java
@@ -24,12 +24,16 @@ import static org.mockito.Mockito.when;
import org.apache.beam.sdk.transforms.Aggregator;
import org.apache.beam.sdk.transforms.Sum.SumIntegerFn;
import org.apache.beam.sdk.util.ExecutionContext.StepContext;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -37,6 +41,7 @@ import java.util.concurrent.TimeUnit;
/**
* Tests for {@link AggregatorContainer}.
*/
+@RunWith(JUnit4.class)
public class AggregatorContainerTest {
@Rule
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DoFnLifecycleManagerTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DoFnLifecycleManagerTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DoFnLifecycleManagerTest.java
index 77b3296..9da46f2 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DoFnLifecycleManagerTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DoFnLifecycleManagerTest.java
@@ -29,6 +29,8 @@ import org.apache.beam.sdk.transforms.OldDoFn;
import org.hamcrest.Matchers;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import java.util.ArrayList;
import java.util.List;
@@ -42,6 +44,7 @@ import java.util.concurrent.TimeUnit;
/**
* Tests for {@link DoFnLifecycleManager}.
*/
+@RunWith(JUnit4.class)
public class DoFnLifecycleManagerTest {
private TestFn fn = new TestFn();
private DoFnLifecycleManager mgr = DoFnLifecycleManager.of(fn);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
index a53bc64..20b2776 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WriteWithShardingFactoryTest.java
@@ -53,6 +53,8 @@ import com.google.common.collect.Iterables;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import java.io.File;
import java.io.FileReader;
@@ -68,6 +70,7 @@ import java.util.concurrent.ThreadLocalRandom;
/**
* Tests for {@link WriteWithShardingFactory}.
*/
+@RunWith(JUnit4.class)
public class WriteWithShardingFactoryTest {
public static final int INPUT_SIZE = 10000;
@Rule public TemporaryFolder tmp = new TemporaryFolder();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/WindowSupplierTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/WindowSupplierTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/WindowSupplierTest.java
index 178c67c..1a2fd1d 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/WindowSupplierTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/WindowSupplierTest.java
@@ -32,6 +32,8 @@ import org.joda.time.Instant;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import java.io.IOException;
import java.io.InputStream;
@@ -41,6 +43,7 @@ import java.util.Collections;
/**
* Tests for {@link WindowSupplier}.
*/
+@RunWith(JUnit4.class)
public class WindowSupplierTest {
private final IntervalWindow window = new IntervalWindow(new Instant(0L), new Instant(100L));
private final IntervalWindow otherWindow =
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java
index 7e756e2..28f0143 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java
@@ -29,10 +29,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
/** Tests for {@link DoFnInvokers}. */
+@RunWith(JUnit4.class)
public class DoFnInvokersTest {
/** A convenience struct holding flags that indicate whether a particular method was invoked. */
public static class Invocations {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubClientTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubClientTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubClientTest.java
index 2250857..0703124 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubClientTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubClientTest.java
@@ -30,12 +30,15 @@ import org.joda.time.Instant;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import java.util.Map;
/**
* Tests for helper classes and methods in PubsubClient.
*/
+@RunWith(JUnit4.class)
public class PubsubClientTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubGrpcClientTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubGrpcClientTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubGrpcClientTest.java
index 71ee27c..4d0ec29 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubGrpcClientTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubGrpcClientTest.java
@@ -40,9 +40,12 @@ import com.google.pubsub.v1.ReceivedMessage;
import com.google.pubsub.v1.SubscriberGrpc;
import io.grpc.ManagedChannel;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import org.mockito.Mockito;
import java.io.IOException;
@@ -51,6 +54,7 @@ import java.util.List;
/**
* Tests for PubsubGrpcClient.
*/
+@RunWith(JUnit4.class)
public class PubsubGrpcClientTest {
private ManagedChannel mockChannel;
private GoogleCredentials mockCredentials;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubJsonClientTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubJsonClientTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubJsonClientTest.java
index dfdc46e..2168935 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubJsonClientTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubJsonClientTest.java
@@ -38,6 +38,8 @@ import com.google.common.collect.ImmutableMap;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import org.mockito.Mockito;
import java.io.IOException;
@@ -46,6 +48,7 @@ import java.util.List;
/**
* Tests for PubsubJsonClient.
*/
+@RunWith(JUnit4.class)
public class PubsubJsonClientTest {
private Pubsub mockPubsub;
private PubsubClient client;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3b221732/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubTestClientTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubTestClientTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubTestClientTest.java
index d788f10..d86f5e7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubTestClientTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/PubsubTestClientTest.java
@@ -32,6 +32,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import java.io.IOException;
import java.util.List;
@@ -40,6 +42,7 @@ import java.util.concurrent.atomic.AtomicLong;
/**
* Tests for PubsubTestClient.
*/
+@RunWith(JUnit4.class)
public class PubsubTestClientTest {
private static final TopicPath TOPIC = PubsubClient.topicPathFromName("testProject", "testTopic");
private static final SubscriptionPath SUBSCRIPTION =