From e8b24bc99498fa8b2974137380a931679e433739 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Tue, 14 Mar 2017 09:49:17 +1100 Subject: [PATCH] Bumped robolectric target to the same as our compile target When we first bumped to v24, robolectric didn't support it. Now it does. --- app/src/test/java/org/fdroid/fdroid/UtilsTest.java | 3 +-- app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java | 3 +-- .../test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java | 3 +-- app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java | 3 +-- .../test/java/org/fdroid/fdroid/data/DatabaseMigration.java | 3 +-- .../java/org/fdroid/fdroid/data/InstalledAppProviderTest.java | 3 +-- app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java | 3 +-- app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java | 3 +-- .../fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java | 3 +-- .../java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java | 3 +-- .../test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java | 3 +-- .../org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java | 3 +-- .../java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java | 3 +-- .../java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java | 3 +-- 14 files changed, 14 insertions(+), 28 deletions(-) diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java index f7e58ac0e..9932297ed 100644 --- a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java +++ b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java @@ -16,8 +16,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, sdk = 23) +@Config(constants = BuildConfig.class, sdk = 24) @RunWith(RobolectricTestRunner.class) 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 288a4282d..de7eb532c 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java @@ -29,8 +29,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, application = Application.class, sdk = 23) +@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) @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 877f4644b..3340e553a 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java @@ -16,8 +16,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, application = Application.class, sdk = 23) +@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) @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 c57ec459e..1abe19618 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java @@ -28,8 +28,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, application = Application.class, sdk = 23) +@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) @RunWith(RobolectricTestRunner.class) 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 ca8a792db..0fa834dd8 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java +++ b/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java @@ -19,8 +19,7 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowContentResolver; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, application = Application.class, sdk = 23) +@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) @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 de4ab010c..4ee2a182b 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java @@ -23,8 +23,7 @@ import static org.junit.Assert.assertTrue; import java.util.Map; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, application = Application.class, sdk = 23) +@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) @RunWith(RobolectricTestRunner.class) public class InstalledAppProviderTest 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 bc6754eac..0a79aa83f 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java @@ -20,8 +20,7 @@ import java.util.List; import static org.fdroid.fdroid.Assert.assertInvalidUri; import static org.fdroid.fdroid.Assert.assertValidUri; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, sdk = 23) +@Config(constants = BuildConfig.class, sdk = 24) @RunWith(RobolectricTestRunner.class) 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 d4b974e24..85c3b641f 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java @@ -41,8 +41,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, application = Application.class, sdk = 23) +@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) @RunWith(RobolectricTestRunner.class) public class RepoProviderTest extends FDroidProviderTest { 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 e2c781ce6..0f7517c46 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java @@ -20,8 +20,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, sdk = 23) +@Config(constants = BuildConfig.class, sdk = 24) @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 6b1f75b8a..b8eaaf971 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java @@ -14,8 +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. */ -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, sdk = 23) +@Config(constants = BuildConfig.class, sdk = 24) @RunWith(RobolectricTestRunner.class) public class FDroidRepoUpdateTest extends MultiRepoUpdaterTest { 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 41bdffd50..ad59b3d61 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java @@ -19,8 +19,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, sdk = 23) +@Config(constants = BuildConfig.class, sdk = 24) @RunWith(RobolectricTestRunner.class) 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 bbf061671..578391376 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java @@ -30,8 +30,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, sdk = 23) +@Config(constants = BuildConfig.class, sdk = 24) @RunWith(RobolectricTestRunner.class) public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest { private static final String TAG = "ProperMultiRepoSupport"; 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 20c08030e..38acb06cd 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java @@ -56,8 +56,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, sdk = 23) +@Config(constants = BuildConfig.class, sdk = 24) @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 bc50b0f7b..70ac2834f 100644 --- a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java @@ -23,8 +23,7 @@ import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -// TODO: Use sdk=24 when Robolectric supports this -@Config(constants = BuildConfig.class, application = Application.class, sdk = 23) +@Config(constants = BuildConfig.class, application = Application.class, sdk = 24) @RunWith(RobolectricTestRunner.class) public class AppDetailsAdapterTest extends FDroidProviderTest {