From d8e6e5145281ceb048f02d0b2c0ad69440364757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 28 Dec 2014 21:44:03 +0100 Subject: Fix test for future creation timestamps to account for loosen timestamp check --- .../keychain/pgp/UncachedKeyringCanonicalizeTest.java | 11 ++++++----- settings.gradle | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java index e66026246..a4b6edac8 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java @@ -64,6 +64,7 @@ import org.sufficientlysecure.keychain.support.KeyringTestingHelper.RawPacket; import java.io.ByteArrayInputStream; import java.security.Security; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.Iterator; @@ -355,18 +356,18 @@ public class UncachedKeyringCanonicalizeTest { @Test public void testSignatureFuture() throws Exception { - // generate future - subHashedPacketsGen.setSignatureCreationTime(false, new Date(new Date().getTime() + 1000 * 1000)); + // generate future timestamp (we allow up to one day future timestamps) + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.DAY_OF_YEAR, 2); + subHashedPacketsGen.setSignatureCreationTime(false, cal.getTime()); injectEverytype(secretKey, ring, subHashedPacketsGen); - } @Test public void testSignatureLocal() throws Exception { - // generate future - subHashedPacketsGen.setSignatureCreationTime(false, new Date()); + // make key local only subHashedPacketsGen.setExportable(false, false); injectEverytype(secretKey, ring, subHashedPacketsGen); diff --git a/settings.gradle b/settings.gradle index b51bdc94d..7afbe219a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,3 +14,4 @@ include ':extern:minidns' include ':extern:KeybaseLib:Lib' include ':extern:TokenAutoComplete:library' include ':extern:safeslinger-exchange' +include ':OpenKeychain-Test' -- cgit v1.2.3