You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/08/25 02:19:58 UTC
[james-project] 07/07: [Refactoring] Fix issues in
DistributedMailboxSetMethodTest
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9b0d56ce676d51c54e0f851e48f902e21a84bb65
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Mon Aug 24 10:34:15 2020 +0700
[Refactoring] Fix issues in DistributedMailboxSetMethodTest
---
.../jmap/rfc8621/distributed/DistributedMailboxSetMethodTest.java | 5 +++++
.../james/jmap/rfc8621/contract/MailboxSetMethodContract.scala | 8 ++++----
.../james/jmap/rfc8621/memory/MemoryMailboxSetMethodTest.java | 5 +++++
3 files changed, 14 insertions(+), 4 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/DistributedMailboxSetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxSetMethodTest.java
index e2842c1..44d55ac 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxSetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxSetMethodTest.java
@@ -59,4 +59,9 @@ public class DistributedMailboxSetMethodTest implements MailboxSetMethodContract
public MailboxId randomMailboxId() {
return CassandraId.of(UUIDs.timeBased());
}
+
+ @Override
+ public String errorInvalidMailboxIdMessage(String value) {
+ return String.format("%s is not a mailboxId: Invalid UUID string: %s", value, 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/MailboxSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala
index 12f1a4d..f968913 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala
@@ -58,6 +58,7 @@ trait MailboxSetMethodContract {
}
def randomMailboxId: MailboxId
+ def errorInvalidMailboxIdMessage(value: String): String
@Test
def updateShouldFailWhenModifyingRole(server: GuiceJamesServer): Unit = {
@@ -2295,7 +2296,6 @@ trait MailboxSetMethodContract {
.body
.asString
- val message: String = "invalid is not a mailboxId: For input string: \\\"invalid\\\""
assertThatJson(response).isEqualTo(
s"""{
| "sessionState": "75128aab4b1b",
@@ -2307,7 +2307,7 @@ trait MailboxSetMethodContract {
| "notDestroyed": {
| "invalid": {
| "type": "invalidArguments",
- | "description": "$message"
+ | "description": "${errorInvalidMailboxIdMessage("invalid")}"
| }
| }
| },
@@ -2712,14 +2712,14 @@ trait MailboxSetMethodContract {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
| "newState": "000001",
| "updated": {
- | "1": {}
+ | "${mailboxId.serialize()}": {}
| }
| }, "c2"],
| ["Mailbox/get", {
| "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
| "state": "000001",
| "list": [{
- | "id": "1",
+ | "id": "${mailboxId.serialize()}",
| "name": "newName"
| }],
| "notFound": []
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryMailboxSetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryMailboxSetMethodTest.java
index 519b119..ee6e1c6 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryMailboxSetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryMailboxSetMethodTest.java
@@ -44,4 +44,9 @@ public class MemoryMailboxSetMethodTest implements MailboxSetMethodContract {
public MailboxId randomMailboxId() {
return InMemoryId.of(ThreadLocalRandom.current().nextInt(100000) + 100);
}
+
+ @Override
+ public String errorInvalidMailboxIdMessage(String value) {
+ return String.format("%s is not a mailboxId: For input string: \\\"%s\\\"", value, value);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org