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

[FIR-TEST] Get rid of FirDiagnosticsTestLightTreeHelper

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-03-23 10:34:37 +03:00
parent b13b6d86c7
commit caafe84611
3 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
+4 -1
View File
@@ -46,7 +46,7 @@ import java.util.*
abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() { abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
override fun analyzeAndCheck(testDataFile: File, files: List<TestFile>) { override fun analyzeAndCheck(testDataFile: File, files: List<TestFile>) {
try { try {
analyzeAndCheckUnhandled(testDataFile, files) analyzeAndCheckUnhandled(testDataFile, files, useLightTree)
} catch (t: AssertionError) { } catch (t: AssertionError) {
throw t throw t
} catch (t: Throwable) { } catch (t: Throwable) {
@@ -54,6 +54,9 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
} }
} }
protected open val useLightTree: Boolean
get() = false
override fun setupEnvironment(environment: KotlinCoreEnvironment) { override fun setupEnvironment(environment: KotlinCoreEnvironment) {
Extensions.getArea(environment.project) Extensions.getArea(environment.project)
.getExtensionPoint(PsiElementFinder.EP_NAME) .getExtensionPoint(PsiElementFinder.EP_NAME)
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
+3 -4
View File
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File import java.io.File
abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticsTest(), FirDiagnosticsTestLightTreeHelper { abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticsTest() {
override fun doTest(filePath: String) { override fun doTest(filePath: String) {
val file = createTestFileFromPath(filePath) val file = createTestFileFromPath(filePath)
val expectedText = KotlinTestUtils.doLoadFile(file) val expectedText = KotlinTestUtils.doLoadFile(file)
@@ -18,7 +18,6 @@ abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticsT
super.doTest(filePath) super.doTest(filePath)
} }
override fun analyzeAndCheck(testDataFile: File, files: List<TestFile>) { override val useLightTree: Boolean
super<FirDiagnosticsTestLightTreeHelper>.analyzeAndCheck(testDataFile, files) get() = true
}
} }
compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt
-23
View File
@@ -1,23 +0,0 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest
import java.io.File
interface FirDiagnosticsTestLightTreeHelper {
fun analyzeAndCheck(testDataFile: File, files: List<BaseDiagnosticsTest.TestFile>) {
try {
analyzeAndCheckUnhandled(testDataFile, files, useLightTree = true)
} catch (t: AssertionError) {
throw t
} catch (t: Throwable) {
throw t
}
}
fun analyzeAndCheckUnhandled(testDataFile: File, files: List<BaseDiagnosticsTest.TestFile>, useLightTree: Boolean)
}