JAMES-2107 fix assertj deprecations
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3bd12ae6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3bd12ae6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3bd12ae6 Branch: refs/heads/master Commit: 3bd12ae60cc5c5d11bf34f2f93409fb2667582e6 Parents: a1b4ac9 Author: Matthieu Baechler <matth...@apache.org> Authored: Wed Aug 16 15:34:04 2017 +0200 Committer: Matthieu Baechler <matth...@apache.org> Committed: Thu Aug 17 13:27:12 2017 +0200 ---------------------------------------------------------------------- .../mailbox/store/AbstractMailboxManagerAttachmentTest.java | 6 +++--- .../james/mailbox/store/mail/model/impl/MessageParserTest.java | 2 +- .../apache/james/core/MimeMessageInputStreamSourceTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3bd12ae6/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java index 4c809fc..899e6f1 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java @@ -131,7 +131,7 @@ public abstract class AbstractMailboxManagerAttachmentTest { List<MessageAttachment> attachments = messages.next().getAttachments(); assertThat(attachments).hasSize(1); assertThat(attachmentMapper.getAttachment(attachments.get(0).getAttachmentId()).getStream()) - .hasContentEqualTo(ClassLoader.getSystemResourceAsStream("eml/gimp.png")); + .hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/gimp.png")); } @Test @@ -154,9 +154,9 @@ public abstract class AbstractMailboxManagerAttachmentTest { List<MessageAttachment> attachments = messages.next().getAttachments(); assertThat(attachments).hasSize(2); assertThat(attachmentMapper.getAttachment(attachments.get(0).getAttachmentId()).getStream()) - .hasContentEqualTo(ClassLoader.getSystemResourceAsStream("eml/4037_014.jpg")); + .hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/4037_014.jpg")); assertThat(attachmentMapper.getAttachment(attachments.get(1).getAttachmentId()).getStream()) - .hasContentEqualTo(ClassLoader.getSystemResourceAsStream("eml/4037_015.jpg")); + .hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/4037_015.jpg")); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3bd12ae6/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java index ceb3df9..cc2b8ce 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java @@ -138,7 +138,7 @@ public class MessageParserTest { List<MessageAttachment> attachments = testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml")); Attachment attachment = attachments.get(0).getAttachment(); - assertThat(attachment.getStream()).hasContentEqualTo(ClassLoader.getSystemResourceAsStream("eml/gimp.png")); + assertThat(attachment.getStream()).hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/gimp.png")); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3bd12ae6/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java index a6f18cb..c62f107 100644 --- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java +++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java @@ -42,13 +42,13 @@ public class MimeMessageInputStreamSourceTest { @Test public void streamWith1MBytesShouldBeReadable() throws MessagingException, IOException { testee = new MimeMessageInputStreamSource("myKey", new ZeroedInputStream(_1M)); - assertThat(testee.getInputStream()).hasContentEqualTo(new ZeroedInputStream(_1M)); + assertThat(testee.getInputStream()).hasSameContentAs(new ZeroedInputStream(_1M)); } @Test public void streamWith10KBytesShouldBeReadable() throws MessagingException, IOException { testee = new MimeMessageInputStreamSource("myKey", new ZeroedInputStream(_10KB)); - assertThat(testee.getInputStream()).hasContentEqualTo(new ZeroedInputStream(_10KB)); + assertThat(testee.getInputStream()).hasSameContentAs(new ZeroedInputStream(_10KB)); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
