Fix DatastoreIT test options
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/195be03f Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/195be03f Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/195be03f Branch: refs/heads/master Commit: 195be03fcd53bb28ab06f54b8872de5ec2cc3cb9 Parents: 8daa8b5 Author: Vikas Kedigehalli <[email protected]> Authored: Tue Nov 8 14:41:25 2016 -0800 Committer: Dan Halperin <[email protected]> Committed: Thu Nov 10 10:21:50 2016 -0800 ---------------------------------------------------------------------- .../apache/beam/sdk/io/gcp/datastore/V1ReadIT.java | 15 +++++++++------ .../beam/sdk/io/gcp/datastore/V1TestOptions.java | 5 ----- .../apache/beam/sdk/io/gcp/datastore/V1TestUtil.java | 10 ++++++---- .../apache/beam/sdk/io/gcp/datastore/V1WriteIT.java | 9 ++++++--- 4 files changed, 21 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/195be03f/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1ReadIT.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1ReadIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1ReadIT.java index 37ad064..6fe2568 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1ReadIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1ReadIT.java @@ -31,6 +31,7 @@ import java.util.UUID; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.io.gcp.datastore.V1TestUtil.UpsertMutationBuilder; import org.apache.beam.sdk.io.gcp.datastore.V1TestUtil.V1TestWriter; +import org.apache.beam.sdk.options.GcpOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; @@ -48,6 +49,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class V1ReadIT { private V1TestOptions options; + private String project; private String ancestor; private final long numEntities = 1000; @@ -55,6 +57,7 @@ public class V1ReadIT { public void setup() { PipelineOptionsFactory.register(V1TestOptions.class); options = TestPipeline.testingPipelineOptions().as(V1TestOptions.class); + project = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject(); ancestor = UUID.randomUUID().toString(); } @@ -68,14 +71,14 @@ public class V1ReadIT { @Test public void testE2EV1Read() throws Exception { // Create entities and write them to datastore - writeEntitiesToDatastore(options, ancestor, numEntities); + writeEntitiesToDatastore(options, project, ancestor, numEntities); // Read from datastore Query query = V1TestUtil.makeAncestorKindQuery( options.getKind(), options.getNamespace(), ancestor); DatastoreV1.Read read = DatastoreIO.v1().read() - .withProjectId(options.getProject()) + .withProjectId(project) .withQuery(query) .withNamespace(options.getNamespace()); @@ -90,9 +93,9 @@ public class V1ReadIT { } // Creates entities and write them to datastore - private static void writeEntitiesToDatastore(V1TestOptions options, String ancestor, - long numEntities) throws Exception { - Datastore datastore = getDatastore(options, options.getProject()); + private static void writeEntitiesToDatastore(V1TestOptions options, String project, + String ancestor, long numEntities) throws Exception { + Datastore datastore = getDatastore(options, project); // Write test entities to datastore V1TestWriter writer = new V1TestWriter(datastore, new UpsertMutationBuilder()); Key ancestorKey = makeAncestorKey(options.getNamespace(), options.getKind(), ancestor); @@ -106,6 +109,6 @@ public class V1ReadIT { @After public void tearDown() throws Exception { - deleteAllEntities(options, ancestor); + deleteAllEntities(options, project, ancestor); } } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/195be03f/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestOptions.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestOptions.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestOptions.java index 9ebba3a..a77d669 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestOptions.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestOptions.java @@ -27,11 +27,6 @@ import org.apache.beam.sdk.testing.TestPipelineOptions; * DatastoreV1 Datastore related pipeline options. */ public interface V1TestOptions extends TestPipelineOptions { - @Description("Project ID to read from datastore") - @Default.String("apache-beam-testing") - String getProject(); - void setProject(String value); - @Description("Datastore Entity kind") @Default.String("beam-test") String getKind(); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/195be03f/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestUtil.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestUtil.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestUtil.java index 76a1fc8..526f035 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestUtil.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1TestUtil.java @@ -166,8 +166,9 @@ class V1TestUtil { /** * Delete all entities with the given ancestor. */ - static void deleteAllEntities(V1TestOptions options, String ancestor) throws Exception { - Datastore datastore = getDatastore(options, options.getProject()); + static void deleteAllEntities(V1TestOptions options, String project, String ancestor) + throws Exception { + Datastore datastore = getDatastore(options, project); Query query = V1TestUtil.makeAncestorKindQuery( options.getKind(), options.getNamespace(), ancestor); @@ -188,9 +189,10 @@ class V1TestUtil { /** * Returns the total number of entities for the given datastore. */ - static long countEntities(V1TestOptions options, String ancestor) throws Exception { + static long countEntities(V1TestOptions options, String project, String ancestor) + throws Exception { // Read from datastore. - Datastore datastore = V1TestUtil.getDatastore(options, options.getProject()); + Datastore datastore = V1TestUtil.getDatastore(options, project); Query query = V1TestUtil.makeAncestorKindQuery( options.getKind(), options.getNamespace(), ancestor); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/195be03f/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1WriteIT.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1WriteIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1WriteIT.java index e97e80a..0fcd9d3 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1WriteIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/V1WriteIT.java @@ -26,6 +26,7 @@ import java.util.UUID; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.io.CountingInput; import org.apache.beam.sdk.io.gcp.datastore.V1TestUtil.CreateEntityFn; +import org.apache.beam.sdk.options.GcpOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.ParDo; @@ -41,6 +42,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class V1WriteIT { private V1TestOptions options; + private String project; private String ancestor; private final long numEntities = 1000; @@ -48,6 +50,7 @@ public class V1WriteIT { public void setup() { PipelineOptionsFactory.register(V1TestOptions.class); options = TestPipeline.testingPipelineOptions().as(V1TestOptions.class); + project = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject(); ancestor = UUID.randomUUID().toString(); } @@ -66,18 +69,18 @@ public class V1WriteIT { p.apply(CountingInput.upTo(numEntities)) .apply(ParDo.of(new CreateEntityFn( options.getKind(), options.getNamespace(), ancestor))) - .apply(DatastoreIO.v1().write().withProjectId(options.getProject())); + .apply(DatastoreIO.v1().write().withProjectId(project)); p.run(); // Count number of entities written to datastore. - long numEntitiesWritten = countEntities(options, ancestor); + long numEntitiesWritten = countEntities(options, project, ancestor); assertEquals(numEntitiesWritten, numEntities); } @After public void tearDown() throws Exception { - deleteAllEntities(options, ancestor); + deleteAllEntities(options, project, ancestor); } }
