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 ad13e26c3f0a4aa15b3c8c5da171d8684b29da6a Author: Rémi Kowalski <[email protected]> AuthorDate: Wed Sep 16 10:53:20 2020 +0200 JAMES-3375 use AppendCommand with internal date in tests --- .../contract/EmailQueryMethodContract.scala | 32 ++++++++++++++-------- 1 file changed, 20 insertions(+), 12 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/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 21a3aad..c240161 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 @@ -20,6 +20,8 @@ package org.apache.james.jmap.rfc8621.contract import java.nio.charset.StandardCharsets +import java.time.ZonedDateTime +import java.util.Date import java.util.concurrent.TimeUnit import com.google.common.hash.Hashing @@ -39,7 +41,6 @@ import org.apache.james.utils.DataProbeImpl import org.awaitility.Awaitility import org.awaitility.Duration.ONE_HUNDRED_MILLISECONDS import org.junit.jupiter.api.{BeforeEach, Test} -import play.api.libs.json.Json trait EmailQueryMethodContract { @@ -73,10 +74,12 @@ trait EmailQueryMethodContract { server.getProbe(classOf[MailboxProbeImpl]).createMailbox(MailboxPath.inbox(BOB)) val otherMailboxPath = MailboxPath.forUser(BOB, "other") server.getProbe(classOf[MailboxProbeImpl]).createMailbox(otherMailboxPath) + val requestDate = Date.from(ZonedDateTime.now().minusDays(1).toInstant) val messageId1: MessageId = server.getProbe(classOf[MailboxProbeImpl]) - .appendMessage(BOB.asString, MailboxPath.inbox(BOB), AppendCommand.from(message)) + .appendMessage(BOB.asString, MailboxPath.inbox(BOB), + AppendCommand.builder().withInternalDate(requestDate).build(message)) .getMessageId - Thread.sleep(1000) // To enforce receivedAt ordering + val messageId2: MessageId = server.getProbe(classOf[MailboxProbeImpl]) .appendMessage(BOB.asString, otherMailboxPath, AppendCommand.from(message)) .getMessageId @@ -198,18 +201,22 @@ trait EmailQueryMethodContract { server.getProbe(classOf[MailboxProbeImpl]).createMailbox(MailboxPath.inbox(BOB)) val otherMailboxPath = MailboxPath.forUser(BOB, "other") server.getProbe(classOf[MailboxProbeImpl]).createMailbox(otherMailboxPath) - val messageId1 = server.getProbe(classOf[MailboxProbeImpl]) - .appendMessage(BOB.asString, MailboxPath.inbox(BOB), AppendCommand.from(message)) + val requestDateMessage1 = Date.from(ZonedDateTime.now().minusDays(1).toInstant) + val messageId1: MessageId = server.getProbe(classOf[MailboxProbeImpl]) + .appendMessage(BOB.asString, MailboxPath.inbox(BOB), + AppendCommand.builder().withInternalDate(requestDateMessage1).build(message)) .getMessageId - Thread.sleep(1000) // To enforce receivedAt ordering + val requestDateMessage2 = Date.from(ZonedDateTime.now().minusDays(1).plusHours(1).toInstant) val messageId2 = server.getProbe(classOf[MailboxProbeImpl]) - .appendMessage(BOB.asString, MailboxPath.inbox(BOB), AppendCommand.from(message)) + .appendMessage(BOB.asString, MailboxPath.inbox(BOB), + AppendCommand.builder().withInternalDate(requestDateMessage2).build(message)) .getMessageId - Thread.sleep(1000) // To enforce receivedAt ordering + val requestDateMessage3 = Date.from(ZonedDateTime.now().minusDays(1).plusHours(2).toInstant) val messageId3 = server.getProbe(classOf[MailboxProbeImpl]) - .appendMessage(BOB.asString, MailboxPath.inbox(BOB), AppendCommand.from(message)) + .appendMessage(BOB.asString, MailboxPath.inbox(BOB), + AppendCommand.builder().withInternalDate(requestDateMessage3).build(message)) .getMessageId - Thread.sleep(1000) // To enforce receivedAt ordering + val request = s"""{ | "using": [ @@ -480,10 +487,11 @@ trait EmailQueryMethodContract { server.getProbe(classOf[MailboxProbeImpl]).createMailbox(MailboxPath.inbox(BOB)) val otherMailboxPath = MailboxPath.forUser(BOB, "other") server.getProbe(classOf[MailboxProbeImpl]).createMailbox(otherMailboxPath) + val requestDateMessage1 = Date.from(ZonedDateTime.now().minusDays(1).toInstant) val messageId1: MessageId = server.getProbe(classOf[MailboxProbeImpl]) - .appendMessage(BOB.asString, MailboxPath.inbox(BOB), AppendCommand.from(message)) + .appendMessage(BOB.asString, MailboxPath.inbox(BOB), + AppendCommand.builder().withInternalDate(requestDateMessage1).build(message)) .getMessageId - Thread.sleep(1000) val messageId2: MessageId = server.getProbe(classOf[MailboxProbeImpl]) .appendMessage(BOB.asString, otherMailboxPath, AppendCommand.from(message)) .getMessageId --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
