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 40389a90f9c..a1d40e07d79 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 @@ -436,9 +436,8 @@ abstract class BasicBoxTest( testPackage: String?, testFunction: String ) { - val filteredUnits = units.filter { it !is TranslationUnit.SourceFile || !it.file.virtualFilePath.endsWith("js/js.translator/testData/_commonFiles/fail_hacked.kt") } val translator = K2JSTranslator(config) - val translationResult = translator.translateUnits(ExceptionThrowingReporter, filteredUnits, mainCallParameters) + val translationResult = translator.translateUnits(ExceptionThrowingReporter, units, mainCallParameters) if (translationResult !is TranslationResult.Success) { val outputStream = ByteArrayOutputStream() @@ -477,7 +476,7 @@ abstract class BasicBoxTest( incrementalData.header = incrementalService.headerMetadata } - processJsProgram(translationResult.program, filteredUnits.filterIsInstance().map { it.file }) + processJsProgram(translationResult.program, units.filterIsInstance().map { it.file }) checkSourceMap(outputFile, translationResult.program, remap) } 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 2bbd43adfa4..19a6c013c4e 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 @@ -51,8 +51,7 @@ abstract class BasicIrBoxTest( // TODO: temporary ignore some files from _commonFiles directory since they can't be compiled correctly by JS IR BE yet. // Also, some declarations depends on stdlib but we don't have any library support in JS IR BE yet // and probably it will be better to avoid using stdlib in testData as much as possible. - "js/js.translator/testData/_commonFiles/arrayAsserts.kt", - "js/js.translator/testData/_commonFiles/fail.kt" + "js/js.translator/testData/_commonFiles/arrayAsserts.kt" ) val filesToCompile = units diff --git a/js/js.translator/testData/_commonFiles/fail.kt b/js/js.translator/testData/_commonFiles/fail.kt index b5ea2ef55b6..c06f20cc1f1 100644 --- a/js/js.translator/testData/_commonFiles/fail.kt +++ b/js/js.translator/testData/_commonFiles/fail.kt @@ -2,4 +2,7 @@ package kotlin // This file should be excluded from tests using StdLib, as these methods conflict with corresponding methods from kotlin.test // see StdLibTestBase.removeAdHocAssertions -fun fail(message: String? = null) = js("throw new Error(message)") \ No newline at end of file +fun fail(message: String? = null): Nothing { + js("throw new Error(message)") + null!! +} \ No newline at end of file diff --git a/js/js.translator/testData/_commonFiles/fail_hacked.kt b/js/js.translator/testData/_commonFiles/fail_hacked.kt deleted file mode 100644 index e99ea96df12..00000000000 --- a/js/js.translator/testData/_commonFiles/fail_hacked.kt +++ /dev/null @@ -1,7 +0,0 @@ -package kotlin -// This file should be excluded from tests using StdLib, as these methods conflict with corresponding methods from kotlin.test -// see StdLibTestBase.removeAdHocAssertions - -fun fail(message: String? = null): Nothing { - null!! -} \ No newline at end of file