From bf537c4a81371e95cff613d4f9847bf2365e6ec8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 1 Jan 2015 18:24:09 +0100
Subject: fix unit tests (canonicalize after create)

---
 .../keychain/pgp/UncachedKeyringCanonicalizeTest.java                  | 2 ++
 .../org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java  | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'OpenKeychain-Test')

diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java
index 7d8a10ee0..b3a149eec 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java
@@ -113,6 +113,8 @@ public class UncachedKeyringCanonicalizeTest {
         staticRing = result.getRing();
         Assert.assertNotNull("initial test key creation must succeed", staticRing);
 
+        staticRing = staticRing.canonicalize(new OperationLog(), 0).getUncachedKeyRing();
+
         // just for later reference
         totalPackets = 9;
 
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
index 799640d6c..7e2cbee0c 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
@@ -34,6 +34,7 @@ import org.spongycastle.jce.provider.BouncyCastleProvider;
 import org.spongycastle.util.Strings;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
 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.Algorithm;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel;
@@ -104,6 +105,7 @@ public class UncachedKeyringMergeTest {
 
             EditKeyResult result = op.createSecretKeyRing(parcel);
             staticRingA = result.getRing();
+            staticRingA = staticRingA.canonicalize(new OperationLog(), 0).getUncachedKeyRing();
         }
 
         {
@@ -119,6 +121,7 @@ public class UncachedKeyringMergeTest {
             OperationResult.OperationLog log = new OperationResult.OperationLog();
             EditKeyResult result = op.createSecretKeyRing(parcel);
             staticRingB = result.getRing();
+            staticRingB = staticRingB.canonicalize(new OperationLog(), 0).getUncachedKeyRing();
         }
 
         Assert.assertNotNull("initial test key creation must succeed", staticRingA);
-- 
cgit v1.2.3