From fead8c9679f6365fbb0c8b5f40a987ffca9cf1f9 Mon Sep 17 00:00:00 2001 From: superjugy Date: Tue, 16 Dec 2014 11:31:04 -0600 Subject: [PATCH] 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. --- .travis.yml | 2 +- example/exampleApp/build.gradle | 12 +++--- .../example/RobolectricGradleTestRunner.java | 28 -------------- .../org/robolectric/AndroidManifestExt.java | 38 ------------------- .../testBeta/java/com/example/BetaTest.java | 3 +- .../java/com/example/BetaDebugTest.java | 3 +- .../java/com/example/BetaReleaseTest.java | 3 +- .../testDebug/java/com/example/DebugTest.java | 3 +- .../testFree/java/com/example/FreeTest.java | 3 +- .../java/com/example/FreeBetaTest.java | 3 +- .../java/com/example/FreeBetaDebugTest.java | 3 +- .../java/com/example/FreeBetaReleaseTest.java | 3 +- .../java/com/example/FreeDebugTest.java | 3 +- .../java/com/example/FreeNormalTest.java | 3 +- .../java/com/example/FreeNormalDebugTest.java | 3 +- .../com/example/FreeNormalReleaseTest.java | 3 +- .../java/com/example/FreeReleaseTest.java | 3 +- .../java/com/example/NormalTest.java | 3 +- .../java/com/example/NormalDebugTest.java | 3 +- .../java/com/example/NormalReleaseTest.java | 3 +- .../testPaid/java/com/example/PaidTest.java | 3 +- .../java/com/example/PaidBetaTest.java | 3 +- .../java/com/example/PaidBetaDebugTest.java | 3 +- .../java/com/example/PaidBetaReleaseTest.java | 3 +- .../java/com/example/PaidDebugTest.java | 3 +- .../java/com/example/PaidNormalTest.java | 3 +- .../java/com/example/PaidNormalDebugTest.java | 3 +- .../com/example/PaidNormalReleaseTest.java | 3 +- .../java/com/example/PaidReleaseTest.java | 3 +- .../java/com/example/ReleaseTest.java | 3 +- example/exampleLibrary/build.gradle | 8 ++-- .../example/RobolectricGradleTestRunner.java | 28 -------------- .../org/robolectric/AndroidManifestExt.java | 38 ------------------- .../testDebug/java/com/example/DebugTest.java | 3 +- .../java/com/example/ReleaseTest.java | 3 +- 35 files changed, 67 insertions(+), 171 deletions(-) delete mode 100644 example/exampleApp/src/test/java/com/example/RobolectricGradleTestRunner.java delete mode 100644 example/exampleApp/src/test/java/org/robolectric/AndroidManifestExt.java delete mode 100644 example/exampleLibrary/src/test/java/com/example/RobolectricGradleTestRunner.java delete mode 100644 example/exampleLibrary/src/test/java/org/robolectric/AndroidManifestExt.java diff --git a/.travis.yml b/.travis.yml index 179818e..a10ae69 100644 --- 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 index 01d9446..65a3400 100644 --- 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 deleted file mode 100644 index fb5650d..0000000 --- a/example/exampleApp/src/test/java/com/example/RobolectricGradleTestRunner.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.example; - -import org.junit.runners.model.InitializationError; -import org.robolectric.AndroidManifest; -import org.robolectric.AndroidManifestExt; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; -import org.robolectric.res.Fs; - -public class RobolectricGradleTestRunner extends RobolectricTestRunner { - public RobolectricGradleTestRunner(final Class testClass) throws InitializationError { - super(testClass); - } - - @Override - protected AndroidManifest getAppManifest(final Config config) { - final String manifestProperty = System.getProperty("android.manifest"); - if (config.manifest().equals(Config.DEFAULT) && manifestProperty != null) { - final String resProperty = System.getProperty("android.resources"); - final String assetsProperty = System.getProperty("android.assets"); - final String packageProperty = System.getProperty("android.package"); - final AndroidManifestExt a = new AndroidManifestExt(Fs.fileFromPath(manifestProperty), Fs.fileFromPath(resProperty), Fs.fileFromPath(assetsProperty)); - a.setPackageName(packageProperty); - return a; - } - return super.getAppManifest(config); - } -} diff --git a/example/exampleApp/src/test/java/org/robolectric/AndroidManifestExt.java b/example/exampleApp/src/test/java/org/robolectric/AndroidManifestExt.java deleted file mode 100644 index e0135ba..0000000 --- a/example/exampleApp/src/test/java/org/robolectric/AndroidManifestExt.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.robolectric; - -import org.robolectric.res.FsFile; - -public class AndroidManifestExt extends AndroidManifest { - private static final String R = ".R"; - private String mPackageName; - private boolean isPackageSet; - - public AndroidManifestExt(final FsFile androidManifestFile, final FsFile resDirectory, final FsFile assetsDirectory) { - super(androidManifestFile, resDirectory, assetsDirectory); - } - - @SuppressWarnings("ProhibitedExceptionDeclared") - @Override - public String getRClassName() throws Exception { - if (isPackageSet) { - parseAndroidManifest(); - return mPackageName + R; - } - return super.getRClassName(); - } - - @Override - public String getPackageName() { - if (isPackageSet) { - parseAndroidManifest(); - return mPackageName; - } else { - return super.getPackageName(); - } - } - - public void setPackageName(final String packageName) { - mPackageName = packageName; - isPackageSet = packageName != null; - } -} diff --git a/example/exampleApp/src/testBeta/java/com/example/BetaTest.java b/example/exampleApp/src/testBeta/java/com/example/BetaTest.java index fab31c3..7b8ac9f 100644 --- 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 index 0f8cc81..2d2ae36 100644 --- 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 index 41786dd..d4224b7 100644 --- 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 index aa2e175..8a1b5b1 100644 --- 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 index ab289c0..d18d911 100644 --- 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 index 38fe320..1b593bd 100644 --- 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 index 5db2bf3..e8c36ec 100644 --- 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 index 4574f20..d9a3a3e 100644 --- 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 index ec01942..928a6a9 100644 --- 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 index c871caa..abad32b 100644 --- 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 index eeaa178..3b6165d 100644 --- 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 index 24401ef..49f5b44 100644 --- 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 index ea6e424..e1192e6 100644 --- 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 index 15eef5e..b8fa654 100644 --- 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 index e635aa3..744bf56 100644 --- 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 index 43cd670..8b2c779 100644 --- 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 index 0e03b59..a800bf5 100644 --- 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 index 236e240..05eb6fa 100644 --- 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 index f351239..3656c89 100644 --- 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 index e88b493..3f6063f 100644 --- 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 diff --git a/example/exampleApp/src/testPaidDebug/java/com/example/PaidDebugTest.java b/example/exampleApp/src/testPaidDebug/java/com/example/PaidDebugTest.java index 2d17277..ada51e9 100644 --- a/example/exampleApp/src/testPaidDebug/java/com/example/PaidDebugTest.java +++ b/example/exampleApp/src/testPaidDebug/java/com/example/PaidDebugTest.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 PaidDebugTest { @Test diff --git a/example/exampleApp/src/testPaidNormal/java/com/example/PaidNormalTest.java b/example/exampleApp/src/testPaidNormal/java/com/example/PaidNormalTest.java index b9344c0..341ee31 100644 --- a/example/exampleApp/src/testPaidNormal/java/com/example/PaidNormalTest.java +++ b/example/exampleApp/src/testPaidNormal/java/com/example/PaidNormalTest.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 PaidNormalTest { @Test diff --git a/example/exampleApp/src/testPaidNormalDebug/java/com/example/PaidNormalDebugTest.java b/example/exampleApp/src/testPaidNormalDebug/java/com/example/PaidNormalDebugTest.java index 817d4a2..ad833da 100644 --- a/example/exampleApp/src/testPaidNormalDebug/java/com/example/PaidNormalDebugTest.java +++ b/example/exampleApp/src/testPaidNormalDebug/java/com/example/PaidNormalDebugTest.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 PaidNormalDebugTest { @Test diff --git a/example/exampleApp/src/testPaidNormalRelease/java/com/example/PaidNormalReleaseTest.java b/example/exampleApp/src/testPaidNormalRelease/java/com/example/PaidNormalReleaseTest.java index 6fa0bfa..8e4719e 100644 --- a/example/exampleApp/src/testPaidNormalRelease/java/com/example/PaidNormalReleaseTest.java +++ b/example/exampleApp/src/testPaidNormalRelease/java/com/example/PaidNormalReleaseTest.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 PaidNormalReleaseTest { @Test diff --git a/example/exampleApp/src/testPaidRelease/java/com/example/PaidReleaseTest.java b/example/exampleApp/src/testPaidRelease/java/com/example/PaidReleaseTest.java index 9d6badf..c1aa49d 100644 --- a/example/exampleApp/src/testPaidRelease/java/com/example/PaidReleaseTest.java +++ b/example/exampleApp/src/testPaidRelease/java/com/example/PaidReleaseTest.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 PaidReleaseTest { @Test diff --git a/example/exampleApp/src/testRelease/java/com/example/ReleaseTest.java b/example/exampleApp/src/testRelease/java/com/example/ReleaseTest.java index 432768d..25539db 100644 --- a/example/exampleApp/src/testRelease/java/com/example/ReleaseTest.java +++ b/example/exampleApp/src/testRelease/java/com/example/ReleaseTest.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 ReleaseTest { @Test diff --git a/example/exampleLibrary/build.gradle b/example/exampleLibrary/build.gradle index 4291511..5d09c39 100644 --- a/example/exampleLibrary/build.gradle +++ b/example/exampleLibrary/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 21 - buildToolsVersion '21.1.1' + buildToolsVersion '21.1.2' } apply plugin: 'android-unit-test' @@ -31,7 +31,7 @@ dependencies { jcenter() } compile 'com.google.android.gms:play-services:6.1.11' - 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/exampleLibrary/src/test/java/com/example/RobolectricGradleTestRunner.java b/example/exampleLibrary/src/test/java/com/example/RobolectricGradleTestRunner.java deleted file mode 100644 index fb5650d..0000000 --- a/example/exampleLibrary/src/test/java/com/example/RobolectricGradleTestRunner.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.example; - -import org.junit.runners.model.InitializationError; -import org.robolectric.AndroidManifest; -import org.robolectric.AndroidManifestExt; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; -import org.robolectric.res.Fs; - -public class RobolectricGradleTestRunner extends RobolectricTestRunner { - public RobolectricGradleTestRunner(final Class testClass) throws InitializationError { - super(testClass); - } - - @Override - protected AndroidManifest getAppManifest(final Config config) { - final String manifestProperty = System.getProperty("android.manifest"); - if (config.manifest().equals(Config.DEFAULT) && manifestProperty != null) { - final String resProperty = System.getProperty("android.resources"); - final String assetsProperty = System.getProperty("android.assets"); - final String packageProperty = System.getProperty("android.package"); - final AndroidManifestExt a = new AndroidManifestExt(Fs.fileFromPath(manifestProperty), Fs.fileFromPath(resProperty), Fs.fileFromPath(assetsProperty)); - a.setPackageName(packageProperty); - return a; - } - return super.getAppManifest(config); - } -} diff --git a/example/exampleLibrary/src/test/java/org/robolectric/AndroidManifestExt.java b/example/exampleLibrary/src/test/java/org/robolectric/AndroidManifestExt.java deleted file mode 100644 index e0135ba..0000000 --- a/example/exampleLibrary/src/test/java/org/robolectric/AndroidManifestExt.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.robolectric; - -import org.robolectric.res.FsFile; - -public class AndroidManifestExt extends AndroidManifest { - private static final String R = ".R"; - private String mPackageName; - private boolean isPackageSet; - - public AndroidManifestExt(final FsFile androidManifestFile, final FsFile resDirectory, final FsFile assetsDirectory) { - super(androidManifestFile, resDirectory, assetsDirectory); - } - - @SuppressWarnings("ProhibitedExceptionDeclared") - @Override - public String getRClassName() throws Exception { - if (isPackageSet) { - parseAndroidManifest(); - return mPackageName + R; - } - return super.getRClassName(); - } - - @Override - public String getPackageName() { - if (isPackageSet) { - parseAndroidManifest(); - return mPackageName; - } else { - return super.getPackageName(); - } - } - - public void setPackageName(final String packageName) { - mPackageName = packageName; - isPackageSet = packageName != null; - } -} diff --git a/example/exampleLibrary/src/testDebug/java/com/example/DebugTest.java b/example/exampleLibrary/src/testDebug/java/com/example/DebugTest.java index aa2e175..8a1b5b1 100644 --- a/example/exampleLibrary/src/testDebug/java/com/example/DebugTest.java +++ b/example/exampleLibrary/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/exampleLibrary/src/testRelease/java/com/example/ReleaseTest.java b/example/exampleLibrary/src/testRelease/java/com/example/ReleaseTest.java index 432768d..25539db 100644 --- a/example/exampleLibrary/src/testRelease/java/com/example/ReleaseTest.java +++ b/example/exampleLibrary/src/testRelease/java/com/example/ReleaseTest.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 ReleaseTest { @Test