JAMES-1862 Use assertj in StartTls tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/eece4acb Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/eece4acb Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/eece4acb Branch: refs/heads/master Commit: eece4acb83ee3a48f3844f321aefd8686c5b611a Parents: 5ca0f7b Author: Antoine Duprat <adup...@apache.org> Authored: Wed Nov 30 10:33:00 2016 +0100 Committer: Antoine Duprat <adup...@apache.org> Committed: Thu Dec 1 14:17:03 2016 +0100 ---------------------------------------------------------------------- protocols/smtp/pom.xml | 27 ++++++++++++-------- .../smtp/netty/NettyStartTlsSMTPServerTest.java | 24 +++++++---------- 2 files changed, 25 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/eece4acb/protocols/smtp/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml index c028f35..7adc77b 100644 --- a/protocols/smtp/pom.xml +++ b/protocols/smtp/pom.xml @@ -39,17 +39,6 @@ <artifactId>protocols-api</artifactId> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.james.protocols</groupId> <artifactId>protocols-api</artifactId> <scope>test</scope> @@ -61,6 +50,16 @@ <scope>test</scope> </dependency> <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -70,6 +69,12 @@ <artifactId>mail</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj-1.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/eece4acb/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java index 41f3b9c..c9dda94 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java @@ -18,8 +18,7 @@ ****************************************************************/ package org.apache.james.protocols.smtp.netty; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import java.net.InetSocketAddress; import java.net.Socket; @@ -88,10 +87,10 @@ public class NettyStartTlsSMTPServerTest { SMTPSClient client = createClient(); client.connect(address.getAddress().getHostAddress(), address.getPort()); - assertTrue(SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isTrue(); client.sendCommand("EHLO localhost"); - assertTrue(SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isTrue(); boolean startTLSAnnounced = false; for (String reply: client.getReplyStrings()) { @@ -100,16 +99,15 @@ public class NettyStartTlsSMTPServerTest { break; } } - assertTrue(startTLSAnnounced); - - assertTrue(client.execTLS()); + assertThat(startTLSAnnounced).isTrue(); + assertThat(client.execTLS()).isTrue(); client.quit(); - assertTrue("Reply="+ client.getReplyString(), SMTPReply.isPositiveCompletion(client.getReplyCode())); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())) + .as("Reply="+ client.getReplyString()) + .isTrue(); client.disconnect(); - - } finally { if (server != null) { server.unbind(); @@ -156,11 +154,7 @@ public class NettyStartTlsSMTPServerTest { transport.connect(new Socket(address.getHostName(), address.getPort())); transport.sendMessage(message, rcpts); - - assertEquals(1, hook.getQueued().size()); - - - + assertThat(hook.getQueued()).hasSize(1); } finally { if (server != null) { server.unbind(); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
