---

elisheva-qlogic · igorbernstein2 · commit 32deaaf6fc52 · 2019-01-16T13:32:27.000-05:00
yaml --- r: 15825 b: refs/heads/autosynth-dialogflow c: 821bf93 h: refs/heads/master i: 15823: e4010ab
diff --git a/[refs] b/[refs]
@@ -130,7 +130,7 @@ refs/heads/autosynth-bigtable: 2fbcb15847e0e89e79d6dc07420e28d7dfcea894
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 039ca5b8db725c76c16a965ff26b2774322b8ef8
 refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
-refs/heads/autosynth-dialogflow: 8ce9aef323f4c87af9f1cc013b9e568e32342330
+refs/heads/autosynth-dialogflow: 821bf93dc663f0d249575f6117a4f3a0e121ae1d
 refs/heads/autosynth-errorreporting: 3d0566d6bebcc187f148bbed463b5a8e75b1edf6
 refs/heads/autosynth-firestore: 92b27fbc8855c9902168695abb0a8f1f433b750b
 refs/heads/autosynth-iot: 9d732be07d99843d8cb53d34ec0837328a807fce
diff --git a/branches/autosynth-dialogflow/google-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITInstanceAdminExample.java b/branches/autosynth-dialogflow/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));
 
