You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/01/12 11:02:11 UTC
[james-project] 12/20: JAMES-3473 New state should be ignored in
irrelevant Email/get calls
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1e19c6b228490afcbdf3291ac4ca85883a7e794d
Author: LanKhuat <dl...@linagora.com>
AuthorDate: Thu Jan 7 13:59:09 2021 +0700
JAMES-3473 New state should be ignored in irrelevant Email/get calls
---
.../rfc8621/contract/BackReferenceContract.scala | 1 +
.../rfc8621/contract/EmailGetMethodContract.scala | 156 ++++++++------
.../rfc8621/contract/EmailSetMethodContract.scala | 235 +++++++++++----------
.../EmailSubmissionSetMethodContract.scala | 8 +-
4 files changed, 219 insertions(+), 181 deletions(-)
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/BackReferenceContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/BackReferenceContract.scala
index 535bfd1..bd27d67 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/BackReferenceContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/BackReferenceContract.scala
@@ -492,6 +492,7 @@ trait BackReferenceContract {
assertThatJson(response)
.withOptions(new Options(Option.IGNORING_ARRAY_ORDER))
+ .whenIgnoringPaths("methodResponses[2][1].state")
.isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
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/EmailGetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala
index 7ddd52e..8dbcafe 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala
@@ -320,14 +320,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [{
| "id": "${messageId.serialize}",
| "size": 85
@@ -2289,6 +2290,7 @@ trait EmailGetMethodContract {
assertThatJson(response)
.withOptions(new Options(IGNORING_ARRAY_ORDER))
+ .whenIgnoringPaths("methodResponses[0][1].state")
.isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
@@ -2296,7 +2298,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${SESSION_STATE.value}",
| "list": [ {
| "id": "${messageId.serialize}",
| "size": 85
@@ -2349,14 +2350,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId1.serialize()}",
@@ -2409,7 +2411,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -2417,7 +2421,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "threadId": "${messageId.serialize}",
@@ -2532,14 +2535,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [{
| "id": "${messageId.serialize}",
| "size": 85
@@ -2589,14 +2593,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [{
| "id": "${messageId.serialize}"
| }],
@@ -2645,7 +2650,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
@@ -2701,14 +2708,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [{
| "id": "${messageId.serialize}",
| "size": 85
@@ -3103,14 +3111,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -3354,7 +3363,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -3362,7 +3373,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -3425,14 +3435,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -3544,7 +3555,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -3552,7 +3565,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -3626,7 +3638,9 @@ trait EmailGetMethodContract {
.asString
val contentType = " multipart/mixed;\\r\\n boundary=\\\"------------64D8D789FC30153D6ED18258\\\""
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -3634,7 +3648,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -3816,7 +3829,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -3824,7 +3839,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -3999,14 +4013,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4063,14 +4078,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4127,14 +4143,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4192,14 +4209,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4255,14 +4273,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4318,7 +4337,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -4329,7 +4350,6 @@ trait EmailGetMethodContract {
| "notFound": [
|
| ],
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "1",
@@ -4385,14 +4405,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4448,14 +4469,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4512,7 +4534,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -4520,7 +4544,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4583,14 +4606,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4646,7 +4670,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -4654,7 +4680,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4720,14 +4745,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4784,7 +4810,9 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -4792,7 +4820,6 @@ trait EmailGetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4858,14 +4885,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4930,14 +4958,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -4986,14 +5015,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -5070,14 +5100,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "${messageId.serialize}",
@@ -5465,14 +5496,15 @@ trait EmailGetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[0][1].state")
+ .isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [[
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [{
| "id": "${messageId.serialize}",
| "headers": [
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/EmailSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala
index ac44738..57285ac 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala
@@ -3021,6 +3021,7 @@ trait EmailSetMethodContract {
|}""".stripMargin)
assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
.isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
@@ -3039,7 +3040,6 @@ trait EmailSetMethodContract {
| }, "c1"],
| ["Email/get", {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "$messageId",
@@ -3133,6 +3133,7 @@ trait EmailSetMethodContract {
.get.asInstanceOf[JsNumber].value
assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
.isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
@@ -3151,7 +3152,6 @@ trait EmailSetMethodContract {
| }, "c1"],
| ["Email/get", {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "id": "$messageId",
@@ -4647,23 +4647,25 @@ trait EmailSetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
- s"""{
- | "sessionState": "${SESSION_STATE.value}",
- | "methodResponses": [
- | ["Email/set", {
- | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "newState": "${INSTANCE.value}",
- | "destroyed": ["${messageId.serialize}"]
- | }, "c1"],
- | ["Email/get", {
- | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
- | "list": [],
- | "notFound": ["${messageId.serialize}"]
- | }, "c2"]
- | ]
- |}""".stripMargin)
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
+ .isEqualTo(
+ s"""{
+ | "sessionState": "${SESSION_STATE.value}",
+ | "methodResponses": [
+ | ["Email/set", {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "${INSTANCE.value}",
+ | "destroyed": ["${messageId.serialize}"]
+ | }, "c1"],
+ | ["Email/get", {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "state": "${INSTANCE.value}",
+ | "list": [],
+ | "notFound": ["${messageId.serialize}"]
+ | }, "c2"]
+ | ]
+ |}""".stripMargin)
}
@Test
@@ -4912,23 +4914,24 @@ trait EmailSetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
- s"""{
- | "sessionState": "${SESSION_STATE.value}",
- | "methodResponses": [
- | ["Email/set", {
- | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "newState": "${INSTANCE.value}",
- | "destroyed": ["${messageId.serialize}"]
- | }, "c1"],
- | ["Email/get", {
- | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
- | "list": [],
- | "notFound": ["${messageId.serialize}"]
- | }, "c2"]
- | ]
- |}""".stripMargin)
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
+ .isEqualTo(
+ s"""{
+ | "sessionState": "${SESSION_STATE.value}",
+ | "methodResponses": [
+ | ["Email/set", {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "${INSTANCE.value}",
+ | "destroyed": ["${messageId.serialize}"]
+ | }, "c1"],
+ | ["Email/get", {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "list": [],
+ | "notFound": ["${messageId.serialize}"]
+ | }, "c2"]
+ | ]
+ |}""".stripMargin)
}
@Test
@@ -4982,23 +4985,24 @@ trait EmailSetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
- s"""{
- | "sessionState": "${SESSION_STATE.value}",
- | "methodResponses": [
- | ["Email/set", {
- | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "newState": "${INSTANCE.value}",
- | "destroyed": ["${messageId.serialize}"]
- | }, "c1"],
- | ["Email/get", {
- | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
- | "list": [],
- | "notFound": ["${messageId.serialize}"]
- | }, "c2"]
- | ]
- |}""".stripMargin)
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
+ .isEqualTo(
+ s"""{
+ | "sessionState": "${SESSION_STATE.value}",
+ | "methodResponses": [
+ | ["Email/set", {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "${INSTANCE.value}",
+ | "destroyed": ["${messageId.serialize}"]
+ | }, "c1"],
+ | ["Email/get", {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "list": [],
+ | "notFound": ["${messageId.serialize}"]
+ | }, "c2"]
+ | ]
+ |}""".stripMargin)
}
@Test
@@ -5374,33 +5378,34 @@ trait EmailSetMethodContract {
.body
.asString
- assertThatJson(response).isEqualTo(
- s"""{
- | "sessionState": "${SESSION_STATE.value}",
- | "methodResponses": [
- | ["Email/set", {
- | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "newState": "${INSTANCE.value}",
- | "updated": {
- | "${messageId.serialize}": null
- | }
- | }, "c1"],
- | ["Email/get",{
- | "accountId":"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state":"${INSTANCE.value}",
- | "list":[
- | {
- | "id":"${messageId.serialize}",
- | "mailboxIds":{
- | "${mailboxId2.serialize}":true,
- | "${mailboxId3.serialize}":true
- | }
- | }
- | ],
- | "notFound":[]
- | },"c2"]
- | ]
- |}""".stripMargin)
+ assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
+ .isEqualTo(
+ s"""{
+ | "sessionState": "${SESSION_STATE.value}",
+ | "methodResponses": [
+ | ["Email/set", {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "${INSTANCE.value}",
+ | "updated": {
+ | "${messageId.serialize}": null
+ | }
+ | }, "c1"],
+ | ["Email/get",{
+ | "accountId":"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "list":[
+ | {
+ | "id":"${messageId.serialize}",
+ | "mailboxIds":{
+ | "${mailboxId2.serialize}":true,
+ | "${mailboxId3.serialize}":true
+ | }
+ | }
+ | ],
+ | "notFound":[]
+ | },"c2"]
+ | ]
+ |}""".stripMargin)
}
@Test
@@ -5463,39 +5468,39 @@ trait EmailSetMethodContract {
.asString
assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
.isEqualTo(
- s"""{
- | "sessionState": "${SESSION_STATE.value}",
- | "methodResponses": [
- | ["Email/set", {
- | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "newState": "${INSTANCE.value}",
- | "updated": {
- | "${messageId1.serialize}": null,
- | "${messageId2.serialize}": null
- | }
- | }, "c1"],
- | ["Email/get", {
- | "accountId":"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state":"${INSTANCE.value}",
- | "list":[
- | {
- | "id":"${messageId1.serialize}",
- | "mailboxIds": {
- | "${mailboxId2.serialize}":true
- | }
- | },
- | {
- | "id":"${messageId2.serialize}",
- | "mailboxIds":{
- | "${mailboxId2.serialize}":true
- | }
- | }
- | ],
- | "notFound":[]
- | },"c2"]
- | ]
- |}""".stripMargin)
+ s"""{
+ | "sessionState": "${SESSION_STATE.value}",
+ | "methodResponses": [
+ | ["Email/set", {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "${INSTANCE.value}",
+ | "updated": {
+ | "${messageId1.serialize}": null,
+ | "${messageId2.serialize}": null
+ | }
+ | }, "c1"],
+ | ["Email/get", {
+ | "accountId":"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "list":[
+ | {
+ | "id":"${messageId1.serialize}",
+ | "mailboxIds": {
+ | "${mailboxId2.serialize}":true
+ | }
+ | },
+ | {
+ | "id":"${messageId2.serialize}",
+ | "mailboxIds":{
+ | "${mailboxId2.serialize}":true
+ | }
+ | }
+ | ],
+ | "notFound":[]
+ | },"c2"]
+ | ]
+ |}""".stripMargin)
}
@Test
@@ -5615,6 +5620,7 @@ trait EmailSetMethodContract {
.asString
assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
.isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
@@ -5631,7 +5637,6 @@ trait EmailSetMethodContract {
| }, "c1"],
| ["Email/get", {
| "accountId":"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state":"${INSTANCE.value}",
| "list":[
| {
| "id":"${messageId.serialize}",
@@ -5786,6 +5791,7 @@ trait EmailSetMethodContract {
.asString
assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
.isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
@@ -5799,7 +5805,6 @@ trait EmailSetMethodContract {
| }, "c1"],
| ["Email/get", {
| "accountId":"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state":"${INSTANCE.value}",
| "list":[
| {
| "id":"${messageId.serialize}",
@@ -5869,6 +5874,7 @@ trait EmailSetMethodContract {
.asString
assertThatJson(response)
+ .whenIgnoringPaths("methodResponses[1][1].state")
.isEqualTo(
s"""{
| "sessionState": "${SESSION_STATE.value}",
@@ -5882,7 +5888,6 @@ trait EmailSetMethodContract {
| }, "c1"],
| ["Email/get", {
| "accountId":"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state":"${INSTANCE.value}",
| "list":[
| {
| "id":"${messageId.serialize}",
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/EmailSubmissionSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSubmissionSetMethodContract.scala
index ddbb3bb..4ea493c 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSubmissionSetMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSubmissionSetMethodContract.scala
@@ -885,7 +885,8 @@ trait EmailSubmissionSetMethodContract {
assertThatJson(response)
// Ids are randomly generated, and not stored, let's ignore it
- .whenIgnoringPaths("methodResponses[0][1].created.k1490")
+ .whenIgnoringPaths("methodResponses[0][1].created.k1490",
+ "methodResponses[2][1].state")
.isEqualTo(s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -915,7 +916,6 @@ trait EmailSubmissionSetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list": [
| {
| "keywords": {"$$sent": true},
@@ -987,7 +987,8 @@ trait EmailSubmissionSetMethodContract {
assertThatJson(response)
// Ids are randomly generated, and not stored, let's ignore it
- .whenIgnoringPaths("methodResponses[0][1].created.k1490")
+ .whenIgnoringPaths("methodResponses[0][1].created.k1490",
+ "methodResponses[2][1].state")
.isEqualTo(s"""{
| "sessionState": "${SESSION_STATE.value}",
| "methodResponses": [
@@ -1015,7 +1016,6 @@ trait EmailSubmissionSetMethodContract {
| "Email/get",
| {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
- | "state": "${INSTANCE.value}",
| "list":[],
| "notFound": ["${messageId.serialize}"]
| },
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org