commit 255b23735e09ce6b39b7a74daa5873631ba004b2
author Rene Cordier <rcordier@linagora.com> Mon Dec 09 11:20:19 2019 +0700
committer Benoit Tellier <btellier@linagora.com> Wed Dec 11 11:49:49 2019 +0700
tree ba514b3399f154cdeba937f67bdebd3f80080229
parent fb8d3646e67b72c5f7ab219feecafcc0463c17f1

[Refactoring] Move SearchQueryTest to JUnit 5

mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/SearchQueryTest.java

diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/SearchQueryTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/SearchQueryTest.java
index 5d64c0c..e5502fd 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/SearchQueryTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/query/SearchQueryTest.java
@@ -19,59 +19,50 @@
 
 package org.apache.james.mailbox.elasticsearch.query;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 import java.util.Date;
 
 import org.apache.james.mailbox.model.SearchQuery;
 import org.apache.james.mailbox.model.SearchQuery.DateResolution;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
-public class SearchQueryTest {
-
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
+class SearchQueryTest {
 
     @Test
-    public void sentDateOnShouldThrowOnNullDate() {
-        expectedException.expect(NullPointerException.class);
-
-        SearchQuery.sentDateOn(null, DateResolution.Day);
+    void sentDateOnShouldThrowOnNullDate() {
+        assertThatThrownBy(() -> SearchQuery.sentDateOn(null, DateResolution.Day))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
-    public void sentDateOnShouldThrowOnNullResolution() {
-        expectedException.expect(NullPointerException.class);
-
-        SearchQuery.sentDateOn(new Date(), null);
+    void sentDateOnShouldThrowOnNullResolution() {
+        assertThatThrownBy(() -> SearchQuery.sentDateOn(new Date(), null))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
-    public void sentDateAfterShouldThrowOnNullDate() {
-        expectedException.expect(NullPointerException.class);
-
-        SearchQuery.sentDateAfter(null, DateResolution.Day);
+    void sentDateAfterShouldThrowOnNullDate() {
+        assertThatThrownBy(() -> SearchQuery.sentDateAfter(null, DateResolution.Day))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
-    public void sentDateAfterShouldThrowOnNullResolution() {
-        expectedException.expect(NullPointerException.class);
-
-        SearchQuery.sentDateAfter(new Date(), null);
+    void sentDateAfterShouldThrowOnNullResolution() {
+        assertThatThrownBy(() -> SearchQuery.sentDateAfter(new Date(), null))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
-    public void sentDateBeforeShouldThrowOnNullDate() {
-        expectedException.expect(NullPointerException.class);
-
-        SearchQuery.sentDateBefore(null, DateResolution.Day);
+    void sentDateBeforeShouldThrowOnNullDate() {
+        assertThatThrownBy(() -> SearchQuery.sentDateBefore(null, DateResolution.Day))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
-    public void sentDateBeforeShouldThrowOnNullResolution() {
-        expectedException.expect(NullPointerException.class);
-
-        SearchQuery.sentDateOn(new Date(), null);
+    void sentDateBeforeShouldThrowOnNullResolution() {
+        assertThatThrownBy(() -> SearchQuery.sentDateOn(new Date(), null))
+            .isInstanceOf(NullPointerException.class);
     }
 
 }