From 951fb0b7e75b8065f2147600612848501fcb18fe Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 4 Mar 2020 18:18:00 +0300
Subject: [PATCH] Move loadTestDataWithoutDiagnostics to FirTestUtils

---
 .../kotlin/checkers/AbstractDiagnosticsTest.kt        |  1 +
 .../jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt  |  5 -----
 .../tests/org/jetbrains/kotlin/fir/FirTestUtils.kt    | 11 ++++++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
index 88ee3f7494a..38ac6715758 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
 import org.jetbrains.kotlin.diagnostics.Errors.*
 import org.jetbrains.kotlin.fir.AbstractFirOldFrontendDiagnosticsTest
+import org.jetbrains.kotlin.fir.loadTestDataWithoutDiagnostics
 import org.jetbrains.kotlin.frontend.java.di.createContainerForLazyResolveWithJava
 import org.jetbrains.kotlin.frontend.java.di.initJvmBuiltInsForTopDownAnalysis
 import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
index 2ede54997a3..7d6fb8c574a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
@@ -481,11 +481,6 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
             )
         }
 
-        fun loadTestDataWithoutDiagnostics(file: File): String {
-            val textWithoutDiagnostics = KotlinTestUtils.doLoadFile(file).replace(DIAGNOSTIC_IN_TESTDATA_PATTERN, "")
-            return StringUtil.convertLineSeparators(textWithoutDiagnostics.trim()).trimTrailingWhitespacesAndAddNewlineAtEOF()
-        }
-
         fun isJavacSkipTest(wholeFile: File, files: List<TestFile>): Boolean {
             val testDataFileText = wholeFile.readText()
             if (isDirectiveDefined(testDataFileText, "// JAVAC_SKIP")) {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestUtils.kt
index 9fbe942ced4..2db933e431a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestUtils.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestUtils.kt
@@ -5,7 +5,11 @@
 
 package org.jetbrains.kotlin.fir
 
+import com.intellij.openapi.util.text.StringUtil
 import junit.framework.TestCase
+import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.Companion.DIAGNOSTIC_IN_TESTDATA_PATTERN
+import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndAddNewlineAtEOF
 import java.io.File
 
 fun compareAndMergeFirFileAndOldFrontendFile(oldFrontendTestDataFile: File, frontendIRTestDataFile: File) {
@@ -28,4 +32,9 @@ fun compareAndMergeFirFileAndOldFrontendFile(oldFrontendTestDataFile: File, fron
             sameDumps
         )
     }
-}
\ No newline at end of file
+}
+
+fun loadTestDataWithoutDiagnostics(file: File): String {
+    val textWithoutDiagnostics = KotlinTestUtils.doLoadFile(file).replace(DIAGNOSTIC_IN_TESTDATA_PATTERN, "")
+    return StringUtil.convertLineSeparators(textWithoutDiagnostics.trim()).trimTrailingWhitespacesAndAddNewlineAtEOF()
+}