From 90b065e82b352165b78bd5d3ee95669bea022427 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 29 Jul 2014 00:07:34 +0400 Subject: [PATCH] += tests fix --- .../codegen/boxWithStdlib/regressions/kt1733.kt | 12 ------------ .../strings/stringPlusOnlyWorksOnString.kt | 1 - .../BlackBoxWithStdlibCodegenTestGenerated.java | 5 ----- .../overloadPlusAssignViaPlusExtensionFunction.kt | 2 +- .../webDemoCanvasExamples/cases/Fancy lines.kt | 2 +- libraries/stdlib/test/collections/CollectionTest.kt | 4 ++-- .../stdlib/test/collections/ListSpecificTest.kt | 2 +- libraries/stdlib/test/dom/DomTest.kt | 2 +- 8 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 compiler/testData/codegen/boxWithStdlib/regressions/kt1733.kt diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt1733.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1733.kt deleted file mode 100644 index 01742d62471..00000000000 --- a/compiler/testData/codegen/boxWithStdlib/regressions/kt1733.kt +++ /dev/null @@ -1,12 +0,0 @@ -fun box() : String { - val map = java.util.TreeMap() - map["a"] = "1" - map["b"] = "2" - - var list = arrayList() - for (e in map) { - list += e.getKey() - } - - return if(list.size==2) "OK" else "fail" -} diff --git a/compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt b/compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt index e9d981d8edc..124a0fe2d9a 100644 --- a/compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt +++ b/compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt @@ -3,6 +3,5 @@ import java.util.ArrayList fun box(): String { var x: MutableCollection = ArrayList() x + ArrayList() - x += ArrayList() return "OK" } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 6590b774d59..5b373bb94bd 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -1753,11 +1753,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1568.kt"); } - @TestMetadata("kt1733.kt") - public void testKt1733() throws Exception { - doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1733.kt"); - } - @TestMetadata("kt1770.kt") public void testKt1770() throws Exception { doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1770.kt"); diff --git a/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignViaPlusExtensionFunction.kt b/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignViaPlusExtensionFunction.kt index 209b1d5ba10..626b81099b6 100644 --- a/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignViaPlusExtensionFunction.kt +++ b/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignViaPlusExtensionFunction.kt @@ -2,7 +2,7 @@ package foo import java.util.* -fun ArrayList.plus(other: Collection): List { +fun ArrayList.plus(other: Collection): ArrayList { val c = ArrayList() c.addAll(this) c.addAll(other) diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt index 8fd05c47b1b..2f718a39345 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt @@ -43,7 +43,7 @@ class FancyLines() { context.bezierCurveTo(width * Math.random(), height * Math.random(), width * Math.random(), height * Math.random(), x, y); - hue += Math.random() * 10; + hue += (Math.random() * 10).toInt(); context.strokeStyle = "hsl($hue, 50%, 50%)"; diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt index 611ff36962f..77b96b64154 100644 --- a/libraries/stdlib/test/collections/CollectionTest.kt +++ b/libraries/stdlib/test/collections/CollectionTest.kt @@ -199,7 +199,7 @@ class CollectionTest { assertEquals(arrayListOf("foo", "bar", "cheese"), list2) // lets use a mutable variable - var list3 = arrayListOf("a", "b") + var list3 = listOf("a", "b") list3 += "c" assertEquals(arrayListOf("a", "b", "c"), list3) } @@ -216,7 +216,7 @@ class CollectionTest { assertEquals(arrayListOf("foo", "bar", "cheese", "wine"), list) // lets use a mutable variable - var ml = a + var ml: List = a ml += "beer" ml += b ml += "z" diff --git a/libraries/stdlib/test/collections/ListSpecificTest.kt b/libraries/stdlib/test/collections/ListSpecificTest.kt index f28527e862f..9258712fdbf 100644 --- a/libraries/stdlib/test/collections/ListSpecificTest.kt +++ b/libraries/stdlib/test/collections/ListSpecificTest.kt @@ -44,7 +44,7 @@ class ListSpecificTest { Test fun mutableList() { val items = listOf("beverage", "location", "name") - var list = arrayListOf() + var list = listOf() for (item in items) { list += item } diff --git a/libraries/stdlib/test/dom/DomTest.kt b/libraries/stdlib/test/dom/DomTest.kt index 3cc7511aabb..4acd5e38673 100644 --- a/libraries/stdlib/test/dom/DomTest.kt +++ b/libraries/stdlib/test/dom/DomTest.kt @@ -23,7 +23,7 @@ class DomTest { e.setAttribute("class", "bar") assertCssClass(e, "bar") - doc += e + doc + e println("document ${doc.toXmlString()}") }