diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 21:48:01 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 21:48:01 +0200 |
| commit | 53680b621320512b44e961f0453043a31c40dfee (patch) | |
| tree | feff220dd5a59f2e89e4e89e8a7488e25bc767da /OpenKeychain/src/test | |
| parent | 52c6d8f8e03ab0047f5e8ed6f46273ac24a87205 (diff) | |
| download | open-keychain-53680b621320512b44e961f0453043a31c40dfee.tar.gz open-keychain-53680b621320512b44e961f0453043a31c40dfee.tar.bz2 open-keychain-53680b621320512b44e961f0453043a31c40dfee.zip | |
Cleanup, fix advanced sharing
Diffstat (limited to 'OpenKeychain/src/test')
| -rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java | 12 |
1 files changed, 6 insertions, 6 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 0f6afc234..29ba2bd19 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/ExportTest.java @@ -56,7 +56,7 @@ import org.sufficientlysecure.keychain.pgp.UncachedKeyRing.IteratorWithIOThrow; import org.sufficientlysecure.keychain.pgp.WrappedSignature; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.provider.TemporaryFileProvider; -import org.sufficientlysecure.keychain.service.ExportKeyringParcel; +import org.sufficientlysecure.keychain.service.BackupKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel; @@ -151,7 +151,7 @@ public class ExportTest { @Test public void testExportAllLocalStripped() throws Exception { - ExportOperation op = new ExportOperation(RuntimeEnvironment.application, + BackupOperation op = new BackupOperation(RuntimeEnvironment.application, new ProviderHelper(RuntimeEnvironment.application), null); // make sure there is a local cert (so the later checks that there are none are meaningful) @@ -251,10 +251,10 @@ public class ExportTest { Application spyApplication = spy(RuntimeEnvironment.application); when(spyApplication.getContentResolver()).thenReturn(mockResolver); - ExportOperation op = new ExportOperation(spyApplication, + BackupOperation op = new BackupOperation(spyApplication, new ProviderHelper(RuntimeEnvironment.application), null); - ExportKeyringParcel parcel = new ExportKeyringParcel(null, + BackupKeyringParcel parcel = new BackupKeyringParcel(null, new long[] { mStaticRing1.getMasterKeyId() }, false, fakeOutputUri); ExportResult result = op.execute(parcel, null); @@ -310,10 +310,10 @@ public class ExportTest { Passphrase passphrase = new Passphrase("abcde"); { // export encrypted - ExportOperation op = new ExportOperation(spyApplication, + BackupOperation op = new BackupOperation(spyApplication, new ProviderHelper(RuntimeEnvironment.application), null); - ExportKeyringParcel parcel = new ExportKeyringParcel(passphrase, + BackupKeyringParcel parcel = new BackupKeyringParcel(passphrase, new long[] { mStaticRing1.getMasterKeyId() }, false, fakeOutputUri); ExportResult result = op.execute(parcel, null); |