From 0ddbe12e62f1b0f99cbc293ec42585758ff68c36 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Thu, 2 Aug 2018 09:43:19 +0200
Subject: [PATCH] Use common assertion in ir-tests and proper arithmetic flag

---
 compiler/testData/codegen/box/ir/classInitializers.kt    | 8 +++-----
 compiler/testData/codegen/box/ir/enumClass.kt            | 9 ++++-----
 compiler/testData/codegen/box/ir/enumClass2.kt           | 8 +++-----
 compiler/testData/codegen/box/ir/enumClass3.kt           | 8 +++-----
 .../testData/codegen/box/ir/fileClassInitializers.kt     | 8 +++-----
 .../ir/primitiveNumberComparisons/comparableToDouble.kt  | 3 +++
 .../box/ir/primitiveNumberComparisons/doubleEqeq.kt      | 1 +
 .../box/ir/primitiveNumberComparisons/floatEqeq.kt       | 1 +
 .../ir/primitiveNumberComparisons/mixedNumberTypes.kt    | 1 +
 9 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/compiler/testData/codegen/box/ir/classInitializers.kt b/compiler/testData/codegen/box/ir/classInitializers.kt
index 8db45da6166..c021573ebe1 100644
--- a/compiler/testData/codegen/box/ir/classInitializers.kt
+++ b/compiler/testData/codegen/box/ir/classInitializers.kt
@@ -1,8 +1,6 @@
-fun <T> assertEquals(actual: T, expected: T) {
-    if (actual != expected) {
-        throw java.lang.AssertionError("Assertion failed: $actual != $expected")
-    }
-}
+//WITH_RUNTIME
+//IGNORE_BACKEND: JS_IR
+import kotlin.test.assertEquals
 
 class Test(val x: Int) {
     val y = x + 1
diff --git a/compiler/testData/codegen/box/ir/enumClass.kt b/compiler/testData/codegen/box/ir/enumClass.kt
index 9f6da5929bd..f6d8edbde7b 100644
--- a/compiler/testData/codegen/box/ir/enumClass.kt
+++ b/compiler/testData/codegen/box/ir/enumClass.kt
@@ -1,8 +1,7 @@
-fun <T> assertEquals(actual: T, expected: T) {
-    if (actual != expected) {
-        throw java.lang.AssertionError("Assertion failed: $actual != $expected")
-    }
-}
+//WITH_RUNTIME
+//IGNORE_BACKEND: JS_IR
+
+import kotlin.test.assertEquals
 
 enum class Test {
     OK
diff --git a/compiler/testData/codegen/box/ir/enumClass2.kt b/compiler/testData/codegen/box/ir/enumClass2.kt
index 14023472ae7..dd8d2fef563 100644
--- a/compiler/testData/codegen/box/ir/enumClass2.kt
+++ b/compiler/testData/codegen/box/ir/enumClass2.kt
@@ -1,8 +1,6 @@
-fun <T> assertEquals(actual: T, expected: T) {
-    if (actual != expected) {
-        throw java.lang.AssertionError("Assertion failed: $actual != $expected")
-    }
-}
+//WITH_RUNTIME
+//IGNORE_BACKEND: JS_IR
+import kotlin.test.assertEquals
 
 enum class TestEnumClass(val x: Int) {
     ZERO
diff --git a/compiler/testData/codegen/box/ir/enumClass3.kt b/compiler/testData/codegen/box/ir/enumClass3.kt
index fb090f92d9a..f928839aeda 100644
--- a/compiler/testData/codegen/box/ir/enumClass3.kt
+++ b/compiler/testData/codegen/box/ir/enumClass3.kt
@@ -1,8 +1,6 @@
-fun <T> assertEquals(actual: T, expected: T) {
-    if (actual != expected) {
-        throw java.lang.AssertionError("Assertion failed: $actual != $expected")
-    }
-}
+//WITH_RUNTIME
+//IGNORE_BACKEND: JS_IR
+import kotlin.test.assertEquals
 
 enum class TestEnumClass {
     ZERO {
diff --git a/compiler/testData/codegen/box/ir/fileClassInitializers.kt b/compiler/testData/codegen/box/ir/fileClassInitializers.kt
index 40b521bc0bc..baa4f40394e 100644
--- a/compiler/testData/codegen/box/ir/fileClassInitializers.kt
+++ b/compiler/testData/codegen/box/ir/fileClassInitializers.kt
@@ -1,8 +1,6 @@
-fun <T> assertEquals(actual: T, expected: T) {
-    if (actual != expected) {
-        throw java.lang.AssertionError("Assertion failed: $actual != $expected")
-    }
-}
+//WITH_RUNTIME
+//IGNORE_BACKEND: JS_IR
+import kotlin.test.assertEquals
 
 val x = 1
 val y = x + 1
diff --git a/compiler/testData/codegen/box/ir/primitiveNumberComparisons/comparableToDouble.kt b/compiler/testData/codegen/box/ir/primitiveNumberComparisons/comparableToDouble.kt
index 33a684d38f6..d072ea665ca 100644
--- a/compiler/testData/codegen/box/ir/primitiveNumberComparisons/comparableToDouble.kt
+++ b/compiler/testData/codegen/box/ir/primitiveNumberComparisons/comparableToDouble.kt
@@ -1,3 +1,6 @@
+// !LANGUAGE: +ProperIeee754Comparisons
+//IGNORE_BACKEND: JS_IR
+
 fun ltDD(x: Comparable<Double>, y: Double) =
     x is Double && x < y
 
diff --git a/compiler/testData/codegen/box/ir/primitiveNumberComparisons/doubleEqeq.kt b/compiler/testData/codegen/box/ir/primitiveNumberComparisons/doubleEqeq.kt
index 3d506b4c4c9..9856a0cbc43 100644
--- a/compiler/testData/codegen/box/ir/primitiveNumberComparisons/doubleEqeq.kt
+++ b/compiler/testData/codegen/box/ir/primitiveNumberComparisons/doubleEqeq.kt
@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProperIeee754Comparisons
 fun eqeq(x: Any, y: Any) =
         x is Double && y is Double && x == y
 
diff --git a/compiler/testData/codegen/box/ir/primitiveNumberComparisons/floatEqeq.kt b/compiler/testData/codegen/box/ir/primitiveNumberComparisons/floatEqeq.kt
index c8579dcbba2..f1117be0b1f 100644
--- a/compiler/testData/codegen/box/ir/primitiveNumberComparisons/floatEqeq.kt
+++ b/compiler/testData/codegen/box/ir/primitiveNumberComparisons/floatEqeq.kt
@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProperIeee754Comparisons
 fun eqeq(x: Any, y: Any) =
         x is Float && y is Float && x == y
 
diff --git a/compiler/testData/codegen/box/ir/primitiveNumberComparisons/mixedNumberTypes.kt b/compiler/testData/codegen/box/ir/primitiveNumberComparisons/mixedNumberTypes.kt
index 7c458cacf5d..103bf360ed7 100644
--- a/compiler/testData/codegen/box/ir/primitiveNumberComparisons/mixedNumberTypes.kt
+++ b/compiler/testData/codegen/box/ir/primitiveNumberComparisons/mixedNumberTypes.kt
@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProperIeee754Comparisons
 fun ltDI(x: Any, y: Any) =
     x is Double && y is Int && x < y