Merge branch 'master' of github.com:open-keychain/open-keychain

1 files changed, 55 insertions, 0 deletions

diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java
new file mode 100644
index 000000000..7a5afcc3a
--- /dev/null
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java
@@ -0,0 +1,55 @@
+package org.sufficientlysecure.keychain.provider;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowLog;
+import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
+import org.sufficientlysecure.keychain.service.OperationResults.SaveKeyringResult;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+@RunWith(RobolectricTestRunner.class)
+@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
+public class ProviderHelperSaveTest {
+
+    @BeforeClass
+    public static void setUpOnce() throws Exception {
+        ShadowLog.stream = System.out;
+    }
+
+    @Test
+    public void testLongKeyIdCollision() throws Exception {
+
+        UncachedKeyRing first =
+                readRingFromResource("/cooperpair/9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF.asc");
+        UncachedKeyRing second =
+                readRingFromResource("/cooperpair/A55120427374F3F7AA5F1166DDA252EBB8EBE1AF.asc");
+
+        SaveKeyringResult result;
+
+        // insert both keys, second should fail
+        result = new ProviderHelper(Robolectric.application).savePublicKeyRing(first);
+        Assert.assertTrue("first keyring import should succeed", result.success());
+        result = new ProviderHelper(Robolectric.application).savePublicKeyRing(second);
+        Assert.assertFalse("second keyring import should fail", result.success());
+
+        new KeychainDatabase(Robolectric.application).clearDatabase();
+
+        // and the other way around
+        result = new ProviderHelper(Robolectric.application).savePublicKeyRing(second);
+        Assert.assertTrue("first keyring import should succeed", result.success());
+        result = new ProviderHelper(Robolectric.application).savePublicKeyRing(first);
+        Assert.assertFalse("second keyring import should fail", result.success());
+
+    }
+
+    UncachedKeyRing readRingFromResource(String name) throws Exception {
+        return UncachedKeyRing.fromStream(ProviderHelperSaveTest.class.getResourceAsStream(name)).next();
+    }
+
+}
\ No newline at end of file