Make sure generating Java files from Kotlin and Java APs works

Author: tschuchortdev

src/main/kotlin/StreamUtils.kt

@@ -1,5 +1,3 @@
-package com.tschuchort.compiletest
-
 import java.io.IOException
 import java.io.OutputStream
 

src/test/java/JavaTestProcessor.java

@@ -1,3 +1,4 @@
+import com.squareup.javapoet.JavaFile;
 import com.squareup.kotlinpoet.FileSpec;
 import com.squareup.kotlinpoet.FunSpec;
 import com.squareup.kotlinpoet.TypeSpec;
@@ -49,7 +50,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         if(!annotations.isEmpty()) {
             TypeSpec.Builder typeSpecBuilder = TypeSpec.classBuilder("JavaGeneratedKotlinClass");
 
-            for(Element annotatedElement : roundEnv.getElementsAnnotatedWith(Marker.class)) {
+            for (Element annotatedElement : roundEnv.getElementsAnnotatedWith(Marker.class)) {
                 typeSpecBuilder.addFunction(FunSpec.builder(annotatedElement.getSimpleName().toString()
                         ).build()
                 ).build();
@@ -60,6 +61,12 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                     .build();
 
             writeKotlinFile(fileSpec, fileSpec.getName(), fileSpec.getPackageName());
+
+            try {
+                JavaFile.builder("", com.squareup.javapoet.TypeSpec.classBuilder("JavaGeneratedJavaClass").build())
+                        .build().writeTo(processingEnv.getFiler());
+            } catch (Exception e) {
+            }
         }
 
         return false;
@@ -78,7 +85,6 @@ private void writeKotlinFile(FileSpec fileSpec, String fileName, String packageN
             (new FileOutputStream(new File(outputFolder, fileName))).write(fileSpec.toString().getBytes(Charsets.UTF_8));
         }
         catch(Exception e) {
-
         }
     }
 }

src/test/kotlin/KotlinCompilation.kt

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import com.tschuchort.compiletest.NullStream
-import com.tschuchort.compiletest.TeeOutputStream
 import io.github.classgraph.ClassGraph
 import okio.Buffer
 import okio.buffer
@@ -321,7 +319,7 @@ open class KotlinCompilation(
 		val javac = ToolProvider.getSystemJavaCompiler()
 		val javaFileManager = javac.getStandardFileManager(null, null, null)
 
-		val javaSources = sourcesDir.listFilesRecursively()
+		val javaSources = (sourcesDir.listFilesRecursively() + kaptSourceDir.listFilesRecursively())
 			.filterNot<File>(File::isKotlinFile)
 			.map { FileJavaFileObject(it) }
 			.filter { it.kind == JavaFileObject.Kind.SOURCE }

src/test/kotlin/KotlinTestProcessor.kt

@@ -1,3 +1,5 @@
+import com.squareup.javapoet.JavaFile
+import com.squareup.javapoet.TypeSpec as JavaTypeSpec
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.TypeSpec
@@ -38,18 +40,25 @@ class KotlinTestProcessor : AbstractProcessor() {
 	override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
 		processingEnv.messager.printMessage(Diagnostic.Kind.WARNING, "kotlin processor was called")
 
-		if(annotations.isNotEmpty())
+		if(annotations.isNotEmpty()) {
 			FileSpec.builder("", "KotlinGeneratedKotlinClass.kt")
-				.addType(TypeSpec.classBuilder("KotlinGeneratedKotlinClass").apply {
-						for(annotatedElem in roundEnv.getElementsAnnotatedWith(Marker::class.java)) {
-							addFunction(FunSpec.builder(annotatedElem.simpleName.toString())
-								.build()
+				.addType(
+					TypeSpec.classBuilder("KotlinGeneratedKotlinClass").apply {
+						for (annotatedElem in roundEnv.getElementsAnnotatedWith(Marker::class.java)) {
+							addFunction(
+								FunSpec.builder(annotatedElem.simpleName.toString())
+									.build()
 							)
 						}
 					}.build()
 				).build()
 				.let { writeKotlinFile(it) }
 
+		JavaFile.builder("", JavaTypeSpec.classBuilder("KotlinGeneratedJavaClass").build())
+				.build().writeTo(processingEnv.filer)
+
+		}
+
 		return false
 	}
 

src/test/kotlin/SmokeTests.kt

@@ -32,11 +32,12 @@ class SmokeTests {
 
 					fun main(freeArgs: Array<String>) {
 						File("")
-						println("hello")
 						KotlinGeneratedKotlinClass().foo()
 						KotlinGeneratedKotlinClass().bar()
 						JavaGeneratedKotlinClass().foo()
 						JavaGeneratedKotlinClass().bar()
+						KotlinGeneratedJavaClass()
+						JavaGeneratedJavaClass()
 					}
 				""".trimIndent()
 		)
@@ -49,10 +50,12 @@ class SmokeTests {
 
     			public class JSource {
                     public JSource() {
+                    	(new KotlinGeneratedKotlinClass()).bar();
                         (new KotlinGeneratedKotlinClass()).foo();
-						(new KotlinGeneratedKotlinClass()).bar();
 						(new JavaGeneratedKotlinClass()).foo();
 						(new JavaGeneratedKotlinClass()).bar();
+						KotlinGeneratedJavaClass c = new KotlinGeneratedJavaClass();
+						JavaGeneratedJavaClass c2 = new JavaGeneratedJavaClass();
                     }
 
     				@Marker public void bar() {
@@ -65,7 +68,7 @@ class SmokeTests {
 		val systemOutBuffer = Buffer()
 
 		val result = KotlinCompilation(
-			workingDir = File("C:\\compile-testing"),
+			workingDir = temporaryFolder.root,
 			sources = listOf(kSource, jSource),
 			services = listOf(
 				KotlinCompilation.Service(Processor::class, KotlinTestProcessor::class),

src/test/kotlin/StreamUtilTests.kt

@@ -1,6 +1,5 @@
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
-import com.tschuchort.compiletest.TeeOutputStream
 import okio.Buffer
 import org.assertj.core.api.Assertions
 import org.junit.Test