Repository: beam Updated Branches: refs/heads/master 07a49e90b -> bb1838476
Remove ValidatesRunner category tags from non-core libraries Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/f388cc71 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/f388cc71 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/f388cc71 Branch: refs/heads/master Commit: f388cc71dc3515c8092c819a1aed80b6b63359ea Parents: 0683ac1 Author: Kenneth Knowles <[email protected]> Authored: Wed Mar 29 09:57:27 2017 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Thu Apr 6 13:40:55 2017 -0700 ---------------------------------------------------------------------- .../sdk/io/elasticsearch/ElasticsearchIOTest.java | 5 ----- .../beam/sdk/io/gcp/bigquery/BigQueryIOTest.java | 14 ++++---------- .../beam/sdk/io/gcp/datastore/DatastoreV1Test.java | 5 ----- .../java/org/apache/beam/sdk/io/mqtt/MqttIOTest.java | 5 ----- 4 files changed, 4 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/f388cc71/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java b/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java index a14f480..bca0fe8 100644 --- a/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java +++ b/sdks/java/io/elasticsearch/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java @@ -34,7 +34,6 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.SourceTestUtils; import org.apache.beam.sdk.testing.TestPipeline; -import org.apache.beam.sdk.testing.ValidatesRunner; import org.apache.beam.sdk.transforms.Count; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.transforms.DoFnTester; @@ -52,7 +51,6 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; @@ -135,7 +133,6 @@ public class ElasticsearchIOTest implements Serializable { } @Test - @Category(ValidatesRunner.class) public void testRead() throws Exception { ElasticSearchIOTestUtils.insertTestDocuments(ES_INDEX, ES_TYPE, NUM_DOCS, node.client()); @@ -152,7 +149,6 @@ public class ElasticsearchIOTest implements Serializable { } @Test - @Category(ValidatesRunner.class) public void testReadWithQuery() throws Exception { ElasticSearchIOTestUtils.insertTestDocuments(ES_INDEX, ES_TYPE, NUM_DOCS, node.client()); @@ -179,7 +175,6 @@ public class ElasticsearchIOTest implements Serializable { } @Test - @Category(ValidatesRunner.class) public void testWrite() throws Exception { List<String> data = ElasticSearchIOTestUtils.createDocuments( http://git-wip-us.apache.org/repos/asf/beam/blob/f388cc71/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java index abdc542..92ab204 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java @@ -122,7 +122,6 @@ import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.SourceTestUtils; import org.apache.beam.sdk.testing.SourceTestUtils.ExpectedSplitOutcome; import org.apache.beam.sdk.testing.TestPipeline; -import org.apache.beam.sdk.testing.ValidatesRunner; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.DoFnTester; @@ -162,7 +161,6 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; @@ -1281,8 +1279,7 @@ public class BigQueryIOTest implements Serializable { } @Test - @Category(ValidatesRunner.class) - @Ignore("[BEAM-436] DirectRunner ValidatesRunner tempLocation configuration insufficient") + @Ignore("[BEAM-436] DirectRunner tempLocation configuration insufficient") public void testTableSourcePrimitiveDisplayData() throws IOException, InterruptedException { DisplayDataEvaluator evaluator = DisplayDataEvaluator.create(); BigQueryIO.Read read = BigQueryIO.read() @@ -1298,8 +1295,7 @@ public class BigQueryIOTest implements Serializable { } @Test - @Category(ValidatesRunner.class) - @Ignore("[BEAM-436] DirectRunner ValidatesRunner tempLocation configuration insufficient") + @Ignore("[BEAM-436] DirectRunner tempLocation configuration insufficient") public void testQuerySourcePrimitiveDisplayData() throws IOException, InterruptedException { DisplayDataEvaluator evaluator = DisplayDataEvaluator.create(); BigQueryIO.Read read = BigQueryIO.read() @@ -1325,15 +1321,13 @@ public class BigQueryIOTest implements Serializable { } @Test - @Category(ValidatesRunner.class) - @Ignore("[BEAM-436] DirectRunner ValidatesRunner tempLocation configuration insufficient") + @Ignore("[BEAM-436] DirectRunner tempLocation configuration insufficient") public void testBatchWritePrimitiveDisplayData() throws IOException, InterruptedException { testWritePrimitiveDisplayData(/* streaming: */ false); } @Test - @Category(ValidatesRunner.class) - @Ignore("[BEAM-436] DirectRunner ValidatesRunner tempLocation configuration insufficient") + @Ignore("[BEAM-436] DirectRunner tempLocation configuration insufficient") public void testStreamingWritePrimitiveDisplayData() throws IOException, InterruptedException { testWritePrimitiveDisplayData(/* streaming: */ true); } http://git-wip-us.apache.org/repos/asf/beam/blob/f388cc71/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1Test.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1Test.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1Test.java index 5d3b278..c09a1fa 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1Test.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1Test.java @@ -88,7 +88,6 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.options.ValueProvider; import org.apache.beam.sdk.options.ValueProvider.StaticValueProvider; import org.apache.beam.sdk.testing.TestPipeline; -import org.apache.beam.sdk.testing.ValidatesRunner; import org.apache.beam.sdk.transforms.DoFnTester; import org.apache.beam.sdk.transforms.DoFnTester.CloningBehavior; import org.apache.beam.sdk.transforms.PTransform; @@ -100,7 +99,6 @@ import org.apache.beam.sdk.values.PCollection; import org.junit.Before; 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; @@ -425,7 +423,6 @@ public class DatastoreV1Test { } @Test - @Category(ValidatesRunner.class) public void testWritePrimitiveDisplayData() { DisplayDataEvaluator evaluator = DisplayDataEvaluator.create(); PTransform<PCollection<Entity>, ?> write = @@ -439,7 +436,6 @@ public class DatastoreV1Test { } @Test - @Category(ValidatesRunner.class) public void testDeleteEntityPrimitiveDisplayData() { DisplayDataEvaluator evaluator = DisplayDataEvaluator.create(); PTransform<PCollection<Entity>, ?> write = @@ -453,7 +449,6 @@ public class DatastoreV1Test { } @Test - @Category(ValidatesRunner.class) public void testDeleteKeyPrimitiveDisplayData() { DisplayDataEvaluator evaluator = DisplayDataEvaluator.create(); PTransform<PCollection<Key>, ?> write = http://git-wip-us.apache.org/repos/asf/beam/blob/f388cc71/sdks/java/io/mqtt/src/test/java/org/apache/beam/sdk/io/mqtt/MqttIOTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/mqtt/src/test/java/org/apache/beam/sdk/io/mqtt/MqttIOTest.java b/sdks/java/io/mqtt/src/test/java/org/apache/beam/sdk/io/mqtt/MqttIOTest.java index da89aa2..1b3d2da 100644 --- a/sdks/java/io/mqtt/src/test/java/org/apache/beam/sdk/io/mqtt/MqttIOTest.java +++ b/sdks/java/io/mqtt/src/test/java/org/apache/beam/sdk/io/mqtt/MqttIOTest.java @@ -29,7 +29,6 @@ import org.apache.activemq.broker.Connection; import org.apache.beam.sdk.io.mqtt.MqttIO.Read; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; -import org.apache.beam.sdk.testing.ValidatesRunner; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.values.PCollection; import org.fusesource.hawtbuf.Buffer; @@ -42,7 +41,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -78,7 +76,6 @@ public class MqttIOTest { } @Test(timeout = 60 * 1000) - @Category(ValidatesRunner.class) public void testReadNoClientId() throws Exception { final String topicName = "READ_TOPIC_NO_CLIENT_ID"; Read mqttReader = MqttIO.read() @@ -138,7 +135,6 @@ public class MqttIOTest { } @Test(timeout = 60 * 1000) - @Category(ValidatesRunner.class) public void testRead() throws Exception { PCollection<byte[]> output = pipeline.apply( MqttIO.read() @@ -198,7 +194,6 @@ public class MqttIOTest { } @Test - @Category(ValidatesRunner.class) public void testWrite() throws Exception { MQTT client = new MQTT(); client.setHost("tcp://localhost:" + port);
