Skip to content

Commit 42715ad

Browse files
committed
test(dialogflow): deflake and re-enable test cases in ITSystemTest
1 parent 50a72e1 commit 42715ad

4 files changed

Lines changed: 179 additions & 12 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@
8787
<artifactId>google-cloud-core</artifactId>
8888
<scope>test</scope>
8989
</dependency>
90+
<dependency>
91+
<groupId>org.awaitility</groupId>
92+
<artifactId>awaitility</artifactId>
93+
<scope>test</scope>
94+
</dependency>
9095
<!-- {x-generated-grpc-dependencies-start} -->
9196
<dependency>
9297
<groupId>com.google.api.grpc</groupId>

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

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
*/
1616
package com.google.cloud.dialogflow.v2.it;
1717

18+
import static com.google.common.collect.Streams.stream;
19+
import static org.awaitility.Awaitility.await;
1820
import static org.junit.Assert.assertEquals;
21+
import static org.junit.Assert.assertTrue;
1922

2023
import com.google.cloud.ServiceOptions;
2124
import com.google.cloud.dialogflow.v2.Agent;
@@ -54,10 +57,10 @@
5457
import com.google.protobuf.Struct;
5558
import com.google.protobuf.Value;
5659
import java.io.IOException;
60+
import java.time.Duration;
5761
import java.util.UUID;
5862
import org.junit.AfterClass;
5963
import org.junit.BeforeClass;
60-
import org.junit.Ignore;
6164
import org.junit.Test;
6265

