Add integration tests and remote test helper for Datastore

mziccard · mziccard · commit 72e0d3a5db76 · 2016-09-13T14:40:22.000+02:00
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
@@ -34,7 +34,7 @@ public final class DatastoreException extends BaseServiceException {
 
   // see https://cloud.google.com/datastore/docs/concepts/errors#Error_Codes"
   private static final Set<Error> RETRYABLE_ERRORS = ImmutableSet.of(
-      new Error(10, "ABORTED", true),
+      new Error(10, "ABORTED", false),
       new Error(4, "DEADLINE_EXCEEDED", false),
       new Error(14, "UNAVAILABLE", true));
   private static final long serialVersionUID = 2663750991205874435L;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.datastore.testing;
+
+import com.google.cloud.RetryParams;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Key;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.StructuredQuery;
+
+import java.util.UUID;
+
+/**
+ * Utility to create a remote datastore configuration for testing. Datastore options can be obtained
+ * via the {@link #options()} method. Returned options use a randomly generated namespace
+ * ({@link DatastoreOptions#namespace()}) that can be used to run the tests. Once the tests are run,
+ * all entities in the namespace can be deleted using {@link #deleteNamespace()}. Returned options
+ * also have custom {@link DatastoreOptions#retryParams()}: {@link RetryParams#retryMaxAttempts()}
+ * is {@code 10}, {@link RetryParams#retryMinAttempts()} is {@code 6},
+ * {@link RetryParams#maxRetryDelayMillis()} is {@code 30000},
+ * {@link RetryParams#totalRetryPeriodMillis()} is {@code 120000} and
+ * {@link RetryParams#initialRetryDelayMillis()} is {@code 250}.
+ * {@link DatastoreOptions#connectTimeout()} and {@link DatastoreOptions#readTimeout()} are both set
+ * to {@code 60000}.
+ */
+public class RemoteDatastoreHelper {
+
+  private final DatastoreOptions options;
+  private final Datastore datastore;
+  private final String namespace;
+
+  private RemoteDatastoreHelper(DatastoreOptions options) {
+    this.options = options;
+    this.datastore = options.service();
+    this.namespace = options.namespace();
+  }
+
+  /**
+   * Returns a {@link DatastoreOptions} object to be used for testing. The options are associated
+   * to a randomly generated namespace.
+   */
+  public DatastoreOptions options() {
+    return options;
+  }
+
+  /**
+   * Deletes all entities in the namespace associated with this {@link RemoteDatastoreHelper}.
+   */
+  public void deleteNamespace() {
+    StructuredQuery<Key> query = Query.keyQueryBuilder().namespace(namespace).build();
+    QueryResults<Key> keys = datastore.run(query);
+    while (keys.hasNext()) {
+      datastore.delete(keys.next());
+    }
+  }
+
+  /**
+   * Creates a {@code RemoteStorageHelper} object.
+   */
+  public static RemoteDatastoreHelper create() {
+    DatastoreOptions datastoreOption = DatastoreOptions.builder()
+        .namespace(UUID.randomUUID().toString())
+        .retryParams(retryParams())
+        .connectTimeout(60000)
+        .readTimeout(60000)
+        .build();
+    return new RemoteDatastoreHelper(datastoreOption);
+  }
+
+  private static RetryParams retryParams() {
+    return RetryParams.builder()
+        .retryMaxAttempts(10)
+        .retryMinAttempts(6)
+        .maxRetryDelayMillis(30000)
+        .totalRetryPeriodMillis(120000)
+        .initialRetryDelayMillis(250)
+        .build();
+  }
+}
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
