JAMES-2586 Fix flaky tests in EmailQueryMethodTest
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
index 8924bed..3bec025 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
@@ -2997,7 +2997,7 @@
val message1: Message = Message.Builder
.of
- .setTo("aaa@domain.tld")
+ .setTo("\"aaa\" <aaa@domain.tld>")
.setSubject("subject")
.setBody("any body", StandardCharsets.UTF_8)
.build
@@ -3008,7 +3008,7 @@
val message2: Message = Message.Builder
.of
- .setTo("ccc@domain.tld")
+ .setTo("\"ccc\" <ccc@domain.tld>")
.setSubject("subject")
.setBody("any body", StandardCharsets.UTF_8)
.build
@@ -3019,7 +3019,7 @@
val message3: Message = Message.Builder
.of
- .setTo("aba@domain.tld")
+ .setTo("\"aba\" <aba@domain.tld>")
.setSubject("subject")
.setBody("any body", StandardCharsets.UTF_8)
.build
@@ -3067,7 +3067,7 @@
val message1: Message = Message.Builder
.of
- .setFrom("aaa@domain.tld")
+ .setFrom("\"aaa\" <aaa@domain.tld>")
.setSubject("subject")
.setBody("any body", StandardCharsets.UTF_8)
.build
@@ -3078,7 +3078,7 @@
val message2: Message = Message.Builder
.of
- .setFrom("ccc@domain.tld")
+ .setFrom("\"ccc\" <ccc@domain.tld>")
.setSubject("subject")
.setBody("any body", StandardCharsets.UTF_8)
.build
@@ -3089,7 +3089,7 @@
val message3: Message = Message.Builder
.of
- .setFrom("aba@domain.tld")
+ .setFrom("\"aba\" <aba@domain.tld>")
.setSubject("subject")
.setBody("any body", StandardCharsets.UTF_8)
.build
@@ -7175,22 +7175,24 @@
| "c1"]]
|}""".stripMargin
- val response = `given`
- .header(ACCEPT.toString, ACCEPT_RFC8621_VERSION_HEADER)
- .body(request)
+ awaitAtMostTenSeconds.untilAsserted { () =>
+ val response = `given`
+ .header(ACCEPT.toString, ACCEPT_RFC8621_VERSION_HEADER)
+ .body(request)
.when
- .post
+ .post
.`then`
- .statusCode(SC_OK)
- .contentType(JSON)
- .extract
- .body
- .asString
+ .statusCode(SC_OK)
+ .contentType(JSON)
+ .extract
+ .body
+ .asString
- assertThatJson(response)
- .withOptions(new Options(IGNORING_ARRAY_ORDER))
- .inPath("$.methodResponses[0][1].ids")
- .isEqualTo(s"""["${messageId.serialize}"]""")
+ assertThatJson(response)
+ .withOptions(new Options(IGNORING_ARRAY_ORDER))
+ .inPath("$.methodResponses[0][1].ids")
+ .isEqualTo(s"""["${messageId.serialize}"]""")
+ }
}
@Test
