From a3c2eaf1e92307f36356b8c9283fee813681f39a Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 31 Jul 2014 19:25:10 +0200 Subject: tests: adapt to new EditKeyResult return value --- .../keychain/tests/UncachedKeyringTest.java | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java') diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java index 23ae177d0..15aaa4c5d 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java @@ -14,6 +14,7 @@ import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; import org.sufficientlysecure.keychain.pgp.UncachedPublicKey; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.service.OperationResultParcel; +import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.support.KeyringTestingHelper.RawPacket; import org.sufficientlysecure.keychain.util.ProgressScaler; @@ -32,7 +33,6 @@ public class UncachedKeyringTest { UncachedKeyRing ring, pubRing; ArrayList onlyA = new ArrayList(); ArrayList onlyB = new ArrayList(); - OperationResultParcel.OperationLog log = new OperationResultParcel.OperationLog(); PgpKeyOperation op; SaveKeyringParcel parcel; @@ -54,8 +54,8 @@ public class UncachedKeyringTest { parcel.mNewPassphrase = ""; PgpKeyOperation op = new PgpKeyOperation(null); - OperationResultParcel.OperationLog log = new OperationResultParcel.OperationLog(); - staticRing = op.createSecretKeyRing(parcel, log, 0); + EditKeyResult result = op.createSecretKeyRing(parcel); + staticRing = result.getRing(); staticPubRing = staticRing.extractPublicKeyRing(); Assert.assertNotNull("initial test key creation must succeed", staticRing); @@ -102,24 +102,20 @@ public class UncachedKeyringTest { ring.encodeArmored(out, "OpenKeychain"); pubRing.encodeArmored(out, "OpenKeychain"); - List rings = + Iterator it = UncachedKeyRing.fromStream(new ByteArrayInputStream(out.toByteArray())); - Assert.assertEquals("there should be two rings in the stream", 2, rings.size()); + Assert.assertTrue("there should be two rings in the stream", it.hasNext()); Assert.assertArrayEquals("first ring should be the first we put in", - ring.getEncoded(), rings.get(0).getEncoded()); + ring.getEncoded(), it.next().getEncoded()); + Assert.assertTrue("there should be two rings in the stream", it.hasNext()); Assert.assertArrayEquals("second ring should be the second we put in", - pubRing.getEncoded(), rings.get(1).getEncoded()); + pubRing.getEncoded(), it.next().getEncoded()); + Assert.assertFalse("there should be two rings in the stream", it.hasNext()); // this should fail with PgpGeneralException, since it expects exactly one ring UncachedKeyRing.decodeFromData(out.toByteArray()); } - @Test(expected = RuntimeException.class) - public void testPublicAvailableSubkeys() throws Exception { - // can't do this! - pubRing.getAvailableSubkeys(); - } - @Test(expected = RuntimeException.class) public void testPublicExtractPublic() throws Exception { // can't do this, either! -- cgit v1.2.3