From aacf934b49c029c4ad5aa6cb8dce031b48965ed2 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 1 Dec 2020 17:46:41 +0300 Subject: [PATCH] [TEST] Drop machinery about experimental coroutines from compiler tests --- .../java/AbstractFirTypeEnhancementTest.kt | 2 +- .../checkers/AbstractDiagnosticsTest.kt | 25 +++---------- .../AbstractDiagnosticsTestWithStdLib.kt | 2 +- .../checkers/KotlinMultiFileTestWithJava.kt | 7 +--- .../codegen/AbstractBlackBoxCodegenTest.java | 8 ++--- .../codegen/AbstractBytecodeListingTest.kt | 3 +- .../codegen/AbstractDumpDeclarationsTest.kt | 4 +-- .../kotlin/codegen/CodegenTestCase.java | 15 ++------ .../kotlin/fir/AbstractFirDiagnosticTest.kt | 9 +---- .../jvm/compiler/AbstractLoadJavaTest.java | 2 +- .../resolve/ExtensibleResolveTestCase.java | 2 +- .../jetbrains/kotlin/test/KotlinBaseTest.kt | 35 ++----------------- .../kotlin/test/KotlinTestUtils.java | 2 +- .../org/jetbrains/kotlin/test/TestFiles.java | 17 +++------ .../AbstractJvmRuntimeDescriptorLoaderTest.kt | 3 +- .../quickfix/AbstractQuickFixMultiFileTest.kt | 2 +- .../js/test/AbstractJsLineNumberTest.kt | 4 +-- .../jetbrains/kotlin/js/test/BasicBoxTest.kt | 3 +- .../kotlin/js/test/BasicWasmBoxTest.kt | 8 +---- 19 files changed, 31 insertions(+), 122 deletions(-) diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt index de044a956ec..47147ad1248 100644 --- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt +++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt @@ -116,7 +116,7 @@ abstract class AbstractFirTypeEnhancementTest : KtUsefulTestCase() { return targetFile } - }, "" + } ) environment = createEnvironment(content) val virtualFiles = srcFiles.map { 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 77f25e674ed..1a0ee265e1c 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.TestsCompilerError import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory import org.jetbrains.kotlin.asJava.finder.JavaElementFinder -import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.GroupingMessageCollector @@ -127,15 +126,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { val oldModule = modules[testModule]!! - val languageVersionSettings = - if (coroutinesPackage.isNotEmpty()) { - val isExperimental = coroutinesPackage == StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() - CompilerTestLanguageVersionSettings( - DEFAULT_DIAGNOSTIC_TESTS_FEATURES, - if (isExperimental) ApiVersion.KOTLIN_1_2 else ApiVersion.KOTLIN_1_3, - if (isExperimental) LanguageVersion.KOTLIN_1_2 else LanguageVersion.KOTLIN_1_3 - ) - } else loadLanguageVersionSettings(testFilesInModule) + val languageVersionSettings = loadLanguageVersionSettings(testFilesInModule) languageVersionSettingsByModule[testModule] = languageVersionSettings @@ -180,7 +171,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { var exceptionFromDescriptorValidation: Throwable? = null try { val expectedFile = getExpectedDescriptorFile(testDataFile, files) - validateAndCompareDescriptorWithFile(expectedFile, files, modules, coroutinesPackage) + validateAndCompareDescriptorWithFile(expectedFile, files, modules) } catch (e: Throwable) { exceptionFromDescriptorValidation = e } @@ -262,9 +253,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { } protected open fun checkDiagnostics(actualText: String, testDataFile: File) { - KotlinTestUtils.assertEqualsToFile(getExpectedDiagnosticsFile(testDataFile), actualText) { s -> - s.replace("COROUTINES_PACKAGE", coroutinesPackage) - } + KotlinTestUtils.assertEqualsToFile(getExpectedDiagnosticsFile(testDataFile), actualText) } private fun checkFirTestdata(testDataFile: File, files: List) { @@ -289,7 +278,6 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { val testRunner = object : AbstractFirOldFrontendDiagnosticsTest() { init { environment = this@AbstractDiagnosticsTest.environment - coroutinesPackage = this@AbstractDiagnosticsTest.coroutinesPackage } } if (testDataFile.readText().contains("// FIR_IDENTICAL")) { @@ -529,8 +517,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { private fun validateAndCompareDescriptorWithFile( expectedFile: File, testFiles: List, - modules: Map, - coroutinesPackage: String + modules: Map ) { if (skipDescriptorsValidation()) return if (testFiles.any { file -> InTextDirectivesUtils.isDirectiveDefined(file.expectedText, "// SKIP_TXT") }) { @@ -591,9 +578,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { "Such tests are hard to maintain, take long time to execute and are subject to sudden unreviewed changes anyway." } - KotlinTestUtils.assertEqualsToFile(expectedFile, allPackagesText) { s -> - s.replace("COROUTINES_PACKAGE", coroutinesPackage) - } + KotlinTestUtils.assertEqualsToFile(expectedFile, allPackagesText) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt index 4ea5ecd7872..58f86254873 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt @@ -16,6 +16,6 @@ abstract class AbstractDiagnosticsTestWithStdLib : AbstractDiagnosticsTest() { override fun shouldValidateFirTestData(testDataFile: File): Boolean { val path = testDataFile.absolutePath - return !path.endsWith(".kts") && coroutinesPackage != StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() + return !path.endsWith(".kts") } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt index 398d20ae6dc..525689ce89d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt @@ -88,11 +88,6 @@ abstract class KotlinMultiFileTestWithJava s.replace("COROUTINES_PACKAGE", coroutinesPackage)); + assertEqualsToFile(expectedFile, text); } protected void blackBox(boolean reportProblems, boolean unexpectedBehaviour) { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt index a5f74ca9ffd..701cb204048 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt @@ -31,8 +31,7 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() { ) val prefixes = when { - backend.isIR -> listOf("_ir", "_1_3", "") - coroutinesPackage == StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.asString() -> listOf("_1_3", "") + backend.isIR -> listOf("_ir", "") else -> listOf("") } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt index 4699e551d3d..c47c6429ea7 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt @@ -19,9 +19,7 @@ abstract class AbstractDumpDeclarationsTest : CodegenTestCase() { dumpToFile = KotlinTestUtils.tmpDirForTest(this).resolve("$name.json") compile(files) classFileFactory.generationState.destroy() - KotlinTestUtils.assertEqualsToFile(expectedResult, dumpToFile.readText()) { - it.replace("COROUTINES_PACKAGE", coroutinesPackage) - } + KotlinTestUtils.assertEqualsToFile(expectedResult, dumpToFile.readText()) } override fun updateConfiguration(configuration: CompilerConfiguration) { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index bbe6985df8c..0048d97e788 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -607,32 +607,21 @@ public abstract class CodegenTestCase extends KotlinBaseTest testFiles = createTestFilesFromFile(file, expectedText); doMultiFileTest(file, testFiles); } - @Override - protected void doTestWithCoroutinesPackageReplacement(@NotNull String filePath, @NotNull String packageName) throws Exception { - this.coroutinesPackage = packageName; - doTest(filePath); - } - @Override @NotNull protected List createTestFilesFromFile(@NotNull File file, @NotNull String expectedText) { - return createTestFilesFromFile(file, expectedText, coroutinesPackage, parseDirectivesPerFiles(), getBackend()); + return createTestFilesFromFile(file, expectedText, parseDirectivesPerFiles(), getBackend()); } @NotNull public static List createTestFilesFromFile( @NotNull File file, @NotNull String expectedText, - @NotNull String coroutinesPackage, boolean parseDirectivesPerFiles, @NotNull TargetBackend backend ) { @@ -643,7 +632,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest javaPackageAndContext = compileJavaAndLoadTestPackageAndBindingContextFromBinary( srcFiles, compiledDir, ConfigurationKind.ALL diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java index a32170843b9..0ca2cf943ee 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java @@ -50,7 +50,7 @@ public abstract class ExtensibleResolveTestCase extends KotlinTestWithEnvironmen public KtFile create(@NotNull String fileName, @NotNull String text, @NotNull Directives directives) { return expectedResolveData.createFileFromMarkedUpText(fileName, text); } - }, ""); + }); expectedResolveData.checkResult(ExpectedResolveData.analyze(files, getEnvironment())); } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt index c5615da32dc..f41d9d4ce5a 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt @@ -24,29 +24,15 @@ import java.util.* import java.util.regex.Pattern abstract class KotlinBaseTest : KtUsefulTestCase() { - - @JvmField - protected var coroutinesPackage: String = "" - @Throws(Exception::class) override fun setUp() { - coroutinesPackage = "" super.setUp() } - @Throws(java.lang.Exception::class) - protected open fun doTestWithCoroutinesPackageReplacement(filePath: String, coroutinesPackage: String) { - this.coroutinesPackage = coroutinesPackage - doTest(filePath) - } - @Throws(java.lang.Exception::class) protected open fun doTest(filePath: String) { val file = File(filePath) - var expectedText = KotlinTestUtils.doLoadFile(file) - if (coroutinesPackage.isNotEmpty()) { - expectedText = expectedText.replace("COROUTINES_PACKAGE", coroutinesPackage) - } + val expectedText = KotlinTestUtils.doLoadFile(file) doMultiFileTest(file, createTestFilesFromFile(file, expectedText)) } @@ -98,7 +84,6 @@ abstract class KotlinBaseTest : KtUsefulTestCase() updateConfigurationByDirectivesInTestFiles( testFilesWithConfigurationDirectives, configuration, - coroutinesPackage, parseDirectivesPerFiles() ) updateConfiguration(configuration) @@ -203,18 +188,16 @@ abstract class KotlinBaseTest : KtUsefulTestCase() testFilesWithConfigurationDirectives: List, configuration: CompilerConfiguration ) { - updateConfigurationByDirectivesInTestFiles(testFilesWithConfigurationDirectives, configuration, "", false) + updateConfigurationByDirectivesInTestFiles(testFilesWithConfigurationDirectives, configuration, false) } private fun updateConfigurationByDirectivesInTestFiles( testFilesWithConfigurationDirectives: List, configuration: CompilerConfiguration, - coroutinesPackage: String, usePreparsedDirectives: Boolean ) { var explicitLanguageVersionSettings: LanguageVersionSettings? = null - var disableReleaseCoroutines = false var includeCompatExperimentalCoroutines = false val kotlinConfigurationFlags: MutableList = ArrayList(0) for (testFile in testFilesWithConfigurationDirectives) { @@ -247,13 +230,6 @@ abstract class KotlinBaseTest : KtUsefulTestCase() """.trimIndent() ) } - if (directives.contains("COMMON_COROUTINES_TEST")) { - assert(!directives.contains("COROUTINES_PACKAGE")) { "Must replace COROUTINES_PACKAGE prior to tests compilation" } - if (StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() == coroutinesPackage) { - disableReleaseCoroutines = true - includeCompatExperimentalCoroutines = true - } - } if (content.contains(StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString())) { includeCompatExperimentalCoroutines = true } @@ -263,13 +239,6 @@ abstract class KotlinBaseTest : KtUsefulTestCase() explicitLanguageVersionSettings = fileLanguageVersionSettings } } - if (disableReleaseCoroutines) { - explicitLanguageVersionSettings = CompilerTestLanguageVersionSettings( - Collections.singletonMap(LanguageFeature.ReleaseCoroutines, LanguageFeature.State.DISABLED), - ApiVersion.LATEST_STABLE, - LanguageVersion.LATEST_STABLE, emptyMap() - ) - } if (includeCompatExperimentalCoroutines) { configuration.addJvmClasspathRoot(ForTestCompileRuntime.coroutinesCompatForTests()) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 5d99a01c596..a45ce8992f6 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -574,7 +574,7 @@ public class KotlinTestUtils { int firstLineEnd = text.indexOf('\n'); return StringUtil.trimTrailing(text.substring(firstLineEnd + 1)); } - }, ""); + }); Assert.assertTrue("Exactly two files expected: ", files.size() == 2); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java index 2e5dfe3d518..fa6d858610b 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java @@ -41,23 +41,18 @@ public class TestFiles { @NotNull public static List createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory factory) { - return createTestFiles(testFileName, expectedText, factory, false, ""); - } - - @NotNull - public static List createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory factory, String coroutinesPackage) { - return createTestFiles(testFileName, expectedText, factory, false, coroutinesPackage); + return createTestFiles(testFileName, expectedText, factory, false); } @NotNull public static List createTestFiles(String testFileName, String expectedText, TestFileFactory factory, - boolean preserveLocations, String coroutinesPackage) { - return createTestFiles(testFileName, expectedText, factory, preserveLocations, coroutinesPackage, false); + boolean preserveLocations) { + return createTestFiles(testFileName, expectedText, factory, preserveLocations, false); } @NotNull public static List createTestFiles(String testFileName, String expectedText, TestFileFactory factory, - boolean preserveLocations, String coroutinesPackage, boolean parseDirectivesPerFile) { + boolean preserveLocations, boolean parseDirectivesPerFile) { Map modules = new HashMap<>(); List testFiles = Lists.newArrayList(); Matcher matcher = FILE_OR_MODULE_PATTERN.matcher(expectedText); @@ -127,9 +122,7 @@ public class TestFiles { assert oldValue == null : "Module with name " + supportModule.name + " already present in file"; } - boolean isReleaseCoroutines = - !coroutinesPackage.contains("experimental") && - !isDirectiveDefined(expectedText, "!LANGUAGE: -ReleaseCoroutines"); + boolean isReleaseCoroutines = !isDirectiveDefined(expectedText, "!LANGUAGE: -ReleaseCoroutines"); boolean checkStateMachine = isDirectiveDefined(expectedText, "CHECK_STATE_MACHINE"); boolean checkTailCallOptimization = isDirectiveDefined(expectedText, "CHECK_TAIL_CALL_OPTIMIZATION"); diff --git a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index dc000741501..2464d77580e 100644 --- a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -122,8 +122,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() { targetFile.writeText(adaptJavaSource(text)) return targetFile } - }, - "" + } ) LoadDescriptorUtil.compileJavaWithAnnotationsJar(sources, tmpdir, emptyList(), null) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt index 2bd4fb58780..c0efd188c53 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt @@ -121,7 +121,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest } return TestFile(fileName, linesWithoutDirectives.joinToString(separator = "\n")) } - }, "" + } ) val afterFile = subFiles.firstOrNull { file -> file.path.contains(".after") } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt index 88e303b046c..ba506fbf626 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt @@ -44,7 +44,7 @@ abstract class AbstractJsLineNumberTest : KotlinTestWithEnvironment() { val sourceCode = file.readText() TestFileFactoryImpl().use { testFactory -> - val inputFiles = TestFiles.createTestFiles(file.name, sourceCode, testFactory, true, "") + val inputFiles = TestFiles.createTestFiles(file.name, sourceCode, testFactory, true) val modules = inputFiles .map { it.module }.distinct() .associateBy { it.name } @@ -175,4 +175,4 @@ abstract class AbstractJsLineNumberTest : KotlinTestWithEnvironment() { private val BASE_PATH = "${BasicBoxTest.TEST_DATA_DIR_PATH}/$DIR_NAME" private val OUT_PATH = "${BasicBoxTest.TEST_DATA_DIR_PATH}/out/$DIR_NAME" } -} \ No newline at end of file +} diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index b628f1cdec0..91d9ee82cbf 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -141,8 +141,7 @@ abstract class BasicBoxTest( file.name, fileContent, testFactory, - true, - coroutinesPackage + true ) val modules = inputFiles .map { it.module }.distinct() diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt index 68594c305d3..bc67960b279 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.js.test import com.intellij.openapi.util.io.FileUtil -import com.intellij.openapi.vfs.StandardFileSystems -import com.intellij.openapi.vfs.VirtualFileManager -import com.intellij.psi.PsiManager -import junit.framework.TestCase import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig import org.jetbrains.kotlin.backend.common.phaser.toPhaseMap import org.jetbrains.kotlin.backend.wasm.compileWasm @@ -28,10 +24,8 @@ import org.jetbrains.kotlin.js.test.engines.SpiderMonkeyEngine import org.jetbrains.kotlin.library.resolver.impl.KotlinLibraryResolverResultImpl import org.jetbrains.kotlin.library.resolver.impl.KotlinResolvedLibraryImpl import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.KtPsiFactory -import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.Directives import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironment @@ -63,7 +57,7 @@ abstract class BasicWasmBoxTest( val fileContent = KotlinTestUtils.doLoadFile(file) TestFileFactoryImpl().use { testFactory -> - val inputFiles: MutableList = TestFiles.createTestFiles(file.name, fileContent, testFactory, true, "") + val inputFiles: MutableList = TestFiles.createTestFiles(file.name, fileContent, testFactory, true) val testPackage = testFactory.testPackage val outputFileBase = outputDir.absolutePath + "/" + getTestName(true) val outputWatFile = outputFileBase + ".wat" -- GitLab