JAMES-2543 use assertj Fail.fail instead of junit Assert.fail
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a8d97954 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a8d97954 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a8d97954 Branch: refs/heads/master Commit: a8d97954046e5d540871ce333643fee35bed1435 Parents: c631837 Author: Matthieu Baechler <[email protected]> Authored: Thu May 31 21:44:32 2018 +0200 Committer: Matthieu Baechler <[email protected]> Committed: Mon Sep 10 21:25:25 2018 +0200 ---------------------------------------------------------------------- .../mailbox/store/PartContentBuilderComplexMultipartTest.java | 2 +- .../org/apache/james/imap/decode/FetchPartPathDecoderTest.java | 2 +- .../org/apache/james/imap/decode/main/IdRangeParseTest.java | 6 +++--- .../decode/parser/SearchCommandParserQuotedCharsetTest.java | 4 ++-- .../imap/decode/parser/SearchCommandParserSearchKeyTest.java | 2 +- .../apache/james/protocols/imap/utils/DecoderUtilsTest.java | 4 ++-- .../protocols/smtp/core/fastfail/SpamTrapHandlerTest.java | 2 +- .../james/server/core/MimeMessageCopyOnWriteProxyTest.java | 2 +- .../java/org/apache/james/server/core/MimeMessageTest.java | 4 +--- .../apache/james/domainlist/lib/AbstractDomainListTest.java | 2 +- .../james/user/memory/UsersRepositoryManagementTest.java | 2 +- .../apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java | 2 +- .../org/apache/james/karaf/features/KarafLiveTestSupport.java | 2 +- .../lib/AbstractStateCompositeProcessorTest.java | 2 +- .../test/java/org/apache/james/smtpserver/SMTPServerTest.java | 2 +- 15 files changed, 19 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java index eaf685c..12f3cdf 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java @@ -20,7 +20,7 @@ package org.apache.james.mailbox.store; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import java.io.ByteArrayInputStream; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java index 766f2a9..118516b 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java @@ -21,7 +21,7 @@ package org.apache.james.imap.decode; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import java.util.Collection; import java.util.Iterator; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java index cad8eda..2f35eb5 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java @@ -18,6 +18,7 @@ ****************************************************************/ package org.apache.james.imap.decode.main; +import static org.assertj.core.api.Fail.fail; import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; @@ -28,7 +29,6 @@ import org.apache.james.imap.api.message.IdRange; import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.decode.ImapRequestStreamLineReader; import org.apache.james.protocols.imap.DecodingException; -import org.junit.Assert; import org.junit.Test; public class IdRangeParseTest { @@ -60,7 +60,7 @@ public class IdRangeParseTest { try { ranges(rangeAsString(0, val1)); - Assert.fail(); + fail("Expecting DecodingException"); } catch (DecodingException e) { // number smaller then 1 should not work } @@ -68,7 +68,7 @@ public class IdRangeParseTest { try { ranges(rangeAsString(Long.MAX_VALUE, val1)); - Assert.fail(); + fail("Expecting DecodingException"); } catch (DecodingException e) { // number smaller then 1 should not work } http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java index c3a8da3..17b1e91 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java @@ -19,8 +19,8 @@ package org.apache.james.imap.decode.parser; +import static org.assertj.core.api.Fail.fail; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; @@ -174,7 +174,7 @@ public class SearchCommandParserQuotedCharsetTest { } @Test - public void testBadCharset() throws Exception { + public void testBadCharset() throws Exception { ImapRequestLineReader reader = new ImapRequestStreamLineReader( new ByteArrayInputStream("CHARSET BOGUS ".getBytes("US-ASCII")), new ByteArrayOutputStream()); http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java index aed0a81..03ffdd8 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java @@ -19,8 +19,8 @@ package org.apache.james.imap.decode.parser; +import static org.assertj.core.api.Fail.fail; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java b/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java index 935fd34..3f67f57 100644 --- a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java +++ b/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java @@ -20,8 +20,8 @@ package org.apache.james.protocols.imap.utils; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.fail; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import java.util.Calendar; import java.util.Date; @@ -47,7 +47,7 @@ public class DecoderUtilsTest { Flags flags = new Flags(); try { DecoderUtils.setFlag("\\Recent", flags); - fail(); + fail("DecodingException was expect"); } catch (DecodingException e) { // expected } http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java index 044d063..1eb76c8 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java @@ -20,7 +20,7 @@ package org.apache.james.protocols.smtp.core.fastfail; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import java.net.InetSocketAddress; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java index 63a28ad..b95ec07 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageCopyOnWriteProxyTest.java @@ -21,7 +21,7 @@ package org.apache.james.server.core; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java index 6488230..971c817 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java @@ -20,10 +20,8 @@ package org.apache.james.server.core; import static org.apache.mailet.base.RFC2822Headers.RETURN_PATH; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.fail; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java index 9884dcf..e54cc05 100644 --- a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java @@ -19,7 +19,7 @@ package org.apache.james.domainlist.lib; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import java.net.UnknownHostException; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java b/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java index ea4063f..ed93a8f 100644 --- a/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java +++ b/server/data/data-memory/src/test/java/org/apache/james/user/memory/UsersRepositoryManagementTest.java @@ -20,7 +20,7 @@ package org.apache.james.user.memory; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import java.util.Arrays; import java.util.List; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java b/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java index bd693e8..5464f2a 100644 --- a/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java +++ b/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java @@ -19,8 +19,8 @@ package org.apache.james.dnsservice.dnsjava; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.fail; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doAnswer; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java index 332e789..fcb02a4 100644 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java +++ b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java @@ -5,7 +5,7 @@ import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keep import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.CoreOptions.systemProperty; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java index 20b1119..0ea0021 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java @@ -19,7 +19,7 @@ package org.apache.james.mailetcontainer.lib; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import java.io.ByteArrayInputStream; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/james-project/blob/a8d97954/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java index 4f492a5..c12f0ce 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java @@ -19,7 +19,7 @@ package org.apache.james.smtpserver; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Fail.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
