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

test: onlyX vars are lists now, use them as such

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-07-11 14:54:35 +02:00
parent aaecf13ce0
commit e00c65ed82
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java
View File

@ -150,13 +150,12 @@ public class PgpKeyOperationTest {
Assert.assertEquals("no extra packets in original", 0, onlyA.size()); Assert.assertEquals("no extra packets in original", 0, onlyA.size());
Assert.assertEquals("exactly two extra packets in modified", 2, onlyB.size()); Assert.assertEquals("exactly two extra packets in modified", 2, onlyB.size());
Iterator<RawPacket> it = onlyB.iterator();
Packet p; 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); 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.assertTrue("second new packet must be signature", p instanceof SignaturePacket);
Assert.assertEquals("signature type must be subkey binding certificate", Assert.assertEquals("signature type must be subkey binding certificate",
PGPSignature.SUBKEY_BINDING, ((SignaturePacket) p).getSignatureType()); 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("no extra packets in original", 0, onlyA.size());
Assert.assertEquals("exactly one extra packet in modified", 1, onlyB.size()); Assert.assertEquals("exactly one extra packet in modified", 1, onlyB.size());
Iterator<RawPacket> it = onlyB.iterator();
Packet p; 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.assertTrue("first new packet must be secret subkey", p instanceof SignaturePacket);
Assert.assertEquals("signature type must be subkey binding certificate", Assert.assertEquals("signature type must be subkey binding certificate",
PGPSignature.SUBKEY_REVOCATION, ((SignaturePacket) p).getSignatureType()); 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("no extra packets in original", 0, onlyA.size());
Assert.assertEquals("exactly one extra packet in modified", 1, onlyB.size()); Assert.assertEquals("exactly one extra packet in modified", 1, onlyB.size());
Iterator<RawPacket> it = onlyB.iterator();
Packet p; 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.assertTrue("first new packet must be secret subkey", p instanceof SignaturePacket);
Assert.assertEquals("signature type must be subkey binding certificate", Assert.assertEquals("signature type must be subkey binding certificate",
PGPSignature.CERTIFICATION_REVOCATION, ((SignaturePacket) p).getSignatureType()); 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("no extra packets in original", 0, onlyA.size());
Assert.assertEquals("exactly two extra packets in modified", 2, onlyB.size()); Assert.assertEquals("exactly two extra packets in modified", 2, onlyB.size());
Iterator<RawPacket> it = onlyB.iterator();
Packet p;
Assert.assertTrue("keyring must contain added user id", Assert.assertTrue("keyring must contain added user id",
modified.getPublicKey().getUnorderedUserIds().contains("rainbow")); 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.assertTrue("first new packet must be user id", p instanceof UserIDPacket);
Assert.assertEquals("user id packet must match added user id", Assert.assertEquals("user id packet must match added user id",
"rainbow", ((UserIDPacket) p).getID()); "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()); System.out.println(p.getClass().getName());
Assert.assertTrue("second new packet must be signature", p instanceof SignaturePacket); Assert.assertTrue("second new packet must be signature", p instanceof SignaturePacket);
Assert.assertEquals("signature type must be positive certification", Assert.assertEquals("signature type must be positive certification",