moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

fix unit tests (canonicalize after create)

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-01-01 18:24:09 +01:00
parent 71c53f13ec
commit bf537c4a81
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java
View File

@ -113,6 +113,8 @@ public class UncachedKeyringCanonicalizeTest {
staticRing = result.getRing(); staticRing = result.getRing();
Assert.assertNotNull("initial test key creation must succeed", staticRing); Assert.assertNotNull("initial test key creation must succeed", staticRing);
staticRing = staticRing.canonicalize(new OperationLog(), 0).getUncachedKeyRing();
// just for later reference // just for later reference
totalPackets = 9; totalPackets = 9;

3
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
View File

@ -34,6 +34,7 @@ import org.spongycastle.jce.provider.BouncyCastleProvider;
import org.spongycastle.util.Strings; import org.spongycastle.util.Strings;
import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.operations.results.OperationResult;
import org.sufficientlysecure.keychain.operations.results.EditKeyResult; import org.sufficientlysecure.keychain.operations.results.EditKeyResult;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel;
@ -104,6 +105,7 @@ public class UncachedKeyringMergeTest {
EditKeyResult result = op.createSecretKeyRing(parcel); EditKeyResult result = op.createSecretKeyRing(parcel);
staticRingA = result.getRing(); staticRingA = result.getRing();
staticRingA = staticRingA.canonicalize(new OperationLog(), 0).getUncachedKeyRing();
} }
{ {
@ -119,6 +121,7 @@ public class UncachedKeyringMergeTest {
OperationResult.OperationLog log = new OperationResult.OperationLog(); OperationResult.OperationLog log = new OperationResult.OperationLog();
EditKeyResult result = op.createSecretKeyRing(parcel); EditKeyResult result = op.createSecretKeyRing(parcel);
staticRingB = result.getRing(); staticRingB = result.getRing();
staticRingB = staticRingB.canonicalize(new OperationLog(), 0).getUncachedKeyRing();
} }
Assert.assertNotNull("initial test key creation must succeed", staticRingA); Assert.assertNotNull("initial test key creation must succeed", staticRingA);