using built-in GradleRunner instead of custom gradletest plugin

Author: dcendents

build.gradle

@@ -2,10 +2,10 @@
 plugins {
 	id "nu.studer.plugindev" version "1.0.4"
 	id "com.gradle.plugin-publish" version "0.9.4"
-	id "org.ysb33r.gradletest" version "0.5.5"
 }
 
-apply plugin: 'groovy'
+apply plugin: "groovy"
+apply plugin: "java-gradle-plugin"
 apply plugin: "nu.studer.plugindev"
 apply plugin: "jacoco"
 apply plugin: "maven"
@@ -21,16 +21,20 @@ sourceSets {
 			srcDirs = ['src/test/groovy', 'src/test/core/src/testFixtures/groovy', 'src/test/internal-testing/src/main/groovy' ]
 		}
 	}
+}
 
-	integTest {
-		compileClasspath += main.output + test.output
-		runtimeClasspath += main.output + test.output
-	}
+ext {
+	gradleVersions = '3.0'
+	androidGradleBuildVersion = '2.2.0-beta1'
+	androidCompileSdkVersion = 'android-24'
+	androidBuildToolsVersion = '24.0.0'
 }
 
-configurations {
-	integTestCompile.extendsFrom testCompile
-	integTestRuntime.extendsFrom testRuntime
+test {
+	systemProperty 'gradle.versions', gradleVersions
+	systemProperty 'android.gradle.build.version', androidGradleBuildVersion
+	systemProperty 'android.compile.sdk.version', androidCompileSdkVersion
+	systemProperty 'android.build.tools.version', androidBuildToolsVersion
 }
 
 dependencies {
@@ -77,15 +81,17 @@ dependencies {
 		dependency 'org.sonatype.aether:aether-connector-wagon:1.13.1@jar'
 	}
 
-	gradleTest 'com.android.tools.build:gradle:2.2.0-beta1'
-	
+	testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
+        exclude module: 'groovy-all'
+    }
+
 	testCompile	'junit:junit:4.12',
 				'org.hamcrest:hamcrest-all:1.3',
-				// from gradle/subprojects/core/core.gradle, gradle/subprojects/internal-testing/internal-testing.gradle and gradle/gradle/dependencies.gradle
-				'commons-io:commons-io:2.2',
+				'org.codehaus.groovy:groovy-all:2.4.7'
+				
+	// from gradle/subprojects/core/core.gradle, gradle/subprojects/internal-testing/internal-testing.gradle and gradle/gradle/dependencies.gradle
+	testCompile	'commons-io:commons-io:2.2',
 				'commons-lang:commons-lang:2.6@jar',
-				'org.spockframework:spock-core:1.0-groovy-2.4@jar',
-				"org.codehaus.groovy:groovy-all:2.4.7",
 				'org.objenesis:objenesis:1.2@jar',
 				'cglib:cglib-nodep:2.2.2',
 				'org.jmock:jmock:2.5.1',
@@ -95,11 +101,9 @@ dependencies {
 				'org.jsoup:jsoup:1.6.3',
 				'com.google.code.findbugs:jsr305:1.3.9@jar',
 				'org.ow2.asm:asm-all:5.1'
-
 	testCompile dependencies.module('org.apache.ivy:ivy:2.2.0'){
 		dependency "com.jcraft:jsch:0.1.53"
 	}
-	
 	testCompile dependencies.module('org.apache.ant:ant:1.9.6') {
 		dependency 'org.apache.ant:ant-launcher:1.9.6@jar'
 	}
@@ -170,37 +174,6 @@ pluginBundle {
 	}
 }
 
-ext {
-	gradleVersions = '3.0'
-}
-
-task integTest(type: Test) {
-	systemProperty 'gradle.versions', gradleVersions
-	testClassesDir = sourceSets.integTest.output.classesDir
-	classpath = sourceSets.integTest.runtimeClasspath
-	reports {
-		junitXml.destination = "$buildDir/integration-test-results"
-		reports.html.destination = "$buildDir/reports/integrationTests"
-	}
-}
-
-gradleTest {
-	versions gradleVersions.split(',')
-}
-
-gradleLocations {
-	searchGradleUserHome = true
-	includeGradleHome = false
-	searchGvm = false
-	download = true
-	downloadToGradleUserHome = true
-	useGradleSite = true
-}
-
-gradleTest.dependsOn jar
-integTest.dependsOn gradleTest
-check.dependsOn integTest
-
 jacoco {
 	toolVersion = "0.7.7.201606060606"
 }

src/test/groovy/org/gradle/api/plugins/AndroidMavenPluginIT.groovy

@@ -0,0 +1,129 @@
+package org.gradle.api.plugins
+
+import org.gradle.testkit.runner.GradleRunner
+import static org.gradle.testkit.runner.TaskOutcome.*
+import org.junit.Rule
+import org.junit.rules.TemporaryFolder
+import spock.lang.Specification
+import spock.lang.Shared
+import spock.lang.Unroll
+
+class AndroidMavenPluginIT extends Specification {
+	
+	@Shared def gradleVersions = "${System.properties['gradle.versions']}".split(",")
+	@Shared def androidGradleBuildVersion = "${System.properties['android.gradle.build.version']}"
+	@Shared def androidCompileSdkVersion = "${System.properties['android.compile.sdk.version']}"
+	@Shared def androidBuildToolsVersion = "${System.properties['android.build.tools.version']}"
+	
+    @Rule final TemporaryFolder testProjectDir = new TemporaryFolder()
+	
+	File androidManifest
+	File settingsFile
+    File buildFile
+	
+    def setup() {
+		def srcFolder = testProjectDir.newFolder('src')
+		def mainFolder = new File(srcFolder, 'main')
+		mainFolder.mkdirs()
+		androidManifest = new File(mainFolder, 'AndroidManifest.xml')
+        settingsFile = testProjectDir.newFile('settings.gradle')
+        buildFile = testProjectDir.newFile('build.gradle')
+    }
+
+	@Unroll
+    def "pom is installed with gradle #gradleVersion"() {
+        given:
+		androidManifest << """<?xml version="1.0" encoding="utf-8"?>
+			<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.test.simple" android:versionCode="1" android:versionName="1.0" >
+				<application />
+			</manifest>
+		"""
+		
+		settingsFile << "rootProject.name = 'simple'"
+		
+		def uri = testProjectDir.root.toURI()
+        buildFile << """
+			buildscript {
+				System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'
+				
+				repositories {
+					jcenter()
+					mavenCentral()
+					mavenLocal()
+				}
+
+				dependencies {
+					classpath "com.android.tools.build:gradle:${androidGradleBuildVersion}"
+				}
+			}
+			
+			plugins {
+				id "com.github.dcendents.android-maven"
+			}
+
+			apply plugin: 'com.android.library'
+
+			group = 'org.test'
+			version = '1.0'
+			
+			install {
+				repositories {
+					// Should be mavenInstaller but cannot find how to override the location
+					mavenDeployer {
+						repository(url: "${uri}/${gradleVersion}/repo")
+					}
+				}
+			}
+
+			android {
+				compileSdkVersion "${androidCompileSdkVersion}"
+				buildToolsVersion "${androidBuildToolsVersion}"
+			}
+
+			task runGradleTest {
+				dependsOn install
+			}
+        """
+		
+        when:
+        def result = GradleRunner.create()
+			.withGradleVersion(gradleVersion)
+            .withProjectDir(testProjectDir.root)
+            .withArguments('install')
+			.withPluginClasspath()
+            .build()
+
+        then:
+        result.task(":install").outcome == SUCCESS
+		validateRepo(gradleVersion);
+		
+        where:
+        gradleVersion << gradleVersions
+    }
+	
+	private void validateRepo(String version) {
+		File repo = new File(testProjectDir.root, version + "/repo/org/test/simple")
+		assert repo.exists()
+		
+		File metadata = new File(repo, "maven-metadata.xml");
+		File metadataMd5 = new File(repo, "maven-metadata.xml.md5");
+		File metadataSha1 = new File(repo, "maven-metadata.xml.sha1");
+		assert metadata.exists()
+		assert metadataMd5.exists()
+		assert metadataSha1.exists()
+		
+		File aar = new File(repo, "1.0/simple-1.0.aar");
+		File aarMd5 = new File(repo, "1.0/simple-1.0.aar.md5");
+		File aarSha1 = new File(repo, "1.0/simple-1.0.aar.sha1");
+		assert aar.exists()
+		assert aarMd5.exists()
+		assert aarSha1.exists()
+		
+		File pom = new File(repo, "1.0/simple-1.0.pom");
+		File pomMd5 = new File(repo, "1.0/simple-1.0.pom.md5");
+		File pomSha1 = new File(repo, "1.0/simple-1.0.pom.sha1");
+		assert pom.exists()
+		assert pomMd5.exists()
+		assert pomSha1.exists()
+	}
+}