From a6dbd45eb758f5827d976e579f0bc1b4b21ac423 Mon Sep 17 00:00:00 2001 From: Pavel Talanov Date: Tue, 7 Feb 2012 16:31:24 +0400 Subject: [PATCH] modified outdated tests, removed changes by Natasha --- config.txt | 1 - jslib/src/core/javautil.kt | 2 +- .../src/org/jetbrains/k2js/config/Config.java | 2 +- .../org/jetbrains/k2js/utils/JetFileUtils.java | 18 +----------------- .../k2js/test/OperatorOverloadingTest.java | 2 +- .../cases/overloadPlusAssignReturn.jet | 9 +++------ .../cases/overloadedCallOnProperty.kt | 10 ++++++++-- .../cases/postfixIncOverload.kt | 6 ++++-- .../cases/prefixDecOverload.kt | 6 ++++-- 9 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 config.txt diff --git a/config.txt b/config.txt deleted file mode 100644 index 3d4240955ae..00000000000 --- a/config.txt +++ /dev/null @@ -1 +0,0 @@ -C:\Dev\Projects\jet-contrib\k2js\jslib\src \ No newline at end of file diff --git a/jslib/src/core/javautil.kt b/jslib/src/core/javautil.kt index 822741b81c8..0a511ca7a15 100644 --- a/jslib/src/core/javautil.kt +++ b/jslib/src/core/javautil.kt @@ -23,7 +23,7 @@ public open class Iterator() { library val Collections = object { - library("max") + library("collectionsMax") public fun max(col : Collection, comp : Comparator) : T = f } diff --git a/translator/src/org/jetbrains/k2js/config/Config.java b/translator/src/org/jetbrains/k2js/config/Config.java index 4f05c837795..ae39f2dd735 100644 --- a/translator/src/org/jetbrains/k2js/config/Config.java +++ b/translator/src/org/jetbrains/k2js/config/Config.java @@ -45,7 +45,7 @@ public abstract class Config { List lines = Files.readLines(file, Charsets.UTF_8); return lines.get(0); } catch (Exception ex) { - return "/src"; + return "jslib\\src"; } } diff --git a/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java b/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java index b10eb1cb28e..ff9bceaf284 100644 --- a/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java +++ b/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java @@ -1,6 +1,5 @@ package org.jetbrains.k2js.utils; -import com.google.common.io.ByteStreams; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -13,10 +12,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JetLanguage; -import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; @@ -32,20 +29,7 @@ public final class JetFileUtils { @NotNull private static String doLoadFile(@NotNull String path) throws IOException { - path = path.replace("\\", "/"); - InputStreamReader reader = new InputStreamReader(JetFileUtils.class.getResourceAsStream(path)); - StringBuilder response = new StringBuilder(); - BufferedReader bufferedReader = new BufferedReader(reader); - - String tmp; - while ((tmp = bufferedReader.readLine()) != null) { - response.append(tmp); - response.append(System.getProperty("line.separator")); - } - - reader.close(); - String text = response.toString(); -// String text = FileUtil.loadFile(new File(path), CharsetToolkit.UTF8).trim(); + String text = FileUtil.loadFile(new File(path), CharsetToolkit.UTF8).trim(); text = StringUtil.convertLineSeparators(text); return text; } diff --git a/translator/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java b/translator/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java index cadec44a064..19f2ce45410 100644 --- a/translator/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java +++ b/translator/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java @@ -23,7 +23,7 @@ public final class OperatorOverloadingTest extends TranslationTest { } - public void testPrefixInc() throws Exception { + public void testPrefixDecOverload() throws Exception { testFooBoxIsTrue("prefixDecOverload.kt"); } diff --git a/translator/testFiles/examples/cases/overloadPlusAssignReturn.jet b/translator/testFiles/examples/cases/overloadPlusAssignReturn.jet index 42671b9f138..b6d0c3c0282 100644 --- a/translator/testFiles/examples/cases/overloadPlusAssignReturn.jet +++ b/translator/testFiles/examples/cases/overloadPlusAssignReturn.jet @@ -7,11 +7,8 @@ class ArrayWrapper() { contents.add(item) } - fun plusAssign(rhs: ArrayWrapper): ArrayWrapper { - val result = ArrayWrapper() - result.contents.addAll(contents) - result.contents.addAll(rhs.contents) - return result + fun plusAssign(rhs: ArrayWrapper) { + contents.addAll(rhs.contents) } fun get(index: Int): T { @@ -26,5 +23,5 @@ fun box(): String { val v3 = v1 v2.add("bar") v1 += v2 - return if (v1.contents.size() == 2 && v3.contents.size() == 1) "OK" else "fail" + return if (v1.contents.size() == 2 && v3.contents.size() == 2) "OK" else "fail" } diff --git a/translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt b/translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt index d3664d62609..e539c6936a2 100644 --- a/translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt +++ b/translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt @@ -5,11 +5,17 @@ var a = MyInt() class MyInt() { var b = 0 - fun inc() = b + 1 + fun inc() : MyInt { + val res = MyInt(); + res.b = b; + res.b++; + return res; + } } fun box() : Boolean { a++; - return (a.b == 1); + a++; + return (a.b == 2); } \ No newline at end of file diff --git a/translator/testFiles/operatorOverloading/cases/postfixIncOverload.kt b/translator/testFiles/operatorOverloading/cases/postfixIncOverload.kt index 6335ddbbe39..ec911c90cc7 100644 --- a/translator/testFiles/operatorOverloading/cases/postfixIncOverload.kt +++ b/translator/testFiles/operatorOverloading/cases/postfixIncOverload.kt @@ -3,8 +3,10 @@ package foo class MyInt() { var b = 0 - fun inc() { - b = b + 1; + fun inc() : MyInt { + val res = MyInt() + res.b++; + return res; } } diff --git a/translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt b/translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt index 6174c609598..7ac38374bc7 100644 --- a/translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt +++ b/translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt @@ -3,8 +3,10 @@ package foo class MyInt() { var b = 0 - fun dec() { - b = b + 1; + fun dec() : MyInt { + val res = MyInt() + res.b++; + return res; } }