From dfc6524fc1d91752c740eddc7ee17327992a0758 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 19 Apr 2018 13:04:27 +0200 Subject: [PATCH] switch Robolectric to use compile SDK version --- app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java | 2 +- app/src/test/java/org/fdroid/fdroid/ProvisionerTest.java | 2 +- app/src/test/java/org/fdroid/fdroid/UtilsTest.java | 2 +- app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java | 2 +- .../test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java | 2 +- app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java | 2 +- app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java | 2 +- .../java/org/fdroid/fdroid/data/InstalledAppProviderTest.java | 2 +- .../java/org/fdroid/fdroid/data/PreferredSignatureTest.java | 2 +- app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java | 2 +- app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java | 2 +- .../test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java | 2 +- app/src/test/java/org/fdroid/fdroid/net/HttpDownloaderTest.java | 2 +- .../fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java | 2 +- .../java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java | 2 +- .../test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java | 2 +- .../test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java | 2 +- .../org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java | 2 +- .../test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java | 2 +- .../java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java b/app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java index 16b2f712e..bd9cd993c 100644 --- a/app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java +++ b/app/src/test/java/org/fdroid/fdroid/AntiFeaturesTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class AntiFeaturesTest extends FDroidProviderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/ProvisionerTest.java b/app/src/test/java/org/fdroid/fdroid/ProvisionerTest.java index 14882e15f..238eb86c6 100644 --- a/app/src/test/java/org/fdroid/fdroid/ProvisionerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/ProvisionerTest.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author Michael Poehn (michael.poehn@fsfe.org) */ -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) @SuppressWarnings("LineLength") public class ProvisionerTest { diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java index bb9589da0..18ac2d62d 100644 --- a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java +++ b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) @SuppressWarnings("LineLength") public class UtilsTest { diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java index bd0f2b86e..e012cc079 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java @@ -28,7 +28,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class ApkProviderTest extends FDroidProviderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java index d0044c8ae..715fbb0f1 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class AppPrefsProviderTest extends FDroidProviderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java index 6cc8803c7..113d27920 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) @SuppressWarnings("LineLength") public class AppProviderTest extends FDroidProviderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java b/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java index fa6ff4d0d..510c8a955 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java +++ b/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java @@ -19,7 +19,7 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowContentResolver; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class DatabaseMigration { diff --git a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java index 5bbedaa8d..616677fd4 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class InstalledAppProviderTest extends FDroidProviderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java b/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java index 2d2ddf8ef..c4dd49d40 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java @@ -13,7 +13,7 @@ import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class PreferredSignatureTest extends FDroidProviderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java index 5f738bcc0..9ffb5c9ad 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java @@ -20,7 +20,7 @@ import java.util.List; import static org.fdroid.fdroid.Assert.assertInvalidUri; import static org.fdroid.fdroid.Assert.assertValidUri; -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) @SuppressWarnings("LineLength") public class ProviderUriTests { diff --git a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java index c7e75d6f9..378ef8cfa 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class RepoProviderTest extends FDroidProviderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java b/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java index 269684c4d..5fe3ad3a2 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java @@ -16,7 +16,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class SuggestedVersionTest extends FDroidProviderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/net/HttpDownloaderTest.java b/app/src/test/java/org/fdroid/fdroid/net/HttpDownloaderTest.java index d5aee05c8..50ddb53b1 100644 --- a/app/src/test/java/org/fdroid/fdroid/net/HttpDownloaderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/net/HttpDownloaderTest.java @@ -15,7 +15,7 @@ import java.net.URL; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) @SuppressWarnings("LineLength") public class HttpDownloaderTest { diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java index fe90ccc26..aa74a4f13 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java @@ -19,7 +19,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest { private static final String TAG = "AcceptableMultiRepoTest"; diff --git a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java index 9cca0faaf..8ee352682 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java @@ -14,7 +14,7 @@ import org.robolectric.annotation.Config; * because there is so much metadata to parse in the main repo, covering many different aspects * of the available metadata. Some apps will be added, others updated, and it should all just work. */ -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) public class FDroidRepoUpdateTest extends MultiRepoUpdaterTest { diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java index 9ea25f9a4..bc49fd16b 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java @@ -55,7 +55,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) public class IndexV1UpdaterTest extends FDroidProviderTest { public static final String TAG = "IndexV1UpdaterTest"; diff --git a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java index 6f5608f4b..e44d2c375 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java @@ -18,7 +18,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) @SuppressWarnings("LineLength") public class Issue763MultiRepo extends MultiRepoUpdaterTest { diff --git a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java index aad16e4f8..d62a98eb9 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java @@ -34,7 +34,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@Config(constants = BuildConfig.class, sdk = 24, shadows = ProperMultiRepoUpdaterTest.ArmSystemProperties.class) +@Config(constants = BuildConfig.class, shadows = ProperMultiRepoUpdaterTest.ArmSystemProperties.class) @RunWith(RobolectricTestRunner.class) @SuppressWarnings("LineLength") public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest { diff --git a/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java b/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java index b5df872ce..7b568c579 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@Config(constants = BuildConfig.class, sdk = 24) +@Config(constants = BuildConfig.class) @RunWith(RobolectricTestRunner.class) public class RepoXMLHandlerTest { private static final String TAG = "RepoXMLHandlerTest"; diff --git a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java b/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java index 3532f1192..8a904f4e4 100644 --- a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java @@ -27,7 +27,7 @@ import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) +@Config(constants = BuildConfig.class, application = Application.class) @RunWith(RobolectricTestRunner.class) public class AppDetailsAdapterTest extends FDroidProviderTest {