Merge branch 'master' into improve-file-more

Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java

1 files changed, 101 insertions, 0 deletions

diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java
new file mode 100644
index 000000000..665e8ef2b
--- /dev/null
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) Art O Cathain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package tests;
+
+import java.util.Collections;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ArrayList;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.*;
+import org.sufficientlysecure.keychain.support.KeyringTestingHelper;
+
+@RunWith(RobolectricTestRunner.class)
+@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
+public class ProviderHelperKeyringTest {
+
+    @Test
+    public void testSavePublicKeyring() throws Exception {
+        Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(Collections.singleton(
+                "/public-key-for-sample.blob"
+        )));
+    }
+
+    // @Test
+    public void testSavePublicKeyringRsa() throws Exception {
+        Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList(
+                        "000001-006.public_key",
+                        "000002-013.user_id",
+                        "000003-002.sig",
+                        "000004-012.ring_trust",
+                        "000005-002.sig",
+                        "000006-012.ring_trust",
+                        "000007-002.sig",
+                        "000008-012.ring_trust",
+                        "000009-002.sig",
+                        "000010-012.ring_trust",
+                        "000011-002.sig",
+                        "000012-012.ring_trust",
+                        "000013-014.public_subkey",
+                        "000014-002.sig",
+                        "000015-012.ring_trust"
+                ))));
+    }
+
+    // @Test
+    public void testSavePublicKeyringDsa() throws Exception {
+        Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList(
+                        "000016-006.public_key",
+                        "000017-002.sig",
+                        "000018-012.ring_trust",
+                        "000019-013.user_id",
+                        "000020-002.sig",
+                        "000021-012.ring_trust",
+                        "000022-002.sig",
+                        "000023-012.ring_trust",
+                        "000024-014.public_subkey",
+                        "000025-002.sig",
+                        "000026-012.ring_trust"
+                ))));
+    }
+
+    // @Test
+    public void testSavePublicKeyringDsa2() throws Exception {
+        Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList(
+                        "000027-006.public_key",
+                        "000028-002.sig",
+                        "000029-012.ring_trust",
+                        "000030-013.user_id",
+                        "000031-002.sig",
+                        "000032-012.ring_trust",
+                        "000033-002.sig",
+                        "000034-012.ring_trust"
+                ))));
+    }
+
+    private static Collection<String> prependResourcePath(Collection<String> files) {
+        Collection<String> prependedFiles = new ArrayList<String>();
+        for (String file: files) {
+            prependedFiles.add("/OpenPGP-Haskell/tests/data/" + file);
+        }
+        return prependedFiles;
+    }
+}