From f9eba0043e032ed2685b62ddf54c917578a9d99a Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Mon, 5 May 2014 13:58:14 -0500
Subject: [PATCH] Assign the springio*Test tasks executable

Fixes: gh-38
---
 .../platform/ConfigureTestJdkTask.groovy      | 28 -------------------
 .../platform/SpringioPlatformPlugin.groovy    |  1 +
 .../SpringioPlatformPluginTests.groovy        |  5 +++-
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 springio-platform-plugin/src/main/groovy/org/springframework/build/gradle/springio/platform/ConfigureTestJdkTask.groovy

diff --git a/springio-platform-plugin/src/main/groovy/org/springframework/build/gradle/springio/platform/ConfigureTestJdkTask.groovy b/springio-platform-plugin/src/main/groovy/org/springframework/build/gradle/springio/platform/ConfigureTestJdkTask.groovy
deleted file mode 100644
index 2362348..0000000
--- a/springio-platform-plugin/src/main/groovy/org/springframework/build/gradle/springio/platform/ConfigureTestJdkTask.groovy
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.springframework.build.gradle.springio.platform
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.TaskAction
-import org.gradle.api.tasks.testing.Test
-
-/**
- *
- * @author Rob Winch
- */
-class ConfigureTestJdkTask extends DefaultTask {
-	Test testTask
-	String jdkVersion
-
-	@TaskAction
-	void configure() {
-		def whichJdk = "${jdkVersion}_HOME"
-		if(!project.hasProperty(whichJdk)) {
-			throw new IllegalStateException("The property ${whichJdk} is not defined. Please ensure to define a valid JDK home as a commandline argument using -P${whichJdk}=<path> or as a property within your Gradle script.")
-		}
-		def jdkHome = project."${whichJdk}"
-		def exec = project.file(jdkHome + '/bin/java')
-		if(!exec.exists()) {
-			throw new IllegalStateException("The path $exec does not exist! Please ensure to define a valid JDK home as a commandline argument using -P${whichJdk}=<path> or as a property within your Gradle script.")
-		}
-		testTask.executable = exec
-	}
-}
diff --git a/springio-platform-plugin/src/main/groovy/org/springframework/build/gradle/springio/platform/SpringioPlatformPlugin.groovy b/springio-platform-plugin/src/main/groovy/org/springframework/build/gradle/springio/platform/SpringioPlatformPlugin.groovy
index 6835c68..3bbf18f 100644
--- a/springio-platform-plugin/src/main/groovy/org/springframework/build/gradle/springio/platform/SpringioPlatformPlugin.groovy
+++ b/springio-platform-plugin/src/main/groovy/org/springframework/build/gradle/springio/platform/SpringioPlatformPlugin.groovy
@@ -67,6 +67,7 @@ class SpringioPlatformPlugin implements Plugin<Project> {
 				html.destination = project.file("$project.buildDir/reports/springio-$jdk-tests/")
 				junitXml.destination = project.file("$project.buildDir/springio-$jdk-test-results/")
 			}
+			executable exec
 		}
 		springioTest.dependsOn springioJdkTest
 	}
diff --git a/springio-platform-plugin/src/test/groovy/org/springframework/build/gradle/springio/platform/SpringioPlatformPluginTests.groovy b/springio-platform-plugin/src/test/groovy/org/springframework/build/gradle/springio/platform/SpringioPlatformPluginTests.groovy
index 4cbccc0..2d1ecd3 100644
--- a/springio-platform-plugin/src/test/groovy/org/springframework/build/gradle/springio/platform/SpringioPlatformPluginTests.groovy
+++ b/springio-platform-plugin/src/test/groovy/org/springframework/build/gradle/springio/platform/SpringioPlatformPluginTests.groovy
@@ -16,10 +16,11 @@ class SpringioPlatformPluginTests extends Specification {
 	Project project
 	@AutoCleanup("deleteDir")
 	File jdkHome = Files.createTempDir()
+	File java
 
 	def setup() {
 		project = ProjectBuilder.builder().build()
-		def java = new File(jdkHome,'bin/java')
+		java = new File(jdkHome,'bin/java')
 		java.parentFile.mkdirs()
 		java.createNewFile()
 	}
@@ -79,6 +80,7 @@ class SpringioPlatformPluginTests extends Specification {
 			project.apply plugin: JavaPlugin
 		then:
 			jdk7TestTask
+			jdk7TestTask.executable == java.absolutePath
 	}
 
 	def "Does not create springioJDK7Test if JDK7_HOME missing Task"() {
@@ -97,6 +99,7 @@ class SpringioPlatformPluginTests extends Specification {
 			project.apply plugin: JavaPlugin
 		then:
 			jdk8TestTask
+			jdk8TestTask.executable == java.absolutePath
 	}
 
 	def "Does not create springioJDK8Test if JDK8_HOME missing Task"() {