aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-09 13:05:16 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-09 13:05:16 +0200
commit85a47d22f9bb1e4aaf5770c67416a5532977658e (patch)
treee2780addf5ebfb94652f37ac1e66ad1b62e8642f /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
parent89f48cc62ee97cbd1c08abfee44699377425c77d (diff)
downloadopen-keychain-85a47d22f9bb1e4aaf5770c67416a5532977658e.tar.gz
open-keychain-85a47d22f9bb1e4aaf5770c67416a5532977658e.tar.bz2
open-keychain-85a47d22f9bb1e4aaf5770c67416a5532977658e.zip
Get rid of robolectric workaround by using new annotation in robolectric 3.0
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java')
-rw-r--r--OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
index e946acf01..1097c9e89 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
@@ -24,12 +24,10 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLog;
import org.spongycastle.bcpg.sig.KeyFlags;
import org.sufficientlysecure.keychain.BuildConfig;
-import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult;
import org.sufficientlysecure.keychain.pgp.UncachedKeyRing.IteratorWithIOThrow;
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
@@ -45,7 +43,8 @@ import java.util.Iterator;
import java.util.Random;
@RunWith(RobolectricGradleTestRunner.class)
-@Config(constants = WorkaroundBuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml")
+@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml",
+ packageName = "org.sufficientlysecure.keychain")
public class UncachedKeyringTest {
static UncachedKeyRing staticRing, staticPubRing;