Revert "test: Creating multi db rule to run tests multiple times against different named databases. (googleapis#1270)"

This reverts commit 780c9f4.

Author: kolea2

google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreAggregationsTest.java

@@ -26,13 +26,15 @@
 import com.google.cloud.datastore.AggregationResult;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.Datastore.TransactionCallable;
+import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.EntityQuery;
 import com.google.cloud.datastore.GqlQuery;
 import com.google.cloud.datastore.Key;
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.QueryResults;
 import com.google.cloud.datastore.Transaction;
+import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
 import com.google.common.collect.ImmutableList;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.datastore.v1.TransactionOptions.ReadOnly;
@@ -41,24 +43,18 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
 import org.junit.Test;
 
 // TODO(jainsahab) Move all the aggregation related tests from ITDatastoreTest to this file
 public class ITDatastoreAggregationsTest {
 
-  @ClassRule public static MultiDbRule multiDbRule = new MultiDbRule();
-
-  private static Datastore DATASTORE;
+  private static final RemoteDatastoreHelper HELPER = RemoteDatastoreHelper.create();
+  private static final DatastoreOptions OPTIONS = HELPER.getOptions();
+  private static final Datastore DATASTORE = OPTIONS.getService();
 
   private static final String KIND = "Marks";
 
-  @BeforeClass
-  public static void beforeClass() throws Exception {
-    DATASTORE = multiDbRule.getDatastore();
-  }
-
   @After
   public void tearDown() {
     EntityQuery allEntitiesQuery = Query.newEntityQueryBuilder().build();
@@ -68,6 +64,11 @@ public void tearDown() {
     DATASTORE.delete(keysToDelete);
   }
 
+  @AfterClass
+  public static void afterClass() throws Exception {
+    DATASTORE.close();
+  }
+
   Key key1 = DATASTORE.newKeyFactory().setKind(KIND).newKey(1);
   Key key2 = DATASTORE.newKeyFactory().setKind(KIND).newKey(2);
   Key key3 = DATASTORE.newKeyFactory().setKind(KIND).newKey(3);
@@ -88,6 +89,7 @@ public void testSumAggregation() {
         Query.newAggregationQueryBuilder()
             .over(baseQuery)
             .addAggregations(sum("marks").as("total_marks"))
+            .setNamespace(OPTIONS.getNamespace())
             .build();
 
     // sum of 2 entities
@@ -106,7 +108,11 @@ public void testSumAggregationWithAutoGeneratedAlias() {
 
     EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
     AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder().over(baseQuery).addAggregations(sum("marks")).build();
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(sum("marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
 
     // sum of 2 entities
     assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("property_1"))
@@ -127,7 +133,11 @@ public void testSumAggregationInGqlQuery() {
                 "AGGREGATE SUM(marks) AS total_marks OVER (SELECT * FROM Marks)")
             .build();
 
-    AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder().over(gqlQuery).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(gqlQuery)
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
 
     // sum of 2 entities
     assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getLong("total_marks"))
@@ -148,6 +158,7 @@ public void testSumAggregationWithResultOfDoubleType() {
         Query.newAggregationQueryBuilder()
             .over(baseQuery)
             .addAggregations(sum("cgpa").as("total_cgpa"))
+            .setNamespace(OPTIONS.getNamespace())
             .build();
 
     // sum of 2 entities
@@ -169,6 +180,7 @@ public void testAvgAggregation() {
         Query.newAggregationQueryBuilder()
             .over(baseQuery)
             .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(OPTIONS.getNamespace())
             .build();
 
     // avg of 2 entities
@@ -187,7 +199,11 @@ public void testAvgAggregationWithAutoGeneratedAlias() {
 
     EntityQuery baseQuery = Query.newEntityQueryBuilder().setKind(KIND).build();
     AggregationQuery aggregationQuery =
-        Query.newAggregationQueryBuilder().over(baseQuery).addAggregations(avg("marks")).build();
+        Query.newAggregationQueryBuilder()
+            .over(baseQuery)
+            .addAggregations(avg("marks"))
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
 
     // avg of 2 entities
     assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("property_1"))
@@ -207,7 +223,11 @@ public void testAvgAggregationInGqlQuery() {
         Query.newGqlQueryBuilder("AGGREGATE AVG(marks) AS avg_marks OVER (SELECT * FROM Marks)")
             .build();
 
-    AggregationQuery aggregationQuery = Query.newAggregationQueryBuilder().over(gqlQuery).build();
+    AggregationQuery aggregationQuery =
+        Query.newAggregationQueryBuilder()
+            .over(gqlQuery)
+            .setNamespace(OPTIONS.getNamespace())
+            .build();
 
     // avg of 2 entities
     assertThat(getOnlyElement(DATASTORE.runAggregation(aggregationQuery)).getDouble("avg_marks"))
@@ -229,6 +249,7 @@ public void testSumAndAvgAggregationTogether() {
             .over(baseQuery)
             .addAggregations(sum("marks").as("total_marks"))
             .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(OPTIONS.getNamespace())
             .build();
 
     // sum of 2 entities
@@ -250,6 +271,7 @@ public void testTransactionShouldReturnAConsistentSnapshot() {
             .addAggregation(count().as("count"))
             .addAggregations(sum("marks").as("total_marks"))
             .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(OPTIONS.getNamespace())
             .build();
 
     // original entity count is 2
@@ -310,6 +332,7 @@ public void testReadOnlyTransactionShouldNotLockTheDocuments()
             .addAggregation(count().as("count"))
             .addAggregations(sum("marks").as("total_marks"))
             .addAggregations(avg("marks").as("avg_marks"))
+            .setNamespace(OPTIONS.getNamespace())
             .build();
 
     TransactionOptions transactionOptions =