[james-project] 25/30: JAMES-3179 Migrate MappingsImplTest to JUnit 5

[rouazana]

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

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

commit 781641160d50ff1474be29c13d856d0864eb65ae
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Wed May 13 10:52:14 2020 +0200

    JAMES-3179 Migrate MappingsImplTest to JUnit 5
---
 .../org/apache/james/rrt/lib/MappingsImplTest.java | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git 
a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
 
b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
index 41d428c..cd2cfe8 100644
--- 
a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
+++ 
b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
@@ -26,14 +26,15 @@ import static 
org.assertj.core.api.Assertions.assertThatThrownBy;
 import java.util.Optional;
 
 import org.apache.james.core.Domain;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 
 public class MappingsImplTest {
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void fromRawStringShouldThrowWhenNull() {
-        MappingsImpl.fromRawString(null);
+        assertThatThrownBy(() -> MappingsImpl.fromRawString(null))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
@@ -157,11 +158,11 @@ public class MappingsImplTest {
     }
 
     
-    @Test(expected = NullPointerException.class)
-    @SuppressWarnings("CheckReturnValue")
+    @Test
     public void containsShouldThrowWhenNull() {
         MappingsImpl mappings = 
MappingsImpl.builder().add(Mapping.regex("toto")).build();
-        mappings.contains((Mapping.Type)null);
+        assertThatThrownBy(() -> mappings.contains((Mapping.Type)null))
+            .isInstanceOf(NullPointerException.class);
     }
     
     @Test
@@ -190,11 +191,11 @@ public class MappingsImplTest {
     }
 
     
-    @Test(expected = NullPointerException.class)
-    @SuppressWarnings("CheckReturnValue")
+    @Test
     public void selectShouldThrowWhenNull() {
         MappingsImpl mappings = 
MappingsImpl.builder().add(Mapping.regex("toto")).build();
-        mappings.select((Mapping.Type)null);
+        assertThatThrownBy(() -> mappings.select((Mapping.Type)null))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
@@ -222,11 +223,11 @@ public class MappingsImplTest {
     }
 
     
-    @Test(expected = NullPointerException.class)
-    @SuppressWarnings("CheckReturnValue")
+    @Test
     public void excludeShouldThrowWhenNull() {
         MappingsImpl mappings = 
MappingsImpl.builder().add(Mapping.regex("toto")).build();
-        mappings.exclude((Mapping.Type)null);
+        assertThatThrownBy(() -> mappings.exclude((Mapping.Type)null))
+            .isInstanceOf(NullPointerException.class);
     }
 
     @Test
@@ -245,9 +246,10 @@ public class MappingsImplTest {
         assertThat(optional.isPresent()).isFalse();
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void unionShouldThrowWhenMappingsNull() {
-        MappingsImpl.empty().union(null);
+        assertThatThrownBy(() -> MappingsImpl.empty().union(null))
+            .isInstanceOf(IllegalStateException.class);
     }
 
     @Test


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