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/05/28 01:06:12 UTC
[02/13] james-project git commit: JAMES-2403 Extract and move
QuotaFixture to mailbox-api
JAMES-2403 Extract and move QuotaFixture to mailbox-api
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0257046e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0257046e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0257046e
Branch: refs/heads/master
Commit: 0257046e8d1e2b3c16d7d5b64933a33069a0013f
Parents: 74b6d80
Author: benwa <bt...@linagora.com>
Authored: Thu May 24 09:15:59 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Mon May 28 08:04:11 2018 +0700
----------------------------------------------------------------------
.../james/mailbox/quota/QuotaFixture.java | 108 +++++++++++++++++++
.../QuotaThresholdConfigurationChangesTest.java | 4 +-
.../QuotaThresholdMailingIntegrationTest.java | 4 +-
.../subscribers/QuotaThresholdNoticeTest.java | 4 +-
.../quota/model/QuotaThresholdFixture.java | 88 ---------------
.../mailbox/quota/model/QuotaThresholdTest.java | 2 +-
.../quota/model/QuotaThresholdsTest.java | 2 +-
7 files changed, 116 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0257046e/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaFixture.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaFixture.java b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaFixture.java
new file mode 100644
index 0000000..740f8c4
--- /dev/null
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/quota/QuotaFixture.java
@@ -0,0 +1,108 @@
+/****************************************************************
+ * 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.mailbox.quota;
+
+import org.apache.james.mailbox.model.Quota;
+
+public interface QuotaFixture {
+ interface Counts {
+ Quota<QuotaCount> _32_PERCENT = Quota.<QuotaCount>builder()
+ .used(QuotaCount.count(32))
+ .computedLimit(QuotaCount.count(100))
+ .build();
+
+ Quota<QuotaCount> _40_PERCENT = Quota.<QuotaCount>builder()
+ .used(QuotaCount.count(40))
+ .computedLimit(QuotaCount.count(100))
+ .build();
+
+ Quota<QuotaCount> _52_PERCENT = Quota.<QuotaCount>builder()
+ .used(QuotaCount.count(52))
+ .computedLimit(QuotaCount.count(100))
+ .build();
+
+ Quota<QuotaCount> _72_PERCENT = Quota.<QuotaCount>builder()
+ .used(QuotaCount.count(72))
+ .computedLimit(QuotaCount.count(100))
+ .build();
+
+ Quota<QuotaCount> _82_PERCENT = Quota.<QuotaCount>builder()
+ .used(QuotaCount.count(82))
+ .computedLimit(QuotaCount.count(100))
+ .build();
+
+ Quota<QuotaCount> _85_PERCENT = Quota.<QuotaCount>builder()
+ .used(QuotaCount.count(85))
+ .computedLimit(QuotaCount.count(100))
+ .build();
+
+ Quota<QuotaCount> _92_PERCENT = Quota.<QuotaCount>builder()
+ .used(QuotaCount.count(92))
+ .computedLimit(QuotaCount.count(100))
+ .build();
+
+ Quota<QuotaCount> _UNLIMITED = Quota.<QuotaCount>builder()
+ .used(QuotaCount.count(92))
+ .computedLimit(QuotaCount.unlimited())
+ .build();
+ }
+
+ interface Sizes {
+ Quota<QuotaSize> _30_PERCENT = Quota.<QuotaSize>builder()
+ .used(QuotaSize.size(30))
+ .computedLimit(QuotaSize.size(100))
+ .build();
+ Quota<QuotaSize> _42_PERCENT = Quota.<QuotaSize>builder()
+ .used(QuotaSize.size(42))
+ .computedLimit(QuotaSize.size(100))
+ .build();
+
+ Quota<QuotaSize> _55_PERCENT = Quota.<QuotaSize>builder()
+ .used(QuotaSize.size(55))
+ .computedLimit(QuotaSize.size(100))
+ .build();
+
+ Quota<QuotaSize> _60_PERCENT = Quota.<QuotaSize>builder()
+ .used(QuotaSize.size(60))
+ .computedLimit(QuotaSize.size(100))
+ .build();
+
+ Quota<QuotaSize> _75_PERCENT = Quota.<QuotaSize>builder()
+ .used(QuotaSize.size(75))
+ .computedLimit(QuotaSize.size(100))
+ .build();
+
+ Quota<QuotaSize> _82_PERCENT = Quota.<QuotaSize>builder()
+ .used(QuotaSize.size(82))
+ .computedLimit(QuotaSize.size(100))
+ .build();
+
+ Quota<QuotaSize> _92_PERCENT = Quota.<QuotaSize>builder()
+ .used(QuotaSize.size(92))
+ .computedLimit(QuotaSize.size(100))
+ .build();
+
+ Quota<QuotaSize> _992_PERTHOUSAND = Quota.<QuotaSize>builder()
+ .used(QuotaSize.size(992))
+ .computedLimit(QuotaSize.size(1000))
+ .build();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0257046e/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdConfigurationChangesTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdConfigurationChangesTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdConfigurationChangesTest.java
index 166d86c..4876b3a 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdConfigurationChangesTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdConfigurationChangesTest.java
@@ -30,9 +30,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.mailbox.MailboxListener.QuotaUsageUpdatedEvent;
+import org.apache.james.mailbox.quota.QuotaFixture.Counts;
+import org.apache.james.mailbox.quota.QuotaFixture.Sizes;
import org.apache.james.mailbox.quota.mailing.QuotaMailingListenerConfiguration;
-import org.apache.james.mailbox.quota.model.QuotaThresholdFixture.Quotas.Counts;
-import org.apache.james.mailbox.quota.model.QuotaThresholdFixture.Quotas.Sizes;
import org.apache.mailet.base.test.FakeMailContext;
import org.junit.jupiter.api.Test;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0257046e/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java
index 362246f..2dbc69b 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdMailingIntegrationTest.java
@@ -39,9 +39,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.mailbox.MailboxListener.QuotaUsageUpdatedEvent;
+import org.apache.james.mailbox.quota.QuotaFixture.Counts;
+import org.apache.james.mailbox.quota.QuotaFixture.Sizes;
import org.apache.james.mailbox.quota.mailing.QuotaMailingListenerConfiguration;
-import org.apache.james.mailbox.quota.model.QuotaThresholdFixture.Quotas.Counts;
-import org.apache.james.mailbox.quota.model.QuotaThresholdFixture.Quotas.Sizes;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
import org.apache.mailet.base.test.FakeMailContext;
import org.junit.jupiter.api.Test;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0257046e/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java
index 071c063..576ae0a 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java
@@ -32,13 +32,13 @@ import java.util.Optional;
import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.mailbox.model.Quota;
import org.apache.james.mailbox.quota.QuotaCount;
+import org.apache.james.mailbox.quota.QuotaFixture.Counts;
+import org.apache.james.mailbox.quota.QuotaFixture.Sizes;
import org.apache.james.mailbox.quota.QuotaSize;
import org.apache.james.mailbox.quota.mailing.QuotaMailingListenerConfiguration;
import org.apache.james.mailbox.quota.mailing.QuotaMailingListenerConfiguration.RenderingInformation;
import org.apache.james.mailbox.quota.model.HistoryEvolution;
import org.apache.james.mailbox.quota.model.QuotaThresholdChange;
-import org.apache.james.mailbox.quota.model.QuotaThresholdFixture.Quotas.Counts;
-import org.apache.james.mailbox.quota.model.QuotaThresholdFixture.Quotas.Sizes;
import org.apache.james.server.core.JamesServerResourceLoader;
import org.apache.james.server.core.filesystem.FileSystemImpl;
import org.assertj.core.api.SoftAssertions;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0257046e/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdFixture.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdFixture.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdFixture.java
index 9adac91..d5ed137 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdFixture.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdFixture.java
@@ -24,10 +24,7 @@ import java.time.Instant;
import java.util.Optional;
import org.apache.james.mailbox.mock.MockMailboxSession;
-import org.apache.james.mailbox.model.Quota;
import org.apache.james.mailbox.model.QuotaRoot;
-import org.apache.james.mailbox.quota.QuotaCount;
-import org.apache.james.mailbox.quota.QuotaSize;
import org.apache.james.mailbox.quota.mailing.QuotaMailingListenerConfiguration;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.test.FakeMailContext;
@@ -41,91 +38,6 @@ public interface QuotaThresholdFixture {
QuotaThreshold _95 = new QuotaThreshold(0.95);
QuotaThreshold _99 = new QuotaThreshold(0.99);
- interface Quotas {
- interface Counts {
- Quota<QuotaCount> _32_PERCENT = Quota.<QuotaCount>builder()
- .used(QuotaCount.count(32))
- .computedLimit(QuotaCount.count(100))
- .build();
-
- Quota<QuotaCount> _40_PERCENT = Quota.<QuotaCount>builder()
- .used(QuotaCount.count(40))
- .computedLimit(QuotaCount.count(100))
- .build();
-
- Quota<QuotaCount> _52_PERCENT = Quota.<QuotaCount>builder()
- .used(QuotaCount.count(52))
- .computedLimit(QuotaCount.count(100))
- .build();
-
- Quota<QuotaCount> _72_PERCENT = Quota.<QuotaCount>builder()
- .used(QuotaCount.count(72))
- .computedLimit(QuotaCount.count(100))
- .build();
-
- Quota<QuotaCount> _82_PERCENT = Quota.<QuotaCount>builder()
- .used(QuotaCount.count(82))
- .computedLimit(QuotaCount.count(100))
- .build();
-
- Quota<QuotaCount> _85_PERCENT = Quota.<QuotaCount>builder()
- .used(QuotaCount.count(85))
- .computedLimit(QuotaCount.count(100))
- .build();
-
- Quota<QuotaCount> _92_PERCENT = Quota.<QuotaCount>builder()
- .used(QuotaCount.count(92))
- .computedLimit(QuotaCount.count(100))
- .build();
-
- Quota<QuotaCount> _UNLIMITED = Quota.<QuotaCount>builder()
- .used(QuotaCount.count(92))
- .computedLimit(QuotaCount.unlimited())
- .build();
- }
-
- interface Sizes {
- Quota<QuotaSize> _30_PERCENT = Quota.<QuotaSize>builder()
- .used(QuotaSize.size(30))
- .computedLimit(QuotaSize.size(100))
- .build();
- Quota<QuotaSize> _42_PERCENT = Quota.<QuotaSize>builder()
- .used(QuotaSize.size(42))
- .computedLimit(QuotaSize.size(100))
- .build();
-
- Quota<QuotaSize> _55_PERCENT = Quota.<QuotaSize>builder()
- .used(QuotaSize.size(55))
- .computedLimit(QuotaSize.size(100))
- .build();
-
- Quota<QuotaSize> _60_PERCENT = Quota.<QuotaSize>builder()
- .used(QuotaSize.size(60))
- .computedLimit(QuotaSize.size(100))
- .build();
-
- Quota<QuotaSize> _75_PERCENT = Quota.<QuotaSize>builder()
- .used(QuotaSize.size(75))
- .computedLimit(QuotaSize.size(100))
- .build();
-
- Quota<QuotaSize> _82_PERCENT = Quota.<QuotaSize>builder()
- .used(QuotaSize.size(82))
- .computedLimit(QuotaSize.size(100))
- .build();
-
- Quota<QuotaSize> _92_PERCENT = Quota.<QuotaSize>builder()
- .used(QuotaSize.size(92))
- .computedLimit(QuotaSize.size(100))
- .build();
-
- Quota<QuotaSize> _992_PERTHOUSAND = Quota.<QuotaSize>builder()
- .used(QuotaSize.size(992))
- .computedLimit(QuotaSize.size(1000))
- .build();
- }
- }
-
interface TestConstants {
Duration GRACE_PERIOD = Duration.ofDays(1);
QuotaMailingListenerConfiguration DEFAULT_CONFIGURATION = QuotaMailingListenerConfiguration.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/0257046e/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java
index f46eb38..ca2f5b0 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java
@@ -27,8 +27,8 @@ import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.james.mailbox.model.Quota;
+import org.apache.james.mailbox.quota.QuotaFixture.Sizes;
import org.apache.james.mailbox.quota.QuotaSize;
-import org.apache.james.mailbox.quota.model.QuotaThresholdFixture.Quotas.Sizes;
import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0257046e/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java
index b959c1d..b871296 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java
@@ -26,8 +26,8 @@ import static org.apache.james.mailbox.quota.model.QuotaThresholdFixture._99;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.model.Quota;
+import org.apache.james.mailbox.quota.QuotaFixture.Sizes;
import org.apache.james.mailbox.quota.QuotaSize;
-import org.apache.james.mailbox.quota.model.QuotaThresholdFixture.Quotas.Sizes;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org