[james-project] 25/42: [Refactoring] Move CombinedComparatorTest to JUnit 5

[rc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 93216f21499cccff7671ad495704b9648e4c82b3
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Thu Dec 5 16:54:03 2019 +0700

    [Refactoring] Move CombinedComparatorTest to JUnit 5
---
 .../store/search/CombinedComparatorTest.java       | 48 ++++++++++------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java
index 2fecfbb..07f511f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java
@@ -20,6 +20,7 @@
 package org.apache.james.mailbox.store.search;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -37,99 +38,92 @@ import org.apache.james.mailbox.store.search.comparator.HeaderDisplayComparator;
 import org.apache.james.mailbox.store.search.comparator.HeaderMailboxComparator;
 import org.apache.james.mailbox.store.search.comparator.MessageComparators;
 import org.apache.james.mailbox.store.search.comparator.SentDateComparator;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.ImmutableList;
 
-public class CombinedComparatorTest {
-
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
+class CombinedComparatorTest {
 
     @Test
-    public void createShouldThrowOnNullListOfSort() {
-        expectedException.expect(NullPointerException.class);
-
-        CombinedComparator.create(null);
+    void createShouldThrowOnNullListOfSort() {
+        assertThatThrownBy(() -> CombinedComparator.create(null))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
-    public void createShouldThrowOnEmptySort() {
-        expectedException.expect(IllegalArgumentException.class);
-
-        CombinedComparator.create(ImmutableList.<SearchQuery.Sort>of());
+    void createShouldThrowOnEmptySort() {
+        assertThatThrownBy(() -> CombinedComparator.create(ImmutableList.<SearchQuery.Sort>of()))
+            .isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    public void createShouldConvertInternalDate() {
+    void createShouldConvertInternalDate() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.Arrival))).getComparators())
             .containsOnly(MessageComparators.INTERNAL_DATE_COMPARATOR);
     }
 
     @Test
-    public void createShouldConvertCc() {
+    void createShouldConvertCc() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.MailboxCc))).getComparators())
             .containsOnly(HeaderMailboxComparator.CC_COMPARATOR);
     }
 
     @Test
-    public void createShouldConvertFrom() {
+    void createShouldConvertFrom() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.MailboxFrom))).getComparators())
             .containsOnly(HeaderMailboxComparator.FROM_COMPARATOR);
     }
 
     @Test
-    public void createShouldConvertTo() {
+    void createShouldConvertTo() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.MailboxTo))).getComparators())
             .containsOnly(HeaderMailboxComparator.TO_COMPARATOR);
     }
 
     @Test
-    public void createShouldConvertSize() {
+    void createShouldConvertSize() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.Size))).getComparators())
             .containsOnly(MessageComparators.SIZE_COMPARATOR);
     }
 
     @Test
-    public void createShouldConvertBaseSubject() {
+    void createShouldConvertBaseSubject() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.BaseSubject))).getComparators())
             .containsOnly(BaseSubjectComparator.BASESUBJECT);
     }
 
     @Test
-    public void createShouldConvertUid() {
+    void createShouldConvertUid() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.Uid))).getComparators())
             .containsOnly(MessageComparators.UID_COMPARATOR);
     }
 
     @Test
-    public void createShouldConvertSentDate() {
+    void createShouldConvertSentDate() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.SentDate))).getComparators())
             .containsOnly(SentDateComparator.SENTDATE);
     }
 
     @Test
-    public void createShouldConvertDisplayTo() {
+    void createShouldConvertDisplayTo() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.DisplayTo))).getComparators())
             .containsOnly(HeaderDisplayComparator.TO_COMPARATOR);
     }
 
     @Test
-    public void createShouldConvertDisplayFrom() {
+    void createShouldConvertDisplayFrom() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.DisplayFrom))).getComparators())
             .containsOnly(HeaderDisplayComparator.FROM_COMPARATOR);
     }
 
     @Test
-    public void createShouldConvertId() {
+    void createShouldConvertId() {
         assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.Id))).getComparators())
             .containsOnly(MessageComparators.MESSAGE_ID_COMPARATOR);
     }
 
     @Test
-    public void createShouldReverse() {
+    void createShouldReverse() {
         MailboxMessage message1 = mock(MailboxMessage.class);
         when(message1.getUid()).thenReturn(MessageUid.of(1));
         MailboxMessage message2 = mock(MailboxMessage.class);


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