From 3ef4ff690c17cfed5f9c82c71ea01bd129745804 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Fri, 20 Jul 2012 07:14:20 +0100
Subject: [PATCH] avoid failure on equals() call passing in null/undefined and
 updated the issues for failing JS unit tests

---
 js/js.translator/testFiles/kotlin_lib.js |  2 ++
 libraries/tools/kotlin-js-tests/pom.xml  | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/js.translator/testFiles/kotlin_lib.js b/js/js.translator/testFiles/kotlin_lib.js
index 613eaba9d5e..32ef95b8964 100644
--- a/js/js.translator/testFiles/kotlin_lib.js
+++ b/js/js.translator/testFiles/kotlin_lib.js
@@ -124,6 +124,7 @@ var kotlin = {set:function (receiver, key, value) {
             }
         },
         equals: function (o) {
+            if (o === null || o === undefined) return false;
             if (this.size() === o.size()) {
                 var iter1 = this.iterator();
                 var iter2 = o.iterator();
@@ -909,6 +910,7 @@ var kotlin = {set:function (receiver, key, value) {
             };
 
             this.equals = function (o) {
+                if (o === null || o === undefined) return false;
                 if (this.size() === o.size()) {
                     var iter1 = this.iterator();
                     var iter2 = o.iterator();
diff --git a/libraries/tools/kotlin-js-tests/pom.xml b/libraries/tools/kotlin-js-tests/pom.xml
index bbd2e93ec4c..aea9146cf6d 100644
--- a/libraries/tools/kotlin-js-tests/pom.xml
+++ b/libraries/tools/kotlin-js-tests/pom.xml
@@ -63,12 +63,19 @@
                                         <include name="ListTest.kt"/>
                                         -->
 <!--
-    TODO: depends on this being fixed: http://youtrack.jetbrains.com/issue/KT-2372
+    TODO: depends on this being fixed: http://youtrack.jetbrains.com/issue/KT-2468
                                         <include name="SetTest.kt"/>
 -->
 <!--
-    TODO: depends on this being fixed: http://youtrack.jetbrains.com/issue/KT-2356
+    TODO: depends on this being fixed:
+    http://youtrack.jetbrains.com/issue/KT-2470
+    http://youtrack.jetbrains.com/issue/KT-2374
+    http://youtrack.jetbrains.com/issue/KT-2468
                                         <include name="CollectionTest.kt"/>
+-->
+
+<!--
+    TODO: depends on this being fixed: http://youtrack.jetbrains.com/issue/KT-2470
                                         <include name="iterators/*.kt"/>
 -->
 <!--