Make example use RobolectricTestRunner.

- Update to build tools 21.1.2 - Update JUnit to 4.11 - Fix robolectric version to 2.4 and fest-android to 1.0.8.
JCAndKSolutions · Dec 16, 2014 · fead8c9 · fead8c9
1 parent f607c6c
commit fead8c9
Show file tree

Hide file tree

Showing 35 changed files with 67 additions and 171 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-21.1.1
+    - build-tools-21.1.2
     - android-21
     - extra-android-m2repository
     - extra-google-m2repository

diff --git a/example/exampleApp/build.gradle b/example/exampleApp/build.gradle
@@ -14,7 +14,7 @@ apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 21
-  buildToolsVersion '21.1.1'
+  buildToolsVersion '21.1.2'
 
   buildTypes {
     debug {
@@ -71,8 +71,8 @@ androidUnitTest {
   }
   testTasks {
     all {
-      maxParallelForks = 4
-      forkEvery = 5
+      maxParallelForks = 2
+      forkEvery = 10
       minHeapSize = '128m'
       maxHeapSize = '1024m'
       jvmArgs '-XX:MaxPermSize=256m'
@@ -92,7 +92,7 @@ dependencies {
     jcenter()
   }
   compile project(':exampleLibrary')
-  testCompile 'junit:junit:4.10'
-  testCompile 'org.robolectric:robolectric:2.+'
-  testCompile 'com.squareup:fest-android:1.0.+'
+  testCompile 'junit:junit:4.11'
+  testCompile 'org.robolectric:robolectric:2.4'
+  testCompile 'com.squareup:fest-android:1.0.8'
 }
diff --git a/example/exampleApp/src/test/java/com/example/RobolectricGradleTestRunner.java b/example/exampleApp/src/test/java/com/example/RobolectricGradleTestRunner.java
diff --git a/example/exampleApp/src/test/java/org/robolectric/AndroidManifestExt.java b/example/exampleApp/src/test/java/org/robolectric/AndroidManifestExt.java
diff --git a/example/exampleApp/src/testBeta/java/com/example/BetaTest.java b/example/exampleApp/src/testBeta/java/com/example/BetaTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class BetaTest {
   @Test

diff --git a/example/exampleApp/src/testBetaDebug/java/com/example/BetaDebugTest.java b/example/exampleApp/src/testBetaDebug/java/com/example/BetaDebugTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class BetaDebugTest {
   @Test

diff --git a/example/exampleApp/src/testBetaRelease/java/com/example/BetaReleaseTest.java b/example/exampleApp/src/testBetaRelease/java/com/example/BetaReleaseTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class BetaReleaseTest {
   @Test

diff --git a/example/exampleApp/src/testDebug/java/com/example/DebugTest.java b/example/exampleApp/src/testDebug/java/com/example/DebugTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class DebugTest {
   @Test

diff --git a/example/exampleApp/src/testFree/java/com/example/FreeTest.java b/example/exampleApp/src/testFree/java/com/example/FreeTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeTest {
   @Test

diff --git a/example/exampleApp/src/testFreeBeta/java/com/example/FreeBetaTest.java b/example/exampleApp/src/testFreeBeta/java/com/example/FreeBetaTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeBetaTest {
   @Test

diff --git a/example/exampleApp/src/testFreeBetaDebug/java/com/example/FreeBetaDebugTest.java b/example/exampleApp/src/testFreeBetaDebug/java/com/example/FreeBetaDebugTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeBetaDebugTest {
   @Test

diff --git a/example/exampleApp/src/testFreeBetaRelease/java/com/example/FreeBetaReleaseTest.java b/example/exampleApp/src/testFreeBetaRelease/java/com/example/FreeBetaReleaseTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeBetaReleaseTest {
   @Test

diff --git a/example/exampleApp/src/testFreeDebug/java/com/example/FreeDebugTest.java b/example/exampleApp/src/testFreeDebug/java/com/example/FreeDebugTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeDebugTest {
   @Test

diff --git a/example/exampleApp/src/testFreeNormal/java/com/example/FreeNormalTest.java b/example/exampleApp/src/testFreeNormal/java/com/example/FreeNormalTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeNormalTest {
   @Test

diff --git a/example/exampleApp/src/testFreeNormalDebug/java/com/example/FreeNormalDebugTest.java b/example/exampleApp/src/testFreeNormalDebug/java/com/example/FreeNormalDebugTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeNormalDebugTest {
   @Test

diff --git a/example/exampleApp/src/testFreeNormalRelease/java/com/example/FreeNormalReleaseTest.java b/example/exampleApp/src/testFreeNormalRelease/java/com/example/FreeNormalReleaseTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeNormalReleaseTest {
   @Test

diff --git a/example/exampleApp/src/testFreeRelease/java/com/example/FreeReleaseTest.java b/example/exampleApp/src/testFreeRelease/java/com/example/FreeReleaseTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class FreeReleaseTest {
   @Test

diff --git a/example/exampleApp/src/testNormal/java/com/example/NormalTest.java b/example/exampleApp/src/testNormal/java/com/example/NormalTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class NormalTest {
   @Test

diff --git a/example/exampleApp/src/testNormalDebug/java/com/example/NormalDebugTest.java b/example/exampleApp/src/testNormalDebug/java/com/example/NormalDebugTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class NormalDebugTest {
   @Test

diff --git a/example/exampleApp/src/testNormalRelease/java/com/example/NormalReleaseTest.java b/example/exampleApp/src/testNormalRelease/java/com/example/NormalReleaseTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class NormalReleaseTest {
   @Test

diff --git a/example/exampleApp/src/testPaid/java/com/example/PaidTest.java b/example/exampleApp/src/testPaid/java/com/example/PaidTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class PaidTest {
   @Test

diff --git a/example/exampleApp/src/testPaidBeta/java/com/example/PaidBetaTest.java b/example/exampleApp/src/testPaidBeta/java/com/example/PaidBetaTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class PaidBetaTest {
   @Test

diff --git a/example/exampleApp/src/testPaidBetaDebug/java/com/example/PaidBetaDebugTest.java b/example/exampleApp/src/testPaidBetaDebug/java/com/example/PaidBetaDebugTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class PaidBetaDebugTest {
   @Test

diff --git a/example/exampleApp/src/testPaidBetaRelease/java/com/example/PaidBetaReleaseTest.java b/example/exampleApp/src/testPaidBetaRelease/java/com/example/PaidBetaReleaseTest.java
@@ -5,11 +5,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(emulateSdk = 18)
 public class PaidBetaReleaseTest {
   @Test