Skip to content

Commit 19a8f3e

Browse files
author
Marcel Schnelle
authored
Move to JUnit 5.2.0 (#99)
* Bump to JUnit 5.2, Gradle 4.8 & AGP 3.2.0-alpha17 to ensure compatibility * Bump minimum Gradle requirement to 4.7 * Bump a whole lot of other dependencies & move to AS 3.2 * Port FunctionalSpec to Kotlin * Remove dependency on Spock * Introduce semver check library & apply new nullability settings
1 parent 7185095 commit 19a8f3e

20 files changed

Lines changed: 664 additions & 697 deletions

File tree

.idea/codeStyleSettings.xml

Lines changed: 0 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Instrumentation_Library__Run_Instrumented_Tests.xml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.idea/runConfigurations/Instrumentation_Library__Run_Unit_Tests__IDE_.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Instrumentation_Runner__Run_Unit_Tests__IDE_.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android-junit5-tests/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import de.mannodermaus.gradle.plugins.junit5.WriteClasspathResource
22
import org.apache.tools.ant.filters.ReplaceTokens
3-
import org.junit.platform.console.options.Details
43

54
apply plugin: "groovy"
65
apply plugin: "java-gradle-plugin"
@@ -55,10 +54,13 @@ test {
5554
}
5655

5756
junitPlatform {
58-
details Details.TREE
57+
details "tree"
5958
enableStandardTestTask true
6059
}
6160

61+
// Enable this line to run slow Functional Tests on the local device as well
62+
//junitPlatformTest.environment("CI", "true")
63+
6264
dependencies {
6365
// Test Plugin Dependencies
6466
testImplementation project(":android-junit5")
@@ -74,17 +76,15 @@ dependencies {
7476
// Test Execution
7577
testImplementation "junit:junit:$JUNIT4_VERSION"
7678
testImplementation "org.junit.jupiter:junit-jupiter-api:$JUNIT_JUPITER_VERSION"
79+
testImplementation "org.junit.jupiter:junit-jupiter-params:$JUNIT_JUPITER_VERSION"
7780
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$JUNIT_JUPITER_VERSION"
7881
testImplementation "org.jetbrains.spek:spek-api:$SPEK_VERSION"
7982
testRuntimeOnly "org.jetbrains.spek:spek-junit-platform-engine:$SPEK_VERSION"
83+
testImplementation "org.junit-pioneer:junit-pioneer:$JUNIT_PIONEER_VERSION"
8084

8185
testImplementation "org.assertj:assertj-core:$ASSERTJ_VERSION"
8286
testImplementation "org.mockito:mockito-core:$MOCKITO_VERSION"
8387

84-
testImplementation("org.spockframework:spock-core:$SPOCK_VERSION") {
85-
exclude group: "org.codehaus.groovy"
86-
}
87-
8888
// Compilation of local classpath for functional tests
8989
functionalTest "junit:junit:$JUNIT4_VERSION"
9090
functionalTest "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"

0 commit comments

Comments
 (0)