Fixed ordering issues between 'test' and 'integrationTest' tasks

ysb33r · ysb33r · commit 7eba39a36442 · 2014-08-21T16:46:48.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,6 @@ test {
     }
 
     systemProperties TESTROOT : new File(buildDir,'tmp/test/unittests').absolutePath
-    systemProperties TEST_SCRIPT_DIR : new File(projectDir,'src/test/resources/scripts').absolutePath
     systemProperties 'logback.configurationFile' : new File(projectDir,'src/test/resources/logback-test.xml').absolutePath
 
 }
diff --git a/gradle/integration-tests.gradle b/gradle/integration-tests.gradle
@@ -15,15 +15,15 @@ sourceSets {
         java.srcDir file("src/integTest/java")
         groovy.srcDir file("src/integTest/groovy")
         resources.srcDir file("src/integTest/resources")
-        compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile
+        compileClasspath = sourceSets.main.output +  configurations.integrationTestCompile
         runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime
     }
 }
 
 task integrationTest(type: Test, dependsOn: jar) {
     testClassesDir = sourceSets.integrationTest.output.classesDir
     classpath = sourceSets.integrationTest.runtimeClasspath
-    systemProperties["integTest.projects"] = new File(sourceSets.integrationTest.output.resourcesDir, "projects").absolutePath
+    mustRunAfter test
 }
 
 check.dependsOn integrationTest
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Aug 08 12:16:10 PDT 2014
+#Fri Aug 15 18:13:15 BST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ test {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`systemProperties TESTROOT : new File(buildDir,'tmp/test/unittests').absolutePath`
`48`		`- systemProperties TEST_SCRIPT_DIR : new File(projectDir,'src/test/resources/scripts').absolutePath`
`49`	`48`	`systemProperties 'logback.configurationFile' : new File(projectDir,'src/test/resources/logback-test.xml').absolutePath`
`50`	`49`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@ sourceSets {`
`15`	`15`	`java.srcDir file("src/integTest/java")`
`16`	`16`	`groovy.srcDir file("src/integTest/groovy")`
`17`	`17`	`resources.srcDir file("src/integTest/resources")`
`18`		`- compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile`
	`18`	`+ compileClasspath = sourceSets.main.output + configurations.integrationTestCompile`
`19`	`19`	`runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`task integrationTest(type: Test, dependsOn: jar) {`
`24`	`24`	`testClassesDir = sourceSets.integrationTest.output.classesDir`
`25`	`25`	`classpath = sourceSets.integrationTest.runtimeClasspath`
`26`		`- systemProperties["integTest.projects"] = new File(sourceSets.integrationTest.output.resourcesDir, "projects").absolutePath`
	`26`	`+ mustRunAfter test`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`check.dependsOn integrationTest`