---

elisheva-qlogic · igorbernstein2 · commit 43c328f861d8 · 2019-01-16T13:32:27.000-05:00
yaml --- r: 17129 b: refs/heads/autosynth-scheduler c: 821bf93 h: refs/heads/master i: 17127: 1d4bbce
diff --git a/[refs] b/[refs]
@@ -138,7 +138,7 @@ refs/heads/autosynth-kms: 4fff8f3cf6c830f7706ac4ef272f036bb87fbaf8
 refs/heads/autosynth-language: 6262e2eb76944f01972c887b3e684aaf65ec999a
 refs/heads/autosynth-os-login: a88a337797996a205873040a63abe1d3116f5789
 refs/heads/autosynth-redis: 0cdb2e47359d51b73763bcea8af3de62aa99119b
-refs/heads/autosynth-scheduler: 8ce9aef323f4c87af9f1cc013b9e568e32342330
+refs/heads/autosynth-scheduler: 821bf93dc663f0d249575f6117a4f3a0e121ae1d
 refs/heads/autosynth-securitycenter: 8e95447ccb176c3648880ee0cb926cd1f4065156
 refs/heads/autosynth-spanner: 563dc6c78c6a2579b681f441f0a9b59005212394
 refs/heads/autosynth-speech: 878243784f42771467d7cf52bd59e4a6a7950ee9
diff --git a/branches/autosynth-scheduler/google-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITInstanceAdminExample.java b/branches/autosynth-scheduler/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));
 
