test(dialogflow): deflake and re-enable test cases in ITSystemTest

Author: whowes

google-cloud-jar-parent/pom.xml

@@ -71,6 +71,12 @@
       </dependency>
 
       <!-- Test dependencies -->
+      <dependency>
+        <groupId>org.awaitility</groupId>
+        <artifactId>awaitility</artifactId>
+        <version>4.3.0</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>

java-dialogflow/google-cloud-dialogflow/pom.xml

@@ -87,6 +87,11 @@
       <artifactId>google-cloud-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- {x-generated-grpc-dependencies-start} -->
     <dependency>
       <groupId>com.google.api.grpc</groupId>

java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/it/ITSystemTest.java

@@ -15,9 +15,14 @@
  */
 package com.google.cloud.dialogflow.v2.it;
 
+import static com.google.common.collect.Streams.stream;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.ServiceOptions;
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicReference;
 import com.google.cloud.dialogflow.v2.Agent;
 import com.google.cloud.dialogflow.v2.AgentsClient;
 import com.google.cloud.dialogflow.v2.Context;
@@ -57,7 +62,6 @@
 import java.util.UUID;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class ITSystemTest {
@@ -259,7 +263,6 @@ public void getIntentTest() {
   }
 
   @Test
-  @Ignore("b/423958346")
   public void detectIntentTest() {
     QueryInput queryInput =
         QueryInput.newBuilder()
@@ -279,22 +282,32 @@ public void detectIntentTest() {
             .setSession(SESSION_NAME.toString())
             .setQueryInput(queryInput)
             .build();
-    DetectIntentResponse response = sessionsClient.detectIntent(request);
-    QueryResult result = response.getQueryResult();
+    AtomicReference<DetectIntentResponse> responseRef =
+        new AtomicReference<>();
+    await()
+        .atMost(Duration.ofSeconds(10))
+        .pollInterval(Duration.ofSeconds(2))
+        .until(
+            () -> {
+              DetectIntentResponse response = sessionsClient.detectIntent(request);
+              responseRef.set(response);
+              return !response.getQueryResult().getQueryText().isEmpty();
+            });
+    QueryResult result = responseRef.get().getQueryResult();
     assertEquals(EVENT_NAME, result.getQueryText());
     assertEquals(ACTION_NAME, result.getAction());
     assertEquals(DEFAULT_LANGUAGE_CODE, result.getLanguageCode());
     assertEquals(intent.getDisplayName(), result.getIntent().getDisplayName());
   }
 
   @Test
-  @Ignore("b/423958346")
   public void listContextsTest() {
     ListContextsRequest request =
         ListContextsRequest.newBuilder().setParent(SESSION_NAME.toString()).build();
-    for (Context actualContext : contextsClient.listContexts(request).iterateAll()) {
-      assertEquals(context.getName(), actualContext.getName());
-    }
+    boolean contextNameInActualContext =
+        stream(contextsClient.listContexts(request).iterateAll())
+            .anyMatch(actualContext -> context.getName().equals(actualContext.getName()));
+    assertTrue(contextNameInActualContext);
   }
 
   @Test