diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-15 19:35:12 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-15 19:35:12 +0100 |
commit | d824ec3bc9e75ed89b0af14568c6422913be8a69 (patch) | |
tree | d8523fe0eea1c89d8d503db2622a28cc50a92c54 /OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp | |
parent | 75368034bd620d3d958ba6962f19e82edcb3a562 (diff) | |
parent | db39b779c984a758e13adc16837893509f3b364f (diff) | |
download | open-keychain-d824ec3bc9e75ed89b0af14568c6422913be8a69.tar.gz open-keychain-d824ec3bc9e75ed89b0af14568c6422913be8a69.tar.bz2 open-keychain-d824ec3bc9e75ed89b0af14568c6422913be8a69.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java index dd2feb825..8feff4cc4 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java @@ -536,6 +536,12 @@ public class PgpKeyOperationTest { expiry, modified.getPublicKey(keyId).getUnsafeExpiryTimeForTesting().getTime() / 1000); Assert.assertEquals("modified key must have same flags as before", ring.getPublicKey(keyId).getKeyUsage(), modified.getPublicKey(keyId).getKeyUsage()); + + Date date = modified.canonicalize(new OperationLog(), 0).getPublicKey().getExpiryTime(); + Assert.assertNotNull("modified key must have an expiry date", date); + Assert.assertEquals("modified key must have expected expiry date", + expiry, date.getTime() / 1000); + } { |