diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-09 13:05:16 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-09 13:05:16 +0200 |
commit | 85a47d22f9bb1e4aaf5770c67416a5532977658e (patch) | |
tree | e2780addf5ebfb94652f37ac1e66ad1b62e8642f /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider | |
parent | 89f48cc62ee97cbd1c08abfee44699377425c77d (diff) | |
download | open-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/provider')
2 files changed, 13 insertions, 14 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java index 6779784a2..32fb68ea6 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java @@ -17,22 +17,23 @@ package org.sufficientlysecure.keychain.provider; -import java.util.Collections; -import java.util.Arrays; -import java.util.Collection; -import java.util.ArrayList; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.*; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.sufficientlysecure.keychain.BuildConfig; -import org.sufficientlysecure.keychain.WorkaroundBuildConfig; import org.sufficientlysecure.keychain.support.KeyringTestingHelper; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; + @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 ProviderHelperKeyringTest { @Test diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java index 04851ebbb..5fa7fb36d 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java @@ -22,23 +22,20 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.Robolectric; import org.robolectric.RobolectricGradleTestRunner; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.util.encoders.Hex; import org.sufficientlysecure.keychain.BuildConfig; -import org.sufficientlysecure.keychain.WorkaroundBuildConfig; +import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; +import org.sufficientlysecure.keychain.operations.results.SaveKeyringResult; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; -import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; -import org.sufficientlysecure.keychain.operations.results.SaveKeyringResult; import org.sufficientlysecure.keychain.util.IterableIterator; import org.sufficientlysecure.keychain.util.ProgressScaler; @@ -46,7 +43,8 @@ import java.util.Arrays; import java.util.Iterator; @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 ProviderHelperSaveTest { ProviderHelper mProviderHelper = new ProviderHelper(RuntimeEnvironment.application); |