From f392d95ac34361ac9b38f9f39baf57500717e665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 8 Sep 2014 11:40:06 +0200
Subject: [PATCH] Fix test

---
 .../keychain/pgp/UncachedKeyringMergeTest.java                  | 2 +-
 settings.gradle                                                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
index 64152a040..96d56cb77 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
@@ -281,7 +281,7 @@ public class UncachedKeyringMergeTest {
                     ringB.getEncoded(), false, 0).getSecretKey();
             secretKey.unlock("");
             // sign all user ids
-            modified = secretKey.certifyUserIds(publicRing, publicRing.getPublicKey().getUnorderedUserIds());
+            modified = secretKey.certifyUserIds(publicRing, publicRing.getPublicKey().getUnorderedUserIds(), null, null);
         }
 
         {
diff --git a/settings.gradle b/settings.gradle
index 038e9da23..997dcc838 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,3 +15,4 @@ include ':extern:KeybaseLib:Lib'
 include ':extern:TokenAutoComplete:library'
 include ':extern:openpgp-card-nfc-lib:library'
 include ':extern:safeslinger-exchange'
+include ':OpenKeychain-Test'