JAMES-1757 Explicit reference to the UTF-8 charset when checking Messages to JSON conversion
Before, it was platform dependant. Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2c860c68 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2c860c68 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2c860c68 Branch: refs/heads/master Commit: 2c860c684ef3ae7691a7085bb9a79bdc55fc23d3 Parents: 98c6090 Author: Benoit Tellier <[email protected]> Authored: Mon Jun 13 16:19:09 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Tue Jun 14 15:44:52 2016 +0700 ---------------------------------------------------------------------- .../json/MailboxMessageToElasticSearchJsonTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/2c860c68/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java index dbfe8c4..c6f12e2 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java @@ -24,6 +24,7 @@ import static net.javacrumbs.jsonunit.core.Option.IGNORING_VALUES; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import java.io.IOException; +import java.nio.charset.Charset; import java.time.ZoneId; import java.util.Date; @@ -41,6 +42,7 @@ import org.apache.james.mailbox.tika.extractor.TikaTextExtractor; import org.junit.Before; import org.junit.Test; +import com.google.common.base.Charsets; import com.google.common.base.Throwables; public class MailboxMessageToElasticSearchJsonTest { @@ -50,6 +52,7 @@ public class MailboxMessageToElasticSearchJsonTest { public static final TestId MAILBOX_ID = TestId.of(18L); public static final long MOD_SEQ = 42L; public static final long UID = 25L; + public static final Charset CHARSET = Charsets.UTF_8; private Date date; private PropertyBuilder propertyBuilder; @@ -80,7 +83,7 @@ public class MailboxMessageToElasticSearchJsonTest { spamMail.setModSeq(MOD_SEQ); assertThatJson(messageToElasticSearchJson.convertToJson(spamMail)) .when(IGNORING_ARRAY_ORDER) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("documents/spamMail.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("documents/spamMail.json"), CHARSET)); } @Test @@ -242,7 +245,7 @@ public class MailboxMessageToElasticSearchJsonTest { spamMail.setModSeq(MOD_SEQ); assertThatJson(messageToElasticSearchJson.convertToJson(spamMail)) .when(IGNORING_ARRAY_ORDER) - .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("documents/nonTextual.json"))); + .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("documents/nonTextual.json"), CHARSET)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
