From ce946f4257f7ccfbace40eea774a1545728d48cd Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Tue, 14 Mar 2017 09:37:53 +1100 Subject: [PATCH] Bump robolectric version There were troubles with the particular version of gradle plugin and gradle that we were using, which has since been fixed by robolectric. --- app/build.gradle | 2 +- .../java/org/fdroid/fdroid/TestUtils.java | 9 ++++++++ .../java/org/fdroid/fdroid/UtilsTest.java | 4 ++-- .../fdroid/fdroid/data/ApkProviderTest.java | 4 ++-- .../fdroid/data/AppPrefsProviderTest.java | 8 +++---- .../fdroid/fdroid/data/AppProviderTest.java | 7 +++--- .../fdroid/data/CategoryProviderTest.java | 9 ++++---- .../fdroid/fdroid/data/DatabaseMigration.java | 6 ++--- .../fdroid/data/FDroidProviderTest.java | 2 +- .../fdroid/data/InstalledAppProviderTest.java | 8 +++---- .../fdroid/fdroid/data/ProviderUriTests.java | 22 +++++++++---------- .../fdroid/fdroid/data/RepoProviderTest.java | 4 ++-- .../AcceptableMultiRepoUpdaterTest.java | 4 ++-- .../fdroid/updater/FDroidRepoUpdateTest.java | 4 ++-- .../fdroid/updater/Issue763MultiRepo.java | 4 ++-- .../updater/ProperMultiRepoUpdaterTest.java | 4 ++-- .../fdroid/updater/RepoXMLHandlerTest.java | 4 ++-- .../fdroid/views/AppDetailsAdapterTest.java | 4 ++-- 18 files changed, 59 insertions(+), 50 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 536765ef6..d7bedaf25 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -50,7 +50,7 @@ dependencies { testCompile 'junit:junit:4.12' - testCompile "org.robolectric:robolectric:3.1.2" + testCompile "org.robolectric:robolectric:3.3.1" // As per https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474 testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1' diff --git a/app/src/test/java/org/fdroid/fdroid/TestUtils.java b/app/src/test/java/org/fdroid/fdroid/TestUtils.java index 2cc05800c..febd80a26 100644 --- a/app/src/test/java/org/fdroid/fdroid/TestUtils.java +++ b/app/src/test/java/org/fdroid/fdroid/TestUtils.java @@ -1,9 +1,12 @@ package org.fdroid.fdroid; +import android.content.ContentProvider; import android.content.ContentResolver; import android.content.ContextWrapper; +import android.content.pm.ProviderInfo; import org.mockito.AdditionalAnswers; +import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowContentResolver; @@ -22,6 +25,12 @@ public class TestUtils { @SuppressWarnings("unused") private static final String TAG = "TestUtils"; // NOPMD + public static void registerContentProvider(String authority, Class providerClass) { + ProviderInfo info = new ProviderInfo(); + info.authority = authority; + Robolectric.buildContentProvider(providerClass).create(info); + } + public static File copyResourceToTempFile(String resourceName) { File tempFile = null; InputStream input = null; diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java index f434dadf1..f7e58ac0e 100644 --- a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java +++ b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java @@ -6,7 +6,7 @@ import android.content.Context; import org.fdroid.fdroid.views.AppDetailsRecyclerViewAdapter; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -18,7 +18,7 @@ import static org.junit.Assert.assertTrue; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UtilsTest { String fdroidFingerprint = "43238D512C1E5EB2D6569F4A3AFBF5523418B82E0A3ED1552770ABB9A9C9CCAB"; 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 0f21dd119..288a4282d 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java @@ -13,7 +13,7 @@ import org.fdroid.fdroid.mock.MockApk; import org.fdroid.fdroid.mock.MockRepo; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.ArrayList; @@ -31,7 +31,7 @@ import static org.junit.Assert.fail; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApkProviderTest extends FDroidProviderTest { private static final String[] PROJ = Cols.ALL; 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 150e99f99..877f4644b 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java @@ -4,12 +4,12 @@ import android.app.Application; import org.fdroid.fdroid.Assert; import org.fdroid.fdroid.BuildConfig; +import org.fdroid.fdroid.TestUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowContentResolver; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; @@ -18,12 +18,12 @@ import static org.junit.Assert.assertNull; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppPrefsProviderTest extends FDroidProviderTest { @Before public void setup() { - ShadowContentResolver.registerProvider(AppProvider.getAuthority(), new AppProvider()); + TestUtils.registerContentProvider(AppProvider.getAuthority(), AppProvider.class); } @SuppressWarnings({"PMD.EqualsNull", "EqualsWithItself", "EqualsBetweenInconvertibleTypes", "ObjectEqualsNull"}) 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 1fa675503..c57ec459e 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java @@ -8,11 +8,12 @@ import android.database.Cursor; import android.net.Uri; import org.fdroid.fdroid.BuildConfig; +import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowContentResolver; @@ -29,14 +30,14 @@ import static org.junit.Assert.assertTrue; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppProviderTest extends FDroidProviderTest { private static final String[] PROJ = Cols.ALL; @Before public void setup() { - ShadowContentResolver.registerProvider(AppProvider.getAuthority(), new AppProvider()); + TestUtils.registerContentProvider(AppProvider.getAuthority(), AppProvider.class); } /** diff --git a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java index fb73d0fb6..5903f335b 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java @@ -7,28 +7,27 @@ import android.net.Uri; import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.R; +import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols; import org.fdroid.fdroid.mock.MockRepo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowContentResolver; import java.util.List; import static org.fdroid.fdroid.Assert.assertContainsOnly; import static org.junit.Assert.assertEquals; -// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CategoryProviderTest extends FDroidProviderTest { @Before public void setup() { - ShadowContentResolver.registerProvider(AppProvider.getAuthority(), new AppProvider()); + TestUtils.registerContentProvider(AppProvider.getAuthority(), AppProvider.class); } // ======================================================================== 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 c53cbeefe..ca8a792db 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java +++ b/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java @@ -13,7 +13,7 @@ import org.fdroid.fdroid.Utils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -21,7 +21,7 @@ import org.robolectric.shadows.ShadowContentResolver; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DatabaseMigration { protected ShadowContentResolver contentResolver; @@ -31,7 +31,7 @@ public class DatabaseMigration { public final void setupBase() { contentResolver = Shadows.shadowOf(RuntimeEnvironment.application.getContentResolver()); context = TestUtils.createContextWithContentResolver(contentResolver); - ShadowContentResolver.registerProvider(AppProvider.getAuthority(), new AppProvider()); + TestUtils.registerContentProvider(AppProvider.getAuthority(), AppProvider.class); } @Test diff --git a/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java index ca46c75a5..c1f2463ce 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java @@ -18,7 +18,7 @@ public abstract class FDroidProviderTest { public final void setupBase() { contentResolver = Shadows.shadowOf(RuntimeEnvironment.application.getContentResolver()); context = TestUtils.createContextWithContentResolver(contentResolver); - ShadowContentResolver.registerProvider(AppProvider.getAuthority(), new AppProvider()); + TestUtils.registerContentProvider(AppProvider.getAuthority(), AppProvider.class); } @After 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 148c59544..de4ab010c 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java @@ -6,14 +6,14 @@ import android.database.Cursor; import android.net.Uri; import org.fdroid.fdroid.BuildConfig; +import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Schema.InstalledAppTable.Cols; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowContentResolver; import static org.fdroid.fdroid.Assert.assertIsInstalledVersionInDb; import static org.fdroid.fdroid.Assert.assertResultCount; @@ -25,12 +25,12 @@ import java.util.Map; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstalledAppProviderTest extends FDroidProviderTest { @Before public void setup() { - ShadowContentResolver.registerProvider(InstalledAppProvider.getAuthority(), new InstalledAppProvider()); + TestUtils.registerContentProvider(InstalledAppProvider.getAuthority(), InstalledAppProvider.class); } @Test 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 410285fc3..bc6754eac 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java @@ -8,7 +8,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -22,7 +22,7 @@ import static org.fdroid.fdroid.Assert.assertValidUri; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ProviderUriTests { private ShadowContentResolver resolver; @@ -39,14 +39,14 @@ public class ProviderUriTests { @Test public void invalidInstalledAppProviderUris() { - ShadowContentResolver.registerProvider(InstalledAppProvider.getAuthority(), new InstalledAppProvider()); + TestUtils.registerContentProvider(InstalledAppProvider.getAuthority(), InstalledAppProvider.class); assertInvalidUri(resolver, InstalledAppProvider.getAuthority()); assertInvalidUri(resolver, "blah"); } @Test public void validInstalledAppProviderUris() { - ShadowContentResolver.registerProvider(InstalledAppProvider.getAuthority(), new InstalledAppProvider()); + TestUtils.registerContentProvider(InstalledAppProvider.getAuthority(), InstalledAppProvider.class); String[] projection = new String[] {InstalledAppTable.Cols._ID}; assertValidUri(resolver, InstalledAppProvider.getContentUri(), projection); assertValidUri(resolver, InstalledAppProvider.getAppUri("org.example.app"), projection); @@ -58,14 +58,14 @@ public class ProviderUriTests { @Test public void invalidRepoProviderUris() { - ShadowContentResolver.registerProvider(RepoProvider.getAuthority(), new RepoProvider()); + TestUtils.registerContentProvider(RepoProvider.getAuthority(), RepoProvider.class); assertInvalidUri(resolver, RepoProvider.getAuthority()); assertInvalidUri(resolver, "blah"); } @Test public void validRepoProviderUris() { - ShadowContentResolver.registerProvider(RepoProvider.getAuthority(), new RepoProvider()); + TestUtils.registerContentProvider(RepoProvider.getAuthority(), RepoProvider.class); String[] projection = new String[] {Schema.RepoTable.Cols._ID}; assertValidUri(resolver, RepoProvider.getContentUri(), projection); assertValidUri(resolver, RepoProvider.getContentUri(10000L), projection); @@ -74,14 +74,14 @@ public class ProviderUriTests { @Test public void invalidAppProviderUris() { - ShadowContentResolver.registerProvider(AppProvider.getAuthority(), new AppProvider()); + TestUtils.registerContentProvider(AppProvider.getAuthority(), AppProvider.class); assertInvalidUri(resolver, AppProvider.getAuthority()); assertInvalidUri(resolver, "blah"); } @Test public void validAppProviderUris() { - ShadowContentResolver.registerProvider(AppProvider.getAuthority(), new AppProvider()); + TestUtils.registerContentProvider(AppProvider.getAuthority(), AppProvider.class); String[] projection = new String[] {Schema.AppMetadataTable.Cols._ID}; assertValidUri(resolver, AppProvider.getContentUri(), "content://org.fdroid.fdroid.data.AppProvider", projection); assertValidUri(resolver, AppProvider.getSearchUri("'searching!'", null), "content://org.fdroid.fdroid.data.AppProvider/search/'searching!'", projection); @@ -105,7 +105,7 @@ public class ProviderUriTests { @Test public void validTempAppProviderUris() { - ShadowContentResolver.registerProvider(TempAppProvider.getAuthority(), new TempAppProvider()); + TestUtils.registerContentProvider(TempAppProvider.getAuthority(), TempAppProvider.class); String[] projection = new String[]{Schema.AppMetadataTable.Cols._ID}; // Required so that the `assertValidUri` calls below will indeed have a real temp_fdroid_app @@ -122,14 +122,14 @@ public class ProviderUriTests { @Test public void invalidApkProviderUris() { - ShadowContentResolver.registerProvider(ApkProvider.getAuthority(), new ApkProvider()); + TestUtils.registerContentProvider(ApkProvider.getAuthority(), ApkProvider.class); assertInvalidUri(resolver, ApkProvider.getAuthority()); assertInvalidUri(resolver, "blah"); } @Test public void validApkProviderUris() { - ShadowContentResolver.registerProvider(ApkProvider.getAuthority(), new ApkProvider()); + TestUtils.registerContentProvider(ApkProvider.getAuthority(), ApkProvider.class); String[] projection = new String[] {Schema.ApkTable.Cols._ID}; List apks = new ArrayList<>(10); 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 c9553c83c..d4b974e24 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java @@ -32,7 +32,7 @@ import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Schema.RepoTable; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.List; @@ -43,7 +43,7 @@ import static org.junit.Assert.assertNull; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RepoProviderTest extends FDroidProviderTest { private static final String[] COLS = RepoTable.Cols.ALL; 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 90ced14d3..e2c781ce6 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java @@ -12,7 +12,7 @@ import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.data.Schema.RepoTable.Cols; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.List; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.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 11d1586bb..6b1f75b8a 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java @@ -6,7 +6,7 @@ import org.fdroid.fdroid.RepoUpdater; import org.fdroid.fdroid.Utils; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; /** @@ -16,7 +16,7 @@ import org.robolectric.annotation.Config; */ // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FDroidRepoUpdateTest extends MultiRepoUpdaterTest { private static final String TAG = "FDroidRepoUpdateTest"; 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 f4f169092..41bdffd50 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java @@ -12,7 +12,7 @@ import org.fdroid.fdroid.data.Schema; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.List; @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class Issue763MultiRepo extends MultiRepoUpdaterTest { private Repo microGRepo; 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 e978ec5ac..bbf061671 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java @@ -18,7 +18,7 @@ import org.fdroid.fdroid.data.Schema.AppMetadataTable; import org.fdroid.fdroid.data.Schema.RepoTable.Cols; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.lang.annotation.Retention; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotNull; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.class) +@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 b14ec574c..20c08030e 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java @@ -36,7 +36,7 @@ import org.fdroid.fdroid.mock.RepoDetails; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; @@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue; // TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 23) -@RunWith(RobolectricGradleTestRunner.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 c4b63b1f4..bc50b0f7b 100644 --- a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java @@ -18,14 +18,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; 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) -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppDetailsAdapterTest extends FDroidProviderTest { @Before