From 4f0a858e934da0841ad42f814091dd857fc9d401 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Wed, 3 Jun 2015 17:26:17 +0300
Subject: [PATCH] JS backend: fix tests after move testTrue and testFalse to
 common place

---
 .../kotlin/js/test/semantics/StringTest.java  | 23 +++----------------
 .../expression/string/cases/intInTemplate.kt  |  5 +++-
 .../cases/multipleExpressionsInTemplate.kt    |  5 +++-
 .../string/cases/stringInTemplate.kt          |  5 +++-
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java
index b6bd08a6c59..e97f210602c 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java
@@ -16,12 +16,6 @@
 
 package org.jetbrains.kotlin.js.test.semantics;
 
-import com.intellij.openapi.util.io.FileUtil;
-import org.jetbrains.kotlin.js.config.EcmaVersion;
-
-import java.io.File;
-import java.io.IOException;
-
 public final class StringTest extends AbstractExpressionTest {
 
     public StringTest() {
@@ -37,18 +31,15 @@ public final class StringTest extends AbstractExpressionTest {
     }
 
     public void testIntInTemplate() throws Exception {
-        fooBoxIsValue("my age is 3");
-        checkHasNoToStringCalls();
+        checkFooBoxIsOk();
     }
 
     public void testStringInTemplate() throws Exception {
-        fooBoxIsValue("oHelloo");
-        checkHasNoToStringCalls();
+        checkFooBoxIsOk();
     }
 
     public void testMultipleExpressionsInTemplate() throws Exception {
-        fooBoxIsValue("left = 3\nright = 2\nsum = 5\n");
-        checkHasNoToStringCalls();
+        checkFooBoxIsOk();
     }
 
     public void testObjectToStringCallInTemplate() throws Exception {
@@ -71,14 +62,6 @@ public final class StringTest extends AbstractExpressionTest {
         fooBoxIsValue("2354");
     }
 
-    private void checkHasNoToStringCalls() throws IOException {
-        for (EcmaVersion ecmaVersion : DEFAULT_ECMA_VERSIONS) {
-            String filePath = getOutputFilePath(getTestName(true), ecmaVersion);
-            String text = FileUtil.loadFile(new File(filePath), /*convertLineSeparators = */ true);
-            assertFalse(filePath + " should not contain toString calls", text.contains("toString"));
-        }
-    }
-
     public void testStringSplit() throws Exception {
         checkFooBoxIsOk();
     }
diff --git a/js/js.translator/testData/expression/string/cases/intInTemplate.kt b/js/js.translator/testData/expression/string/cases/intInTemplate.kt
index 6e609ef5fd7..0afa29ad922 100644
--- a/js/js.translator/testData/expression/string/cases/intInTemplate.kt
+++ b/js/js.translator/testData/expression/string/cases/intInTemplate.kt
@@ -1,7 +1,10 @@
+// CHECK_NOT_CALLED_IN_SCOPE: scope=box function=toString
+
 package foo
 
 fun box(): String {
     var number = 3
-    return ("my age is $number");
+    assertEquals("my age is 3", "my age is $number")
+    return "OK"
 }
 
diff --git a/js/js.translator/testData/expression/string/cases/multipleExpressionsInTemplate.kt b/js/js.translator/testData/expression/string/cases/multipleExpressionsInTemplate.kt
index 8c90a477294..c95438a259d 100644
--- a/js/js.translator/testData/expression/string/cases/multipleExpressionsInTemplate.kt
+++ b/js/js.translator/testData/expression/string/cases/multipleExpressionsInTemplate.kt
@@ -1,8 +1,11 @@
+// CHECK_NOT_CALLED_IN_SCOPE: scope=box function=toString
+
 package foo
 
 fun box(): String {
     var right = 2
     var left = 3
-    return ("left = $left\nright = $right\nsum = ${left + right}\n");
+    assertEquals("left = 3\nright = 2\nsum = 5\n", "left = $left\nright = $right\nsum = ${left + right}\n");
+    return "OK"
 }
 
diff --git a/js/js.translator/testData/expression/string/cases/stringInTemplate.kt b/js/js.translator/testData/expression/string/cases/stringInTemplate.kt
index 6046c46c77e..0bfd975fbb7 100644
--- a/js/js.translator/testData/expression/string/cases/stringInTemplate.kt
+++ b/js/js.translator/testData/expression/string/cases/stringInTemplate.kt
@@ -1,7 +1,10 @@
+// CHECK_NOT_CALLED_IN_SCOPE: scope=box function=toString
+
 package foo
 
 fun box(): String {
     var name = "Hello"
-    return ("o${name}o");
+    assertEquals("oHelloo", "o${name}o")
+    return "OK";
 }