From c1cc27366cb9ab6a2962170f1363fc7accfc617c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 29 Aug 2015 13:36:35 +0200
Subject: [PATCH] move stray test file to correct position

---
 .../keychain/util/KeyFormattingUtilsTest.java             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename {OpenKeychain-Test => OpenKeychain}/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java (79%)

diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java
similarity index 79%
rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java
rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java
index 6aa4e7b8e..44e383d85 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java
@@ -4,12 +4,14 @@ package org.sufficientlysecure.keychain.util;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 
 
-@RunWith(RobolectricTestRunner.class)
-@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(constants = WorkaroundBuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml")
 public class KeyFormattingUtilsTest {
 
     static final byte[] fp = new byte[] {