From c24c3da1f1e391612049d15f1f96c546cd5f5c05 Mon Sep 17 00:00:00 2001 From: Plastix Date: Tue, 12 Jul 2016 03:28:38 -0400 Subject: [PATCH] Update Robolectric to 3.1 (#187) --- .../QualityMattersIntegrationRobolectricTestRunner.java | 7 +++++-- .../QualityMattersRobolectricUnitTestRunner.java | 5 ++++- dependencies.gradle | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/integrationTests/java/com/artemzin/qualitymatters/QualityMattersIntegrationRobolectricTestRunner.java b/app/src/integrationTests/java/com/artemzin/qualitymatters/QualityMattersIntegrationRobolectricTestRunner.java index 6fe28c1..03e9cab 100644 --- a/app/src/integrationTests/java/com/artemzin/qualitymatters/QualityMattersIntegrationRobolectricTestRunner.java +++ b/app/src/integrationTests/java/com/artemzin/qualitymatters/QualityMattersIntegrationRobolectricTestRunner.java @@ -12,7 +12,7 @@ public class QualityMattersIntegrationRobolectricTestRunner extends RobolectricGradleTestRunner { // This value should be changed as soon as Robolectric will support newer api. - private static final int SDK_EMULATE_LEVEL = 21; + private static final int SDK_EMULATE_LEVEL = 23; public QualityMattersIntegrationRobolectricTestRunner(@NonNull Class klass) throws Exception { super(klass); @@ -26,10 +26,13 @@ public Config getConfig(@NonNull Method method) { defaultConfig.manifest(), defaultConfig.qualifiers(), defaultConfig.packageName(), + defaultConfig.abiSplit(), defaultConfig.resourceDir(), defaultConfig.assetDir(), + defaultConfig.buildDir(), defaultConfig.shadows(), - QualityMattersIntegrationTestApp.class, + defaultConfig.instrumentedPackages(), + QualityMattersUnitTestApp.class, // Notice that we override real application class for Unit tests. defaultConfig.libraries(), defaultConfig.constants() == Void.class ? BuildConfig.class : defaultConfig.constants() ); diff --git a/app/src/unitTests/java/com/artemzin/qualitymatters/QualityMattersRobolectricUnitTestRunner.java b/app/src/unitTests/java/com/artemzin/qualitymatters/QualityMattersRobolectricUnitTestRunner.java index ccf47f3..f58670f 100644 --- a/app/src/unitTests/java/com/artemzin/qualitymatters/QualityMattersRobolectricUnitTestRunner.java +++ b/app/src/unitTests/java/com/artemzin/qualitymatters/QualityMattersRobolectricUnitTestRunner.java @@ -12,7 +12,7 @@ public class QualityMattersRobolectricUnitTestRunner extends RobolectricGradleTestRunner { // This value should be changed as soon as Robolectric will support newer api. - private static final int SDK_EMULATE_LEVEL = 21; + private static final int SDK_EMULATE_LEVEL = 23; public QualityMattersRobolectricUnitTestRunner(@NonNull Class klass) throws Exception { super(klass); @@ -26,9 +26,12 @@ public Config getConfig(@NonNull Method method) { defaultConfig.manifest(), defaultConfig.qualifiers(), defaultConfig.packageName(), + defaultConfig.abiSplit(), defaultConfig.resourceDir(), defaultConfig.assetDir(), + defaultConfig.buildDir(), defaultConfig.shadows(), + defaultConfig.instrumentedPackages(), QualityMattersUnitTestApp.class, // Notice that we override real application class for Unit tests. defaultConfig.libraries(), defaultConfig.constants() == Void.class ? BuildConfig.class : defaultConfig.constants() diff --git a/dependencies.gradle b/dependencies.gradle index 3cb6f3b..9cacac7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -42,7 +42,7 @@ ext.versions = [ processPhoenix : '1.0.2', junit : '4.12', - robolectric : '3.0', + robolectric : '3.1', assertJ : '2.4.0', equalsVerifier : '1.7.5', mockito : '1.10.19',