moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 00:18:51 -05:00
Code Issues Releases Wiki Activity

fix tests for changed key flag semantics

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-09-03 02:55:35 +02:00
parent 7bc424a8cb
commit 6e219d245f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java
View File

@ -195,7 +195,7 @@ public class PgpKeyOperationTest {
Assert.assertEquals("the keyring should contain only the master key", Assert.assertEquals("the keyring should contain only the master key",
1, KeyringTestingHelper.itToList(ring.getPublicKeys()).size()); 1, KeyringTestingHelper.itToList(ring.getPublicKeys()).size());
Assert.assertEquals("first (master) key must have both flags", Assert.assertEquals("first (master) key must have both flags",
KeyFlags.CERTIFY_OTHER | KeyFlags.SIGN_DATA, ring.getPublicKey().getKeyUsage()); KeyFlags.CERTIFY_OTHER | KeyFlags.SIGN_DATA, (long) ring.getPublicKey().getKeyUsage());
} }
@ -224,10 +224,10 @@ public class PgpKeyOperationTest {
ring.getPublicKey().getExpiryTime()); ring.getPublicKey().getExpiryTime());
Assert.assertEquals("first (master) key can certify", Assert.assertEquals("first (master) key can certify",
KeyFlags.CERTIFY_OTHER, subkeys.get(0).getKeyUsage()); KeyFlags.CERTIFY_OTHER, (long) subkeys.get(0).getKeyUsage());
Assert.assertEquals("second key can sign", Assert.assertEquals("second key can sign",
KeyFlags.SIGN_DATA, subkeys.get(1).getKeyUsage()); KeyFlags.SIGN_DATA, (long) subkeys.get(1).getKeyUsage());
ArrayList<WrappedSignature> sigs = subkeys.get(1).getSignatures().next().getEmbeddedSignatures(); ArrayList<WrappedSignature> sigs = subkeys.get(1).getSignatures().next().getEmbeddedSignatures();
Assert.assertEquals("signing key signature should have one embedded signature", Assert.assertEquals("signing key signature should have one embedded signature",
1, sigs.size()); 1, sigs.size());
@ -237,7 +237,7 @@ public class PgpKeyOperationTest {
subkeys.get(1).getKeyId(), sigs.get(0).getKeyId()); subkeys.get(1).getKeyId(), sigs.get(0).getKeyId());
Assert.assertEquals("third key can encrypt", Assert.assertEquals("third key can encrypt",
KeyFlags.ENCRYPT_COMMS, subkeys.get(2).getKeyUsage()); KeyFlags.ENCRYPT_COMMS, (long) subkeys.get(2).getKeyUsage());
} }
@ -336,7 +336,7 @@ public class PgpKeyOperationTest {
Assert.assertEquals("added key must have expected expiry date", Assert.assertEquals("added key must have expected expiry date",
expiry, newKey.getExpiryTime().getTime()/1000); expiry, newKey.getExpiryTime().getTime()/1000);
Assert.assertEquals("added key must have expected flags", Assert.assertEquals("added key must have expected flags",
flags, newKey.getKeyUsage()); flags, (long) newKey.getKeyUsage());
Assert.assertEquals("added key must have expected bitsize", Assert.assertEquals("added key must have expected bitsize",
bits, (int) newKey.getBitStrength()); bits, (int) newKey.getBitStrength());
@ -431,7 +431,7 @@ public class PgpKeyOperationTest {
ring.getMasterKeyId(), ((SignaturePacket) p).getKeyID()); ring.getMasterKeyId(), ((SignaturePacket) p).getKeyID());
Assert.assertEquals("modified key must have expected flags", Assert.assertEquals("modified key must have expected flags",
flags, modified.getPublicKey(keyId).getKeyUsage()); flags, (long) modified.getPublicKey(keyId).getKeyUsage());
Assert.assertNotNull("key must retain its expiry", Assert.assertNotNull("key must retain its expiry",
modified.getPublicKey(keyId).getExpiryTime()); modified.getPublicKey(keyId).getExpiryTime());
Assert.assertEquals("key expiry must be unchanged", Assert.assertEquals("key expiry must be unchanged",
@ -535,7 +535,7 @@ public class PgpKeyOperationTest {
modified = applyModificationWithChecks(parcel, modified, onlyA, onlyB); modified = applyModificationWithChecks(parcel, modified, onlyA, onlyB);
Assert.assertEquals("modified key must have expected flags", Assert.assertEquals("modified key must have expected flags",
flags, modified.getPublicKey(keyId).getKeyUsage()); flags, (long) modified.getPublicKey(keyId).getKeyUsage());
Assert.assertNotNull("key must retain its expiry", Assert.assertNotNull("key must retain its expiry",
modified.getPublicKey(keyId).getExpiryTime()); modified.getPublicKey(keyId).getExpiryTime());
Assert.assertEquals("key expiry must be unchanged", Assert.assertEquals("key expiry must be unchanged",
@ -682,7 +682,7 @@ public class PgpKeyOperationTest {
Assert.assertFalse("subkey must no longer be revoked", Assert.assertFalse("subkey must no longer be revoked",
modified.getPublicKey(keyId).isRevoked()); modified.getPublicKey(keyId).isRevoked());
Assert.assertEquals("subkey must have the same usage flags as before", Assert.assertEquals("subkey must have the same usage flags as before",
flags, modified.getPublicKey(keyId).getKeyUsage()); flags, (long) modified.getPublicKey(keyId).getKeyUsage());
} }
} }