wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2076 from jca02266/master

Browse source 
Don't use default charset to pass the test
This commit is contained in:
cketti 2017-01-17 14:56:11 +01:00 committed by GitHub
commit fb1de9453a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
k9mail/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.java
View file

@ -34,6 +34,8 @@ import com.fsck.k9.mail.internet.MimeUtility;
import com.fsck.k9.mail.internet.TextBody; import com.fsck.k9.mail.internet.TextBody;
import com.fsck.k9.message.MessageBuilder.Callback; import com.fsck.k9.message.MessageBuilder.Callback;
import com.fsck.k9.view.RecipientSelectView.Recipient; import com.fsck.k9.view.RecipientSelectView.Recipient;
import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.util.MimeUtil; import org.apache.james.mime4j.util.MimeUtil;
import org.junit.Assert; import org.junit.Assert;
@ -526,7 +528,7 @@ public class PgpMessageBuilderTest {
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
InputStream inputStream = MimeUtility.decodeBody(signatureBodyPart.getBody()); InputStream inputStream = MimeUtility.decodeBody(signatureBodyPart.getBody());
IOUtils.copy(inputStream, bos); IOUtils.copy(inputStream, bos);
Assert.assertEquals(reason, expected, new String(bos.toByteArray())); Assert.assertEquals(reason, expected, new String(bos.toByteArray(), Charsets.UTF_8));
} catch (IOException | MessagingException e) { } catch (IOException | MessagingException e) {
Assert.fail(); Assert.fail();
} }