From a9952d021b75b68a5567d1b166981fedeb6a2670 Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sun, 18 Jun 2017 23:38:57 -0400 Subject: [PATCH] Update to Robolectric 3.3.2 This is necessary, as Robolectric 3.0 did not work with the newer Android SDK. Further, Robolectric 3.3.2 did not like running tests at SDK 17, so this was also bumped. --- app/build.gradle | 4 ++-- .../test/java/protect/card_locker/DatabaseTest.java | 6 +++--- .../protect/card_locker/ImportExportActivityTest.java | 10 ++++------ .../java/protect/card_locker/ImportExportTest.java | 6 +++--- .../card_locker/LoyaltyCardCursorAdapterTest.java | 6 +++--- .../card_locker/LoyaltyCardViewActivityTest.java | 9 ++++----- .../java/protect/card_locker/MainActivityTest.java | 6 +++--- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9ea4de950..6ac06dfb4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,10 +40,10 @@ dependencies { compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar' compile 'com.google.zxing:core:3.3.0' compile 'org.apache.commons:commons-csv:1.2' - compile group: 'com.google.guava', name: 'guava', version: '18.0' + compile group: 'com.google.guava', name: 'guava', version: '20.0' compile 'com.github.apl-devs:appintro:v4.2.0' testCompile 'junit:junit:4.12' - testCompile "org.robolectric:robolectric:3.0" + testCompile "org.robolectric:robolectric:3.3.2" } task findbugs(type: FindBugs, dependsOn: assembleDebug) { diff --git a/app/src/test/java/protect/card_locker/DatabaseTest.java b/app/src/test/java/protect/card_locker/DatabaseTest.java index 88761c8a3..7eab1444d 100644 --- a/app/src/test/java/protect/card_locker/DatabaseTest.java +++ b/app/src/test/java/protect/card_locker/DatabaseTest.java @@ -11,7 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; @@ -19,8 +19,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, sdk = 17) +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 23) public class DatabaseTest { private DBHelper db; diff --git a/app/src/test/java/protect/card_locker/ImportExportActivityTest.java b/app/src/test/java/protect/card_locker/ImportExportActivityTest.java index 6bb169c01..7b6485782 100644 --- a/app/src/test/java/protect/card_locker/ImportExportActivityTest.java +++ b/app/src/test/java/protect/card_locker/ImportExportActivityTest.java @@ -11,7 +11,7 @@ import android.view.View; 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.res.builder.RobolectricPackageManager; @@ -20,16 +20,14 @@ import static org.robolectric.Shadows.shadowOf; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, sdk = 17) +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 23) public class ImportExportActivityTest { private void registerIntentHandler(String handler) { // Add something that will 'handle' the given intent type - - RobolectricPackageManager packageManager = (RobolectricPackageManager) shadowOf( - RuntimeEnvironment.application).getPackageManager(); + RobolectricPackageManager packageManager = shadowOf(RuntimeEnvironment.application.getPackageManager()); ResolveInfo info = new ResolveInfo(); info.isDefault = true; diff --git a/app/src/test/java/protect/card_locker/ImportExportTest.java b/app/src/test/java/protect/card_locker/ImportExportTest.java index 563912410..312b2439c 100644 --- a/app/src/test/java/protect/card_locker/ImportExportTest.java +++ b/app/src/test/java/protect/card_locker/ImportExportTest.java @@ -11,7 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.io.ByteArrayInputStream; @@ -26,8 +26,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, sdk = 17) +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 23) public class ImportExportTest { private Activity activity; diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java index 8a2ff854f..995ae3f34 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java @@ -11,13 +11,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import static org.junit.Assert.assertEquals; -@RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, sdk = 17) +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 23) public class LoyaltyCardCursorAdapterTest { private Activity activity; diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java index 39da5e78c..b351a5c08 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java @@ -18,7 +18,7 @@ import org.junit.Before; 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.res.builder.RobolectricPackageManager; @@ -32,8 +32,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.robolectric.Shadows.shadowOf; -@RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, sdk = 17) +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 23) public class LoyaltyCardViewActivityTest { private final String BARCODE_DATA = "428311627547"; @@ -63,8 +63,7 @@ public class LoyaltyCardViewActivityTest private void registerMediaStoreIntentHandler() { // Add something that will 'handle' the media capture intent - RobolectricPackageManager packageManager = (RobolectricPackageManager) shadowOf( - RuntimeEnvironment.application).getPackageManager(); + RobolectricPackageManager packageManager = shadowOf(RuntimeEnvironment.application.getPackageManager()); ResolveInfo info = new ResolveInfo(); info.isDefault = true; diff --git a/app/src/test/java/protect/card_locker/MainActivityTest.java b/app/src/test/java/protect/card_locker/MainActivityTest.java index 022df00f0..d727fb89d 100644 --- a/app/src/test/java/protect/card_locker/MainActivityTest.java +++ b/app/src/test/java/protect/card_locker/MainActivityTest.java @@ -18,7 +18,7 @@ import org.junit.Before; 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.util.ActivityController; @@ -29,8 +29,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.robolectric.Shadows.shadowOf; -@RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, sdk = 17) +@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class, sdk = 23) public class MainActivityTest { private SharedPreferences prefs;