export: improve stream handling, performance

1 files changed, 16 insertions, 0 deletions

diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java
index 935ff4b93..4d4915e8d 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java
@@ -354,6 +354,22 @@ public class ExportTest {
                     "backup_" + KeyFormattingUtils.convertKeyIdToHex(mStaticRing1.getMasterKeyId()) + ".pub.asc",
                     result.getDecryptionMetadata().getFilename());
 
+            TestingUtils.assertArrayEqualsPrefix("exported data must start with ascii armor header",
+                    "-----BEGIN PGP PUBLIC KEY BLOCK-----\n".getBytes(), result.getOutputBytes());
+            TestingUtils.assertArrayEqualsSuffix("exported data must end with ascii armor header",
+                    "-----END PGP PUBLIC KEY BLOCK-----\n".getBytes(), result.getOutputBytes());
+
+            {
+                IteratorWithIOThrow<UncachedKeyRing> unc
+                        = UncachedKeyRing.fromStream(new ByteArrayInputStream(result.getOutputBytes()));
+
+                assertTrue("export must have one key", unc.hasNext());
+                UncachedKeyRing ring = unc.next();
+                Assert.assertEquals("exported key has correct masterkeyid",
+                        mStaticRing1.getMasterKeyId(), ring.getMasterKeyId());
+                assertFalse("export must have exactly one key", unc.hasNext());
+            }
+
         }
 
     }