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/30 02:24:22 UTC

[11/14] james-project git commit: JAMES-2404 Re-enable some skept assertions

JAMES-2404 Re-enable some skept assertions


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9a6fdbe3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9a6fdbe3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9a6fdbe3

Branch: refs/heads/master
Commit: 9a6fdbe3d68da82665b5bb9d3a1c753f021aa7e3
Parents: 33e94d6
Author: benwa <bt...@linagora.com>
Authored: Tue May 29 09:36:20 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Tue May 29 15:32:53 2018 +0200

----------------------------------------------------------------------
 .../webadmin/routes/GlobalQuotaRoutesTest.java      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/9a6fdbe3/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
index fd81fcf..d2cf81f 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
@@ -163,7 +163,7 @@ class GlobalQuotaRoutesTest {
     }
 
     @Test
-    public void deleteCountShouldSetQuotaToUnlimited() throws Exception {
+    public void deleteCountShouldSetQuotaToUnlimited() {
         maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(42));
 
         when()
@@ -270,7 +270,7 @@ class GlobalQuotaRoutesTest {
     }
 
     @Test
-    public void deleteSizeShouldSetQuotaToUnlimited() throws Exception {
+    public void deleteSizeShouldSetQuotaToUnlimited() {
         maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(42));
 
         when()
@@ -321,7 +321,7 @@ class GlobalQuotaRoutesTest {
     }
 
     @Test
-    public void getQuotaShouldReturnOnlySizeWhenNoCount() throws Exception {
+    public void getQuotaShouldReturnOnlySizeWhenNoCount() {
         maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(42));
 
         JsonPath jsonPath =
@@ -372,6 +372,7 @@ class GlobalQuotaRoutesTest {
         SoftAssertions softly = new SoftAssertions();
         softly.assertThat(maxQuotaManager.getGlobalMaxMessage()).contains(QuotaCount.count(52));
         softly.assertThat(maxQuotaManager.getGlobalMaxStorage()).contains(QuotaSize.size(42));
+        softly.assertAll();
     }
 
     @Test
@@ -386,10 +387,11 @@ class GlobalQuotaRoutesTest {
         SoftAssertions softly = new SoftAssertions();
         softly.assertThat(maxQuotaManager.getGlobalMaxMessage()).contains(QuotaCount.unlimited());
         softly.assertThat(maxQuotaManager.getGlobalMaxStorage()).contains(QuotaSize.unlimited());
+        softly.assertAll();
     }
 
     @Test
-    public void putQuotaShouldUnsetCountWhenNull() throws Exception {
+    public void putQuotaShouldUnsetCountWhenNull() {
         maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(42));
         given()
             .body("{\"count\":null,\"size\":43}")
@@ -402,7 +404,7 @@ class GlobalQuotaRoutesTest {
     }
 
     @Test
-    public void putQuotaShouldUnsetSizeWhenNull() throws Exception {
+    public void putQuotaShouldUnsetSizeWhenNull() {
         maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(44));
         given()
             .body("{\"count\":45,\"size\":null}")
@@ -415,7 +417,7 @@ class GlobalQuotaRoutesTest {
     }
 
     @Test
-    public void putQuotaShouldUnsetCountWhenAbsent() throws Exception {
+    public void putQuotaShouldUnsetCountWhenAbsent() {
         maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(42));
         given()
             .body("{\"size\":43}")
@@ -428,7 +430,7 @@ class GlobalQuotaRoutesTest {
     }
 
     @Test
-    public void putQuotaShouldUnsetSizeWhenAbsent() throws Exception {
+    public void putQuotaShouldUnsetSizeWhenAbsent() {
         maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(44));
         given()
             .body("{\"count\":45}")


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org