azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use separate directive to check results of descriptor renderer for NI

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-11-06 22:03:19 +03:00
parent b6542caf47
commit 84ac5a3e22
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
+6 -5
View File
@@ -142,12 +142,13 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
var exceptionFromDescriptorValidation: Throwable? = null var exceptionFromDescriptorValidation: Throwable? = null
val originalTestFile = testDataFile.readText() val originalTestFile = testDataFile.readText()
try { try {
val isJavacExpectedFile = InTextDirectivesUtils.isDirectiveDefined(originalTestFile, "// JAVAC_EXPECTED_FILE")
&& environment.configuration.getBoolean(JVMConfigurationKeys.USE_JAVAC)
val postfix = when { val postfix = when {
isJavacExpectedFile -> ".javac.txt" InTextDirectivesUtils.isDirectiveDefined(originalTestFile, "// JAVAC_EXPECTED_FILE") &&
files.all { it.withNewInferenceDirective && it.newInferenceEnabled } -> ".ni.txt" environment.configuration.getBoolean(JVMConfigurationKeys.USE_JAVAC) -> ".javac.txt"
InTextDirectivesUtils.isDirectiveDefined(originalTestFile, "// NI_EXPECTED_FILE") &&
files.any { it.newInferenceEnabled } && !USE_OLD_INFERENCE_DIAGNOSTICS_FOR_NI -> ".ni.txt"
else -> ".txt" else -> ".txt"
} }
val expectedFile = File(FileUtil.getNameWithoutExtension(testDataFile.absolutePath) + postfix) val expectedFile = File(FileUtil.getNameWithoutExtension(testDataFile.absolutePath) + postfix)
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
+1 -1
View File
@@ -325,7 +325,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
val WITH_NEW_INFERENCE_DIRECTIVE = "WITH_NEW_INFERENCE" val WITH_NEW_INFERENCE_DIRECTIVE = "WITH_NEW_INFERENCE"
// Change it to "true" to load diagnostics for old inference to test new inference (ignore diagnostics with <NI; prefix) // Change it to "true" to load diagnostics for old inference to test new inference (ignore diagnostics with <NI; prefix)
private val USE_OLD_INFERENCE_DIAGNOSTICS_FOR_NI = false val USE_OLD_INFERENCE_DIAGNOSTICS_FOR_NI = false
private fun parseDiagnosticFilterDirective(directiveMap: Map<String, String>, allowUnderscoreUsage: Boolean): Condition<Diagnostic> { private fun parseDiagnosticFilterDirective(directiveMap: Map<String, String>, allowUnderscoreUsage: Boolean): Condition<Diagnostic> {
val directives = directiveMap[DIAGNOSTICS_DIRECTIVE] val directives = directiveMap[DIAGNOSTICS_DIRECTIVE]