use gradle integration tests module

libraries/tools/kotlin-gradle-plugin-core/pom.xml

@@ -27,9 +27,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>kotlin-gradle-plugin-test</artifactId>
-            <version>4.11</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt

@@ -12,214 +12,42 @@ import kotlin.test.assertTrue
 import kotlin.test.assertEquals
 import kotlin.test.fail
 import org.junit.Ignore
+import org.jetbrains.kotlin.gradle.BaseGradleIT.Project
 
-class BasicKotlinGradleIT {
+class BasicKotlinGradleIT : BaseGradleIT() {
-
-    var workingDir: File = File(".")
-
-    Before fun setUp() {
-        workingDir = Files.createTempDir()!!
-        workingDir.mkdirs()
-    }
-
-
-    After fun tearDown() {
-        deleteRecursively(workingDir)
-    }
 
     Test fun testSimpleCompile() {
-        copyRecursively(File("src/test/resources/testProject/alfa"), workingDir)
+        val project = Project("alfa")
-        val projectDir = File(workingDir, "alfa")
 
-        val pathToKotlinPlugin = "-PpathToKotlinPlugin=${File("local-repo").getAbsolutePath()}"
+        project.build("compileDeployKotlin", "build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
-        val version = "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT"
+            assertSuccessful()
-        val cmd = if (SystemInfo.isWindows)
+            assertReportExists("build/reports/tests/demo.TestSource.html")
-            listOf("cmd", "/C", "gradlew.bat", "compileDeployKotlin", "build", pathToKotlinPlugin, version, "--no-daemon", "--debug")
+            assertContains(":compileKotlin", ":compileTestKotlin", ":compileDeployKotlin")
-        else
-            listOf("/bin/bash", "./gradlew", "compileDeployKotlin", "build", pathToKotlinPlugin, version,  "--no-daemon", "--debug")
-
-        val builder = ProcessBuilder(cmd)
-        builder.directory(projectDir)
-        builder.redirectErrorStream(true)
-        val process = builder.start()
-
-        val s = Scanner(process.getInputStream()!!)
-        val text = StringBuilder()
-        while (s.hasNextLine()) {
-            text append s.nextLine()
-            text append "\n"
         }
-        s.close()
 
-        val result = process.waitFor()
+        project.build("compileDeployKotlin", "build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
-        val buildOutput = text.toString()
+            assertSuccessful()
-
+            assertContains(":compileKotlin UP-TO-DATE", ":compileTestKotlin UP-TO-DATE", ":compileDeployKotlin UP-TO-DATE", ":compileJava UP-TO-DATE")
-        println(buildOutput)
-
-        assertEquals(result, 0)
-        assertTrue(buildOutput.contains(":compileKotlin"), "Should contain ':compileKotlin'")
-        assertTrue(buildOutput.contains(":compileTestKotlin"), "Should contain ':compileTestKotlin'")
-        assertTrue(buildOutput.contains(":compileDeployKotlin"), "Should contain ':compileDeployKotlin'")
-        assertTrue(File(projectDir, "build/reports/tests/demo.TestSource.html").exists(), "Test report does not exist. Were tests executed?")
-
-        // Run the build second time, assert everything is up-to-date
-
-        val up2dateBuilder = ProcessBuilder(cmd)
-        up2dateBuilder.directory(projectDir)
-        up2dateBuilder.redirectErrorStream(true)
-        val up2dateProcess = up2dateBuilder.start()
-
-        val up2dateProcessScanner = Scanner(up2dateProcess.getInputStream()!!)
-        val up2dateText = StringBuilder()
-        while (up2dateProcessScanner.hasNextLine()) {
-            up2dateText append up2dateProcessScanner.nextLine()
-            up2dateText append "\n"
         }
-        up2dateProcessScanner.close()
-
-        val up2dateResult = up2dateProcess.waitFor()
-        val up2dateBuildOutput = up2dateText.toString()
-
-        println(up2dateBuildOutput)
-
-        assertEquals(up2dateResult, 0)
-        assertTrue(up2dateBuildOutput.contains(":compileKotlin UP-TO-DATE"), "Should contain ':compileKotlin UP-TO-DATE'")
-        assertTrue(up2dateBuildOutput.contains(":compileTestKotlin UP-TO-DATE"), "Should contain ':compileTestKotlin UP-TO-DATE'")
-        assertTrue(up2dateBuildOutput.contains(":compileDeployKotlin UP-TO-DATE"), "Should contain ':compileDeployKotlin UP-TO-DATE'")
-        assertTrue(up2dateBuildOutput.contains(":compileJava UP-TO-DATE"), "Should contain ':compileJava UP-TO-DATE'")
     }
 
     Test fun testKotlinCustomDirectory() {
-        copyRecursively(File("src/test/resources/testProject/beta"), workingDir)
+        Project("beta").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
-
+            assertSuccessful()
-        val projectDir = File(workingDir, "beta")
+        }
-
-            val pathToKotlinPlugin = "-PpathToKotlinPlugin=${File("local-repo").getAbsolutePath()}"
-            val version = "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT"
-            val cmd = if (SystemInfo.isWindows)
-                listOf("cmd", "/C", "gradlew.bat", "build", pathToKotlinPlugin, version, "--no-daemon", "--debug")
-            else
-                listOf("/bin/bash", "./gradlew", "build", pathToKotlinPlugin, version,  "--no-daemon", "--debug")
-
-            val builder = ProcessBuilder(cmd)
-            builder.directory(projectDir)
-            builder.redirectErrorStream(true)
-            val process = builder.start()
-
-            val s = Scanner(process.getInputStream()!!)
-            val text = StringBuilder()
-            while (s.hasNextLine()) {
-                text append s.nextLine()
-                text append "\n"
-            }
-            s.close()
-
-            val result = process.waitFor()
-            val buildOutput = text.toString()
-
-            println(buildOutput)
-
-            assertEquals(result, 0)
     }
 
     Test fun testSimpleKDoc() {
-        copyRecursively(File("src/test/resources/testProject/delta"), workingDir)
+        Project("delta").build("kdoc", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
-        val projectDir = File(workingDir, "delta")
+            assertSuccessful()
-
+            assertReportExists("build/docs/kdoc/demo/MyClass.html")
-        val pathToKotlinPlugin = "-PpathToKotlinPlugin=${File("local-repo").getAbsolutePath()}"
+            assertContains(":kdoc", "Generating kdoc to")
-        val version = "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT"
-        val cmd = if (SystemInfo.isWindows)
-            listOf("cmd", "/C", "gradlew.bat", "kdoc", pathToKotlinPlugin, version, "--no-daemon", "--debug")
-        else
-            listOf("/bin/bash", "./gradlew", "kdoc", pathToKotlinPlugin, version,  "--no-daemon", "--debug")
-
-        val builder = ProcessBuilder(cmd)
-        builder.directory(projectDir)
-        builder.redirectErrorStream(true)
-        val process = builder.start()
-
-        val s = Scanner(process.getInputStream()!!)
-        val text = StringBuilder()
-        while (s.hasNextLine()) {
-            val line = s.nextLine()
-            text append line
-            text append "\n"
         }
-        s.close()
-
-        val result = process.waitFor()
-        val buildOutput = text.toString()
-        println(buildOutput)
-        assertEquals(result, 0)
-        assertTrue(buildOutput.contains(":kdoc"), "Should contain ':kdoc'")
-        assertTrue(buildOutput.contains("Generating kdoc to"), "Should contain info on kdoc launch")
     }
 
     Ignore fun testKotlinExtraJavaSrc() {
-        copyRecursively(File("src/test/resources/testProject/gamma"), workingDir)
+        Project("gamma").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
-        val projectDir = File(workingDir, "gamma")
+            assertSuccessful()
-
-        val pathToKotlinPlugin = "-PpathToKotlinPlugin=${File("local-repo").getAbsolutePath()}"
-        val version = "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT"
-        val cmd = if (SystemInfo.isWindows)
-            listOf("cmd", "/C", "gradlew.bat", "build", pathToKotlinPlugin, version, "--no-daemon", "--debug")
-        else
-            listOf("/bin/bash", "./gradlew", "build", pathToKotlinPlugin, version,  "--no-daemon", "--debug")
-
-        val builder = ProcessBuilder(cmd)
-        builder.directory(projectDir)
-        builder.redirectErrorStream(true)
-        val process = builder.start()
-
-        val s = Scanner(process.getInputStream()!!)
-        val text = StringBuilder()
-        while (s.hasNextLine()) {
-            text append s.nextLine()
-            text append "\n"
         }
-        s.close()
-
-        val result = process.waitFor()
-        val buildOutput = text.toString()
-
-        println(buildOutput)
-
-        assertEquals(result, 0)
-    }
-
-
-    fun copyRecursively(source: File, target: File) {
-        assertTrue(target.isDirectory())
-        val targetFile = File(target, source.getName())
-        if (source.isDirectory()) {
-            targetFile.mkdir()
-            val array = source.listFiles()
-            if (array != null) {
-                for (child in array) {
-                    copyRecursively(child, targetFile)
-                }
-            }
-        } else {
-            Files.copy(source, targetFile)
-        }
-    }
-
-
-    fun deleteRecursively(f: File): Unit {
-        if (f.isDirectory()) {
-            val children = f.listFiles()
-            if (children != null) {
-                for (child in children) {
-                    deleteRecursively(child)
-                }
-            }
-            val shouldBeEmpty = f.listFiles()
-            if (shouldBeEmpty != null) {
-                assertTrue(shouldBeEmpty.isEmpty())
-            } else {
-                fail("Error listing directory content")
-            }
-        }
-        f.delete()
     }
 }