diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-09 13:16:30 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-09 13:16:30 +0200 |
commit | bceda47d12033ee2130197cc4716d4f7474a229d (patch) | |
tree | bcd32bb60f139c29c470a4e4b3df4a4c30ba2d9a /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java | |
parent | 2299c0302376d94312d3b7ae58ea6b7f7b5138c9 (diff) | |
download | open-keychain-bceda47d12033ee2130197cc4716d4f7474a229d.tar.gz open-keychain-bceda47d12033ee2130197cc4716d4f7474a229d.tar.bz2 open-keychain-bceda47d12033ee2130197cc4716d4f7474a229d.zip |
Tests not working anymore on travis after using new annotation parameter
Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0"
This reverts commit 85a47d22f9bb1e4aaf5770c67416a5532977658e.
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java')
-rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java index 2506f1630..c0e28cd4b 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java @@ -21,11 +21,11 @@ package org.sufficientlysecure.keychain.pgp; import junit.framework.AssertionFailedError; import org.junit.Assert; +import org.junit.Test; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.*; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.BCPGInputStream; @@ -41,7 +41,7 @@ import org.spongycastle.bcpg.UserIDPacket; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.openpgp.PGPSignature; -import org.sufficientlysecure.keychain.BuildConfig; +import org.sufficientlysecure.keychain.WorkaroundBuildConfig; import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; @@ -73,8 +73,7 @@ import java.util.List; import java.util.Random; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml", - packageName = "org.sufficientlysecure.keychain") +@Config(constants = WorkaroundBuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml") public class PgpKeyOperationTest { static UncachedKeyRing staticRing; |