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 2018/12/14 10:34:22 UTC
[06/18] james-project git commit: MAILBOX-358 Remove Unnecessary Fake
class of FlagsUpdate Event
MAILBOX-358 Remove Unnecessary Fake class of FlagsUpdate Event
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d83ef64e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d83ef64e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d83ef64e
Branch: refs/heads/master
Commit: d83ef64e329b65a58f14147826867f338ec49d03
Parents: bc7df1b
Author: datph <dp...@linagora.com>
Authored: Wed Dec 12 18:39:28 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Fri Dec 14 17:09:20 2018 +0700
----------------------------------------------------------------------
.../base/FakeMailboxListenerAdded.java | 89 --------------------
.../base/MailboxEventAnalyserTest.java | 76 ++++++++++-------
2 files changed, 47 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d83ef64e/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java
deleted file mode 100644
index 06a363a..0000000
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.imap.processor.base;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.mail.Flags;
-
-import org.apache.james.core.User;
-import org.apache.james.mailbox.MailboxListener;
-import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageUid;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.model.MessageMetaData;
-
-import com.google.common.collect.ImmutableSortedMap;
-
-public class FakeMailboxListenerAdded extends MailboxListener.Added {
-
- public List<MessageUid> uids;
-
- public FakeMailboxListenerAdded(MailboxSession.SessionId sessionId, User user, List<MessageUid> uids, MailboxPath path, MailboxId mailboxId) {
- super(sessionId, user, path, mailboxId, ImmutableSortedMap.of());
- this.uids = uids;
- }
-
- @Override
- public List<MessageUid> getUids() {
- return uids;
- }
-
- @Override
- public MessageMetaData getMetaData(MessageUid uid) {
- return new MessageMetaData() {
-
- @Override
- public MessageUid getUid() {
- return null;
- }
-
- @Override
- public long getSize() {
- return 0;
- }
-
- @Override
- public Date getInternalDate() {
- return null;
- }
-
- @Override
- public Flags getFlags() {
- return null;
- }
-
- @Override
- public long getModSeq() {
- return 0;
- }
-
- @Override
- public MessageId getMessageId() {
- return null;
- }
- };
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d83ef64e/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
index 9d836c2..3bc16e9 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
@@ -24,6 +24,8 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.util.Date;
+
import javax.mail.Flags;
import org.apache.commons.lang3.NotImplementedException;
@@ -43,10 +45,15 @@ import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.model.MessageResultIterator;
import org.apache.james.mailbox.model.TestId;
import org.apache.james.mailbox.model.UpdatedFlags;
+import org.apache.james.mailbox.store.SimpleMessageMetaData;
+import org.apache.james.mailbox.store.event.EventFactory;
+import org.apache.james.mailbox.store.mail.model.DefaultMessageId;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.Before;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSortedMap;
public class MailboxEventAnalyserTest {
@@ -88,8 +95,11 @@ public class MailboxEventAnalyserTest {
private static final char PATH_DELIMITER = '.';
private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", "user", "name");
private static final TestId MAILBOX_ID = TestId.of(36);
+ private static final int UID_VALIDITY = 1024;
+ private static final SimpleMailbox DEFAULT_MAILBOX = new SimpleMailbox(MAILBOX_PATH, UID_VALIDITY, MAILBOX_ID);
private SelectedMailboxImpl testee;
+ private EventFactory eventFactory;
@Before
public void setUp() throws MailboxException {
@@ -120,6 +130,7 @@ public class MailboxEventAnalyserTest {
.thenReturn(new SingleMessageResultIterator(messageResult));
testee = new SelectedMailboxImpl(mailboxManager, imapSession, MAILBOX_PATH);
+ eventFactory = new EventFactory();
}
@Test
@@ -134,16 +145,23 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldBeNoSizeChangeOnAdded() {
- testee.event(new FakeMailboxListenerAdded(MAILBOX_SESSION.getSessionId(),
- MAILBOX_SESSION.getUser().getCoreUser(),
- ImmutableList.of(MessageUid.of(11)), MAILBOX_PATH, MAILBOX_ID));
+ MailboxListener.Added mailboxAdded = eventFactory.added(
+ MAILBOX_SESSION,
+ ImmutableSortedMap.of(MessageUid.of(11),
+ new SimpleMessageMetaData(MessageUid.of(11), 0, new Flags(), 45, new Date(), new DefaultMessageId())),
+ DEFAULT_MAILBOX);
+ testee.event(mailboxAdded);
assertThat(testee.isSizeChanged()).isTrue();
}
@Test
public void testShouldNoSizeChangeAfterReset() {
- testee.event(new FakeMailboxListenerAdded(MAILBOX_SESSION.getSessionId(),
- MAILBOX_SESSION.getUser().getCoreUser(), ImmutableList.of(MessageUid.of(11)), MAILBOX_PATH, MAILBOX_ID));
+ MailboxListener.Added mailboxAdded = eventFactory.added(
+ MAILBOX_SESSION,
+ ImmutableSortedMap.of(MessageUid.of(11),
+ new SimpleMessageMetaData(MessageUid.of(11), 0, new Flags(), 45, new Date(), new DefaultMessageId())),
+ DEFAULT_MAILBOX);
+ testee.event(mailboxAdded);
testee.resetEvents();
assertThat(testee.isSizeChanged()).isFalse();
@@ -151,16 +169,16 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldNotSetUidWhenNoSystemFlagChange() {
- FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(MAILBOX_SESSION,
+ MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
+ MAILBOX_SESSION,
ImmutableList.of(MessageUid.of(90L)),
+ DEFAULT_MAILBOX,
ImmutableList.of(UpdatedFlags.builder()
.uid(MessageUid.of(90))
.modSeq(-1)
.oldFlags(new Flags())
.newFlags(new Flags())
- .build()),
- MAILBOX_PATH,
- MAILBOX_ID);
+ .build()));
testee.event(update);
assertThat(testee.flagUpdateUids()).isEmpty();
@@ -170,16 +188,16 @@ public class MailboxEventAnalyserTest {
public void testShouldSetUidWhenSystemFlagChange() {
MessageUid uid = MessageUid.of(900);
- FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(OTHER_MAILBOX_SESSION,
+ MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
+ OTHER_MAILBOX_SESSION,
ImmutableList.of(uid),
+ DEFAULT_MAILBOX,
ImmutableList.of(UpdatedFlags.builder()
.uid(uid)
.modSeq(-1)
.oldFlags(new Flags())
.newFlags(new Flags(Flags.Flag.ANSWERED))
- .build()),
- MAILBOX_PATH,
- MAILBOX_ID);
+ .build()));
testee.event(update);
assertThat(testee.flagUpdateUids().iterator()).containsExactly(uid);
@@ -190,16 +208,16 @@ public class MailboxEventAnalyserTest {
MessageUid uid = MessageUid.of(900);
SelectedMailboxImpl analyser = this.testee;
- FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(MAILBOX_SESSION,
+ MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
+ MAILBOX_SESSION,
ImmutableList.of(uid),
+ DEFAULT_MAILBOX,
ImmutableList.of(UpdatedFlags.builder()
.uid(uid)
.modSeq(-1)
.oldFlags(new Flags())
.newFlags(new Flags(Flags.Flag.ANSWERED))
- .build()),
- MAILBOX_PATH,
- MAILBOX_ID);
+ .build()));
analyser.event(update);
analyser.event(update);
analyser.deselect();
@@ -211,16 +229,16 @@ public class MailboxEventAnalyserTest {
public void testShouldSetUidWhenSystemFlagChangeDifferentSessionInSilentMode() {
MessageUid uid = MessageUid.of(900);
- FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(OTHER_MAILBOX_SESSION,
+ MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
+ OTHER_MAILBOX_SESSION,
ImmutableList.of(uid),
+ DEFAULT_MAILBOX,
ImmutableList.of(UpdatedFlags.builder()
.uid(uid)
.modSeq(-1)
.oldFlags(new Flags())
.newFlags(new Flags(Flags.Flag.ANSWERED))
- .build()),
- MAILBOX_PATH,
- MAILBOX_ID);
+ .build()));
testee.event(update);
testee.setSilentFlagChanges(true);
testee.event(update);
@@ -230,16 +248,16 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldNotSetUidWhenSystemFlagChangeSameSessionInSilentMode() {
- FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(MAILBOX_SESSION,
+ MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
+ MAILBOX_SESSION,
ImmutableList.of(MessageUid.of(345)),
+ DEFAULT_MAILBOX,
ImmutableList.of(UpdatedFlags.builder()
.uid(MessageUid.of(345))
.modSeq(-1)
.oldFlags(new Flags())
.newFlags(new Flags())
- .build()),
- MAILBOX_PATH,
- MAILBOX_ID);
+ .build()));
testee.event(update);
testee.setSilentFlagChanges(true);
testee.event(update);
@@ -249,16 +267,16 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldNotSetUidWhenOnlyRecentFlagUpdated() {
- FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(MAILBOX_SESSION,
+ MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
+ MAILBOX_SESSION,
ImmutableList.of(MessageUid.of(886)),
+ DEFAULT_MAILBOX,
ImmutableList.of(UpdatedFlags.builder()
.uid(MessageUid.of(886))
.modSeq(-1)
.oldFlags(new Flags())
.newFlags(new Flags(Flags.Flag.RECENT))
- .build()),
- MAILBOX_PATH,
- MAILBOX_ID);
+ .build()));
testee.event(update);
assertThat(testee.flagUpdateUids().iterator()).isEmpty();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org