From 9d64960720116036ed5107f976576fcf4b95a1a0 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Thu, 5 Jul 2012 11:04:31 +0100
Subject: [PATCH] enabled the Map tests as they seem to work fine again now

---
 .../jetbrains/k2js/test/semantics/StdLibTestToJSTest.java   | 6 +++---
 js/js.translator/src/org/jetbrains/k2js/config/Config.java  | 2 +-
 libraries/tools/kotlin-js-library/pom.xml                   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

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 f053a58ac60..c11480c5ae6 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
@@ -25,10 +25,10 @@ public class StdLibTestToJSTest extends StdLibTestBase {
         performStdLibTest(EcmaVersion.all(),
                           "libraries/stdlib/test",
                           "dom/DomTest.kt",
-                         // "js/MapTest.kt",
+                          "js/MapTest.kt",
                           "js/JsDomTest.kt",
-                          //"iterators/FunctionIteratorTest.kt",
-                          //"iterators/IteratorsTest.kt",
+                          "iterators/FunctionIteratorTest.kt",
+                          "iterators/IteratorsTest.kt",
                           "GetOrElseTest.kt",
                           "ListTest.kt",
                           "SetTest.kt",
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index 966c9551de0..ab226083d09 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -97,7 +97,7 @@ public abstract class Config {
             "/core/stringsCode.kt",
             "/stdlib/domCode.kt",
             "/stdlib/jutilCode.kt",
-            //"/stdlib/JUMapsCode.kt",
+            "/stdlib/JUMapsCode.kt",
             "/stdlib/testCode.kt"
     );
 
diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml
index f95559a88ea..a5fe71174a0 100644
--- a/libraries/tools/kotlin-js-library/pom.xml
+++ b/libraries/tools/kotlin-js-library/pom.xml
@@ -44,7 +44,9 @@
                                 <copy todir="${basedir}/target/generated-js-library">
                                     <fileset dir="${kotlin-js-lib-srcdir}">
                                         <include name="**/*Code.kt"/>
+<!--
                                         <exclude name="**/JUtilMapsCode.kt"/>
+-->
                                     </fileset>
                                 </copy>
                                 <copy todir="${basedir}/target/generated-js-library/kotlin">
@@ -65,12 +67,10 @@
                                         <include name="Iterators.kt"/>
                                         <include name="JUtil.kt"/>
                                         <include name="JUtilCollections.kt"/>
-<!--
                                         <include name="JUtilMaps.kt"/>
--->
                                         <include name="JLangIterables.kt"/>
                                         <include name="JLangIterablesLazy.kt"/>
-                                        <include name="JLangIterablesSpecial.kkt"/>
+                                        <include name="JLangIterablesSpecial.kt"/>
 <!--
                                         <include name="Ordering.kt"/>
 -->