Update Robolectric to 3.1 (artem-zinnatullin#187)

mufidtk · Jul 12, 2016 · c24c3da · c24c3da
1 parent 40045de
commit c24c3da
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...ests/java/com/artemzin/qualitymatters/QualityMattersIntegrationRobolectricTestRunner.java b/...ests/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/...c/unitTests/java/com/artemzin/qualitymatters/QualityMattersRobolectricUnitTestRunner.java b/...c/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
@@ -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',