diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-08-29 13:36:35 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-08-29 13:36:35 +0200 |
| commit | c1cc27366cb9ab6a2962170f1363fc7accfc617c (patch) | |
| tree | d4bcd4627adbe317ca7c86204f554ae10256d14a | |
| parent | e037b7824856cea0bf090a394cb70eb92c38c5a4 (diff) | |
| download | open-keychain-c1cc27366cb9ab6a2962170f1363fc7accfc617c.tar.gz open-keychain-c1cc27366cb9ab6a2962170f1363fc7accfc617c.tar.bz2 open-keychain-c1cc27366cb9ab6a2962170f1363fc7accfc617c.zip | |
move stray test file to correct position
| -rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java (renamed from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/KeyFormattingUtilsTest.java) | 8 |
1 files changed, 5 insertions, 3 deletions
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 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[] { |