From 5d5d2c3c36c77b22a90acae33adb6908c4d7b5d9 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 17 May 2016 21:13:41 +0200 Subject: refactor BackupOperation a bit, make more illegal states explicit --- .../org/sufficientlysecure/keychain/operations/ExportTest.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'OpenKeychain/src/test') 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); -- cgit v1.2.3