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 ma...@apache.org on 2018/04/25 08:55:22 UTC

[03/24] james-project git commit: JAMES-2381 Migrate ValidRcptHandlerTest to assertJ

JAMES-2381 Migrate ValidRcptHandlerTest to assertJ


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

Branch: refs/heads/master
Commit: 33d4231aea8db8aa57cecd6d1ca19a25d7f5513a
Parents: 54d188f
Author: benwa <bt...@linagora.com>
Authored: Fri Apr 20 10:56:22 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Tue Apr 24 15:28:38 2018 +0200

----------------------------------------------------------------------
 .../james/smtpserver/ValidRcptHandlerTest.java       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/33d4231a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
index 87c9271..83f4fd0 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
@@ -18,8 +18,7 @@
  ****************************************************************/
 package org.apache.james.smtpserver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 import java.io.ByteArrayInputStream;
@@ -127,7 +126,7 @@ public class ValidRcptHandlerTest {
 
         int rCode = handler.doRcpt(session, null, mailAddress).getResult();
 
-        assertEquals("Rejected", rCode, HookReturnCode.DENY);
+        assertThat(rCode).isEqualTo(HookReturnCode.DENY);
     }
 
     @Test
@@ -137,7 +136,7 @@ public class ValidRcptHandlerTest {
 
         int rCode = handler.doRcpt(session, null, mailAddress).getResult();
 
-        assertEquals("Rejected", rCode, HookReturnCode.DENY);
+        assertThat(rCode).isEqualTo(HookReturnCode.DENY);
     }
 
     @Test
@@ -147,7 +146,7 @@ public class ValidRcptHandlerTest {
 
         int rCode = handler.doRcpt(session, null, mailAddress).getResult();
 
-        assertEquals("Not rejected", rCode, HookReturnCode.DECLINED);
+        assertThat(rCode).isEqualTo(HookReturnCode.DECLINED);
     }
 
     @Test
@@ -157,7 +156,7 @@ public class ValidRcptHandlerTest {
 
         int rCode = handler.doRcpt(session, null, mailAddress).getResult();
 
-        assertEquals("Not rejected", rCode, HookReturnCode.DECLINED);
+        assertThat(rCode).isEqualTo(HookReturnCode.DECLINED);
     }
 
     @Test
@@ -167,8 +166,8 @@ public class ValidRcptHandlerTest {
 
         int rCode = handler.doRcpt(session, null, mailAddress).getResult();
 
-        assertNull("Valid Error mapping", session.getAttachment("VALID_USER", State.Transaction));
-        assertEquals("Error mapping", rCode, HookReturnCode.DENY);
+        assertThat(session.getAttachment("VALID_USER", State.Transaction)).isNull();
+        assertThat(rCode).isEqualTo(HookReturnCode.DENY);
     }
     
 }


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