diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:24:27 +0300 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:24:27 +0300 |
commit | 9306b5ce325d0c3a968a4a0e64468163666addb7 (patch) | |
tree | 6e8c312917f65b7a3f8a68d38124cc6024cd1675 /OpenKeychain/src/test/java/org | |
parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
parent | c8b112c70d9f45b00bfd30e2ac746bfbbb31671e (diff) | |
download | open-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.tar.gz open-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.tar.bz2 open-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.zip |
Merge branch 'backup-api'
Diffstat (limited to 'OpenKeychain/src/test/java/org')
-rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java | 8 |
1 files changed, 4 insertions, 4 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 abf55b71b..6fab979ed 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java @@ -255,7 +255,7 @@ public class ExportTest { BackupOperation op = new BackupOperation(spyApplication, new ProviderHelper(RuntimeEnvironment.application), null); - BackupKeyringParcel parcel = new BackupKeyringParcel(null, + BackupKeyringParcel parcel = new BackupKeyringParcel( new long[] { mStaticRing1.getMasterKeyId() }, false, fakeOutputUri); ExportResult result = op.execute(parcel, null); @@ -314,10 +314,10 @@ public class ExportTest { BackupOperation op = new BackupOperation(spyApplication, new ProviderHelper(RuntimeEnvironment.application), null); - BackupKeyringParcel parcel = new BackupKeyringParcel(passphrase, + BackupKeyringParcel parcel = new BackupKeyringParcel( new long[] { mStaticRing1.getMasterKeyId() }, false, fakeOutputUri); - - ExportResult result = op.execute(parcel, null); + CryptoInputParcel inputParcel = new CryptoInputParcel(passphrase); + ExportResult result = op.execute(parcel, inputParcel); verify(mockResolver).openOutputStream(fakePipedUri); verify(mockResolver).openInputStream(fakePipedUri); |