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 885a4ae5155..089d5213b17 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 @@ -124,7 +124,7 @@ abstract class BasicBoxTest( generateJavaScriptFile( file.parent, module, outputFileName, dependencies, friends, modules.size > 1, !SKIP_SOURCEMAP_REMAPPING.matcher(fileContent).find(), - outputPrefixFile, outputPostfixFile, mainCallParameters, testPackage, testFunction, coroutinesPackage.isNotEmpty() + outputPrefixFile, outputPostfixFile, mainCallParameters, testPackage, testFunction ) if (!module.name.endsWith(OLD_MODULE_SUFFIX)) Pair(outputFileName, module) else null @@ -302,8 +302,7 @@ abstract class BasicBoxTest( outputPostfixFile: File?, mainCallParameters: MainCallParameters, testPackage: String?, - testFunction: String, - doNotCache: Boolean + testFunction: String ) { val kotlinFiles = module.files.filter { it.fileName.endsWith(".kt") } val testFiles = kotlinFiles.map { it.fileName } @@ -325,7 +324,7 @@ abstract class BasicBoxTest( val incrementalData = IncrementalData() translateFiles( psiFiles.map(TranslationUnit::SourceFile), outputFile, config, outputPrefixFile, outputPostfixFile, - mainCallParameters, incrementalData, remap, testPackage, testFunction, doNotCache + mainCallParameters, incrementalData, remap, testPackage, testFunction ) if (module.hasFilesToRecompile) { @@ -372,7 +371,7 @@ abstract class BasicBoxTest( translateFiles( translationUnits, recompiledOutputFile, recompiledConfig, outputPrefixFile, outputPostfixFile, - mainCallParameters, incrementalData, remap, testPackage, testFunction, false + mainCallParameters, incrementalData, remap, testPackage, testFunction ) val originalOutput = FileUtil.loadFile(outputFile) @@ -436,8 +435,7 @@ abstract class BasicBoxTest( incrementalData: IncrementalData, remap: Boolean, testPackage: String?, - testFunction: String, - doNotCache: Boolean + testFunction: String ) { val translator = K2JSTranslator(config) val translationResult = translator.translateUnits(ExceptionThrowingReporter, units, mainCallParameters) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt index 92708d3fe23..28ddb7a5bae 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt @@ -85,8 +85,7 @@ abstract class BasicIrBoxTest( incrementalData: IncrementalData, remap: Boolean, testPackage: String?, - testFunction: String, - doNotCache: Boolean + testFunction: String ) { val filesToCompile = units .map { (it as TranslationUnit.SourceFile).file } @@ -113,22 +112,12 @@ abstract class BasicIrBoxTest( runtimeFile.write(runtimeResult!!.generatedCode) } - val result = if (doNotCache) { - val runtimeFiles = runtimeSources.map(::createPsiFile) - val allFiles = runtimeFiles + filesToCompile - compile( - config.project, - allFiles, - runtimeConfiguration, - FqName((testPackage?.let { "$it." } ?: "") + testFunction)) - } else { - compile( - config.project, - filesToCompile, - config.configuration, - FqName((testPackage?.let { "$it." } ?: "") + testFunction), - listOf(runtimeResult!!.moduleDescriptor)) - } + val result = compile( + config.project, + filesToCompile, + config.configuration, + FqName((testPackage?.let { "$it." } ?: "") + testFunction), + listOf(runtimeResult!!.moduleDescriptor)) outputFile.write(result.generatedCode) }