fix expiry of master keys

fixes #1141
2015-03-15 19:18:35 +01:00
parent 809cd6e495
commit db39b779c9
2 changed files with 21 additions and 14 deletions
--- 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);
+
        }

        {