From fedbe2648009c95f05d3d5171f1dad6e9f8e84a8 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Tue, 21 Oct 2014 16:17:11 +0400
Subject: [PATCH] Minor: added regression tests for KT-4235

#KT-4235 Obsolete
---
 .../string/cases/extensionMethods.kt          | 60 ++++++++++++-------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/js/js.translator/testData/expression/string/cases/extensionMethods.kt b/js/js.translator/testData/expression/string/cases/extensionMethods.kt
index dab8532976d..3ff4f4c61ba 100644
--- a/js/js.translator/testData/expression/string/cases/extensionMethods.kt
+++ b/js/js.translator/testData/expression/string/cases/extensionMethods.kt
@@ -2,35 +2,49 @@ package foo
 
 val testString = "foobarbaz"
 val testStringSize = 9
+val testIndexOfB = 3
 val emptyString = ""
 val startsWithParam = "foo"
 val endsWithParam = "az"
 val containsParam = "ar"
 
-fun assertEquals(actual: Any, expected: Any, s: String, whatTested: String) =
-        if (expected != actual) "String.$whatTested fails on \"$s\", expected: $expected, actual: $actual" else null
+fun assertEquals(expected: Any, actual: Any, s: CharSequence, type: String, whatTested: String) {
+    assertEquals(expected, actual, "$type.$whatTested fails on \"$s\"")
+}
 
-fun assertEquals(actual: Any, expected: Any, s: CharSequence, whatTested: CharSequence) =
-        if (expected != actual) "CharSequence.$whatTested fails on \"$s\", expected: $expected, actual: $actual" else null
+fun assertEquals(expected: Any, actual: Any, s: String, whatTested: String) {
+    assertEquals(expected, actual, s, "String", whatTested)
+}
 
-fun testString(s: String, expectedSize: Int): String? =
-        assertEquals(s.size, expectedSize, s, "size") ?:
-        assertEquals(s.length(), expectedSize, s, "length()") ?:
-        assertEquals(s.length, expectedSize, s, "length") ?:
-        assertEquals(s.isEmpty(), expectedSize == 0, s, "isEmpty()") ?:
-        assertEquals(s.startsWith(startsWithParam), expectedSize != 0, s, "startsWith(\"$startsWithParam\")") ?:
-        assertEquals(s.endsWith(endsWithParam), expectedSize != 0, s, "endsWith(\"$endsWithParam\")") ?:
-        assertEquals(s.contains(containsParam), expectedSize != 0, s, "contains(\"$containsParam\")")
+fun assertEquals(expected: Any, actual: Any, s: CharSequence, whatTested: String) {
+    assertEquals(expected, actual, s, "CharSequence", whatTested)
+}
 
-fun testCharSequence(s: CharSequence, expectedSize: Int): String? =
-        assertEquals(s.size, expectedSize, s, "size") ?:
-        assertEquals(s.length(), expectedSize, s, "length()") ?:
-        assertEquals(s.length, expectedSize, s, "length") ?:
-        assertEquals(s.isEmpty(), expectedSize == 0, s, "isEmpty()")
+fun testString(s: String, expectedSize: Int, indexOfB: Int) {
+    assertEquals(expectedSize, s.size, s, "size")
+    assertEquals(expectedSize, s.length(), s, "length()")
+    assertEquals(expectedSize, s.length, s, "length")
+    assertEquals(expectedSize == 0, s.isEmpty(), s, "isEmpty()")
+    assertEquals(expectedSize != 0, s.startsWith(startsWithParam), s, "startsWith(\"$startsWithParam\")")
+    assertEquals(expectedSize != 0, s.endsWith(endsWithParam), s, "endsWith(\"$endsWithParam\")")
+    assertEquals(expectedSize != 0, s.contains(containsParam), s, "contains(\"$containsParam\")")
+    assertEquals(indexOfB, s.indexOf("bar"), s, "indexOf(\"bar\")")
+    assertEquals(-1, s.indexOf("Go"), s, "indexOf(\"Go\")")
+    assertEquals(indexOfB, s.indexOf("b"), s, "indexOf(\"b\")")
+    assertEquals(-1, s.indexOf("G"), s, "indexOf(\"G\")")
+}
 
-fun box(): String =
-        testString(testString, testStringSize) ?:
-        testString(emptyString, 0) ?:
-        testCharSequence(testString, testStringSize) ?:
-        testCharSequence(emptyString, 0) ?:
-        "OK"
+fun testCharSequence(s: CharSequence, expectedSize: Int) {
+    assertEquals(expectedSize, s.size, s, "size")
+    assertEquals(expectedSize, s.length(), s, "length()")
+    assertEquals(expectedSize, s.length, s, "length")
+    assertEquals(expectedSize == 0, s.isEmpty(), s, "isEmpty()")
+}
+
+fun box(): String {
+    testString(testString, testStringSize, testIndexOfB)
+    testString(emptyString, 0, -1)
+    testCharSequence(testString, testStringSize)
+    testCharSequence(emptyString, 0)
+    return "OK"
+}