From 8d555eb8376d1ba9620d7e0201765c0badf49046 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Tue, 23 May 2017 11:39:17 -0400 Subject: [PATCH] Read Robolectric version from environment --- app/build.gradle | 1 + .../java/org/isoron/uhabits/activities/BaseActivityTest.java | 2 +- .../test/java/org/isoron/uhabits/activities/BaseScreenTest.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index eaefab308..13eb6d1a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,6 +14,7 @@ android { buildConfigField "Integer", "databaseVersion", "19" buildConfigField "String", "databaseFilename", "\"uhabits.db\"" + buildConfigField "Integer", "roboSdk", (System.getenv("ROBO_SDK")?: "25") testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArgument "size", "medium" diff --git a/app/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java b/app/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java index aa94d89fe..cf3050970 100644 --- a/app/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java +++ b/app/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java @@ -42,7 +42,7 @@ import static org.robolectric.Robolectric.*; import static org.robolectric.Shadows.*; @RunWith(RobolectricTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(sdk = BuildConfig.roboSdk, constants = BuildConfig.class) public class BaseActivityTest { private static boolean hasCrashed = false; diff --git a/app/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java b/app/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java index 7fdc7375b..f087aca4d 100644 --- a/app/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java +++ b/app/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.*; import static org.robolectric.Robolectric.*; @RunWith(RobolectricTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(sdk = BuildConfig.roboSdk, constants = BuildConfig.class) public class BaseScreenTest { @Test