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

test: even nicer code

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-08-16 03:48:13 +02:00
parent bbe986743c
commit 0708b573fc
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,10 +237,8 @@ public class PgpKeyOperationTest {
parcel.mMasterKeyId = ring.getMasterKeyId() -1; parcel.mMasterKeyId = ring.getMasterKeyId() -1;
parcel.mFingerprint = ring.getFingerprint(); parcel.mFingerprint = ring.getFingerprint();
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
assertModifyFailure("keyring modification with bad master key id should fail", assertModifyFailure("keyring modification with bad master key id should fail",
secretRing, parcel); ring, parcel);
} }
{ {
@ -249,10 +247,8 @@ public class PgpKeyOperationTest {
parcel.mMasterKeyId = null; parcel.mMasterKeyId = null;
parcel.mFingerprint = ring.getFingerprint(); parcel.mFingerprint = ring.getFingerprint();
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
assertModifyFailure("keyring modification with null master key id should fail", assertModifyFailure("keyring modification with null master key id should fail",
secretRing, parcel); ring, parcel);
} }
{ {
@ -262,10 +258,8 @@ public class PgpKeyOperationTest {
// some byte, off by one // some byte, off by one
parcel.mFingerprint[5] += 1; parcel.mFingerprint[5] += 1;
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
assertModifyFailure("keyring modification with bad fingerprint should fail", assertModifyFailure("keyring modification with bad fingerprint should fail",
secretRing, parcel); ring, parcel);
} }
{ {
@ -273,10 +267,8 @@ public class PgpKeyOperationTest {
parcel.mMasterKeyId = ring.getMasterKeyId(); parcel.mMasterKeyId = ring.getMasterKeyId();
parcel.mFingerprint = null; parcel.mFingerprint = null;
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
assertModifyFailure("keyring modification with null fingerprint should fail", assertModifyFailure("keyring modification with null fingerprint should fail",
secretRing, parcel); ring, parcel);
} }
{ {
@ -284,10 +276,9 @@ public class PgpKeyOperationTest {
if (badphrase.equals(passphrase)) { if (badphrase.equals(passphrase)) {
badphrase = "a"; badphrase = "a";
} }
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
assertModifyFailure("keyring modification with bad passphrase should fail", assertModifyFailure("keyring modification with bad passphrase should fail",
secretRing, parcel, badphrase); ring, parcel, badphrase);
} }
} }
@ -340,9 +331,7 @@ public class PgpKeyOperationTest {
parcel.reset(); parcel.reset();
parcel.mAddSubKeys.add(new SubkeyAdd( parcel.mAddSubKeys.add(new SubkeyAdd(
PublicKeyAlgorithmTags.RSA_GENERAL, new Random().nextInt(512), KeyFlags.SIGN_DATA, null)); PublicKeyAlgorithmTags.RSA_GENERAL, new Random().nextInt(512), KeyFlags.SIGN_DATA, null));
assertModifyFailure("creating a subkey with keysize < 512 should fail", ring, parcel);
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
assertModifyFailure("creating a subkey with keysize < 512 should fail", secretRing, parcel);
} }
@ -350,9 +339,7 @@ public class PgpKeyOperationTest {
parcel.reset(); parcel.reset();
parcel.mAddSubKeys.add(new SubkeyAdd(PublicKeyAlgorithmTags.RSA_GENERAL, 1024, KeyFlags.SIGN_DATA, parcel.mAddSubKeys.add(new SubkeyAdd(PublicKeyAlgorithmTags.RSA_GENERAL, 1024, KeyFlags.SIGN_DATA,
new Date().getTime()/1000-10)); new Date().getTime()/1000-10));
assertModifyFailure("creating subkey with past expiry date should fail", ring, parcel);
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
assertModifyFailure("creating subkey with past expiry date should fail", secretRing, parcel);
} }
} }
@ -564,8 +551,7 @@ public class PgpKeyOperationTest {
parcel.reset(); parcel.reset();
parcel.mChangePrimaryUserId = uid; parcel.mChangePrimaryUserId = uid;
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(modified.getEncoded(), false, 0); assertModifyFailure("setting primary user id to a revoked user id should fail", modified, parcel);
assertModifyFailure("setting primary user id to a revoked user id should fail", secretRing, parcel);
} }
@ -610,8 +596,7 @@ public class PgpKeyOperationTest {
{ {
parcel.mAddUserIds.add(""); parcel.mAddUserIds.add("");
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0); assertModifyFailure("adding an empty user id should fail", ring, parcel);
assertModifyFailure("adding an empty user id should fail", secretRing, parcel);
} }
parcel.reset(); parcel.reset();
@ -679,9 +664,8 @@ public class PgpKeyOperationTest {
parcel.mChangePrimaryUserId += "A"; parcel.mChangePrimaryUserId += "A";
} }
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
assertModifyFailure("changing primary user id to a non-existent one should fail", assertModifyFailure("changing primary user id to a non-existent one should fail",
secretRing, parcel); ring, parcel);
} }
// check for revoked primary user id already done in revoke test // check for revoked primary user id already done in revoke test
@ -774,9 +758,10 @@ public class PgpKeyOperationTest {
} }
private void assertModifyFailure(String reason, CanonicalizedSecretKeyRing secretRing, private void assertModifyFailure(String reason, UncachedKeyRing ring,
SaveKeyringParcel parcel, String passphrase) { SaveKeyringParcel parcel, String passphrase) throws Exception {
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
EditKeyResult result = op.modifySecretKeyRing(secretRing, parcel, passphrase); EditKeyResult result = op.modifySecretKeyRing(secretRing, parcel, passphrase);
Assert.assertFalse(reason, result.success()); Assert.assertFalse(reason, result.success());
@ -784,8 +769,10 @@ public class PgpKeyOperationTest {
} }
private void assertModifyFailure(String reason, CanonicalizedSecretKeyRing secretRing, SaveKeyringParcel parcel) { private void assertModifyFailure(String reason, UncachedKeyRing ring, SaveKeyringParcel parcel)
throws Exception {
CanonicalizedSecretKeyRing secretRing = new CanonicalizedSecretKeyRing(ring.getEncoded(), false, 0);
EditKeyResult result = op.modifySecretKeyRing(secretRing, parcel, passphrase); EditKeyResult result = op.modifySecretKeyRing(secretRing, parcel, passphrase);
Assert.assertFalse(reason, result.success()); Assert.assertFalse(reason, result.success());