diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java index 79b446e6fb1..c3efc33fb22 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java @@ -59,7 +59,7 @@ public abstract class JsUnitTestBase extends MultipleFilesTranslationTest { @NotNull @Override protected List additionalKotlinFiles() { - List result = Lists.newArrayList(super.additionalKotlinFiles()); + List result = StdLibTestBase.removeAdHocAssertions(super.additionalKotlinFiles()); result.add(JS_TESTS_KT); return result; } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java index ea979019002..c439d40f727 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.js.test.SingleFileTranslationTest; import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker; import java.io.File; +import java.util.Iterator; import java.util.List; // TODO: should be dropped with derived classes? @@ -62,4 +63,22 @@ abstract class StdLibTestBase extends SingleFileTranslationTest { } return files; } + + @NotNull + @Override + protected List additionalKotlinFiles() { + return removeAdHocAssertions(super.additionalKotlinFiles()); + } + + @NotNull + public static List removeAdHocAssertions(List additionalKotlinFiles) { + List kotlinFiles = Lists.newArrayList(additionalKotlinFiles); + Iterator iterator = kotlinFiles.iterator(); + while (iterator.hasNext()) { + if (new File(iterator.next()).getName().equals("asserts.kt")) + iterator.remove(); + } + return kotlinFiles; + } + } diff --git a/js/js.translator/testData/_commonFiles/asserts.kt b/js/js.translator/testData/_commonFiles/asserts.kt index ef1912532c9..1456a076ae0 100644 --- a/js/js.translator/testData/_commonFiles/asserts.kt +++ b/js/js.translator/testData/_commonFiles/asserts.kt @@ -1,4 +1,6 @@ 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) = throw Exception(message)