aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-16 19:54:57 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-16 19:54:57 +0200
commit6624d1f8304a07ac43e7f22a138262bba9782758 (patch)
tree6e37299002a48c0264cfd6b19a19249b2790dfd8 /OpenKeychain/src/test
parentece06b1933c26688d2eb6b7fa8657acbb8833728 (diff)
downloadopen-keychain-6624d1f8304a07ac43e7f22a138262bba9782758.tar.gz
open-keychain-6624d1f8304a07ac43e7f22a138262bba9782758.tar.bz2
open-keychain-6624d1f8304a07ac43e7f22a138262bba9782758.zip
mime: respect charset header (default to utf-8)
Diffstat (limited to 'OpenKeychain/src/test')
-rw-r--r--OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
index 727464429..cc5ef8038 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
@@ -792,9 +792,9 @@ public class PgpEncryptDecryptTest {
Assert.assertArrayEquals("decrypted ciphertext should equal plaintext bytes",
out.toByteArray(), plaindata);
Assert.assertEquals("charset should be read correctly",
- "iso-2022-jp", result.getCharset());
+ "iso-2022-jp", result.getDecryptionMetadata().getCharset());
Assert.assertEquals("decrypted ciphertext should equal plaintext",
- new String(out.toByteArray(), result.getCharset()), plaintext);
+ new String(out.toByteArray(), result.getDecryptionMetadata().getCharset()), plaintext);
Assert.assertEquals("decryptionResult should be RESULT_ENCRYPTED",
OpenPgpDecryptionResult.RESULT_ENCRYPTED, result.getDecryptionResult().getResult());
Assert.assertEquals("signatureResult should be RESULT_NO_SIGNATURE",