From e00c65ed82c7f6de35c2969066f279cf27f57aab Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 11 Jul 2014 14:54:35 +0200 Subject: test: onlyX vars are lists now, use them as such --- .../keychain/tests/PgpKeyOperationTest.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java') diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java index 6565ffc24..0cd615012 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java @@ -150,13 +150,12 @@ public class PgpKeyOperationTest { Assert.assertEquals("no extra packets in original", 0, onlyA.size()); Assert.assertEquals("exactly two extra packets in modified", 2, onlyB.size()); - Iterator it = onlyB.iterator(); Packet p; - p = new BCPGInputStream(new ByteArrayInputStream(it.next().buf)).readPacket(); + p = new BCPGInputStream(new ByteArrayInputStream(onlyB.get(0).buf)).readPacket(); Assert.assertTrue("first new packet must be secret subkey", p instanceof SecretSubkeyPacket); - p = new BCPGInputStream(new ByteArrayInputStream(it.next().buf)).readPacket(); + p = new BCPGInputStream(new ByteArrayInputStream(onlyB.get(1).buf)).readPacket(); Assert.assertTrue("second new packet must be signature", p instanceof SignaturePacket); Assert.assertEquals("signature type must be subkey binding certificate", PGPSignature.SUBKEY_BINDING, ((SignaturePacket) p).getSignatureType()); @@ -179,10 +178,9 @@ public class PgpKeyOperationTest { Assert.assertEquals("no extra packets in original", 0, onlyA.size()); Assert.assertEquals("exactly one extra packet in modified", 1, onlyB.size()); - Iterator it = onlyB.iterator(); Packet p; - p = new BCPGInputStream(new ByteArrayInputStream(it.next().buf)).readPacket(); + p = new BCPGInputStream(new ByteArrayInputStream(onlyB.get(0).buf)).readPacket(); Assert.assertTrue("first new packet must be secret subkey", p instanceof SignaturePacket); Assert.assertEquals("signature type must be subkey binding certificate", PGPSignature.SUBKEY_REVOCATION, ((SignaturePacket) p).getSignatureType()); @@ -206,10 +204,9 @@ public class PgpKeyOperationTest { Assert.assertEquals("no extra packets in original", 0, onlyA.size()); Assert.assertEquals("exactly one extra packet in modified", 1, onlyB.size()); - Iterator it = onlyB.iterator(); Packet p; - p = new BCPGInputStream(new ByteArrayInputStream(it.next().buf)).readPacket(); + p = new BCPGInputStream(new ByteArrayInputStream(onlyB.get(0).buf)).readPacket(); Assert.assertTrue("first new packet must be secret subkey", p instanceof SignaturePacket); Assert.assertEquals("signature type must be subkey binding certificate", PGPSignature.CERTIFICATION_REVOCATION, ((SignaturePacket) p).getSignatureType()); @@ -267,18 +264,17 @@ public class PgpKeyOperationTest { Assert.assertEquals("no extra packets in original", 0, onlyA.size()); Assert.assertEquals("exactly two extra packets in modified", 2, onlyB.size()); - Iterator it = onlyB.iterator(); - Packet p; - Assert.assertTrue("keyring must contain added user id", modified.getPublicKey().getUnorderedUserIds().contains("rainbow")); - p = new BCPGInputStream(new ByteArrayInputStream(it.next().buf)).readPacket(); + Packet p; + + p = new BCPGInputStream(new ByteArrayInputStream(onlyB.get(0).buf)).readPacket(); Assert.assertTrue("first new packet must be user id", p instanceof UserIDPacket); Assert.assertEquals("user id packet must match added user id", "rainbow", ((UserIDPacket) p).getID()); - p = new BCPGInputStream(new ByteArrayInputStream(it.next().buf)).readPacket(); + p = new BCPGInputStream(new ByteArrayInputStream(onlyB.get(1).buf)).readPacket(); System.out.println(p.getClass().getName()); Assert.assertTrue("second new packet must be signature", p instanceof SignaturePacket); Assert.assertEquals("signature type must be positive certification", -- cgit v1.2.3