aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2016-05-17 21:13:41 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2016-05-17 21:22:50 +0200
commit5d5d2c3c36c77b22a90acae33adb6908c4d7b5d9 (patch)
treec77ceadda7a80f34722b385f8ab54c74cfeef64d /OpenKeychain/src/test
parent1da8e4c1edd71b2ddbe95a58060c1be20bd13dd7 (diff)
downloadopen-keychain-5d5d2c3c36c77b22a90acae33adb6908c4d7b5d9.tar.gz
open-keychain-5d5d2c3c36c77b22a90acae33adb6908c4d7b5d9.tar.bz2
open-keychain-5d5d2c3c36c77b22a90acae33adb6908c4d7b5d9.zip
refactor BackupOperation a bit, make more illegal states explicit
Diffstat (limited to 'OpenKeychain/src/test')
-rw-r--r--OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java7
1 files changed, 2 insertions, 5 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 6fab979ed..142d2f594 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java
@@ -242,7 +242,6 @@ public class ExportTest {
@Test
public void testExportUnencrypted() throws Exception {
-
ContentResolver mockResolver = mock(ContentResolver.class);
Uri fakeOutputUri = Uri.parse("content://fake/out/1");
@@ -256,7 +255,7 @@ public class ExportTest {
new ProviderHelper(RuntimeEnvironment.application), null);
BackupKeyringParcel parcel = new BackupKeyringParcel(
- new long[] { mStaticRing1.getMasterKeyId() }, false, fakeOutputUri);
+ new long[] { mStaticRing1.getMasterKeyId() }, false, false, fakeOutputUri);
ExportResult result = op.execute(parcel, null);
@@ -284,8 +283,6 @@ public class ExportTest {
@Test
public void testExportEncrypted() throws Exception {
-
-
Application spyApplication;
ContentResolver mockResolver = mock(ContentResolver.class);
@@ -315,7 +312,7 @@ public class ExportTest {
new ProviderHelper(RuntimeEnvironment.application), null);
BackupKeyringParcel parcel = new BackupKeyringParcel(
- new long[] { mStaticRing1.getMasterKeyId() }, false, fakeOutputUri);
+ new long[] { mStaticRing1.getMasterKeyId() }, false, true, fakeOutputUri);
CryptoInputParcel inputParcel = new CryptoInputParcel(passphrase);
ExportResult result = op.execute(parcel, inputParcel);