Repository: james-project Updated Branches: refs/heads/master 2a4984533 -> d8e844e3c
MAILBOX-294 Correct MessageIdMapper test Removing a flag that was not present lead to NOOP. Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c6850011 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c6850011 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c6850011 Branch: refs/heads/master Commit: c68500119ef65dc5b978e61000465c54f93a8e00 Parents: 2a49845 Author: benwa <btell...@linagora.com> Authored: Fri Apr 21 09:05:07 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Fri Apr 21 17:51:20 2017 +0700 ---------------------------------------------------------------------- .../store/mail/model/MessageIdMapperTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c6850011/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java index fed386c..b080eda 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java @@ -425,7 +425,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { MessageId messageId = message1.getMessageId(); Flags newFlags = new Flags(Flag.ANSWERED); - Map<MailboxId, UpdatedFlags> flags = sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, MessageManager.FlagsUpdateMode.REMOVE); + Map<MailboxId, UpdatedFlags> flags = sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, FlagsUpdateMode.REMOVE); assertThat(flags).isEmpty(); } @@ -433,7 +433,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { @ContractTest public void setFlagsShouldReturnEmptyWhenMessageIdDoesntExist() throws Exception { MessageId unknownMessageId = mapperProvider.generateMessageId(); - Map<MailboxId, UpdatedFlags> flags = sut.setFlags(unknownMessageId, ImmutableList.of(message1.getMailboxId()), new Flags(Flag.RECENT), MessageManager.FlagsUpdateMode.REMOVE); + Map<MailboxId, UpdatedFlags> flags = sut.setFlags(unknownMessageId, ImmutableList.of(message1.getMailboxId()), new Flags(Flag.RECENT), FlagsUpdateMode.REMOVE); assertThat(flags).isEmpty(); } @@ -448,7 +448,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { MessageId messageId = message1.getMessageId(); - Map<MailboxId, UpdatedFlags> flags = sut.setFlags(messageId, ImmutableList.of(message1.getMailboxId()), new Flags(Flag.ANSWERED), MessageManager.FlagsUpdateMode.ADD); + Map<MailboxId, UpdatedFlags> flags = sut.setFlags(messageId, ImmutableList.of(message1.getMailboxId()), new Flags(Flag.ANSWERED), FlagsUpdateMode.ADD); Flags newFlags = new FlagsBuilder() .add(Flag.RECENT) @@ -520,7 +520,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { MessageId messageId = message1.getMessageId(); Flags newFlags = new Flags(Flag.ANSWERED); - sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, MessageManager.FlagsUpdateMode.REMOVE); + sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, FlagsUpdateMode.REMOVE); List<MailboxMessage> messages = sut.find(ImmutableList.of(messageId), MessageMapper.FetchType.Body); assertThat(messages).hasSize(1); @@ -535,7 +535,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { sut.save(message1); MessageId messageId = message1.getMessageId(); - sut.setFlags(messageId, ImmutableList.of(message1.getMailboxId()), new Flags(Flag.ANSWERED), MessageManager.FlagsUpdateMode.REMOVE); + sut.setFlags(messageId, ImmutableList.of(message1.getMailboxId()), new Flags(Flag.ANSWERED), FlagsUpdateMode.ADD); List<MailboxMessage> messages = sut.find(ImmutableList.of(messageId), MessageMapper.FetchType.Body); assertThat(messages).hasSize(1); @@ -553,7 +553,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { MessageId messageId = message1.getMessageId(); Flags newFlags = new Flags(Flag.ANSWERED); - sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, MessageManager.FlagsUpdateMode.REMOVE); + sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, FlagsUpdateMode.REMOVE); List<MailboxMessage> messages = sut.find(ImmutableList.of(messageId), MessageMapper.FetchType.Body); assertThat(messages).hasSize(1); @@ -755,7 +755,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); - sut.setFlags(message1.getMessageId(), ImmutableList.of(message1.getMailboxId()), new Flags(Flag.SEEN), MessageManager.FlagsUpdateMode.ADD); + sut.setFlags(message1.getMessageId(), ImmutableList.of(message1.getMailboxId()), new Flags(Flag.SEEN), FlagsUpdateMode.ADD); assertThat(messageMapper.countUnseenMessagesInMailbox(benwaInboxMailbox)).isEqualTo(0); } @@ -767,7 +767,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { message1.setFlags(new Flags(Flag.SEEN)); sut.save(message1); - sut.setFlags(message1.getMessageId(), ImmutableList.of(message1.getMailboxId()), new Flags(Flag.SEEN), MessageManager.FlagsUpdateMode.REMOVE); + sut.setFlags(message1.getMessageId(), ImmutableList.of(message1.getMailboxId()), new Flags(Flag.SEEN), FlagsUpdateMode.REMOVE); assertThat(messageMapper.countUnseenMessagesInMailbox(benwaInboxMailbox)).isEqualTo(1); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org