This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch postgresql in repository https://gitbox.apache.org/repos/asf/james-project.git
commit bb2f9079c5d5f71709f320d958e950c6595e4934 Author: vttran <[email protected]> AuthorDate: Thu Mar 21 11:43:47 2024 +0700 JAMES-3534 Update IdentityGetContract - fix failing when running with Distributed test --- .../org/apache/james/jmap/rfc8621/distributed/DistributedBase.java | 3 ++- .../apache/james/jmap/rfc8621/contract/IdentityGetContract.scala | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedBase.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedBase.java index 03a7df3053..dfb4902d1d 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedBase.java +++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedBase.java @@ -26,6 +26,7 @@ import org.apache.james.DockerOpenSearchExtension; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.SearchConfiguration; +import org.apache.james.jmap.rfc8621.contract.IdentityProbeModule; import org.apache.james.jmap.rfc8621.contract.probe.DelegationProbeModule; import org.apache.james.modules.AwsS3BlobStoreExtension; import org.apache.james.modules.RabbitMQExtension; @@ -52,6 +53,6 @@ public class DistributedBase { .extension(new RabbitMQExtension()) .extension(new AwsS3BlobStoreExtension()) .server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule(), new DelegationProbeModule())) + .overrideWith(new TestJMAPServerModule(), new DelegationProbeModule(), new IdentityProbeModule())) .build(); } 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/IdentityGetContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/IdentityGetContract.scala index 8e1341a6c5..3ae4e521a6 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/IdentityGetContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/IdentityGetContract.scala @@ -686,7 +686,8 @@ trait IdentityGetContract { | "Identity/get", | { | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6", - | "ids": [ "$serverSetIdentityId" ] + | "ids": [ "$serverSetIdentityId" ], + | "properties": ["id", "mayDelete"] | }, | "c1"]] |}""".stripMargin) @@ -703,11 +704,7 @@ trait IdentityGetContract { .inPath("methodResponses[0][1].list[0]") .isEqualTo( s"""{ - | "name": "", - | "email": "[email protected]", - | "htmlSignature": "html signature", | "id": "$serverSetIdentityId", - | "textSignature": "", | "mayDelete": false |}""".stripMargin) } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
