azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid failure on equals() call passing in null/undefined and updated the issues for failing JS unit tests

Browse Source
This commit is contained in:
James Strachan
2012-07-20 07:14:20 +01:00
parent 14abbc9e5f
commit 3ef4ff690c
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testFiles/kotlin_lib.js
+2
View File
@@ -124,6 +124,7 @@ var kotlin = {set:function (receiver, key, value) {
} }
}, },
equals: function (o) { equals: function (o) {
if (o === null || o === undefined) return false;
if (this.size() === o.size()) { if (this.size() === o.size()) {
var iter1 = this.iterator(); var iter1 = this.iterator();
var iter2 = o.iterator(); var iter2 = o.iterator();
@@ -909,6 +910,7 @@ var kotlin = {set:function (receiver, key, value) {
}; };
this.equals = function (o) { this.equals = function (o) {
if (o === null || o === undefined) return false;
if (this.size() === o.size()) { if (this.size() === o.size()) {
var iter1 = this.iterator(); var iter1 = this.iterator();
var iter2 = o.iterator(); var iter2 = o.iterator();
libraries/tools/kotlin-js-tests/pom.xml
+9 -2
View File
@@ -63,12 +63,19 @@
<include name="ListTest.kt"/> <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"/> <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"/> <include name="CollectionTest.kt"/>
-->
<!--
TODO: depends on this being fixed: http://youtrack.jetbrains.com/issue/KT-2470
<include name="iterators/*.kt"/> <include name="iterators/*.kt"/>
--> -->
<!-- <!--