JS: move more test to box tests

js/js.translator/testData/box/multiFile/classOfTheSameNameInAnotherPackage.kt

@@ -0,0 +1,18 @@
+// FILE: A.kt
+package foo
+
+open class A() {
+    fun f() = 3
+}
+
+fun box(): String {
+    return if ((A().f() + bar.A().f()) == 9) "OK" else "fail"
+}
+
+
+// FILE: B.kt
+package bar
+
+open class A() {
+    fun f() = 6
+}

js/js.translator/testData/box/multiFile/classesInheritedFromOtherFile.kt

@@ -0,0 +1,26 @@
+// FILE: a.kt
+package foo
+
+open class A() {
+    open fun f() = 3;
+}
+
+open class C() : B() {
+    override fun f() = 5
+}
+
+
+// FILE: b.kt
+package foo
+
+open class B() : A() {
+    override fun f() = 4
+}
+
+fun box(): String {
+    if (A().f() != 3) return "fail1"
+    if (B().f() != 4) return "fail2"
+    if (C().f() != 5) return "fail3"
+
+    return "OK"
+}

js/js.translator/testData/box/multiFile/functionsVisibleFromOtherFile.kt

@@ -0,0 +1,10 @@
+// FILE: a.kt
+package foo
+
+fun f() = 3;
+
+
+// FILE: b.kt
+package foo
+
+fun box() = if (f() == 3) "OK" else "fail"

js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt

@@ -0,0 +1,12 @@
+// MODULE: module-1
+// FILE: bar.kt
+// MODULE_KIND: AMD
+fun bar() = "bar"
+
+// MODULE: main(module-1)
+// FILE: box.kt
+// MODULE_KIND: AMD
+fun box(): String {
+    assertEquals("bar", bar())
+    return "OK"
+}

js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt

@@ -0,0 +1,12 @@
+// MODULE: module1
+// FILE: bar.kt
+// MODULE_KIND: AMD
+fun bar() = "bar"
+
+// MODULE: main(module1)
+// FILE: box.kt
+// MODULE_KIND: AMD
+fun box(): String {
+    assertEquals("bar", bar())
+    return "OK"
+}

js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt

@@ -0,0 +1,12 @@
+// MODULE: module-1
+// FILE: bar.kt
+// MODULE_KIND: COMMON_JS
+fun bar() = "bar"
+
+// MODULE: main(module-1)
+// FILE: box.kt
+// MODULE_KIND: COMMON_JS
+fun box(): String {
+    assertEquals("bar", bar())
+    return "OK"
+}

js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt

@@ -0,0 +1,12 @@
+// MODULE: module1
+// FILE: bar.kt
+// MODULE_KIND: COMMON_JS
+fun bar() = "bar"
+
+// MODULE: main(module1)
+// FILE: box.kt
+// MODULE_KIND: COMMON_JS
+fun box(): String {
+    assertEquals("bar", bar())
+    return "OK"
+}

js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt

@@ -0,0 +1,12 @@
+// MODULE: module-1
+// FILE: bar.kt
+// MODULE_KIND: PLAIN
+fun bar() = "bar"
+
+// MODULE: main(module-1)
+// FILE: box.kt
+// MODULE_KIND: PLAIN
+fun box(): String {
+    assertEquals("bar", bar())
+    return "OK"
+}

js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt

@@ -0,0 +1,12 @@
+// MODULE: module1
+// FILE: bar.kt
+// MODULE_KIND: PLAIN
+fun bar() = "bar"
+
+// MODULE: main(module1)
+// FILE: box.kt
+// MODULE_KIND: PLAIN
+fun box(): String {
+    assertEquals("bar", bar())
+    return "OK"
+}

js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt

@@ -0,0 +1,12 @@
+// MODULE: module-1
+// FILE: bar.kt
+// MODULE_KIND: UMD
+fun bar() = "bar"
+
+// MODULE: main(module-1)
+// FILE: box.kt
+// MODULE_KIND: UMD
+fun box(): String {
+    assertEquals("bar", bar())
+    return "OK"
+}

js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt

@@ -0,0 +1,12 @@
+// MODULE: module1
+// FILE: bar.kt
+// MODULE_KIND: UMD
+fun bar() = "bar"
+
+// MODULE: main(module1)
+// FILE: box.kt
+// MODULE_KIND: UMD
+fun box(): String {
+    assertEquals("bar", bar())
+    return "OK"
+}

js/js.translator/testData/box/multideclaration/multiValForRange.kt

@@ -7,16 +7,16 @@ class C(val i: Int) : Comparable<C>, A() {
 
 }
 
-fun ComparableRange<C>.iterator(): Iterator<C> {
+operator fun ClosedRange<C>.iterator(): Iterator<C> {
     var curI: Int = start.i - 1
 
-    return object :Iterator<C> {
+    return object : Iterator<C> {
         public override fun next(): C {
             curI++
             return C(curI)
         }
         public override fun hasNext(): Boolean {
-            return curI < end.i
+            return curI <= endInclusive.i
         }
 
     }

js/js.translator/testData/multiFile/cases/classOfTheSameNameInAnotherPackage/A.kt

@@ -1,7 +0,0 @@
-package foo
-
-open class A() {
-    fun f() = 3
-}
-
-fun box() = (A().f() + bar.A().f()) == 9

js/js.translator/testData/multiFile/cases/classOfTheSameNameInAnotherPackage/B.kt

@@ -1,5 +0,0 @@
-package bar
-
-open class A() {
-    fun f() = 6
-}

js/js.translator/testData/multiFile/cases/classesInheritedFromOtherFile/a.kt

@@ -1,9 +0,0 @@
-package foo
-
-open class A() {
-    open fun f() = 3;
-}
-
-open class C() : B() {
-    override fun f() = 5
-}

js/js.translator/testData/multiFile/cases/classesInheritedFromOtherFile/b.kt

@@ -1,7 +0,0 @@
-package foo
-
-open class B() : A() {
-    override fun f() = 4
-}
-
-fun box() = (A().f() == 3) && (B().f() == 4) && (C().f() == 5)

js/js.translator/testData/multiFile/cases/functionsVisibleFromOtherFile/a.kt

@@ -1,3 +0,0 @@
-package foo
-
-fun f() = 3;

js/js.translator/testData/multiFile/cases/functionsVisibleFromOtherFile/b.kt

@@ -1,3 +0,0 @@
-package foo
-
-fun box() = (f() == 3)

js/js.translator/testData/multiModuleWrappers/cases/moduleWithNonIdentifierName/dependencies.txt

@@ -1,2 +0,0 @@
-module-1->
-main->module-1

js/js.translator/testData/multiModuleWrappers/cases/moduleWithNonIdentifierName/main/main.kt

@@ -1,4 +0,0 @@
-fun box(): String {
-    assertEquals("bar", bar())
-    return "OK"
-}

js/js.translator/testData/multiModuleWrappers/cases/moduleWithNonIdentifierName/module-1/module-1.kt

@@ -1 +0,0 @@
-fun bar() = "bar"

js/js.translator/testData/multiModuleWrappers/cases/simple/dependencies.txt

@@ -1,2 +0,0 @@
-module1->
-main->module1

js/js.translator/testData/multiModuleWrappers/cases/simple/main/main.kt

@@ -1,4 +0,0 @@
-fun box(): String {
-    assertEquals("bar", bar())
-    return "OK"
-}

js/js.translator/testData/multiModuleWrappers/cases/simple/module1/module1.kt

@@ -1 +0,0 @@
-fun bar() = "bar"