Added integration test for single source set with Java and Clojure

sources.

Renamed test cases with backticks for more readable test output.

Author: pbzdyl

src/test/int-tests-projects/cursive/JavaAndClojureInOneSourceSetTest/build.gradle

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 Colin Fleming
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id 'com.cursive-ide.clojure'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'org.clojure:clojure:1.8.0'
+}
+
+compileClojure {
+    aotCompile = true
+}

src/test/int-tests-projects/cursive/JavaAndClojureInOneSourceSetTest/src/main/clojure/clj_example/core.clj

@@ -0,0 +1,19 @@
+;
+; Copyright 2017 Colin Fleming
+;
+; Licensed under the Apache License, Version 2.0 (the "License")
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+(ns clj-example.core)
+
+(defn test [])

src/test/int-tests-projects/cursive/JavaAndClojureInOneSourceSetTest/src/main/java/javaExample/Example.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017 Colin Fleming
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javaExample;
+
+public class Example {
+    public void test() {
+    }
+}

src/test/kotlin/cursive/BasicClojureProjectTest.kt

@@ -24,7 +24,7 @@ class BasicClojureProjectTest : IntegrationTestBase() {
   val coreNsSourceFile = testProjectDir.resolve("src/main/clojure/basic_project/core.clj")
 
   @Test
-  fun basicClojureProjectBuildNoAot() {
+  fun `Build without AOT only copies clj files to output directory`() {
     // when
     val result = projectBuildRunner().withArguments("check").build()
 
@@ -39,7 +39,7 @@ class BasicClojureProjectTest : IntegrationTestBase() {
   }
 
   @Test
-  fun basicClojureProjectBuildWithAot() {
+  fun `Build with AOT compiles to class files without copying clj files to output directory`() {
     // given
     projectGradleFile().appendText("compileClojure.aotCompile = true")
 

src/test/kotlin/cursive/IncrementalCompilationTest.kt

@@ -24,7 +24,7 @@ class IncrementalCompilationTest : IntegrationTestBase() {
   val coreNsSourceFile = testProjectDir.resolve("src/main/clojure/basic_project/core.clj")
 
   @Test
-  fun incrementalCompileTaskUpToDateWhenNoChangesNoAot() {
+  fun `Incremental compile task without AOT is up-to-date when no input changes`() {
     // when
     val firstRunResult = projectBuildRunner().withArguments("check").build()
 
@@ -41,7 +41,7 @@ class IncrementalCompilationTest : IntegrationTestBase() {
   }
 
   @Test
-  fun incrementalCompileTaskUpToDateWhenNoChangesWithAot() {
+  fun `Incremental compile task with AOT is up-to-date when no input changes`() {
     // given
     projectGradleFile().appendText("compileClojure.aotCompile = true")
 
@@ -61,7 +61,7 @@ class IncrementalCompilationTest : IntegrationTestBase() {
   }
 
   @Test
-  fun incrementalCompileTaskExecutedWhenSourceFileChangedNoAot() {
+  fun `Incremental compile task without AOT processes outdated source files when input changes`() {
     // given
     val utilsNsSourceFile = testProjectDir.resolve("src/main/clojure/basic_project/utils.clj")
 
@@ -88,7 +88,7 @@ class IncrementalCompilationTest : IntegrationTestBase() {
   }
 
   @Test
-  fun incrementalCompileTaskExecutedWhenNewCljFileAddedWithAot() {
+  fun `Incremental compile task with AOT processes outdated source files when input changes`() {
     // given
     projectGradleFile().appendText("compileClojure.aotCompile = true")
     val utilsNsSourceFile = testProjectDir.resolve("src/main/clojure/basic_project/utils.clj")

src/test/kotlin/cursive/JavaAndClojureInOneSourceSetTest.kt

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017 Colin Fleming
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cursive
+
+import org.assertj.core.api.KotlinAssertions.assertThat
+import org.gradle.testkit.runner.TaskOutcome
+import org.junit.Test
+
+class JavaAndClojureInOneSourceSetTest : IntegrationTestBase() {
+  val coreNsSourceFile = testProjectDir.resolve("src/main/clojure/clj_example/core.clj")
+  val utilsNsSourceFile = testProjectDir.resolve("src/main/clojure/clj_example/utils.clj")
+  val javaClassFile = testProjectDir.resolve("build/classes/main/javaExample/Example.class")
+
+  @Test
+  fun `Incremental compile task does not remove Java class files`() {
+    // when
+    val firstRunResult = projectBuildRunner().withArguments("build").build()
+
+    // then
+    assertThat(firstRunResult.task(":compileClojure").outcome).isEqualTo(TaskOutcome.SUCCESS)
+    assertThat(firstRunResult.task(":compileJava").outcome).isEqualTo(TaskOutcome.SUCCESS)
+    assertSourceFileIsOnlyCompiledToOutputDir(coreNsSourceFile)
+    assertThat(javaClassFile.exists()).isTrue()
+
+    coreNsSourceFile.delete()
+    utilsNsSourceFile.writeText("""(ns clj-example.utils) (defn ping [] "pong")""")
+
+    // when
+    val secondRunResult = projectBuildRunner().withArguments("build").build()
+
+    // then
+    assertThat(secondRunResult.task(":compileClojure").outcome).isEqualTo(TaskOutcome.SUCCESS)
+    assertThat(secondRunResult.task(":compileJava").outcome).isEqualTo(TaskOutcome.UP_TO_DATE)
+    assertSourceFileNotCopiedToOutputDir(coreNsSourceFile)
+    assertSourceFileNotCompiledToOutputDir(coreNsSourceFile)
+    assertSourceFileIsOnlyCompiledToOutputDir(utilsNsSourceFile)
+    assertThat(javaClassFile.exists()).isTrue()
+  }
+}

src/test/kotlin/cursive/MixedClojureJavaTest.kt

@@ -22,7 +22,7 @@ import org.junit.Test
 
 class MixedClojureJavaTest : IntegrationTestBase()  {
   @Test
-  fun compilationWithJavaCodeDependingOnClojureCode() {
+  fun `Compilation with Java code depending on Clojure code`() {
     // given
     val cljSourceDir = testProjectDir.resolve("src/cljSS/clojure")
     val cljExampleNsFile = cljSourceDir.resolve("cljSS/Example.clj")

src/test/kotlin/cursive/MixedJavaClojureTest.kt

@@ -22,7 +22,7 @@ import org.junit.Test
 
 class MixedJavaClojureTest : IntegrationTestBase() {
   @Test
-  fun compilationWithClojureCodeDependingOnJavaCode() {
+  fun `Compilation with Clojure code depending on Java code`() {
     // given
     val javaOutputDir = testProjectDir.resolve("build/classes/javaSS")
     val javaClassFile = javaOutputDir.resolve("javaSS/Example.class")

src/test/kotlin/cursive/MultipleSourceSetsTest.kt

@@ -22,7 +22,7 @@ import org.junit.Test
 
 class MultipleSourceSetsTest : IntegrationTestBase()  {
   @Test
-  fun compilationWithMultipleSourceSets() {
+  fun `Compilation with multiple source sets`() {
     // given
     val ss1SourceDir = testProjectDir.resolve("src/ss1/clojure")
     val ss1CoreNsFile = ss1SourceDir.resolve("ss1/core.clj")

src/test/kotlin/cursive/TestFailureFailsBuildTest.kt

@@ -23,7 +23,7 @@ import org.junit.Test
 
 class TestFailureFailsBuildTest : IntegrationTestBase() {
   @Test
-  fun testFailureFailsBuild() {
+  fun `testClojure task failure fails build`() {
     // when
     val result = projectBuildRunner().withArguments("check").buildAndFail()