Exclude common file asserts.kt from tests using StdLib, as its methods conflict with kotlin.test.* methods.

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<String> additionalKotlinFiles() {
-        List<String> result = Lists.newArrayList(super.additionalKotlinFiles());
+        List<String> result = StdLibTestBase.removeAdHocAssertions(super.additionalKotlinFiles());
         result.add(JS_TESTS_KT);
         return result;
     }

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<String> additionalKotlinFiles() {
+        return removeAdHocAssertions(super.additionalKotlinFiles());
+    }
+
+    @NotNull
+    public static List<String> removeAdHocAssertions(List<String> additionalKotlinFiles) {
+        List<String> kotlinFiles = Lists.newArrayList(additionalKotlinFiles);
+        Iterator<String> iterator = kotlinFiles.iterator();
+        while (iterator.hasNext()) {
+            if (new File(iterator.next()).getName().equals("asserts.kt"))
+                iterator.remove();
+        }
+        return kotlinFiles;
+    }
+
 }

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)