diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-24 23:05:50 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-24 23:05:50 +0100 |
| commit | 0e0970c347f0a2f78f190d6d26205178037f5095 (patch) | |
| tree | 434ac525431eeddc2fe2afd6c80b0a85843d65d2 /OpenKeychain-Test/src/test/java/org | |
| parent | 53955a80141372a0779fea5f9921705dfcb1a91e (diff) | |
| download | open-keychain-0e0970c347f0a2f78f190d6d26205178037f5095.tar.gz open-keychain-0e0970c347f0a2f78f190d6d26205178037f5095.tar.bz2 open-keychain-0e0970c347f0a2f78f190d6d26205178037f5095.zip | |
move key stripping into ChangeSubkey, support divert-to-card
Diffstat (limited to 'OpenKeychain-Test/src/test/java/org')
| -rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java index 3ea88aac6..d4fdf14d7 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java @@ -701,7 +701,7 @@ public class PgpKeyOperationTest { public void testSubkeyStrip() throws Exception { long keyId = KeyringTestingHelper.getSubkeyId(ring, 1); - parcel.mStripSubKeys.add(keyId); + parcel.mChangeSubKeys.add(new SubkeyChange(keyId, true, false)); applyModificationWithChecks(parcel, ring, onlyA, onlyB); Assert.assertEquals("one extra packet in original", 1, onlyA.size()); @@ -727,7 +727,7 @@ public class PgpKeyOperationTest { public void testMasterStrip() throws Exception { long keyId = ring.getMasterKeyId(); - parcel.mStripSubKeys.add(keyId); + parcel.mChangeSubKeys.add(new SubkeyChange(keyId, true, false)); applyModificationWithChecks(parcel, ring, onlyA, onlyB); Assert.assertEquals("one extra packet in original", 1, onlyA.size()); |