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 2017/06/22 08:45:22 UTC
[4/4] james-project git commit: JAMES-1720 MockMailboxSession is
mutable and thus should not be static in tests
JAMES-1720 MockMailboxSession is mutable and thus should not be static in tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7eb1c524
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7eb1c524
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7eb1c524
Branch: refs/heads/master
Commit: 7eb1c5245b8d13f82a303700798559c4cbb12c95
Parents: e72b79b
Author: benwa <bt...@linagora.com>
Authored: Wed Jun 21 17:55:40 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Jun 22 15:44:34 2017 +0700
----------------------------------------------------------------------
.../AbstractMessageIdManagerStorageTest.java | 8 ++--
.../StoreMailboxManagerAnnotationTest.java | 4 +-
.../store/StoreMessageIdManagerTestSystem.java | 5 ++-
.../event/MailboxAnnotationListenerTest.java | 3 +-
.../BroadcastDelegatingMailboxListenerTest.java | 46 ++++++++++----------
...RegisteredDelegatingMailboxListenerTest.java | 25 ++++++-----
.../mailbox/store/mail/MessageUtilsTest.java | 3 +-
.../registrations/GlobalRegistrationTest.java | 10 ++---
.../registrations/MailboxRegistrationTest.java | 9 ++--
9 files changed, 62 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
index 97d35fe..4dcd687 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
@@ -55,8 +55,6 @@ import com.google.common.collect.ImmutableMap;
public abstract class AbstractMessageIdManagerStorageTest {
public static final Flags FLAGS = new Flags();
- private static final MailboxSession SYSTEM_USER = new MockMailboxSession("systemuser", SessionType.System);
-
private static final MessageUid messageUid1 = MessageUid.of(111);
private static final MessageUid messageUid2 = MessageUid.of(222);
@@ -95,6 +93,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
private Mailbox mailbox4;
private MailboxSession session;
private MailboxSession otherSession;
+ private MailboxSession systemSession;
@Rule
public ExpectedException expectedException = ExpectedException.none();
@@ -105,6 +104,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
public void setUp() throws Exception {
session = new MockMailboxSession(MailboxManagerFixture.USER);
otherSession = new MockMailboxSession(MailboxManagerFixture.OTHER_USER);
+ systemSession = new MockMailboxSession("systemuser", SessionType.System);
testingData = createTestingData();
messageIdManager = testingData.getMessageIdManager();
@@ -349,7 +349,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
MessageId messageId = testingData.persist(mailbox1.getMailboxId(), messageUid1, FLAGS, session);
- messageIdManager.delete(messageId, ImmutableList.of(mailbox1.getMailboxId()), SYSTEM_USER);
+ messageIdManager.delete(messageId, ImmutableList.of(mailbox1.getMailboxId()), systemSession);
}
@Test
@@ -510,7 +510,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
Flags newFlags = new Flags(Flags.Flag.SEEN);
MessageId messageId = testingData.persist(mailbox1.getMailboxId(), messageUid1, FLAGS, session);
- messageIdManager.setFlags(newFlags, MessageManager.FlagsUpdateMode.ADD, messageId, ImmutableList.of(mailbox1.getMailboxId()), SYSTEM_USER);
+ messageIdManager.setFlags(newFlags, MessageManager.FlagsUpdateMode.ADD, messageId, ImmutableList.of(mailbox1.getMailboxId()), systemSession);
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
index 08e5837..dbccca7 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
@@ -67,7 +67,6 @@ public class StoreMailboxManagerAnnotationTest {
private static final List<MailboxAnnotation> ANNOTATIONS = ImmutableList.of(PRIVATE_ANNOTATION, SHARED_ANNOTATION);
private static final List<MailboxAnnotation> ANNOTATIONS_WITH_NIL_ENTRY = ImmutableList.of(PRIVATE_ANNOTATION, MailboxAnnotation.nil(SHARED_KEY));
- private static final MockMailboxSession session = new MockMailboxSession("userName");
@Mock private MailboxSessionMapperFactory mailboxSessionMapperFactory;
@Mock private Authenticator authenticator;
@@ -81,6 +80,7 @@ public class StoreMailboxManagerAnnotationTest {
@Mock private MessageParser messageParser;
@Mock private MailboxId mailboxId;
@Mock private MessageId.Factory messageIdFactory;
+ private MockMailboxSession session;
private StoreMailboxManager storeMailboxManager;
@@ -90,6 +90,8 @@ public class StoreMailboxManagerAnnotationTest {
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
+ session = new MockMailboxSession("userName");
+
when(mailboxSessionMapperFactory.getMailboxMapper(eq(session))).thenReturn(mailboxMapper);
when(mailboxSessionMapperFactory.getAnnotationMapper(eq(session))).thenReturn(annotationMapper);
when(mailbox.getMailboxId()).thenReturn(mailboxId);
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java
index 7c0c1fa..90883fc 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java
@@ -43,18 +43,19 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import com.google.common.base.Throwables;
public class StoreMessageIdManagerTestSystem extends MessageIdManagerTestSystem {
- private static final MailboxSession DEFAULT_MAILBOX_SESSION = new MockMailboxSession("user", SessionType.System);
private static final long MOD_SEQ = 18;
private static final ByteArrayInputStream ARRAY_INPUT_STREAM = new ByteArrayInputStream("".getBytes());
private final MessageId.Factory messageIdFactory;
private final TestMailboxSessionMapperFactory mapperFactory;
+ private final MailboxSession defaultMailboxSession;
public StoreMessageIdManagerTestSystem(MessageIdManager messageIdManager, MessageId.Factory messageIdFactory, TestMailboxSessionMapperFactory mapperFactory) {
super(messageIdManager);
this.messageIdFactory = messageIdFactory;
this.mapperFactory = mapperFactory;
+ this.defaultMailboxSession = new MockMailboxSession("user", SessionType.System);
}
@Override
@@ -66,7 +67,7 @@ public class StoreMessageIdManagerTestSystem extends MessageIdManagerTestSystem
public MessageId persist(MailboxId mailboxId, MessageUid uid, Flags flags, MailboxSession session) {
MessageId messageId = messageIdFactory.generate();
try {
- mapperFactory.createMessageIdMapper(DEFAULT_MAILBOX_SESSION)
+ mapperFactory.createMessageIdMapper(defaultMailboxSession)
.save(createMessage(mailboxId, flags, messageId, uid));
return messageId;
} catch (MailboxException e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java
index 5c94a3e..da634b5 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java
@@ -48,7 +48,6 @@ import java.util.List;
public class MailboxAnnotationListenerTest {
private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", "user", "name");
- private static final MailboxSession mailboxSession = new MockMailboxSession("test");
private static final MailboxAnnotationKey PRIVATE_KEY = new MailboxAnnotationKey("/private/comment");
private static final MailboxAnnotationKey SHARED_KEY = new MailboxAnnotationKey("/shared/comment");
@@ -68,10 +67,12 @@ public class MailboxAnnotationListenerTest {
private EventFactory eventFactory;
private MailboxAnnotationListener listener;
private MailboxListener.Event deleteEvent;
+ private MailboxSession mailboxSession;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
+ mailboxSession = new MockMailboxSession("test");
listener = new MailboxAnnotationListener(mailboxSessionMapperFactory);
eventFactory = new EventFactory();
mailbox = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "name"), UID_VALIDITY, mailboxId);
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java
index b8af665..d61bf63 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerTest.java
@@ -46,9 +46,6 @@ public class BroadcastDelegatingMailboxListenerTest {
private static final MailboxPath MAILBOX_PATH_NEW = new MailboxPath("namespace_new", "user_new", "name_new");
private static final Topic TOPIC = new Topic("topic");
private static final byte[] BYTES = new byte[0];
- private static final MailboxSession mailboxSession = new MockMailboxSession("benwa");
-
- public static final MailboxListener.Event EVENT = new MailboxListener.Event(mailboxSession, MAILBOX_PATH) {};
private BroadcastDelegatingMailboxListener broadcastDelegatingMailboxListener;
private Publisher mockedPublisher;
@@ -56,9 +53,14 @@ public class BroadcastDelegatingMailboxListenerTest {
private EventCollector mailboxEventCollector;
private EventCollector eachEventCollector;
private EventCollector onceEventCollector;
+ private MailboxSession mailboxSession;
+ private MailboxListener.Event event;
@Before
public void setUp() throws Exception {
+ mailboxSession = new MockMailboxSession("benwa");
+ event = new MailboxListener.Event(mailboxSession, MAILBOX_PATH) {};
+
mockedEventSerializer = mock(EventSerializer.class);
mockedPublisher = mock(Publisher.class);
MessageConsumer messageConsumer = mock(MessageConsumer.class);
@@ -70,14 +72,14 @@ public class BroadcastDelegatingMailboxListenerTest {
@Test
public void eventWithNoRegisteredListenersShouldWork() throws Exception {
- when(mockedEventSerializer.serializeEvent(EVENT)).thenAnswer(new Answer<byte[]>() {
+ when(mockedEventSerializer.serializeEvent(event)).thenAnswer(new Answer<byte[]>() {
@Override
public byte[] answer(InvocationOnMock invocation) throws Throwable {
return BYTES;
}
});
- broadcastDelegatingMailboxListener.event(EVENT);
- verify(mockedEventSerializer).serializeEvent(EVENT);
+ broadcastDelegatingMailboxListener.event(event);
+ verify(mockedEventSerializer).serializeEvent(event);
verify(mockedPublisher).publish(TOPIC, BYTES);
verifyNoMoreInteractions(mockedEventSerializer, mockedPublisher);
}
@@ -85,15 +87,15 @@ public class BroadcastDelegatingMailboxListenerTest {
@Test
public void eventWithMailboxRegisteredListenerShouldWork() throws Exception {
broadcastDelegatingMailboxListener.addListener(MAILBOX_PATH, mailboxEventCollector, mailboxSession);
- when(mockedEventSerializer.serializeEvent(EVENT)).thenAnswer(new Answer<byte[]>() {
+ when(mockedEventSerializer.serializeEvent(event)).thenAnswer(new Answer<byte[]>() {
@Override
public byte[] answer(InvocationOnMock invocation) throws Throwable {
return BYTES;
}
});
- broadcastDelegatingMailboxListener.event(EVENT);
+ broadcastDelegatingMailboxListener.event(event);
assertThat(mailboxEventCollector.getEvents()).isEmpty();
- verify(mockedEventSerializer).serializeEvent(EVENT);
+ verify(mockedEventSerializer).serializeEvent(event);
verify(mockedPublisher).publish(TOPIC, BYTES);
verifyNoMoreInteractions(mockedEventSerializer, mockedPublisher);
}
@@ -101,15 +103,15 @@ public class BroadcastDelegatingMailboxListenerTest {
@Test
public void eventWithEachRegisteredListenerShouldWork() throws Exception {
broadcastDelegatingMailboxListener.addGlobalListener(eachEventCollector, mailboxSession);
- when(mockedEventSerializer.serializeEvent(EVENT)).thenAnswer(new Answer<byte[]>() {
+ when(mockedEventSerializer.serializeEvent(event)).thenAnswer(new Answer<byte[]>() {
@Override
public byte[] answer(InvocationOnMock invocation) throws Throwable {
return BYTES;
}
});
- broadcastDelegatingMailboxListener.event(EVENT);
+ broadcastDelegatingMailboxListener.event(event);
assertThat(eachEventCollector.getEvents()).isEmpty();
- verify(mockedEventSerializer).serializeEvent(EVENT);
+ verify(mockedEventSerializer).serializeEvent(event);
verify(mockedPublisher).publish(TOPIC, BYTES);
verifyNoMoreInteractions(mockedEventSerializer, mockedPublisher);
}
@@ -117,15 +119,15 @@ public class BroadcastDelegatingMailboxListenerTest {
@Test
public void eventWithOnceRegisteredListenerShouldWork() throws Exception {
broadcastDelegatingMailboxListener.addGlobalListener(onceEventCollector, mailboxSession);
- when(mockedEventSerializer.serializeEvent(EVENT)).thenAnswer(new Answer<byte[]>() {
+ when(mockedEventSerializer.serializeEvent(event)).thenAnswer(new Answer<byte[]>() {
@Override
public byte[] answer(InvocationOnMock invocation) throws Throwable {
return BYTES;
}
});
- broadcastDelegatingMailboxListener.event(EVENT);
- assertThat(onceEventCollector.getEvents()).containsOnly(EVENT);
- verify(mockedEventSerializer).serializeEvent(EVENT);
+ broadcastDelegatingMailboxListener.event(event);
+ assertThat(onceEventCollector.getEvents()).containsOnly(event);
+ verify(mockedEventSerializer).serializeEvent(event);
verify(mockedPublisher).publish(TOPIC, BYTES);
verifyNoMoreInteractions(mockedEventSerializer, mockedPublisher);
}
@@ -135,7 +137,7 @@ public class BroadcastDelegatingMailboxListenerTest {
when(mockedEventSerializer.deSerializeEvent(BYTES)).thenAnswer(new Answer<MailboxListener.Event>() {
@Override
public MailboxListener.Event answer(InvocationOnMock invocation) throws Throwable {
- return EVENT;
+ return event;
}
});
broadcastDelegatingMailboxListener.receiveSerializedEvent(BYTES);
@@ -149,13 +151,13 @@ public class BroadcastDelegatingMailboxListenerTest {
when(mockedEventSerializer.deSerializeEvent(BYTES)).thenAnswer(new Answer<MailboxListener.Event>() {
@Override
public MailboxListener.Event answer(InvocationOnMock invocation) throws Throwable {
- return EVENT;
+ return event;
}
});
broadcastDelegatingMailboxListener.receiveSerializedEvent(BYTES);
verify(mockedEventSerializer).deSerializeEvent(BYTES);
verifyNoMoreInteractions(mockedEventSerializer, mockedPublisher);
- assertThat(mailboxEventCollector.getEvents()).containsOnly(EVENT);
+ assertThat(mailboxEventCollector.getEvents()).containsOnly(event);
}
@Test
@@ -164,13 +166,13 @@ public class BroadcastDelegatingMailboxListenerTest {
when(mockedEventSerializer.deSerializeEvent(BYTES)).thenAnswer(new Answer<MailboxListener.Event>() {
@Override
public MailboxListener.Event answer(InvocationOnMock invocation) throws Throwable {
- return EVENT;
+ return event;
}
});
broadcastDelegatingMailboxListener.receiveSerializedEvent(BYTES);
verify(mockedEventSerializer).deSerializeEvent(BYTES);
verifyNoMoreInteractions(mockedEventSerializer, mockedPublisher);
- assertThat(eachEventCollector.getEvents()).containsOnly(EVENT);
+ assertThat(eachEventCollector.getEvents()).containsOnly(event);
}
@Test
@@ -179,7 +181,7 @@ public class BroadcastDelegatingMailboxListenerTest {
when(mockedEventSerializer.deSerializeEvent(BYTES)).thenAnswer(new Answer<MailboxListener.Event>() {
@Override
public MailboxListener.Event answer(InvocationOnMock invocation) throws Throwable {
- return EVENT;
+ return event;
}
});
broadcastDelegatingMailboxListener.receiveSerializedEvent(BYTES);
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java
index 977acdf..438bc97 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListenerTest.java
@@ -52,8 +52,6 @@ public class RegisteredDelegatingMailboxListenerTest {
private static final Topic TOPIC = new Topic("topic");
private static final Topic TOPIC_2 = new Topic("topic_2");
private static final byte[] BYTES = new byte[0];
- private static final MailboxSession mailboxSession = new MockMailboxSession("benwa");
- public static final MailboxListener.Event EVENT = new MailboxListener.Event(mailboxSession, MAILBOX_PATH) {};
private RegisteredDelegatingMailboxListener testee;
private MailboxPathRegister mockedMailboxPathRegister;
@@ -62,9 +60,14 @@ public class RegisteredDelegatingMailboxListenerTest {
private EventCollector mailboxEventCollector;
private EventCollector eachEventCollector;
private EventCollector onceEventCollector;
+ private MailboxSession mailboxSession;
+ private MailboxListener.Event event;
@Before
public void setUp() throws Exception {
+ mailboxSession = new MockMailboxSession("benwa");
+ event = new MailboxListener.Event(mailboxSession, MAILBOX_PATH) {};
+
mockedEventSerializer = mock(EventSerializer.class);
mockedPublisher = mock(Publisher.class);
mockedMailboxPathRegister = mock(MailboxPathRegister.class);
@@ -91,8 +94,8 @@ public class RegisteredDelegatingMailboxListenerTest {
return TOPIC;
}
});
- testee.event(EVENT);
- assertThat(mailboxEventCollector.getEvents()).containsOnly(EVENT);
+ testee.event(event);
+ assertThat(mailboxEventCollector.getEvents()).containsOnly(event);
verify(mockedMailboxPathRegister, times(2)).getLocalTopic();
verify(mockedMailboxPathRegister).getTopics(MAILBOX_PATH);
verifyNoMoreInteractions(mockedEventSerializer);
@@ -116,17 +119,17 @@ public class RegisteredDelegatingMailboxListenerTest {
return TOPIC;
}
});
- when(mockedEventSerializer.serializeEvent(EVENT)).thenAnswer(new Answer<byte[]>() {
+ when(mockedEventSerializer.serializeEvent(event)).thenAnswer(new Answer<byte[]>() {
@Override
public byte[] answer(InvocationOnMock invocation) throws Throwable {
return BYTES;
}
});
- testee.event(EVENT);
- assertThat(mailboxEventCollector.getEvents()).containsOnly(EVENT);
+ testee.event(event);
+ assertThat(mailboxEventCollector.getEvents()).containsOnly(event);
verify(mockedMailboxPathRegister, times(2)).getLocalTopic();
verify(mockedMailboxPathRegister).getTopics(MAILBOX_PATH);
- verify(mockedEventSerializer).serializeEvent(EVENT);
+ verify(mockedEventSerializer).serializeEvent(event);
verify(mockedPublisher).publish(TOPIC_2, BYTES);
verifyNoMoreInteractions(mockedEventSerializer);
verifyNoMoreInteractions(mockedPublisher);
@@ -170,11 +173,11 @@ public class RegisteredDelegatingMailboxListenerTest {
when(mockedEventSerializer.deSerializeEvent(BYTES)).thenAnswer(new Answer<MailboxListener.Event>() {
@Override
public MailboxListener.Event answer(InvocationOnMock invocation) throws Throwable {
- return EVENT;
+ return event;
}
});
testee.receiveSerializedEvent(BYTES);
- assertThat(mailboxEventCollector.getEvents()).containsOnly(EVENT);
+ assertThat(mailboxEventCollector.getEvents()).containsOnly(event);
verify(mockedMailboxPathRegister).getLocalTopic();
verify(mockedEventSerializer).deSerializeEvent(BYTES);
verifyNoMoreInteractions(mockedEventSerializer);
@@ -189,7 +192,7 @@ public class RegisteredDelegatingMailboxListenerTest {
when(mockedEventSerializer.deSerializeEvent(BYTES)).thenAnswer(new Answer<MailboxListener.Event>() {
@Override
public MailboxListener.Event answer(InvocationOnMock invocation) throws Throwable {
- return EVENT;
+ return event;
}
});
testee.receiveSerializedEvent(BYTES);
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java
index a58d645..12eebc6 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java
@@ -46,7 +46,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
public class MessageUtilsTest {
- private static final MailboxSession mailboxSession = new MockMailboxSession("user");
private static final MessageUid MESSAGE_UID = MessageUid.of(1);
private static final MessageId MESSAGE_ID = new DefaultMessageId();
private static final int BODY_START = 16;
@@ -55,6 +54,7 @@ public class MessageUtilsTest {
@Mock private ModSeqProvider modSeqProvider;
@Mock private UidProvider uidProvider;
@Mock private Mailbox mailbox;
+ private MailboxSession mailboxSession;
@Rule
public ExpectedException expectedException = ExpectedException.none();
@@ -65,6 +65,7 @@ public class MessageUtilsTest {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
+ mailboxSession = new MockMailboxSession("user");
messageUtils = new MessageUtils(mailboxSession, uidProvider, modSeqProvider);
message = new SimpleMailboxMessage(MESSAGE_ID, new Date(), CONTENT.length(), BODY_START, new SharedByteArrayInputStream(CONTENT.getBytes()), new Flags(), new PropertyBuilder(), mailbox.getMailboxId());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java
index 6737fa0..fddd82f 100644
--- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java
+++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistrationTest.java
@@ -32,8 +32,6 @@ import org.junit.Test;
import com.google.common.base.Optional;
public class GlobalRegistrationTest {
-
- public static final MockMailboxSession SESSION = new MockMailboxSession("test");
public static final MailboxPath INBOX = new MailboxPath("#private", "btellier@apache.org", "INBOX");
public static final MailboxPath NEW_PATH = new MailboxPath("#private", "btellier@apache.org", "INBOX.new");
public static final int UID_VALIDITY = 45;
@@ -42,10 +40,12 @@ public class GlobalRegistrationTest {
private GlobalRegistration globalRegistration;
private EventFactory eventFactory;
+ private MockMailboxSession session;
@Before
public void setUp() {
eventFactory = new EventFactory();
+ session = new MockMailboxSession("test");
globalRegistration = new GlobalRegistration();
}
@@ -56,21 +56,21 @@ public class GlobalRegistrationTest {
@Test
public void pathToIndexShouldNotBeChangedByAddedEvents() {
- MailboxListener.Event event = eventFactory.mailboxAdded(SESSION, MAILBOX);
+ MailboxListener.Event event = eventFactory.mailboxAdded(session, MAILBOX);
globalRegistration.event(event);
assertThat(globalRegistration.getPathToIndex(INBOX).get()).isEqualTo(INBOX);
}
@Test
public void pathToIndexShouldBeNullifiedByDeletedEvents() {
- MailboxListener.Event event = eventFactory.mailboxDeleted(SESSION, MAILBOX);
+ MailboxListener.Event event = eventFactory.mailboxDeleted(session, MAILBOX);
globalRegistration.event(event);
assertThat(globalRegistration.getPathToIndex(INBOX)).isEqualTo(Optional.absent());
}
@Test
public void pathToIndexShouldBeModifiedByRenamedEvents() {
- MailboxListener.Event event = eventFactory.mailboxRenamed(SESSION, INBOX, NEW_MAILBOX);
+ MailboxListener.Event event = eventFactory.mailboxRenamed(session, INBOX, NEW_MAILBOX);
globalRegistration.event(event);
assertThat(globalRegistration.getPathToIndex(INBOX).get()).isEqualTo(NEW_PATH);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java
index e965aec..21992e2 100644
--- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java
+++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java
@@ -49,15 +49,16 @@ public class MailboxRegistrationTest {
public static final MessageUid UID = MessageUid.of(18);
public static final int UID_VALIDITY = 45;
public static final SimpleMailbox MAILBOX = new SimpleMailbox(INBOX, UID_VALIDITY);
- public static final MockMailboxSession SESSION = new MockMailboxSession("test");
public static final int MOD_SEQ = 21;
public static final int SIZE = 41;
public static final Flags NEW_FLAGS = new Flags(Flags.Flag.ANSWERED);
private MailboxRegistration mailboxRegistration;
private EventFactory eventFactory;
+ private MockMailboxSession session;
@Before
public void setUp() {
+ session = new MockMailboxSession("test");
eventFactory = new EventFactory();
mailboxRegistration = new MailboxRegistration(INBOX);
}
@@ -72,7 +73,7 @@ public class MailboxRegistrationTest {
public void AddedEventsShouldNotBeReported() {
TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<MessageUid, MessageMetaData>();
treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId()));
- MailboxListener.Event event = eventFactory.added(SESSION, treeMap, MAILBOX);
+ MailboxListener.Event event = eventFactory.added(session, treeMap, MAILBOX);
mailboxRegistration.event(event);
assertThat(mailboxRegistration.getImpactingEvents(UID)).isEmpty();
}
@@ -81,14 +82,14 @@ public class MailboxRegistrationTest {
public void ExpungedEventsShouldBeReported() {
TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<MessageUid, MessageMetaData>();
treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId()));
- MailboxListener.Event event = eventFactory.expunged(SESSION, treeMap, MAILBOX);
+ MailboxListener.Event event = eventFactory.expunged(session, treeMap, MAILBOX);
mailboxRegistration.event(event);
assertThat(mailboxRegistration.getImpactingEvents(UID)).containsExactly(new MessageDeletedEvent(INBOX, UID));
}
@Test
public void FlagsEventsShouldBeReported() {
- MailboxListener.Event event = eventFactory.flagsUpdated(SESSION,
+ MailboxListener.Event event = eventFactory.flagsUpdated(session,
Lists.newArrayList(UID),
MAILBOX,
Lists.newArrayList(UpdatedFlags.builder()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org