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/provider | |
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/provider')
2 files changed, 14 insertions, 13 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 32fb68ea6..6779784a2 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java @@ -17,23 +17,22 @@ 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.RobolectricGradleTestRunner; -import org.robolectric.RuntimeEnvironment; +import org.robolectric.*; 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 = 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 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 5fa7fb36d..04851ebbb 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperSaveTest.java @@ -22,20 +22,23 @@ 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.operations.results.OperationResult.OperationLog; -import org.sufficientlysecure.keychain.operations.results.SaveKeyringResult; +import org.sufficientlysecure.keychain.WorkaroundBuildConfig; 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; @@ -43,8 +46,7 @@ import java.util.Arrays; import java.util.Iterator; @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 ProviderHelperSaveTest { ProviderHelper mProviderHelper = new ProviderHelper(RuntimeEnvironment.application); |