From f7546c809d64d361af26222d7facaf30d52b9de8 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 10 Apr 2018 21:09:21 +0300 Subject: [PATCH] Minor: use common implementation of doubleTotalOrderEquals for tests --- libraries/stdlib/common/test/testUtils.kt | 1 - libraries/stdlib/js/test/core/testUtils.kt | 1 - libraries/stdlib/jvm/test/testUtilsJVM.kt | 2 -- libraries/stdlib/test/text/StringNumberConversionTest.kt | 1 + 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/stdlib/common/test/testUtils.kt b/libraries/stdlib/common/test/testUtils.kt index 7c6e08814b1..209e7774a80 100644 --- a/libraries/stdlib/common/test/testUtils.kt +++ b/libraries/stdlib/common/test/testUtils.kt @@ -21,4 +21,3 @@ public expect fun assertTypeEquals(expected: Any?, actual: Any?) public expect fun randomInt(limit: Int): Int internal expect fun String.removeLeadingPlusOnJava6(): String -internal expect fun doubleTotalOrderEquals(a: Double?, b: Double?): Boolean diff --git a/libraries/stdlib/js/test/core/testUtils.kt b/libraries/stdlib/js/test/core/testUtils.kt index a3a8d6fd2c1..e6782409ed4 100644 --- a/libraries/stdlib/js/test/core/testUtils.kt +++ b/libraries/stdlib/js/test/core/testUtils.kt @@ -27,4 +27,3 @@ public actual fun randomInt(limit: Int): Int = (kotlin.js.Math.random() * limit) @Suppress("NOTHING_TO_INLINE") internal actual inline fun String.removeLeadingPlusOnJava6(): String = this -internal actual fun doubleTotalOrderEquals(a: Double?, b: Double?) = a == b || (a != a && b != b) diff --git a/libraries/stdlib/jvm/test/testUtilsJVM.kt b/libraries/stdlib/jvm/test/testUtilsJVM.kt index 799404b8440..4c0fc56467a 100644 --- a/libraries/stdlib/jvm/test/testUtilsJVM.kt +++ b/libraries/stdlib/jvm/test/testUtilsJVM.kt @@ -33,5 +33,3 @@ private val isJava6 = System.getProperty("java.version").startsWith("1.6.") internal actual fun String.removeLeadingPlusOnJava6(): String = if (isJava6) removePrefix("+") else this -@kotlin.jvm.JvmVersion -internal actual fun doubleTotalOrderEquals(a: Double?, b: Double?) = (a as Any?) == b diff --git a/libraries/stdlib/test/text/StringNumberConversionTest.kt b/libraries/stdlib/test/text/StringNumberConversionTest.kt index 48d41f3718a..decf4b53cec 100644 --- a/libraries/stdlib/test/text/StringNumberConversionTest.kt +++ b/libraries/stdlib/test/text/StringNumberConversionTest.kt @@ -150,6 +150,7 @@ class StringNumberConversionTest { } } +internal fun doubleTotalOrderEquals(a: Double?, b: Double?): Boolean = (a as Any?) == b internal fun compareConversion(convertOrFail: (String) -> T, convertOrNull: (String) -> T?,