From b2f096f20a556177707a4128ba6e98c01eaa35eb Mon Sep 17 00:00:00 2001 From: Erokhin Stanislav Date: Thu, 17 Oct 2013 14:46:10 +0400 Subject: [PATCH] JS backend: add debug info into several tests --- .../testFiles/classObject/cases/setVar.kt | 8 ++++---- .../testFiles/classObject/cases/simple.kt | 8 ++++---- .../classObject/cases/withExtension.kt | 12 ++++++------ .../testFiles/enum/cases/simple.kt | 18 +++++++++--------- .../testFiles/enum/cases/standardMethods.kt | 18 +++++++++--------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/js/js.translator/testFiles/classObject/cases/setVar.kt b/js/js.translator/testFiles/classObject/cases/setVar.kt index 8ca559b6de1..0f5b35b1bd8 100644 --- a/js/js.translator/testFiles/classObject/cases/setVar.kt +++ b/js/js.translator/testFiles/classObject/cases/setVar.kt @@ -27,17 +27,17 @@ class A { fun box() : String { A.a = 2 - if (A.a != 2) return "A.a != 2" + if (A.a != 2) return "A.a != 2, it: ${A.a}" val a = A a.a = 3 - if (a.a != 3) return "a = A; a.a = 3; a != 3" + if (a.a != 3) return "a = A; a.a = 3; a != 3, it: ${a.a}" - if (A().a != 3) return "A().a != 3" + if (A().a != 3) return "A().a != 3, it: ${A().a}" val x = A() x.a = 4 - if (x.a != 4) return "x = A(); x.a = 4; x.a != 4" + if (x.a != 4) return "x = A(); x.a = 4; x.a != 4, it: ${x.a}" return "OK" } diff --git a/js/js.translator/testFiles/classObject/cases/simple.kt b/js/js.translator/testFiles/classObject/cases/simple.kt index cf3f98445b4..d4c6d6badfa 100644 --- a/js/js.translator/testFiles/classObject/cases/simple.kt +++ b/js/js.translator/testFiles/classObject/cases/simple.kt @@ -27,13 +27,13 @@ class A { fun box() : String { - if (A.a != 2) return "A.a != 2" - if (A.b != 5) return "A.b != 5" + if (A.a != 2) return "A.a != 2, it: ${A.a}" + if (A.b != 5) return "A.b != 5, it: ${A.b}" val b = A - if (b.a != 2) return "b = A; b != 2" + if (b.a != 2) return "b = A; b != 2, it: ${b.a}" - if (A().a != 3) return "A().a != 3" + if (A().a != 3) return "A().a != 3, it: ${A().a}" return "OK" } diff --git a/js/js.translator/testFiles/classObject/cases/withExtension.kt b/js/js.translator/testFiles/classObject/cases/withExtension.kt index 28aa89c3177..f6251611db6 100644 --- a/js/js.translator/testFiles/classObject/cases/withExtension.kt +++ b/js/js.translator/testFiles/classObject/cases/withExtension.kt @@ -32,16 +32,16 @@ class B { } fun box() : String { - if (A.a != 3) return "A.a != 3" - if (A.foo() != 5) return "A.foo() != 5" + if (A.a != 3) return "A.a != 3, it: ${A.a}" + if (A.foo() != 5) return "A.foo() != 5, it: ${A.foo()}" val a = A - if (a.c != 3) return "a = A; a.c != 3" + if (a.c != 3) return "a = A; a.c != 3, it: ${a.c}" - if (A().a != 3) return "A().a != 3" + if (A().a != 3) return "A().a != 3, it: ${A().a}" - if (B.a != 3) return "B.a != 3" + if (B.a != 3) return "B.a != 3, it: ${B.a}" val b = B - if (b.foo() != 5) return "b = B; b.foo() != 5" + if (b.foo() != 5) return "b = B; b.foo() != 5, it: ${b.foo()}" return "OK" } diff --git a/js/js.translator/testFiles/enum/cases/simple.kt b/js/js.translator/testFiles/enum/cases/simple.kt index 17ae3a8891c..faebfcda919 100644 --- a/js/js.translator/testFiles/enum/cases/simple.kt +++ b/js/js.translator/testFiles/enum/cases/simple.kt @@ -26,18 +26,18 @@ enum class Y(override val foo: Int) : X { } fun box(): String { - if (B.a.x != 1) return "B.a.x != 1" - if (B.a.y != 0) return "B.a.y != 0" - if (B.a.bar != 3) return "B.a.bar != 3" + if (B.a.x != 1) return "B.a.x != 1, it: ${B.a.x}" + if (B.a.y != 0) return "B.a.y != 0, it: ${B.a.y}" + if (B.a.bar != 3) return "B.a.bar != 3, it: ${B.a.bar}" - if (B.b.bar != 4) return "B.b.bar != 4" - if (B.b.y != 12) return "B.b.y != 12" + if (B.b.y != 12) return "B.b.y != 12, it: ${B.b.y}" + if (B.b.bar != 4) return "B.b.bar != 4, it: ${B.b.bar}" - if (B.c.bar != 5) return "B.c.bar != 5" - if (B.c.y != 12) return "B.c.y != 12" + if (B.c.bar != 5) return "B.c.bar != 5, it: ${B.c.bar}" + if (B.c.y != 12) return "B.c.y != 12, it: ${B.c.y}" - if (Y.m.bar() != 3) return "Y.m.bar() != 3" - if (Y.n.bar() != 6) return "Y.n.bar() != 6" + if (Y.m.bar() != 3) return "Y.m.bar() != 3, it: ${Y.m.bar()}" + if (Y.n.bar() != 6) return "Y.n.bar() != 6, it: ${Y.m.bar()}" return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/enum/cases/standardMethods.kt b/js/js.translator/testFiles/enum/cases/standardMethods.kt index b6ce378911c..2b854842d85 100644 --- a/js/js.translator/testFiles/enum/cases/standardMethods.kt +++ b/js/js.translator/testFiles/enum/cases/standardMethods.kt @@ -16,9 +16,9 @@ enum class B { c } fun box(): String { - if (Simple.OK.name() != "OK") return "Simple.OK.name() != OK" + if (Simple.OK.name() != "OK") return "Simple.OK.name() != OK, it: ${Simple.OK.name()}" val ok = Simple.OK - if (ok.ordinal() != 0) return "ok = Simple.Ok; ok.ordinal() != 0" + if (ok.ordinal() != 0) return "ok = Simple.Ok; ok.ordinal() != 0, it: ${ok.ordinal()}" val ok2 = Simple.valueOf("OK") if(!ok2.equals(ok)) return "ok2 not equal ok" @@ -29,17 +29,17 @@ fun box(): String { if (A.values() != array(A.a, A.b, A.c)) return "Wrong A.values(): " + A.values().toString() - if (A.c.toString() != "c") return "A.c.toString() != c" + if (A.c.toString() != "c") return "A.c.toString() != c, it: ${A.c.toString()}" if (A.valueOf("b") != A.b) return "A.valueOf('b') != A.b" if (A.a == A.b) return "A.a == A.b" - if (A.a.name() != "a") return "A.a.name() != a" - if (A.b.name() != "b") return "A.b.name() != b" - if (A.c.name() != "c") return "A.c.name() != c" + if (A.a.name() != "a") return "A.a.name() != a, it: ${A.a.name()}" + if (A.b.name() != "b") return "A.b.name() != b, it: ${A.b.name()}" + if (A.c.name() != "c") return "A.c.name() != c, it: ${A.c.name()}" - if (A.a.ordinal() != 0) return "A.a.ordinal() != 0" - if (A.b.ordinal() != 1) return "A.b.ordinal() != 1" - if (A.c.ordinal() != 2) return "A.c.ordinal() != 2" + if (A.a.ordinal() != 0) return "A.a.ordinal() != 0, it: ${A.a.ordinal()}" + if (A.b.ordinal() != 1) return "A.b.ordinal() != 1, it: ${A.b.ordinal()}" + if (A.c.ordinal() != 2) return "A.c.ordinal() != 2, it: ${A.c.ordinal()}" if (A.c.equals(B.c)) return "A.c.equals(B.c)"