diff --git a/java-dialogflow/google-cloud-dialogflow/pom.xml b/java-dialogflow/google-cloud-dialogflow/pom.xml
index 394c0ddddf1e..26c370a6ef44 100644
--- a/java-dialogflow/google-cloud-dialogflow/pom.xml
+++ b/java-dialogflow/google-cloud-dialogflow/pom.xml
@@ -87,6 +87,11 @@
google-cloud-core
test
+
+ org.awaitility
+ awaitility
+ test
+
com.google.api.grpc
diff --git a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/it/ITSystemTest.java b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/it/ITSystemTest.java
index 0f5d52d84320..70a3949dbf83 100644
--- a/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/it/ITSystemTest.java
+++ b/java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/it/ITSystemTest.java
@@ -15,7 +15,10 @@
*/
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 com.google.cloud.dialogflow.v2.Agent;
@@ -54,10 +57,10 @@
import com.google.protobuf.Struct;
import com.google.protobuf.Value;
import java.io.IOException;
+import java.time.Duration;
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 +262,6 @@ public void getIntentTest() {
}
@Test
- @Ignore("b/423958346")
public void detectIntentTest() {
QueryInput queryInput =
QueryInput.newBuilder()
@@ -279,22 +281,28 @@ public void detectIntentTest() {
.setSession(SESSION_NAME.toString())
.setQueryInput(queryInput)
.build();
- DetectIntentResponse response = sessionsClient.detectIntent(request);
- QueryResult result = response.getQueryResult();
- assertEquals(EVENT_NAME, result.getQueryText());
- assertEquals(ACTION_NAME, result.getAction());
- assertEquals(DEFAULT_LANGUAGE_CODE, result.getLanguageCode());
- assertEquals(intent.getDisplayName(), result.getIntent().getDisplayName());
+ await()
+ .atMost(Duration.ofSeconds(30))
+ .pollInterval(Duration.ofSeconds(2))
+ .untilAsserted(
+ () -> {
+ DetectIntentResponse response = sessionsClient.detectIntent(request);
+ QueryResult result = response.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
diff --git a/test-results-native/test/TEST-junit-jupiter.xml b/test-results-native/test/TEST-junit-jupiter.xml
new file mode 100644
index 000000000000..0d5e9238186b
--- /dev/null
+++ b/test-results-native/test/TEST-junit-jupiter.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test-results-native/test/TEST-junit-vintage.xml b/test-results-native/test/TEST-junit-vintage.xml
new file mode 100644
index 000000000000..e89a411b0f29
--- /dev/null
+++ b/test-results-native/test/TEST-junit-vintage.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+