Include generated source files in list of generated files, not only class files and resources

Author: tschuchortdev

src/main/kotlin/com/tschuchort/compiletesting/KotlinCompilation.kt

@@ -314,12 +314,18 @@ class KotlinCompilation {
     }
 
 	/** Result of the compilation */
-	class Result(val exitCode: ExitCode, val outputDirectory: File,
-					  /** Messages that were printed by the compilation */
-					  val messages: String) {
-		/** All output files that were created by the compilation */
-		val generatedFiles: Collection<File> = outputDirectory.listFilesRecursively()
-
+	class Result(
+		val exitCode: ExitCode,
+		/**
+		 * The class, resource and intermediate source files generated during the compilation.
+		 * Does not include stub files and kapt incremental data.
+		 */
+		val generatedFiles: Collection<File>,
+		/** The directory where only the final output class and resources files will be */
+		val outputDirectory: File,
+		/** Messages that were printed by the compilation */
+		val messages: String
+	) {
 		/** class loader to load the compile classes */
 		val classLoader = URLClassLoader(arrayOf(outputDirectory.toURI().toURL()),
 			this::class.java.classLoader)
@@ -724,7 +730,12 @@ class KotlinCompilation {
 		if(exitCode != ExitCode.OK)
 			searchSystemOutForKnownErrors(messages)
 
-		return Result(exitCode, classesDir, messages)
+		val classAndResFiles = classesDir.listFilesRecursively()
+		val kaptGeneratedKotlinFiles = kaptKotlinGeneratedDir.listFilesRecursively()
+		val kaptGeneratedJavaFiles = kaptSourceDir.listFilesRecursively()
+		val generatedFiles = classAndResFiles + kaptGeneratedJavaFiles + kaptGeneratedKotlinFiles
+
+		return Result(exitCode, generatedFiles, classesDir, messages)
 	}
 
 	private fun commonClasspaths() = mutableListOf<File>().apply {

src/test/kotlin/com/tschuchort/compiletesting/KotlinCompilationTests.kt

@@ -464,7 +464,6 @@ class KotlinCompilationTests {
 		}
 	}
 
-
 	@Test
 	fun `Kotlin AP sees Java class`() {
 		val jSource = SourceFile.java(
@@ -649,6 +648,101 @@ class KotlinCompilationTests {
 		assertThat(result.messages).contains("non-existing-plugin.jar not found")
 	}
 
+	@Test
+	fun `Generated Java source is among generated files list`() {
+		val kSource = SourceFile.kotlin(
+			"KSource.kt", """
+				package com.tschuchort.compiletesting
+			
+				@ProcessElem
+				class KSource {
+					fun foo() {}
+				}
+				"""
+		)
+
+		val result = defaultCompilerConfig().apply {
+			sources = listOf(kSource)
+			annotationProcessors = listOf(kotlinTestProc)
+			inheritClassPath = true
+		}.compile()
+
+		assertThat(result.exitCode).isEqualTo(ExitCode.OK)
+		assertThat(result.generatedFiles.map { it.name }).contains(KotlinTestProcessor.GENERATED_JAVA_CLASS_NAME + ".java")
+	}
+
+	@Test
+	fun `Generated Kotlin source is among generated files list`() {
+		val kSource = SourceFile.kotlin(
+			"KSource.kt", """
+				package com.tschuchort.compiletesting
+			
+				@ProcessElem
+				class KSource {
+					fun foo() {}
+				}
+				"""
+		)
+
+		val result = defaultCompilerConfig().apply {
+			sources = listOf(kSource)
+			annotationProcessors = listOf(kotlinTestProc)
+			inheritClassPath = true
+		}.compile()
+
+		assertThat(result.exitCode).isEqualTo(ExitCode.OK)
+		assertThat(result.generatedFiles.map { it.name }).contains(KotlinTestProcessor.GENERATED_KOTLIN_CLASS_NAME + ".kt")
+	}
+
+	@Test
+	fun `Compiled Kotlin class file is among generated files list`() {
+		val kSource = SourceFile.kotlin(
+			"KSource.kt", """
+				package com.tschuchort.compiletesting
+			
+				@ProcessElem
+				class KSource {
+					fun foo() {}
+				}
+				"""
+		)
+
+		val result = defaultCompilerConfig().apply {
+			sources = listOf(kSource)
+			annotationProcessors = listOf(kotlinTestProc)
+			inheritClassPath = true
+		}.compile()
+
+		assertThat(result.exitCode).isEqualTo(ExitCode.OK)
+		assertThat(result.generatedFiles.map { it.name }).contains("KSource.class")
+	}
+
+	@Test
+	fun `Compiled Java class file is among generated files list`() {
+		val jSource = SourceFile.java(
+			"JSource.java", """
+				package com.tschuchort.compiletesting;
+			
+				@ProcessElem
+				class JSource {
+					void foo() {
+					}
+				}
+					"""
+		)
+
+		val result = defaultCompilerConfig().apply {
+			sources = listOf(jSource)
+			annotationProcessors = listOf(kotlinTestProc)
+			inheritClassPath = true
+		}.compile()
+
+		assertThat(result.exitCode).isEqualTo(ExitCode.OK)
+		assertThat(result.generatedFiles.map { it.name }).contains("JSource.class")
+	}
+
+
+
 	private fun defaultCompilerConfig(): KotlinCompilation {
 		return KotlinCompilation().apply {
 			workingDir = temporaryFolder.root