---

elisheva-qlogic · igorbernstein2 · commit 6d3c50211498 · 2019-01-16T13:32:27.000-05:00
yaml --- r: 15217 b: refs/heads/autosynth-bigtable c: 821bf93 h: refs/heads/master i: 15215: 820edb8
diff --git a/[refs] b/[refs]
@@ -126,7 +126,7 @@ refs/heads/autosynth-asset: cd8251de8c40e239ad24dcf9ed93ea2708a3eed5
 refs/heads/autosynth-automl: cced2f56bbef0499609073edbca6253e1df5e535
 refs/heads/autosynth-bigquerydatatransfer: a6667617707608b1dbfb02d59c22b5152f208da7
 refs/heads/autosynth-bigquerystorage: 14ab055598b943ae3f33f484e9fb1653355d08e7
-refs/heads/autosynth-bigtable: 8ce9aef323f4c87af9f1cc013b9e568e32342330
+refs/heads/autosynth-bigtable: 821bf93dc663f0d249575f6117a4f3a0e121ae1d
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 781fdb430a60f9a6491f116e31e4e10118157bdb
 refs/heads/autosynth-datastore: af1fb76aa3eee02fe6f31f8fa1c72a4f048d149b
diff --git a/branches/autosynth-bigtable/google-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITInstanceAdminExample.java b/branches/autosynth-bigtable/google-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITInstanceAdminExample.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.api.gax.rpc.NotFoundException;
-import com.google.bigtable.admin.v2.InstanceName;
 import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient;
 import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminSettings;
 import com.google.cloud.bigtable.admin.v2.models.Cluster;
@@ -42,25 +41,24 @@
 /** Integration tests for {@link InstanceAdminExample} */
 public class ITInstanceAdminExample {
 
-  private static final String INSTANCE_PROPERTY_NAME = "bigtable.instance";
+  private static final String PROJECT_PROPERTY_NAME = "bigtable.project";
   private static final String ID_PREFIX = "instanceadmin";
   private static final String CLUSTER = "cluster";
-  private static String projectName;
+  private static String projectId;
   private static BigtableInstanceAdminClient adminClient;
   private String clusterId;
   private String instanceId;
   private InstanceAdminExample instanceAdmin;
 
   @BeforeClass
   public static void beforeClass() throws IOException {
-    String targetProject = System.getProperty(INSTANCE_PROPERTY_NAME);
-    if (targetProject == null) {
+    projectId = System.getProperty(PROJECT_PROPERTY_NAME);
+    if (projectId == null) {
       adminClient = null;
       return;
     }
-    projectName = InstanceName.parse(targetProject).getProject();
     BigtableInstanceAdminSettings instanceAdminSettings =
-        BigtableInstanceAdminSettings.newBuilder().setProjectId(projectName).build();
+        BigtableInstanceAdminSettings.newBuilder().setProjectId(projectId).build();
     adminClient = BigtableInstanceAdminClient.create(instanceAdminSettings);
   }
 
@@ -74,11 +72,11 @@ public static void afterClass() {
   public void setup() throws IOException {
     if (adminClient == null) {
       throw new AssumptionViolatedException(
-          INSTANCE_PROPERTY_NAME + " property is not set, skipping integration tests.");
+          PROJECT_PROPERTY_NAME + " property is not set, skipping integration tests.");
     }
     instanceId = generateId();
     clusterId = generateId();
-    instanceAdmin = new InstanceAdminExample(projectName, instanceId, clusterId);
+    instanceAdmin = new InstanceAdminExample(projectId, instanceId, clusterId);
     adminClient.createInstance(
         CreateInstanceRequest.of(instanceId)
             .addCluster(clusterId, "us-central1-f", 3, StorageType.SSD)
@@ -99,7 +97,7 @@ public void testCreateAndDeleteInstance() throws IOException {
     String testInstance = generateId();
     String testCluster = generateId();
     InstanceAdminExample testInstanceAdmin =
-        new InstanceAdminExample(projectName, testInstance, testCluster);
+        new InstanceAdminExample(projectId, testInstance, testCluster);
     testInstanceAdmin.createProdInstance();
     assertTrue(adminClient.exists(testInstance));
 
