---

elisheva-qlogic · igorbernstein2 · commit d3a648a0483a · 2019-01-16T13:32:27.000-05:00
yaml --- r: 13559 b: refs/heads/autosynth-dlp c: 821bf93 h: refs/heads/master i: 13557: 3027864 13555: 8641f2f 13551: f1a8e7d
diff --git a/[refs] b/[refs]
@@ -104,7 +104,7 @@ refs/tags/v0.60.0: 4cd518d0612329f8a8e53484eef4cd1651e32855
 refs/tags/v0.61.0: e4b526656bb1bf5eefd0ee578b7405147821225e
 refs/tags/v0.62.0: bbede7385d48ba08f487bdd29ec10668ace96396
 refs/heads/0.60.0-alpha: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
-refs/heads/autosynth-dlp: 8ce9aef323f4c87af9f1cc013b9e568e32342330
+refs/heads/autosynth-dlp: 821bf93dc663f0d249575f6117a4f3a0e121ae1d
 refs/heads/autosynth-logging: f8794c50a64f62b167cddf42513d133547679e01
 refs/heads/dupes: 3478c5d81fd242d0e985656645a679420a2060c2
 refs/tags/v0.63.0: 94f19b71d40f46b36120e7b9d78a1a3d41bfcbd6
diff --git a/branches/autosynth-dlp/google-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITInstanceAdminExample.java b/branches/autosynth-dlp/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));
 
