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 2019/01/15 03:21:48 UTC
[13/30] james-project git commit: JAMES-2641 Fix
QuotaMessageManagerTest
JAMES-2641 Fix QuotaMessageManagerTest
The QuotaUpdater was registered 2 times
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f7f7f73c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f7f7f73c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f7f7f73c
Branch: refs/heads/master
Commit: f7f7f73c6fbf22e596ad961ad02af50613110dbd
Parents: 69487bd
Author: Benoit Tellier <bt...@linagora.com>
Authored: Tue Jan 8 17:18:31 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Jan 15 10:10:04 2019 +0700
----------------------------------------------------------------------
.../james/mailbox/manager/QuotaMessageManagerTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f7f7f73c/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java
index cea2c5d..f110fcc 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java
@@ -103,14 +103,14 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
} catch (OverQuotaException overQuotaException) {
// Silent these exception as we don't want it to disturb the test
}
- QuotaCount maxMessageCount = QuotaCount.count(20L);
+ QuotaCount maxMessageCount = QuotaCount.count(15L);
maxQuotaManager.setMaxMessage(quotaRootResolver.getQuotaRoot(inbox), maxMessageCount);
mailboxManager.copyMessages(MessageRange.all(), inbox, subFolder, session);
}
@Test(expected = OverQuotaException.class)
public void testCopyOverQuotaSize() throws Exception {
- QuotaSize maxQuotaSize = QuotaSize.size(20L * MockMail.MAIL_TEXT_PLAIN.length());
+ QuotaSize maxQuotaSize = QuotaSize.size(15L * MockMail.MAIL_TEXT_PLAIN.length());
maxQuotaManager.setMaxStorage(quotaRootResolver.getQuotaRoot(inbox), maxQuotaSize);
try {
resources.fillMailbox();
@@ -122,7 +122,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
@Test
public void testRetrievalOverMaxMessage() throws Exception {
- QuotaCount maxMessageCount = QuotaCount.count(8L);
+ QuotaCount maxMessageCount = QuotaCount.count(15L);
maxQuotaManager.setMaxMessage(quotaRootResolver.getQuotaRoot(inbox), maxMessageCount);
try {
resources.fillMailbox();
@@ -136,7 +136,7 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
@Test
public void testRetrievalOverMaxStorage() throws Exception {
- QuotaSize maxQuotaSize = QuotaSize.size(8 * MockMail.MAIL_TEXT_PLAIN.length() + 1);
+ QuotaSize maxQuotaSize = QuotaSize.size(15 * MockMail.MAIL_TEXT_PLAIN.getBytes(StandardCharsets.UTF_8).length + 1);
maxQuotaManager.setMaxStorage(quotaRootResolver.getQuotaRoot(inbox), maxQuotaSize);
try {
resources.fillMailbox();
@@ -180,8 +180,8 @@ public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
Quota<QuotaCount> messageQuota = resources.getQuotaManager().getMessageQuota(quotaRoot);
Quota<QuotaSize> storageQuota = resources.getQuotaManager().getStorageQuota(quotaRoot);
SoftAssertions.assertSoftly(softly -> {
- softly.assertThat(messageQuota.getUsed()).isEqualTo(QuotaCount.count(32));
- softly.assertThat(storageQuota.getUsed()).isEqualTo(QuotaSize.size(7904));
+ softly.assertThat(messageQuota.getUsed()).isEqualTo(QuotaCount.count(16));
+ softly.assertThat(storageQuota.getUsed()).isEqualTo(QuotaSize.size(16 * 247));
});
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org