6366
public class ITSystemTest {
@@ -259,7 +262,6 @@ public void getIntentTest() {
259262
}
260263

261264
@Test
262-
@Ignore("b/423958346")
263265
public void detectIntentTest() {
264266
QueryInput queryInput =
265267
QueryInput.newBuilder()
@@ -279,22 +281,28 @@ public void detectIntentTest() {
279281
.setSession(SESSION_NAME.toString())
280282
.setQueryInput(queryInput)
281283
.build();
282-
DetectIntentResponse response = sessionsClient.detectIntent(request);
283-
QueryResult result = response.getQueryResult();
284-
assertEquals(EVENT_NAME, result.getQueryText());
285-
assertEquals(ACTION_NAME, result.getAction());
286-
assertEquals(DEFAULT_LANGUAGE_CODE, result.getLanguageCode());
287-
assertEquals(intent.getDisplayName(), result.getIntent().getDisplayName());
284+
await()
285+
.atMost(Duration.ofSeconds(30))
286+
.pollInterval(Duration.ofSeconds(2))
287+
.untilAsserted(
288+
() -> {
289+
DetectIntentResponse response = sessionsClient.detectIntent(request);
290+
QueryResult result = response.getQueryResult();
291+
assertEquals(EVENT_NAME, result.getQueryText());
292+
assertEquals(ACTION_NAME, result.getAction());
293+
assertEquals(DEFAULT_LANGUAGE_CODE, result.getLanguageCode());
294+
assertEquals(intent.getDisplayName(), result.getIntent().getDisplayName());
295+
});
288296
}
289297

290298
@Test
291-
@Ignore("b/423958346")
292299
public void listContextsTest() {
293300
ListContextsRequest request =
294301
ListContextsRequest.newBuilder().setParent(SESSION_NAME.toString()).build();
295-
for (Context actualContext : contextsClient.listContexts(request).iterateAll()) {
296-
assertEquals(context.getName(), actualContext.getName());
297-
}
302+
boolean contextNameInActualContext =
303+
stream(contextsClient.listContexts(request).iterateAll())
304+
.anyMatch(actualContext -> context.getName().equals(actualContext.getName()));
305+
assertTrue(contextNameInActualContext);
298306
}
299307

300308
@Test
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<testsuite name="JUnit Jupiter" tests="0" skipped="0" failures="0" errors="0" time="0" hostname="whowes.c.googlers.com" timestamp="2026-07-10T21:09:39">
3+
<properties>
4+
<property name="file.encoding" value="UTF-8"/>
5+
<property name="file.separator" value="/"/>
6+
<property name="java.class.path" value=""/>
7+
<property name="java.class.version" value="61.0"/>
8+
<property name="java.endorsed.dirs" value=""/>
9+
<property name="java.ext.dirs" value=""/>
10+
<property name="java.io.tmpdir" value="/tmp"/>
11+
<property name="java.library.path" value="/usr/lib/mesa-diverted/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu/mesa:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/x86_64-linux-gnu/gallium-pipe:/usr/lib64:/lib64:/lib:/usr/lib"/>
12+
<property name="java.runtime.name" value="GraalVM Runtime Environment"/>
13+
<property name="java.runtime.version" value="17.0.9+9-jvmci-23.0-b22"/>
14+
<property name="java.specification.name" value="Java Platform API Specification"/>
15+
<property name="java.specification.vendor" value="Oracle Corporation"/>
16+
<property name="java.specification.version" value="17"/>
17+
<property name="java.vendor" value="GraalVM Community"/>
18+
<property name="java.vendor.url" value="https://www.graalvm.org/"/>
19+
<property name="java.vendor.version" value="GraalVM CE 17.0.9+9.1"/>
20+
<property name="java.version" value="17.0.9"/>
21+
<property name="java.version.date" value="2023-10-17"/>
22+
<property name="java.vm.info" value="serial gc"/>
23+
<property name="java.vm.name" value="Substrate VM"/>
24+
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
25+
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
26+
<property name="java.vm.specification.version" value="17"/>
27+
<property name="java.vm.vendor" value="GraalVM Community"/>
28+
<property name="java.vm.version" value="17.0.9+9"/>
29+
<property name="jdk.lang.Process.launchMechanism" value="FORK"/>
30+
<property name="line.separator" value="
31+
"/>
32+
<property name="native.encoding" value="UTF-8"/>
33+
<property name="org.graalvm.nativeimage.imagecode" value="runtime"/>
34+
<property name="org.graalvm.nativeimage.kind" value="executable"/>
35+
<property name="os.arch" value="amd64"/>
36+
<property name="os.name" value="Linux"/>
37+
<property name="os.version" value="6.18.14-1rodete3-amd64"/>
38+
<property name="path.separator" value=":"/>
39+
<property name="sun.arch.data.model" value="64"/>
40+
<property name="sun.jnu.encoding" value="UTF-8"/>
41+
<property name="user.dir" value="/usr/local/google/home/whowes/cloudsdk/google-cloud-java"/>
42+
<property name="user.home" value="/usr/local/google/home/whowes"/>
43+
<property name="user.name" value="whowes"/>
44+
<property name="user.timezone" value="Etc/UTC"/>
45+
</properties>
46+
<system-out><![CDATA[
47+
unique-id: [engine:junit-jupiter]
48+
display-name: JUnit Jupiter
49+
]]></system-out>
50+
</testsuite>
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<testsuite name="JUnit Vintage" tests="9" skipped="0" failures="0" errors="0" time="4.314" hostname="whowes.c.googlers.com" timestamp="2026-07-10T21:09:39">
3+
<properties>
4+
<property name="file.encoding" value="UTF-8"/>
5+
<property name="file.separator" value="/"/>
6+
<property name="java.class.path" value=""/>
7+
<property name="java.class.version" value="61.0"/>
8+
<property name="java.endorsed.dirs" value=""/>
9+
<property name="java.ext.dirs" value=""/>
10+
<property name="java.io.tmpdir" value="/tmp"/>
11+
<property name="java.library.path" value="/usr/lib/mesa-diverted/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu/mesa:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/x86_64-linux-gnu/gallium-pipe:/usr/lib64:/lib64:/lib:/usr/lib"/>
12+
<property name="java.runtime.name" value="GraalVM Runtime Environment"/>
13+
<property name="java.runtime.version" value="17.0.9+9-jvmci-23.0-b22"/>
14+
<property name="java.specification.name" value="Java Platform API Specification"/>
15+
<property name="java.specification.vendor" value="Oracle Corporation"/>
16+
<property name="java.specification.version" value="17"/>
17+
<property name="java.vendor" value="GraalVM Community"/>
18+
<property name="java.vendor.url" value="https://www.graalvm.org/"/>
19+
<property name="java.vendor.version" value="GraalVM CE 17.0.9+9.1"/>
20+
<property name="java.version" value="17.0.9"/>
21+
<property name="java.version.date" value="2023-10-17"/>
22+
<property name="java.vm.info" value="serial gc"/>
23+
<property name="java.vm.name" value="Substrate VM"/>
24+
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
25+
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
26+
<property name="java.vm.specification.version" value="17"/>
27+
<property name="java.vm.vendor" value="GraalVM Community"/>
28+
<property name="java.vm.version" value="17.0.9+9"/>
29+
<property name="jdk.lang.Process.launchMechanism" value="FORK"/>
30+
<property name="line.separator" value="
31+
"/>
32+
<property name="native.encoding" value="UTF-8"/>
33+
<property name="org.graalvm.nativeimage.imagecode" value="runtime"/>
34+
<property name="org.graalvm.nativeimage.kind" value="executable"/>
35+
<property name="os.arch" value="amd64"/>
36+
<property name="os.name" value="Linux"/>
37+
<property name="os.version" value="6.18.14-1rodete3-amd64"/>
38+
<property name="path.separator" value=":"/>
39+
<property name="sun.arch.data.model" value="64"/>
40+
<property name="sun.jnu.encoding" value="UTF-8"/>
41+
<property name="user.dir" value="/usr/local/google/home/whowes/cloudsdk/google-cloud-java"/>
42+
<property name="user.home" value="/usr/local/google/home/whowes"/>
43+
<property name="user.name" value="whowes"/>
44+
<property name="user.timezone" value="Etc/UTC"/>
45+
</properties>
46+
<testcase name="detectIntentTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="2.229">
47+
<system-out><![CDATA[
48+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:detectIntentTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
49+
display-name: detectIntentTest
50+
]]></system-out>
51+
</testcase>
52+
<testcase name="getContextTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="0.142">
53+
<system-out><![CDATA[
54+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:getContextTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
55+
display-name: getContextTest
56+
]]></system-out>
57+
</testcase>
58+
<testcase name="getAgentTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="0.192">
59+
<system-out><![CDATA[
60+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:getAgentTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
61+
display-name: getAgentTest
62+
]]></system-out>
63+
</testcase>
64+
<testcase name="listContextsTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="0.14">
65+
<system-out><![CDATA[
66+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:listContextsTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
67+
display-name: listContextsTest
68+
]]></system-out>
69+
</testcase>
70+
<testcase name="listEntityTypesTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="0.17">
71+
<system-out><![CDATA[
72+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:listEntityTypesTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
73+
display-name: listEntityTypesTest
74+
]]></system-out>
75+
</testcase>
76+
<testcase name="searchAgentsTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="0.06">
77+
<system-out><![CDATA[
78+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:searchAgentsTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
79+
display-name: searchAgentsTest
80+
]]></system-out>
81+
</testcase>
82+
<testcase name="listIntentsTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="0.086">
83+
<system-out><![CDATA[
84+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:listIntentsTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
85+
display-name: listIntentsTest
86+
]]></system-out>
87+
</testcase>
88+
<testcase name="getIntentTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="0.074">
89+
<system-out><![CDATA[
90+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:getIntentTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
91+
display-name: getIntentTest
92+
]]></system-out>
93+
</testcase>
94+
<testcase name="getEntityTypeTest" classname="com.google.cloud.dialogflow.v2.it.ITSystemTest" time="0.137">
95+
<system-out><![CDATA[
96+
unique-id: [engine:junit-vintage]/[runner:com.google.cloud.dialogflow.v2.it.ITSystemTest]/[test:getEntityTypeTest(com.google.cloud.dialogflow.v2.it.ITSystemTest)]
97+
display-name: getEntityTypeTest
98+
]]></system-out>
99+
</testcase>
100+
<system-out><![CDATA[
101+
unique-id: [engine:junit-vintage]
102+
display-name: JUnit Vintage
103+
]]></system-out>
104+
</testsuite>

0 commit comments

Comments
 (0)