Convert most unit tests to Spek & more work on 1.0.31 (#58)

* Pull in Jupiter for android-junit5-test module
* Remove deprecated dependency handlers
* Pull in Spek & migrate tests over, also remove deprecated APIs
* Convert CallableGroovyTests to JUnit 5 & migrate remainder to AGP 3 syntax
* Fix task execution order with ClasspathWrite tasks & junitPlatformTest
* Use android-junit5 plugin to drive instrumentation-runner tests

Author: Marcel Schnelle

android-junit5-tests/build.gradle

@@ -1,12 +1,28 @@
 import de.mannodermaus.gradle.plugins.junit5.WriteClasspathResource
 import org.apache.tools.ant.filters.ReplaceTokens
+import org.junit.platform.console.options.Details
 
 apply plugin: "groovy"
 apply plugin: "java-gradle-plugin"
 apply plugin: "java-library"
 apply plugin: "idea"
 apply plugin: "jacoco"
 apply plugin: "kotlin"
+apply plugin: "org.junit.platform.gradle.plugin"
+
+// ------------------------------------------------------------------------------------------------
+// Compilation Tweaks
+//
+// The plugin currently consists of a codebase wherein Groovy & Kotlin coexist.
+// Therefore, the compilation chain has to be well-defined to allow Kotlin
+// to call into Groovy code.
+//
+// The other way around ("call Kotlin from Groovy") is prohibited explicitly.
+// ------------------------------------------------------------------------------------------------
+compileTestGroovy.dependsOn = compileTestGroovy.taskDependencies.mutableValues - "compileTestJava"
+compileTestKotlin.dependsOn compileTestGroovy
+compileTestKotlin.classpath += files(compileTestGroovy.destinationDir)
+testClasses.dependsOn compileTestKotlin
 
 // Add custom dependency configurations
 configurations {
@@ -30,30 +46,39 @@ processTestResources {
   }
 }
 
-tasks.withType(WriteClasspathResource).all {
-  processTestResources.finalizedBy it
-}
-
 test.testLogging {
   events "passed", "skipped", "failed"
   exceptionFormat = "full"
 }
 
+junitPlatform {
+  details Details.TREE
+  enableStandardTestTask true
+}
+
 dependencies {
   // Test Plugin Dependencies
-  testCompile project(":android-junit5")
+  testImplementation project(":android-junit5")
 
   // Utilities for assertions & tests in general
-  testCompile "commons-io:commons-io:$APACHE_COMMONS_VERSION"
-  testCompile "commons-lang:commons-lang:$APACHE_COMMONS_VERSION"
+  testImplementation "commons-io:commons-io:$APACHE_COMMONS_VERSION"
+  testImplementation "commons-lang:commons-lang:$APACHE_COMMONS_VERSION"
 
   // Dependent Plugins
-  testCompile "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"
-  testCompile "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
+  testImplementation "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"
+  testImplementation "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
 
   // Test Execution
-  testCompile "junit:junit:$JUNIT4_VERSION"
-  testCompile("org.spockframework:spock-core:$SPOCK_VERSION") {
+  testImplementation "junit:junit:$JUNIT4_VERSION"
+  testImplementation "org.junit.jupiter:junit-jupiter-api:$JUNIT_JUPITER_VERSION"
+  testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$JUNIT_JUPITER_VERSION"
+  testImplementation "org.jetbrains.spek:spek-api:$SPEK_VERSION"
+  testRuntimeOnly "org.jetbrains.spek:spek-junit-platform-engine:$SPEK_VERSION"
+
+  testImplementation "org.assertj:assertj-core:$ASSERTJ_VERSION"
+  testImplementation "org.mockito:mockito-core:$MOCKITO_VERSION"
+
+  testImplementation("org.spockframework:spock-core:$SPOCK_VERSION") {
     exclude group: "org.codehaus.groovy"
   }
 
@@ -77,3 +102,8 @@ task writeFunctionalTestCompileClasspath(type: WriteClasspathResource) {
   outputDir = file("$buildDir/resources/test")
   resourceFileName = "functional-test-compile-classpath.txt"
 }
+
+tasks.withType(WriteClasspathResource).all {
+  processTestResources.finalizedBy it
+  junitPlatformTest.mustRunAfter it
+}

android-junit5-tests/src/test/groovy/de/mannodermaus/gradle/plugins/junit5/CallableGroovyTests.groovy

@@ -1,18 +1,28 @@
 package de.mannodermaus.gradle.plugins.junit5
 
-import org.junit.Test
+import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Test
 
 class CallableGroovyTests {
+
   @Test
+  @DisplayName("Callable0 can be invoked")
   void callable0() {
     def obj = new Callable0<Integer>({ 2 + 2 })
     assert obj() == 4
   }
 
   @Test
-  void callable1() {
+  @DisplayName("Callable1 can be invoked with parameter true")
+  void callable1True() {
     def obj = new Callable1<Boolean, Integer>({ state -> 2 + (state ? 1 : 0) })
     assert obj(true) == 3
+  }
+
+  @Test
+  @DisplayName("Callable1 can be invoked with parameter false")
+  void callable1False() {
+    def obj = new Callable1<Boolean, Integer>({ state -> 2 + (state ? 1 : 0) })
     assert obj(false) == 2
   }
 }

android-junit5-tests/src/test/groovy/de/mannodermaus/gradle/plugins/junit5/FunctionalSpec.groovy

@@ -337,7 +337,7 @@ class FunctionalSpec extends Specification {
       lint.enabled false
 
       dependencies {
-        testCompile files(${
+        testImplementation files(${
       ClasspathSplitter.splitClasspath(testCompileClasspath)
     })
       }
@@ -361,8 +361,10 @@ class FunctionalSpec extends Specification {
     buildFile << """
       apply plugin: "de.mannodermaus.android-junit5"
 
-      junitPlatform {
-        details "flat"
+      android.testOptions {
+        junitPlatform {
+          details "flat"
+        }
       }
 
       dependencies {