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 2020/03/02 03:16:14 UTC
[james-project] 17/29: JAMES-3074 Tests should be using
UidValidity::ofValid
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 d6a921cea2ddfe9fcf4737b8dcf62dbae63b1406
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Feb 26 11:45:17 2020 +0700
JAMES-3074 Tests should be using UidValidity::ofValid
---
.../org/apache/james/mailbox/model/MailboxAssertingToolTest.java | 7 ++++---
.../org/apache/james/mailbox/backup/MailboxMessageFixture.java | 8 ++++----
.../mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java | 2 +-
.../mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java | 4 ++--
.../cassandra/mail/CassandraMailboxMapperConcurrencyTest.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraUidProviderTest.java | 2 +-
.../cassandra/mail/migration/MailboxPathV2MigrationTest.java | 2 +-
.../events/ElasticSearchListeningMessageSearchIndexTest.java | 2 +-
.../lucene/search/LuceneMailboxMessageSearchIndexTest.java | 6 +++---
.../mailbox/inmemory/InMemoryCombinationManagerTestSystem.java | 4 +---
.../james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java | 4 +---
.../james/mailbox/spamassassin/SpamAssassinListenerTest.java | 2 +-
.../org/apache/james/mailbox/store/StoreRightManagerTest.java | 2 +-
.../james/mailbox/store/mail/model/ListMailboxAssertTest.java | 2 +-
.../james/mailbox/store/mail/model/ListMessageAssertTest.java | 2 +-
.../james/mailbox/store/mail/model/MailboxMapperACLTest.java | 2 +-
.../apache/james/mailbox/store/mail/model/MailboxMapperTest.java | 2 +-
.../james/mailbox/store/mail/model/MessageIdMapperTest.java | 2 +-
.../apache/james/mailbox/store/mail/model/MessageMapperTest.java | 2 +-
.../apache/james/mailbox/store/mail/model/MessageMoveTest.java | 2 +-
.../mailbox/store/mail/model/MessageWithAttachmentMapperTest.java | 2 +-
.../mailbox/store/quota/DefaultUserQuotaRootResolverTest.java | 4 ++--
.../org/apache/james/mailbox/store/quota/QuotaCheckerTest.java | 2 +-
.../james/imap/encode/MailboxStatusResponseEncoderTest.java | 2 +-
.../java/org/apache/james/imap/processor/CopyProcessorTest.java | 5 +++--
.../java/org/apache/james/imap/processor/MoveProcessorTest.java | 5 +++--
.../james/imap/processor/base/MailboxEventAnalyserTest.java | 2 +-
.../org/apache/james/adapter/mailbox/MailboxManagementTest.java | 2 +-
31 files changed, 45 insertions(+), 46 deletions(-)
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertingToolTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertingToolTest.java
index 8e3377f..a88498e 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertingToolTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertingToolTest.java
@@ -31,7 +31,8 @@ class MailboxAssertingToolTest {
private static final Username USER = Username.of("user");
private static final Username USER1 = Username.of("user1");
- private static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ private static final UidValidity UID_VALIDITY_2 = UidValidity.ofValid(43);
private static final TestId MAILBOX_ID = TestId.of(24);
@Nested
@@ -83,7 +84,7 @@ class MailboxAssertingToolTest {
@Test
void isEqualToShouldFailWithNotEqualUidValidity() {
Mailbox mailbox1 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY, MAILBOX_ID);
- Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(USER, "name"), UidValidity.of(UID_VALIDITY.asLong() + 1), MAILBOX_ID);
+ Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY_2, MAILBOX_ID);
assertThatThrownBy(() -> MailboxAssertingTool.assertThat(mailbox1).isEqualTo(mailbox2))
.isInstanceOf(AssertionError.class);
@@ -157,7 +158,7 @@ class MailboxAssertingToolTest {
@Test
void isEqualToShouldFailWithNotEqualUidValidity() {
Mailbox mailbox1 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY, MAILBOX_ID);
- Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(USER, "name"), UidValidity.of(UID_VALIDITY.asLong() + 1), MAILBOX_ID);
+ Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(USER, "name"), UID_VALIDITY_2, MAILBOX_ID);
assertThatThrownBy(() -> {
SoftAssertions.assertSoftly(softly -> {
diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java
index 50f8a76..f833839 100644
--- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java
+++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java
@@ -101,10 +101,10 @@ public interface MailboxMessageFixture {
MailboxPath MAILBOX_PATH_USER1_MAILBOX2 = MailboxPath.forUser(USER, MAILBOX_2_NAME);
MailboxPath MAILBOX_PATH_OTHER_USER_MAILBOX1 = MailboxPath.forUser(OTHER_USER, MAILBOX_OTHER_USER_NAME);
- Mailbox MAILBOX_1 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX1, UidValidity.of(42), MAILBOX_ID_1);
- Mailbox MAILBOX_1_OTHER_USER = new Mailbox(MAILBOX_PATH_OTHER_USER_MAILBOX1, UidValidity.of(42), MAILBOX_ID_11);
- Mailbox MAILBOX_1_SUB_1 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX1_SUB_1, UidValidity.of(420), TestId.of(11L));
- Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX2, UidValidity.of(43), MAILBOX_ID_2);
+ Mailbox MAILBOX_1 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX1, UidValidity.ofValid(42), MAILBOX_ID_1);
+ Mailbox MAILBOX_1_OTHER_USER = new Mailbox(MAILBOX_PATH_OTHER_USER_MAILBOX1, UidValidity.ofValid(42), MAILBOX_ID_11);
+ Mailbox MAILBOX_1_SUB_1 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX1_SUB_1, UidValidity.ofValid(420), TestId.of(11L));
+ Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX2, UidValidity.ofValid(43), MAILBOX_ID_2);
List<MailboxAnnotation> NO_ANNOTATION = ImmutableList.of();
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
index d100737..ad0f2be 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
@@ -56,7 +56,7 @@ class CassandraIndexTableHandlerTest {
private static final CassandraId MAILBOX_ID = CassandraId.timeBased();
private static final MessageUid MESSAGE_UID = MessageUid.of(18L);
private static final CassandraMessageId CASSANDRA_MESSAGE_ID = new CassandraMessageId.Factory().generate();
- private static final UidValidity UID_VALIDITY = UidValidity.of(15);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(15);
private static final ModSeq MODSEQ = ModSeq.of(17);
@RegisterExtension
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
index b87fdd3..15f5939 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraMailboxCounterDAOTest {
- private static final UidValidity UID_VALIDITY = UidValidity.of(15);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(15);
private static final CassandraId MAILBOX_ID = CassandraId.timeBased();
@RegisterExtension
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
index f13a96f..9aa1486 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
@@ -41,8 +41,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraMailboxDAOTest {
- private static final UidValidity UID_VALIDITY_1 = UidValidity.of(145);
- private static final UidValidity UID_VALIDITY_2 = UidValidity.of(147);
+ private static final UidValidity UID_VALIDITY_1 = UidValidity.ofValid(145);
+ private static final UidValidity UID_VALIDITY_2 = UidValidity.ofValid(147);
private static final Username USER = Username.of("user");
private static final MailboxPath NEW_MAILBOX_PATH = MailboxPath.forUser(USER, "xyz");
private static CassandraId CASSANDRA_ID_1 = CassandraId.timeBased();
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
index 54e7290..c239e4c 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraMailboxMapperConcurrencyTest {
- private static final UidValidity UID_VALIDITY = UidValidity.of(52);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(52);
private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(Username.of("user"), "name");
private static final int THREAD_COUNT = 10;
private static final int OPERATION_COUNT = 10;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index c724053..986fe8b 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@ -59,7 +59,7 @@ import com.github.fge.lambdas.Throwing;
import com.github.fge.lambdas.runnable.ThrowingRunnable;
class CassandraMailboxMapperTest {
- private static final UidValidity UID_VALIDITY = UidValidity.of(52);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(52);
private static final Username USER = Username.of("user");
private static final CassandraId MAILBOX_ID = CassandraId.timeBased();
private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(USER, "name");
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
index 6c328a4..9d25206 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
@@ -56,7 +56,7 @@ class CassandraModSeqProviderTest {
void setUp(CassandraCluster cassandra) {
modSeqProvider = new CassandraModSeqProvider(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION);
MailboxPath path = new MailboxPath("gsoc", Username.of("ieugen"), "Trash");
- mailbox = new Mailbox(path, UidValidity.of(1234), CASSANDRA_ID);
+ mailbox = new Mailbox(path, UidValidity.ofValid(1234), CASSANDRA_ID);
}
@Test
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
index 80c43b0..53bcdc1 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
@@ -56,7 +56,7 @@ class CassandraUidProviderTest {
void setUp(CassandraCluster cassandra) {
uidProvider = new CassandraUidProvider(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION);
MailboxPath path = new MailboxPath("gsoc", Username.of("ieugen"), "Trash");
- mailbox = new Mailbox(path, UidValidity.of(1234), CASSANDRA_ID);
+ mailbox = new Mailbox(path, UidValidity.ofValid(1234), CASSANDRA_ID);
}
@Test
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
index 82ee289..7412e05 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
@@ -50,7 +50,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class MailboxPathV2MigrationTest {
private static final MailboxPath MAILBOX_PATH_1 = MailboxPath.forUser(Username.of("bob"), "Important");
- private static final UidValidity UID_VALIDITY_1 = UidValidity.of(452);
+ private static final UidValidity UID_VALIDITY_1 = UidValidity.ofValid(452);
private static final CassandraId MAILBOX_ID_1 = CassandraId.timeBased();
public static final CassandraModule MODULES = CassandraModule.aggregateModules(
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
index 5a94b95..49424b4 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
@@ -178,7 +178,7 @@ class ElasticSearchListeningMessageSearchIndexTest {
messageToElasticSearchJson, sessionProvider, new MailboxIdRoutingKeyFactory());
session = sessionProvider.createSystemSession(USERNAME);
- mailbox = mapperFactory.getMailboxMapper(session).create(MailboxPath.forUser(USERNAME, DefaultMailboxes.INBOX), UidValidity.of(MAILBOX_ID.id));
+ mailbox = mapperFactory.getMailboxMapper(session).create(MailboxPath.forUser(USERNAME, DefaultMailboxes.INBOX), UidValidity.random());
}
@Test
diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
index 6ff52fb..1b45f08 100644
--- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
+++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
@@ -62,9 +62,9 @@ class LuceneMailboxMessageSearchIndexTest {
static final TestId TEST_ID_3 = TestId.of(2);
static final Username BOB = Username.of("bob");
- Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.of(18), TEST_ID_1);
- Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.of(19), TEST_ID_2);
- Mailbox mailbox3 = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.of(12), TEST_ID_3);
+ Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.ofValid(18), TEST_ID_1);
+ Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.ofValid(19), TEST_ID_2);
+ Mailbox mailbox3 = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.ofValid(12), TEST_ID_3);
LuceneMessageSearchIndex index;
MailboxSession session;
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java
index 3087bef..be0c9d5 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryCombinationManagerTestSystem.java
@@ -29,8 +29,6 @@ import org.apache.james.mailbox.model.UidValidity;
import org.apache.james.mailbox.store.CombinationManagerTestSystem;
public class InMemoryCombinationManagerTestSystem extends CombinationManagerTestSystem {
- private static final UidValidity UID_VALIDITY = UidValidity.of(1024);
-
private final InMemoryMailboxManager inMemoryMailboxManager;
public InMemoryCombinationManagerTestSystem(MailboxManager mailboxManager, MessageIdManager messageIdManager) {
@@ -47,7 +45,7 @@ public class InMemoryCombinationManagerTestSystem extends CombinationManagerTest
public Mailbox createMailbox(MailboxPath mailboxPath, MailboxSession session) throws MailboxException {
inMemoryMailboxManager.createMailbox(mailboxPath, session);
MessageManager messageManager = inMemoryMailboxManager.getMailbox(mailboxPath, session);
- return new Mailbox(mailboxPath, UID_VALIDITY, messageManager.getId());
+ return messageManager.getMailboxEntity();
}
}
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
index 4933ee5..89db34d 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
@@ -29,8 +29,6 @@ import org.apache.james.mailbox.store.MessageManagerTestSystem;
public class InMemoryMessageManagerTestSystem extends MessageManagerTestSystem {
- private static final UidValidity UID_VALIDITY = UidValidity.of(1024);
-
private final MailboxManager mailboxManager;
public InMemoryMessageManagerTestSystem(MailboxManager mailboxManager) {
@@ -42,6 +40,6 @@ public class InMemoryMessageManagerTestSystem extends MessageManagerTestSystem {
public Mailbox createMailbox(MailboxPath mailboxPath, MailboxSession mailboxSession) throws MailboxException {
mailboxManager.createMailbox(mailboxPath, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
- return new Mailbox(mailboxPath, UID_VALIDITY, messageManager.getId());
+ return messageManager.getMailboxEntity();
}
}
diff --git a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
index 4227d3b..f4bdc90 100644
--- a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
+++ b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
@@ -61,7 +61,7 @@ import org.junit.jupiter.api.Test;
class SpamAssassinListenerTest {
static final Username USER = Username.of("user");
static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER);
- static final UidValidity UID_VALIDITY = UidValidity.of(43);
+ static final UidValidity UID_VALIDITY = UidValidity.ofValid(43);
static final TestMessageId MESSAGE_ID = TestMessageId.of(45);
SpamAssassin spamAssassin;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java
index 7aa4a76..008c170 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java
@@ -59,7 +59,7 @@ import org.junit.jupiter.api.Test;
class StoreRightManagerTest {
static final MailboxId MAILBOX_ID = TestId.of(42);
- static final UidValidity UID_VALIDITY = UidValidity.of(3421L);
+ static final UidValidity UID_VALIDITY = UidValidity.ofValid(3421L);
StoreRightManager storeRightManager;
MailboxSession aliceSession;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
index 0d158a6..97963f6 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
@@ -40,7 +40,7 @@ class ListMailboxAssertTest {
static final String NAME = "name";
static final Username USER = Username.of("user");
static final String NAMESPACE = "namespace";
- static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
static final MailboxId MAILBOX_ID_1 = TestId.of(1);
static final MailboxId MAILBOX_ID_2 = TestId.of(2);
static final Mailbox MAILBOX_1 = new Mailbox(new MailboxPath(NAMESPACE, USER, NAME), UID_VALIDITY, MAILBOX_ID_1);
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
index 99318de..63b2cbd 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
@@ -50,7 +50,7 @@ class ListMessageAssertTest {
static final String BODY_CONTENT2 = "Subject: Test2 \n\nBody2\n.\n";
static final String BODY_CONTENT1 = "Subject: Test1 \n\nBody1\n.\n";
static final int BODY_START = 16;
- static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
static final MailboxId MAILBOX_ID = TestId.of(1);
static final MessageUid MESSAGE_UID = MessageUid.of(2);
static final MessageId MESSAGE_ID = new DefaultMessageId();
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
index 744892f..7776c6a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableMap;
public abstract class MailboxMapperACLTest {
- private static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
private static final boolean POSITIVE = true;
private static final boolean NEGATIVE = !POSITIVE;
private static final Username USER = Username.of("user");
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
index aee7ac5..7731554 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
@@ -49,7 +49,7 @@ import org.junit.jupiter.api.Test;
public abstract class MailboxMapperTest {
private static final char DELIMITER = '.';
- private static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
private static final Username BENWA = Username.of("benwa");
private static final MailboxPath benwaInboxPath = MailboxPath.forUser(BENWA, "INBOX");
private static final MailboxPath benwaWorkPath = MailboxPath.forUser(BENWA, "INBOX" + DELIMITER + "work");
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 731f35a..a14b98d 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
@@ -65,7 +65,7 @@ public abstract class MessageIdMapperTest {
private static final char DELIMITER = '.';
private static final int BODY_START = 16;
- protected static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ protected static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
private MessageMapper messageMapper;
private MailboxMapper mailboxMapper;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
index b199021..bd3b111 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
@@ -70,7 +70,7 @@ public abstract class MessageMapperTest {
private static final char DELIMITER = '.';
private static final int LIMIT = 10;
private static final int BODY_START = 16;
- private static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
private static final String USER_FLAG = "userFlag";
private static final String CUSTOMS_USER_FLAGS_VALUE = "CustomsFlags";
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
index 4542f2f..7ef5380 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
@@ -48,7 +48,7 @@ public abstract class MessageMoveTest {
private static final char DELIMITER = '.';
private static final int LIMIT = 10;
private static final int BODY_START = 16;
- private static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
private MapperProvider mapperProvider;
private MessageMapper messageMapper;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
index f10a0b6..b096fd1 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
@@ -55,7 +55,7 @@ public abstract class MessageWithAttachmentMapperTest {
private static final int LIMIT = 10;
private static final int BODY_START = 16;
- private static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
private MapperProvider mapperProvider;
private MessageMapper messageMapper;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
index d744e15..82cf761 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
@@ -49,9 +49,9 @@ class DefaultUserQuotaRootResolverTest {
static final Username BENWA = Username.of("benwa");
static final MailboxId MAILBOX_ID = TestId.of(42);
static final MailboxPath MAILBOX_PATH = MailboxPath.inbox(BENWA);
- static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UidValidity.of(10), MAILBOX_ID);
+ static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UidValidity.ofValid(10), MAILBOX_ID);
static final MailboxPath MAILBOX_PATH_2 = MailboxPath.forUser(BENWA, "test");
- static final Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_2, UidValidity.of(10), MAILBOX_ID);
+ static final Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_2, UidValidity.ofValid(10), MAILBOX_ID);
static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("#private&benwa", Optional.empty());
static final MailboxSession MAILBOX_SESSION = null;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
index 9c09ab2..35a764d 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
@@ -49,7 +49,7 @@ class QuotaCheckerTest {
static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("benwa", Optional.empty());
static final MailboxId MAILBOX_ID = TestId.of(42);
static final MailboxPath MAILBOX_PATH = MailboxPath.inbox(Username.of("benwa"));
- static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UidValidity.of(10), MAILBOX_ID);
+ static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UidValidity.ofValid(10), MAILBOX_ID);
QuotaRootResolver mockedQuotaRootResolver;
QuotaManager mockedQuotaManager;
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
index 110feee..5ad5417 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
@@ -51,7 +51,7 @@ public class MailboxStatusResponseEncoderTest {
final Long messages = 2L;
final Long recent = 3L;
final MessageUid uidNext = MessageUid.of(5);
- final UidValidity uidValidity = UidValidity.of(7L);
+ final UidValidity uidValidity = UidValidity.ofValid(7L);
final Long unseen = 11L;
final String mailbox = "A mailbox named desire";
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
index 61a7580..11876d4 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
@@ -60,6 +60,7 @@ import com.google.common.collect.Lists;
public class CopyProcessorTest {
private static final Username USERNAME = Username.of("username");
private static final MailboxPath INBOX = MailboxPath.inbox(USERNAME);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(58L);
private CopyProcessor testee;
private ImapProcessor mockNextProcessor;
@@ -98,7 +99,7 @@ public class CopyProcessorTest {
MessageManager targetMessageManager = mock(MessageManager.class);
when(mockMailboxManager.getMailbox(INBOX, mailboxSession)).thenReturn(targetMessageManager);
Mailbox mailbox = mock(Mailbox.class);
- when(mailbox.getUidValidity()).thenReturn(UidValidity.of(58L));
+ when(mailbox.getUidValidity()).thenReturn(UID_VALIDITY);
when(targetMessageManager.getMailboxEntity()).thenReturn(mailbox);
StatusResponse okResponse = mock(StatusResponse.class);
when(mockStatusResponseFactory.taggedOk(any(Tag.class), any(ImapCommand.class), any(HumanReadableText.class), any(StatusResponse.ResponseCode.class))).thenReturn(okResponse);
@@ -131,7 +132,7 @@ public class CopyProcessorTest {
MessageManager targetMessageManager = mock(MessageManager.class);
when(mockMailboxManager.getMailbox(INBOX, mailboxSession)).thenReturn(targetMessageManager);
Mailbox mailbox = mock(Mailbox.class);
- when(mailbox.getUidValidity()).thenReturn(UidValidity.of(58L));
+ when(mailbox.getUidValidity()).thenReturn(UID_VALIDITY);
when(targetMessageManager.getMailboxEntity()).thenReturn(mailbox);
StatusResponse okResponse = mock(StatusResponse.class);
when(mockStatusResponseFactory.taggedOk(any(Tag.class), any(ImapCommand.class), any(HumanReadableText.class), any(StatusResponse.ResponseCode.class))).thenReturn(okResponse);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
index 3fafe5c..3c91299 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
@@ -63,6 +63,7 @@ import com.google.common.collect.Lists;
public class MoveProcessorTest {
private static final Username USERNAME = Username.of("username");
private static final MailboxPath INBOX = MailboxPath.inbox(USERNAME);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(58L);
private MoveProcessor testee;
private ImapProcessor mockNextProcessor;
@@ -114,7 +115,7 @@ public class MoveProcessorTest {
MessageManager targetMessageManager = mock(MessageManager.class);
when(mockMailboxManager.getMailbox(INBOX, mailboxSession)).thenReturn(targetMessageManager);
Mailbox mailbox = mock(Mailbox.class);
- when(mailbox.getUidValidity()).thenReturn(UidValidity.of(58L));
+ when(mailbox.getUidValidity()).thenReturn(UID_VALIDITY);
when(targetMessageManager.getMailboxEntity()).thenReturn(mailbox);
StatusResponse okResponse = mock(StatusResponse.class);
when(mockStatusResponseFactory.taggedOk(any(Tag.class), any(ImapCommand.class), any(HumanReadableText.class), any(StatusResponse.ResponseCode.class))).thenReturn(okResponse);
@@ -147,7 +148,7 @@ public class MoveProcessorTest {
MessageManager targetMessageManager = mock(MessageManager.class);
when(mockMailboxManager.getMailbox(INBOX, mailboxSession)).thenReturn(targetMessageManager);
Mailbox mailbox = mock(Mailbox.class);
- when(mailbox.getUidValidity()).thenReturn(UidValidity.of(58L));
+ when(mailbox.getUidValidity()).thenReturn(UID_VALIDITY);
when(targetMessageManager.getMailboxEntity()).thenReturn(mailbox);
StatusResponse okResponse = mock(StatusResponse.class);
when(mockStatusResponseFactory.taggedOk(any(Tag.class), any(ImapCommand.class), any(HumanReadableText.class), any(StatusResponse.ResponseCode.class))).thenReturn(okResponse);
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 736a0f3..0fca17c 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
@@ -117,7 +117,7 @@ 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 UidValidity UID_VALIDITY = UidValidity.of(1024);
+ private static final UidValidity UID_VALIDITY = UidValidity.ofValid(1024);
private static final Mailbox DEFAULT_MAILBOX = new Mailbox(MAILBOX_PATH, UID_VALIDITY, MAILBOX_ID);
private static final MailboxListener.Added ADDED = EventFactory.added()
.randomEventId()
diff --git a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index 21c33c7..945e33e 100644
--- a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -48,7 +48,7 @@ import org.junit.jupiter.api.Test;
public class MailboxManagementTest {
public static final Username USER = Username.of("user");
- public static final UidValidity UID_VALIDITY = UidValidity.of(10);
+ public static final UidValidity UID_VALIDITY = UidValidity.ofValid(10);
public static final int LIMIT = 1;
private MailboxManagerManagement mailboxManagerManagement;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org