From da24b3607155cf21c89222354048b97124612204 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 2 Jul 2012 16:36:11 +0400 Subject: [PATCH] Turn on tests. --- js/js.libraries/src/core/javautil.kt | 4 ++-- .../org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java | 3 +-- .../org/jetbrains/k2js/test/semantics/StdLibToJSTest.java | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/js/js.libraries/src/core/javautil.kt b/js/js.libraries/src/core/javautil.kt index 65c60678e80..247eaed8ac1 100644 --- a/js/js.libraries/src/core/javautil.kt +++ b/js/js.libraries/src/core/javautil.kt @@ -17,7 +17,7 @@ public trait Iterator { open fun remove() : Unit = js.noImpl } -/* + val Collections = object { library("collectionsMax") public fun max(col : Collection, comp : Comparator) : T = js.noImpl @@ -52,7 +52,7 @@ val Collections = object { list[i2] = tmp } } -}*/ +} library public open class ArrayList() : java.util.List { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java index 44e16882ff6..25f84dd6c1e 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java @@ -20,8 +20,7 @@ import org.jetbrains.k2js.config.EcmaVersion; /** */ -//TODO -public abstract class StdLibTestToJSTest extends StdLibTestSupport { +public class StdLibTestToJSTest extends StdLibTestSupport { public void testGenerateTestCase() throws Exception { generateJavaScriptFiles(EcmaVersion.all(), "libraries/stdlib/test", diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java index bc265facf60..ec65f37b2ea 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java @@ -20,8 +20,7 @@ import org.jetbrains.k2js.config.EcmaVersion; /** */ -//TODO -public abstract class StdLibToJSTest extends StdLibTestSupport { +public class StdLibToJSTest extends StdLibTestSupport { public void testCompileJavaScriptFiles() throws Exception { generateJavaScriptFiles(EcmaVersion.all(),