Make output less noisy #16

Author: tschuchortdev

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

@@ -96,7 +96,7 @@ class KotlinCompilation {
 	var allWarningsAsErrors: Boolean = false
 
 	/** Report locations of files generated by the compiler */
-	var reportOutputFiles: Boolean = verbose
+	var reportOutputFiles: Boolean by default { verbose }
 
 	/** Report on performance of the compilation */
 	var reportPerformance: Boolean = false
@@ -213,7 +213,7 @@ class KotlinCompilation {
 	 * (on JDK8) or --system none (on JDK9+). This can be useful if all
 	 * the JDK classes you need are already on the (inherited) classpath.
 	 * */
-	var jdkHome: File? = getJdkHome()
+	var jdkHome: File? by default { getJdkHome() }
 
 	/**
 	 * Path to the kotlin-stdlib.jar
@@ -399,7 +399,6 @@ class KotlinCompilation {
 		it.allWarningsAsErrors = allWarningsAsErrors
 		it.reportOutputFiles = reportOutputFiles
 		it.reportPerf = reportPerformance
-		it.reportOutputFiles = reportOutputFiles
 	}
 
 	/** Performs the 1st and 2nd compilation step to generate stubs and run annotation processors */
@@ -420,7 +419,9 @@ class KotlinCompilation {
 			}
 
 			it.mode = AptMode.STUBS_AND_APT
-			it.flags.add(KaptFlag.MAP_DIAGNOSTIC_LOCATIONS)
+
+			if (verbose)
+				it.flags.addAll(KaptFlag.MAP_DIAGNOSTIC_LOCATIONS, KaptFlag.VERBOSE)
 		}
 
 		/* The kapt compiler plugin (KaptComponentRegistrar)
@@ -474,13 +475,12 @@ class KotlinCompilation {
 
 		val k2JvmArgs = commonK2JVMArgs().also {
 			it.freeArgs = sourcePaths
-
 			it.pluginClasspaths = (it.pluginClasspaths?.toList() ?: emptyList<String>() + getResourcesPath())
 					.distinct().toTypedArray()
 		}
 
 		val compilerMessageCollector = PrintingMessageCollector(
-			internalMessageStream, MessageRenderer.WITHOUT_PATHS, true
+			internalMessageStream, MessageRenderer.GRADLE_STYLE, verbose
 		)
 
 		return convertKotlinExitCode(
@@ -522,7 +522,7 @@ class KotlinCompilation {
 		}
 
 		val compilerMessageCollector = PrintingMessageCollector(
-			internalMessageStream, MessageRenderer.WITHOUT_PATHS, true
+			internalMessageStream, MessageRenderer.GRADLE_STYLE, verbose
 		)
 
         return convertKotlinExitCode(

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

@@ -120,7 +120,7 @@ class KotlinCompilationTests {
 		}.compile()
 
 		assertThat(result.exitCode).isEqualTo(ExitCode.COMPILATION_ERROR)
-		assertThat(result.messages).contains("unresolved reference: java")
+		assertThat(result.messages).containsIgnoringCase("unresolved reference: java")
 	}
 
 	@Test
@@ -262,7 +262,7 @@ class KotlinCompilationTests {
 		}.compile()
 
 		assertThat(result.exitCode).isEqualTo(ExitCode.COMPILATION_ERROR)
-		assertThat(result.messages).contains("unresolved reference: KotlinCompilationTests")
+		assertThat(result.messages).containsIgnoringCase("unresolved reference: KotlinCompilationTests")
 	}
 
 	@Test
@@ -630,7 +630,7 @@ class KotlinCompilationTests {
 			skipRuntimeVersionCheck = true
 			correctErrorTypes = true
 			verbose = true
-			reportOutputFiles = true
+			reportOutputFiles = false
 			messageOutputStream = System.out
 		}
 	}