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 2d13c4cf0197d3bf15bf992e381ed190163ce165
Author: duc91 <vdngu...@linagora.com>
AuthorDate: Fri Jul 31 14:23:37 2020 +0700
JAMES-3316: remove buggy JsValue from assert sessionRoutesTest
---
.../rfc8621/contract/SessionRoutesContract.scala | 26 +++++----
.../scala/org/apache/james/jmap/json/Fixture.scala | 61 ----------------------
2 files changed, 15 insertions(+), 72 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/SessionRoutesContract.scala
b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
index 2155401..eaf2089 100644
---
a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
+++
b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
@@ -26,11 +26,10 @@ import org.apache.http.HttpStatus.SC_OK
import org.apache.james.GuiceJamesServer
import org.apache.james.jmap.http.UserCredential
import org.apache.james.jmap.rfc8621.contract.Fixture._
-import
org.apache.james.jmap.rfc8621.contract.SessionRoutesContract.session_object_json_expected
+import
org.apache.james.jmap.rfc8621.contract.SessionRoutesContract.expected_session_object
import org.apache.james.jmap.rfc8621.contract.tags.CategoryTags
import org.apache.james.utils.DataProbeImpl
import org.junit.jupiter.api.{BeforeEach, Tag, Test}
-import play.api.libs.json.{JsValue, Json}
object SessionRoutesContract {
private val expected_session_object = """{
@@ -52,11 +51,13 @@ object SessionRoutesContract {
| "maxSizeAttachmentsPerEmail" : 20000000,
| "emailQuerySortOptions" : [ "receivedAt",
"cc", "from", "to", "subject", "size", "sentAt", "hasKeyword", "uid", "Id" ],
| "mayCreateTopLevelMailbox" : true
- | }
+ | },
+ | "urn:apache:james:params:jmap:mail:quota": {},
+ | "urn:apache:james:params:jmap:mail:shares": {}
| },
| "accounts" : {
- |
"0fe275bf13ff761407c17f64b1dfae2f4b3186feea223d7267b79f873a105401" : {
- | "name" : "b...@james.org",
+ |
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6" : {
+ | "name" : "b...@domain.tld",
| "isPersonal" : true,
| "isReadOnly" : false,
| "accountCapabilities" : {
@@ -77,22 +78,25 @@ object SessionRoutesContract {
| "maxSizeAttachmentsPerEmail" : 20000000,
| "emailQuerySortOptions" : [ "receivedAt",
"cc", "from", "to", "subject", "size", "sentAt", "hasKeyword", "uid", "Id" ],
| "mayCreateTopLevelMailbox" : true
- | }
+ | },
+ | "urn:apache:james:params:jmap:mail:quota":
{},
+ | "urn:apache:james:params:jmap:mail:shares":
{}
| }
| }
| },
| "primaryAccounts" : {
- | "urn:ietf:params:jmap:core" :
"0fe275bf13ff761407c17f64b1dfae2f4b3186feea223d7267b79f873a105401",
- | "urn:ietf:params:jmap:mail" :
"0fe275bf13ff761407c17f64b1dfae2f4b3186feea223d7267b79f873a105401"
+ | "urn:ietf:params:jmap:core" :
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "urn:ietf:params:jmap:mail" :
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "urn:apache:james:params:jmap:mail:quota":
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "urn:apache:james:params:jmap:mail:shares":
"29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6"
| },
- | "username" : "b...@james.org",
+ | "username" : "b...@domain.tld",
| "apiUrl" : "http://this-url-is-hardcoded.org/jmap";,
| "downloadUrl" :
"http://this-url-is-hardcoded.org/download";,
| "uploadUrl" :
"http://this-url-is-hardcoded.org/upload";,
| "eventSourceUrl" :
"http://this-url-is-hardcoded.org/eventSource";,
| "state" : "000001"
|}""".stripMargin
- private val session_object_json_expected: JsValue =
Json.parse(expected_session_object)
}
trait SessionRoutesContract {
@@ -124,6 +128,6 @@ trait SessionRoutesContract {
.body()
.asString()
-
assertThatJson(Json.parse(sessionJson)).isEqualTo(session_object_json_expected)
+ assertThatJson(sessionJson).isEqualTo(expected_session_object)
}
}
\ No newline at end of file
diff --git
a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/Fixture.scala
b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/Fixture.scala
index 278d247..c1c1d79 100644
---
a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/Fixture.scala
+++
b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/Fixture.scala
@@ -47,65 +47,4 @@ object Fixture {
val responseObject1: ResponseObject =
ResponseObject(ResponseObject.SESSION_STATE, Seq(invocation1))
val responseObject2: ResponseObject =
ResponseObject(ResponseObject.SESSION_STATE, Seq(invocation2))
val responseObjectWithUnsupportedMethod: ResponseObject =
ResponseObject(ResponseObject.SESSION_STATE, Seq(invocation1,
unsupportedInvocation))
-
- val expected_session_object: String = """{
- | "capabilities" : {
- | "urn:ietf:params:jmap:core" : {
- | "maxSizeUpload" : 10000000,
- | "maxConcurrentUpload" : 4,
- | "maxSizeRequest" : 10000000,
- | "maxConcurrentRequests" : 4,
- | "maxCallsInRequest" : 16,
- | "maxObjectsInGet" : 500,
- | "maxObjectsInSet" : 500,
- | "collationAlgorithms" : [ "i;unicode-casemap" ]
- | },
- | "urn:ietf:params:jmap:mail" : {
- | "maxMailboxesPerEmail" : 10000000,
- | "maxMailboxDepth" : null,
- | "maxSizeMailboxName" : 200,
- | "maxSizeAttachmentsPerEmail" : 20000000,
- | "emailQuerySortOptions" : [ "receivedAt",
"cc", "from", "to", "subject", "size", "sentAt", "hasKeyword", "uid", "Id" ],
- | "mayCreateTopLevelMailbox" : true
- | }
- | },
- | "accounts" : {
- |
"0fe275bf13ff761407c17f64b1dfae2f4b3186feea223d7267b79f873a105401" : {
- | "name" : "b...@james.org",
- | "isPersonal" : true,
- | "isReadOnly" : false,
- | "accountCapabilities" : {
- | "urn:ietf:params:jmap:core" : {
- | "maxSizeUpload" : 10000000,
- | "maxConcurrentUpload" : 4,
- | "maxSizeRequest" : 10000000,
- | "maxConcurrentRequests" : 4,
- | "maxCallsInRequest" : 16,
- | "maxObjectsInGet" : 500,
- | "maxObjectsInSet" : 500,
- | "collationAlgorithms" : [
"i;unicode-casemap" ]
- | },
- | "urn:ietf:params:jmap:mail" : {
- | "maxMailboxesPerEmail" : 10000000,
- | "maxMailboxDepth" : null,
- | "maxSizeMailboxName" : 200,
- | "maxSizeAttachmentsPerEmail" : 20000000,
- | "emailQuerySortOptions" : [ "receivedAt",
"cc", "from", "to", "subject", "size", "sentAt", "hasKeyword", "uid", "Id" ],
- | "mayCreateTopLevelMailbox" : true
- | }
- | }
- | }
- | },
- | "primaryAccounts" : {
- | "urn:ietf:params:jmap:core" :
"0fe275bf13ff761407c17f64b1dfae2f4b3186feea223d7267b79f873a105401",
- | "urn:ietf:params:jmap:mail" :
"0fe275bf13ff761407c17f64b1dfae2f4b3186feea223d7267b79f873a105401"
- | },
- | "username" : "b...@james.org",
- | "apiUrl" : "http://this-url-is-hardcoded.org/jmap";,
- | "downloadUrl" :
"http://this-url-is-hardcoded.org/download";,
- | "uploadUrl" :
"http://this-url-is-hardcoded.org/upload";,
- | "eventSourceUrl" :
"http://this-url-is-hardcoded.org/eventSource";,
- | "state" : "000001"
- |}""".stripMargin
- val expected_session_object_json: JsValue =
Json.parse(expected_session_object)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
