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 cffebdda0181355783ace3851e217e73aba2a606 Author: Benoit Tellier <[email protected]> AuthorDate: Mon Jul 27 10:04:14 2020 +0700 JAMES-3350 SetMessagesMethodTest don't need to call await --- .../cassandra/CassandraSetMessagesMethodTest.java | 5 --- .../methods/integration/SetMessagesMethodTest.java | 43 ---------------------- .../jmap/memory/MemorySetMessagesMethodTest.java | 4 -- .../RabbitMQAwsS3SetMessagesMethodTest.java | 5 --- 4 files changed, 57 deletions(-) diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java index 1f28849..43f0057 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java @@ -42,11 +42,6 @@ public class CassandraSetMessagesMethodTest extends SetMessagesMethodTest { protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } - - @Override - protected void await() { - rule.await(); - } @Override protected MessageId randomMessageId() { diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java index ae72726..4f1d9ac 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java @@ -112,7 +112,6 @@ import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.util.ClassLoaderUtils; import org.apache.james.util.MimeMessageUtil; -import org.apache.james.util.Port; import org.apache.james.util.io.ZeroedInputStream; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; @@ -161,15 +160,12 @@ public abstract class SetMessagesMethodTest { protected abstract MessageId randomMessageId(); - protected abstract void await(); - private AccessToken accessToken; private GuiceJamesServer jmapServer; private MailboxProbe mailboxProbe; private DataProbe dataProbe; private MessageIdProbe messageProbe; private ACLProbe aclProbe; - private Port jmapPort; @Before public void setup() throws Throwable { @@ -283,7 +279,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); given() .header("Authorization", accessToken.asString()) @@ -307,7 +302,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); // When given() @@ -344,7 +338,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message3 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String missingMessageId = randomMessageId().serialize(); given() @@ -381,7 +374,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message3 = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); // When with() @@ -415,7 +407,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); @@ -437,7 +428,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String messageId = message.getMessageId().serialize(); @@ -461,7 +451,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); @@ -493,7 +482,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); @@ -529,7 +517,6 @@ public abstract class SetMessagesMethodTest { .build(); ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, flags); - await(); String serializedMessageId = message.getMessageId().serialize(); @@ -560,7 +547,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED)); - await(); String messageId = message.getMessageId().serialize(); @@ -583,7 +569,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED)); - await(); String messageId = message.getMessageId().serialize(); @@ -606,7 +591,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.DELETED)); - await(); String messageId = message.getMessageId().serialize(); @@ -639,7 +623,6 @@ public abstract class SetMessagesMethodTest { .build(); ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, flags); - await(); String messageId = message.getMessageId().serialize(); @@ -674,7 +657,6 @@ public abstract class SetMessagesMethodTest { .build(); ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, currentFlags); - await(); String messageId = message.getMessageId().serialize(); @@ -707,7 +689,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); given() @@ -736,7 +717,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN)); - await(); String serializedMessageId = message.getMessageId().serialize(); given() @@ -758,7 +738,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN)); - await(); String serializedMessageId = message.getMessageId().serialize(); given() @@ -787,7 +766,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); given() @@ -809,7 +787,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); given() @@ -836,8 +813,6 @@ public abstract class SetMessagesMethodTest { mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); - String messageId = randomMessageId().serialize(); given() @@ -864,8 +839,6 @@ public abstract class SetMessagesMethodTest { mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); - String messageId = USERNAME.asString() + "|mailbox|1"; given() @@ -892,7 +865,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); // When @@ -914,7 +886,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); given() @@ -942,7 +913,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); @@ -962,7 +932,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String serializedMessageId = message.getMessageId().serialize(); given() @@ -2376,7 +2345,6 @@ public abstract class SetMessagesMethodTest { public void setMessagesShouldRejectMovingMessageToOutboxWhenNotInDraft() throws MailboxException { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), MailboxPath.inbox(USERNAME), new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String messageId = message.getMessageId().serialize(); String moveMessageToOutBox = "[" + @@ -3013,7 +2981,6 @@ public abstract class SetMessagesMethodTest { dataProbe.addUser(recipientAddress, password); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX); AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password); - await(); String messageCreationId = "creationId1337"; String fromAddress = USERNAME.asString(); @@ -3060,7 +3027,6 @@ public abstract class SetMessagesMethodTest { dataProbe.addUser(recipientAddress, password); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX); HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password); - await(); String messageCreationId = "creationId1337"; String fromAddress = USERNAME.asString(); @@ -3105,7 +3071,6 @@ public abstract class SetMessagesMethodTest { String password = "password"; dataProbe.addUser(recipientAddress, password); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX); - await(); AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password); String messageCreationId = "creationId1337"; @@ -3161,7 +3126,6 @@ public abstract class SetMessagesMethodTest { String password = "password"; dataProbe.addUser(recipientAddress, password); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX); - await(); String messageCreationId = "creationId1337"; String fromAddress = USERNAME.asString(); @@ -3218,7 +3182,6 @@ public abstract class SetMessagesMethodTest { String bccAddress = BOB.asString(); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bccAddress, DefaultMailboxes.INBOX); - await(); String messageCreationId = "creationId1337"; String fromAddress = USERNAME.asString(); @@ -3289,7 +3252,6 @@ public abstract class SetMessagesMethodTest { String password = "password"; dataProbe.addUser(recipientAddress, password); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX); - await(); AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password); String messageCreationId = "creationId1337"; @@ -3330,7 +3292,6 @@ public abstract class SetMessagesMethodTest { dataProbe.addUser(recipientAddress, recipientPassword); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX); AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), recipientPassword); - await(); String senderDraftsMailboxId = getMailboxId(accessToken, Role.DRAFTS); @@ -3375,7 +3336,6 @@ public abstract class SetMessagesMethodTest { String recipientAddress = "recipient" + "@" + DOMAIN; String recipientPassword = "password"; dataProbe.addUser(recipientAddress, recipientPassword); - await(); String messageCreationId = "creationId"; String fromAddress = USERNAME.asString(); @@ -3437,7 +3397,6 @@ public abstract class SetMessagesMethodTest { dataProbe.addUser(recipientAddress, password); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX); AccessToken recipientToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), Username.of(recipientAddress), password); - await(); String messageCreationId = "creationId1337"; String fromAddress = USERNAME.asString(); @@ -5632,7 +5591,6 @@ public abstract class SetMessagesMethodTest { ComposedMessageId message = mailboxProbe.appendMessage(USERNAME.asString(), USER_MAILBOX, new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags()); - await(); String messageId = message.getMessageId().serialize(); @@ -5768,7 +5726,6 @@ public abstract class SetMessagesMethodTest { String password = "password"; dataProbe.addUser(recipientAddress, password); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX); - await(); String messageCreationId = "creationId1337"; String fromAddress = USERNAME.asString(); diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java index bbf001a..19fa5ca 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java @@ -39,10 +39,6 @@ public class MemorySetMessagesMethodTest extends SetMessagesMethodTest { } @Override - protected void await() { - } - - @Override protected MessageId randomMessageId() { return new InMemoryMessageId.Factory().fromString(String.valueOf(ThreadLocalRandom.current().nextInt(100000) + 100)); } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodTest.java index c92c966..11bd4de 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SetMessagesMethodTest.java @@ -44,11 +44,6 @@ public class RabbitMQAwsS3SetMessagesMethodTest extends SetMessagesMethodTest { } @Override - protected void await() { - rule.await(); - } - - @Override protected MessageId randomMessageId() { return new CassandraMessageId.Factory().generate(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
