diff options
| author | Alex Fong <alexfongg@gmail.com> | 2016-04-19 09:00:15 +0800 |
|---|---|---|
| committer | Alex Fong <alexfongg@gmail.com> | 2016-05-05 07:57:20 +0800 |
| commit | bc3aa44b22546fb5b12c5ca9ab438c979a5449f1 (patch) | |
| tree | 2611866e2dfbfda010b2354969dad0ee4e33b857 /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | |
| parent | a5a2335673d092bf49983273ad6c54a489fa8d92 (diff) | |
| download | open-keychain-bc3aa44b22546fb5b12c5ca9ab438c979a5449f1.tar.gz open-keychain-bc3aa44b22546fb5b12c5ca9ab438c979a5449f1.tar.bz2 open-keychain-bc3aa44b22546fb5b12c5ca9ab438c979a5449f1.zip | |
Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java')
| -rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java index 2e99f8bf6..a8e28a7c6 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java @@ -114,7 +114,7 @@ public class UncachedKeyringMergeTest { } // passphrase is tested in PgpKeyOperationTest, just use empty here - parcel.setNewUnlock(new Passphrase()); + parcel.setNewUnlock(new ChangeUnlockParcel(new Passphrase())); PgpKeyOperation op = new PgpKeyOperation(null); OperationResult.OperationLog log = new OperationResult.OperationLog(); @@ -131,7 +131,7 @@ public class UncachedKeyringMergeTest { parcel.mAddUserIds.add("shy"); // passphrase is tested in PgpKeyOperationTest, just use empty here - parcel.setNewUnlock(new Passphrase()); + parcel.setNewUnlock(new ChangeUnlockParcel(new Passphrase())); PgpKeyOperation op = new PgpKeyOperation(null); OperationResult.OperationLog log = new OperationResult.OperationLog(); |