From caafe84611acd076eeda02bb96169184ae53ffb9 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 23 Mar 2020 10:34:37 +0300
Subject: [PATCH] [FIR-TEST] Get rid of `FirDiagnosticsTestLightTreeHelper`

---
 .../fir/AbstractFirBaseDiagnosticsTest.kt     |  5 +++-
 ...AbstractFirDiagnosticsWithLightTreeTest.kt |  7 +++---
 .../fir/FirDiagnosticsTestLightTreeHelper.kt  | 23 -------------------
 3 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
index 7cbba0dc64b..36a9068dd9a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
@@ -46,7 +46,7 @@ import java.util.*
 abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
     override fun analyzeAndCheck(testDataFile: File, files: List<TestFile>) {
         try {
-            analyzeAndCheckUnhandled(testDataFile, files)
+            analyzeAndCheckUnhandled(testDataFile, files, useLightTree)
         } catch (t: AssertionError) {
             throw t
         } catch (t: Throwable) {
@@ -54,6 +54,9 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
         }
     }
 
+    protected open val useLightTree: Boolean
+        get() = false
+
     override fun setupEnvironment(environment: KotlinCoreEnvironment) {
         Extensions.getArea(environment.project)
             .getExtensionPoint(PsiElementFinder.EP_NAME)
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
index 1a29c3ebc01..9d02829d788 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 
-abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticsTest(), FirDiagnosticsTestLightTreeHelper {
+abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticsTest() {
     override fun doTest(filePath: String) {
         val file = createTestFileFromPath(filePath)
         val expectedText = KotlinTestUtils.doLoadFile(file)
@@ -18,7 +18,6 @@ abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticsT
         super.doTest(filePath)
     }
 
-    override fun analyzeAndCheck(testDataFile: File, files: List<TestFile>) {
-        super<FirDiagnosticsTestLightTreeHelper>.analyzeAndCheck(testDataFile, files)
-    }
+    override val useLightTree: Boolean
+        get() = true
 }
\ No newline at end of file
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt
deleted file mode 100644
index 1b097b15225..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt
+++ /dev/null
@@ -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)
-}
\ No newline at end of file