test: add misc UncachedKeyRing tests

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java

@@ -353,7 +353,7 @@ public class PgpKeyOperationTest {
         { // bad keysize should fail
             parcel.reset();
             parcel.mAddSubKeys.add(new SubkeyAdd(
-                    algorithm.rsa, new Random().nextInt(1024), KeyFlags.SIGN_DATA, null));
+                    algorithm.rsa, new Random().nextInt(512), KeyFlags.SIGN_DATA, null));
 
             WrappedSecretKeyRing secretRing = new WrappedSecretKeyRing(ring.getEncoded(), false, 0);
             OperationResultParcel.OperationLog log = new OperationResultParcel.OperationLog();

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringCanonicalizeTest.java

@@ -174,13 +174,11 @@ public class UncachedKeyringCanonicalizeTest {
             Assert.assertEquals("two packets should be stripped after canonicalization", 2, onlyA.size());
             Assert.assertEquals("no new packets after canonicalization", 0, onlyB.size());
 
-            Packet p;
+            Packet p = new BCPGInputStream(new ByteArrayInputStream(onlyA.get(0).buf)).readPacket();
-            p = new BCPGInputStream(new ByteArrayInputStream(onlyA.get(0).buf)).readPacket();
             Assert.assertTrue("first stripped packet must be user id", p instanceof UserIDPacket);
             Assert.assertEquals("missing user id must be the expected one",
                     "twi", ((UserIDPacket) p).getID());
 
-            p = new BCPGInputStream(new ByteArrayInputStream(onlyA.get(1).buf)).readPacket();
             Assert.assertArrayEquals("second stripped packet must be signature we removed",
                     sig.getEncoded(), onlyA.get(1).buf);
 
@@ -197,13 +195,11 @@ public class UncachedKeyringCanonicalizeTest {
             Assert.assertEquals("two packets should be missing after canonicalization", 2, onlyA.size());
             Assert.assertEquals("no new packets after canonicalization", 0, onlyB.size());
 
-            Packet p;
+            Packet p = new BCPGInputStream(new ByteArrayInputStream(onlyA.get(0).buf)).readPacket();
-            p = new BCPGInputStream(new ByteArrayInputStream(onlyA.get(0).buf)).readPacket();
             Assert.assertTrue("first stripped packet must be user id", p instanceof UserIDPacket);
             Assert.assertEquals("missing user id must be the expected one",
                     "twi", ((UserIDPacket) p).getID());
 
-            p = new BCPGInputStream(new ByteArrayInputStream(onlyA.get(1).buf)).readPacket();
             Assert.assertArrayEquals("second stripped packet must be signature we removed",
                     sig.getEncoded(), onlyA.get(1).buf);
         }

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java

@@ -60,7 +60,6 @@ import java.util.Iterator;
 public class UncachedKeyringMergeTest {
 
     static UncachedKeyRing staticRingA, staticRingB;
-    static int totalPackets;
     UncachedKeyRing ringA, ringB;
     ArrayList<RawPacket> onlyA = new ArrayList<RawPacket>();
     ArrayList<RawPacket> onlyB = new ArrayList<RawPacket>();

OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java

@@ -0,0 +1,129 @@
+package org.sufficientlysecure.keychain.tests;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowLog;
+import org.spongycastle.bcpg.sig.KeyFlags;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
+import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
+import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
+import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
+import org.sufficientlysecure.keychain.service.OperationResultParcel;
+import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
+import org.sufficientlysecure.keychain.support.KeyringTestingHelper.RawPacket;
+import org.sufficientlysecure.keychain.util.ProgressScaler;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
+public class UncachedKeyringTest {
+
+    static UncachedKeyRing staticRing, staticPubRing;
+    UncachedKeyRing ring, pubRing;
+    ArrayList<RawPacket> onlyA = new ArrayList<RawPacket>();
+    ArrayList<RawPacket> onlyB = new ArrayList<RawPacket>();
+    OperationResultParcel.OperationLog log = new OperationResultParcel.OperationLog();
+    PgpKeyOperation op;
+    SaveKeyringParcel parcel;
+
+    @BeforeClass
+    public static void setUpOnce() throws Exception {
+        ShadowLog.stream = System.out;
+
+        SaveKeyringParcel parcel = new SaveKeyringParcel();
+        parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(
+                Constants.choice.algorithm.rsa, 1024, KeyFlags.CERTIFY_OTHER, null));
+        parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(
+                Constants.choice.algorithm.rsa, 1024, KeyFlags.SIGN_DATA, null));
+        parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(
+                Constants.choice.algorithm.rsa, 1024, KeyFlags.ENCRYPT_COMMS, null));
+
+        parcel.mAddUserIds.add("twi");
+        parcel.mAddUserIds.add("pink");
+        // passphrase is tested in PgpKeyOperationTest, just use empty here
+        parcel.mNewPassphrase = "";
+        PgpKeyOperation op = new PgpKeyOperation(null);
+
+        OperationResultParcel.OperationLog log = new OperationResultParcel.OperationLog();
+        staticRing = op.createSecretKeyRing(parcel, log, 0);
+        staticPubRing = staticRing.extractPublicKeyRing();
+
+        Assert.assertNotNull("initial test key creation must succeed", staticRing);
+
+        // we sleep here for a second, to make sure all new certificates have different timestamps
+        Thread.sleep(1000);
+    }
+
+
+    @Before
+    public void setUp() throws Exception {
+        // show Log.x messages in system.out
+        ShadowLog.stream = System.out;
+        ring = staticRing;
+        pubRing = staticPubRing;
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void testPublicKeyItRemove() throws Exception {
+        Iterator<UncachedPublicKey> it = ring.getPublicKeys();
+        it.remove();
+    }
+
+    @Test(expected = PgpGeneralException.class)
+    public void testDecodeFromEmpty() throws Exception {
+        UncachedKeyRing.decodeFromData(new byte[0]);
+    }
+
+    @Test
+    public void testArmorIdentity() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ring.encodeArmored(out, "OpenKeychain");
+
+        Assert.assertArrayEquals("armor encoded and decoded ring should be identical to original",
+            ring.getEncoded(),
+            UncachedKeyRing.decodeFromData(out.toByteArray()).getEncoded());
+    }
+
+    @Test(expected = PgpGeneralException.class)
+    public void testDecodeEncodeMulti() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        // encode secret and public ring in here
+        ring.encodeArmored(out, "OpenKeychain");
+        pubRing.encodeArmored(out, "OpenKeychain");
+
+        List<UncachedKeyRing> rings =
+                UncachedKeyRing.fromStream(new ByteArrayInputStream(out.toByteArray()));
+        Assert.assertEquals("there should be two rings in the stream", 2, rings.size());
+        Assert.assertArrayEquals("first ring should be the first we put in",
+                ring.getEncoded(), rings.get(0).getEncoded());
+        Assert.assertArrayEquals("second ring should be the second we put in",
+                pubRing.getEncoded(), rings.get(1).getEncoded());
+
+        // this should fail with PgpGeneralException, since it expects exactly one ring
+        UncachedKeyRing.decodeFromData(out.toByteArray());
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void testPublicAvailableSubkeys() throws Exception {
+        // can't do this!
+        pubRing.getAvailableSubkeys();
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void testPublicExtractPublic() throws Exception {
+        // can't do this, either!
+        pubRing.extractPublicKeyRing();
+    }
+
+}