Fix inspect tests (GoogleCloudPlatform#3049)

sushicw · web-flow · commit 512c17421bc2 · 2020-06-04T16:40:16.000-07:00
diff --git a/dlp/src/test/java/dlp/snippets/InspectTests.java b/dlp/src/test/java/dlp/snippets/InspectTests.java
@@ -24,10 +24,8 @@
 import com.google.cloud.dlp.v2.DlpServiceClient;
 import com.google.privacy.dlp.v2.CancelDlpJobRequest;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Arrays;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
@@ -158,60 +156,30 @@ public void testInspectImageFile() {
   }
 
   @Test
-  public void testInspectGcsFile() throws InterruptedException, ExecutionException, IOException {
-
+  public void testInspectGcsFile() throws Exception {
     InspectGcsFile.inspectGcsFile(PROJECT_ID, GCS_PATH, TOPIC_ID, SUBSCRIPTION_ID);
-    // Await job creation
-    TimeUnit.SECONDS.sleep(3);
 
     String output = bout.toString();
-    assertThat(output, containsString("Job created: "));
-
-    // Cancelling the job early to conserve quota
-    String jobId = output.split("Job created: ")[1].split("\n")[0];
-    CancelDlpJobRequest request = CancelDlpJobRequest.newBuilder().setName(jobId).build();
-    try (DlpServiceClient client = DlpServiceClient.create()) {
-      client.cancelDlpJob(request);
-    }
+    assertThat(output, containsString("Job status: DONE"));
   }
 
   @Test
-  public void testInspectDatastoreEntity()
-      throws InterruptedException, ExecutionException, IOException {
+  public void testInspectDatastoreEntity() throws Exception {
 
     InspectDatastoreEntity.insepctDatastoreEntity(
         PROJECT_ID, datastoreNamespace, datastoreKind, TOPIC_ID, SUBSCRIPTION_ID);
-    // Await job creation
-    TimeUnit.SECONDS.sleep(3);
 
     String output = bout.toString();
-    assertThat(output, containsString("Job created: "));
-
-    // Cancelling the job early to conserve quota
-    String jobId = output.split("Job created: ")[1].split("\n")[0];
-    CancelDlpJobRequest request = CancelDlpJobRequest.newBuilder().setName(jobId).build();
-    try (DlpServiceClient client = DlpServiceClient.create()) {
-      client.cancelDlpJob(request);
-    }
+    assertThat(output, containsString("Job status: DONE"));
   }
 
   @Test
-  public void testInspectBigQueryTable()
-      throws InterruptedException, ExecutionException, IOException {
+  public void testInspectBigQueryTable() throws Exception {
 
-    InspectBigQueryTable.inspectBigQueryTable(
-        PROJECT_ID, DATASET_ID, TABLE_ID, TOPIC_ID, SUBSCRIPTION_ID);
-    // Await job creation
-    TimeUnit.SECONDS.sleep(3);
+    InspectBigQueryTable
+        .inspectBigQueryTable(PROJECT_ID, DATASET_ID, TABLE_ID, TOPIC_ID, SUBSCRIPTION_ID);
 
     String output = bout.toString();
-    assertThat(output, containsString("Job created: "));
-
-    // Cancelling the job early to conserve quota
-    String jobId = output.split("Job created: ")[1].split("\n")[0];
-    CancelDlpJobRequest request = CancelDlpJobRequest.newBuilder().setName(jobId).build();
-    try (DlpServiceClient client = DlpServiceClient.create()) {
-      client.cancelDlpJob(request);
-    }
+    assertThat(output, containsString("Job status: DONE"));
   }
 }
