From 25172d797e827f0fc0d7855bc6b114bb92c3e069 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Fri, 3 Oct 2014 20:42:48 +0400
Subject: [PATCH] JS tests: disable Rhino optimization by default.

---
 .../org/jetbrains/k2js/test/rhino/RhinoUtils.java   | 13 +++----------
 .../k2js/test/semantics/ClassInheritanceTest.java   |  2 +-
 .../org/jetbrains/k2js/test/semantics/MiscTest.java |  2 +-
 .../testData/expression/misc/cases/localProperty.kt |  5 +++--
 .../cases/initializersOfBasicClassExecute.kt        |  5 +++--
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
index cfd2d17efd0..6287ff58b45 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
@@ -27,10 +27,7 @@ import org.mozilla.javascript.*;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import static org.jetbrains.jet.utils.UtilsPackage.rethrow;
 import static org.jetbrains.k2js.test.BasicTest.TEST_DATA_DIR_PATH;
@@ -111,12 +108,7 @@ public final class RhinoUtils {
     }
 
     public static void runRhinoTest(@NotNull List<String> fileNames, @NotNull RhinoResultChecker checker) throws Exception {
-        runRhinoTest(fileNames, checker, EcmaVersion.defaultVersion());
-    }
-
-    public static void runRhinoTest(@NotNull List<String> fileNames, @NotNull RhinoResultChecker checker, @NotNull EcmaVersion ecmaVersion)
-            throws Exception {
-        runRhinoTest(fileNames, checker, null, ecmaVersion);
+        runRhinoTest(fileNames, checker, null, EcmaVersion.defaultVersion());
     }
 
     public static void runRhinoTest(@NotNull List<String> fileNames,
@@ -134,6 +126,7 @@ public final class RhinoUtils {
             @NotNull List<String> jsLibraries) throws Exception {
         Context context = createContext(ecmaVersion);
 
+        context.setOptimizationLevel(OPTIMIZATION_OFF);
         if (variables != null) {
             context.setOptimizationLevel(getOptimizationLevel(variables));
         }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java
index f168272c8bf..7ee5d1d3db2 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java
@@ -25,7 +25,7 @@ public final class ClassInheritanceTest extends SingleFileTranslationTest {
     }
 
     public void testInitializersOfBasicClassExecute() throws Exception {
-        fooBoxIsValue(3);
+        checkFooBoxIsOk();
     }
 
     public void testMethodOverride() throws Exception {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
index 7fa92289aa6..a8adb0a34c1 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
@@ -29,7 +29,7 @@ public final class MiscTest extends AbstractExpressionTest {
     }
 
     public void testLocalProperty() throws Exception {
-        fooBoxIsValue(50);
+        checkFooBoxIsOk();
     }
 
     public void testIntRange() throws Exception {
diff --git a/js/js.translator/testData/expression/misc/cases/localProperty.kt b/js/js.translator/testData/expression/misc/cases/localProperty.kt
index a0005c2f171..fd0aa12b068 100644
--- a/js/js.translator/testData/expression/misc/cases/localProperty.kt
+++ b/js/js.translator/testData/expression/misc/cases/localProperty.kt
@@ -9,6 +9,7 @@ fun f(a: Int): Int {
     return y
 }
 
-fun box(): Int {
-    return f(y)
+fun box(): String {
+    val r = f(y)
+    return if (r == 50) "OK" else "Fail, r = $r"
 }
diff --git a/js/js.translator/testData/inheritance/cases/initializersOfBasicClassExecute.kt b/js/js.translator/testData/inheritance/cases/initializersOfBasicClassExecute.kt
index 8e8b86762d3..91a2974723f 100644
--- a/js/js.translator/testData/inheritance/cases/initializersOfBasicClassExecute.kt
+++ b/js/js.translator/testData/inheritance/cases/initializersOfBasicClassExecute.kt
@@ -8,6 +8,7 @@ class B() : A() {
 
 }
 
-fun box(): Int {
-    return (B().a)
+fun box(): String {
+    val a = B().a
+    return if (a == 3) "OK" else "Fail, a = $a"
 }