From cbc3480d9e7c62e5ded6c6c339fcf17ac1adf3b2 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 3 Jul 2018 15:23:20 +0300 Subject: [PATCH] Split common builtin companion tests from JVM-only tests Remove duplicated tests from NumbersJVMTest. --- ...ersJsTest.kt => BuiltinCompanionJsTest.kt} | 2 +- .../test/numbers/BuiltinCompanionJVMTest.kt | 70 ++++++++++++++++ .../CompanionIntrinsicObjectsJVMTest.kt | 81 ------------------- .../stdlib/jvm/test/numbers/NumbersJVMTest.kt | 38 +-------- .../test/numbers/BuiltinCompanionTest.kt | 74 +++++++++++++++++ 5 files changed, 147 insertions(+), 118 deletions(-) rename libraries/stdlib/js/test/core/{NumbersJsTest.kt => BuiltinCompanionJsTest.kt} (97%) create mode 100644 libraries/stdlib/jvm/test/numbers/BuiltinCompanionJVMTest.kt delete mode 100644 libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt create mode 100644 libraries/stdlib/test/numbers/BuiltinCompanionTest.kt diff --git a/libraries/stdlib/js/test/core/NumbersJsTest.kt b/libraries/stdlib/js/test/core/BuiltinCompanionJsTest.kt similarity index 97% rename from libraries/stdlib/js/test/core/NumbersJsTest.kt rename to libraries/stdlib/js/test/core/BuiltinCompanionJsTest.kt index 638590c9060..423ef02d5f0 100644 --- a/libraries/stdlib/js/test/core/NumbersJsTest.kt +++ b/libraries/stdlib/js/test/core/BuiltinCompanionJsTest.kt @@ -7,7 +7,7 @@ package test.js import kotlin.test.* -class NumbersJsTest { +class BuiltinCompanionJsTest { @Test fun longMinMaxValues() { assertEquals(js("Kotlin.Long.MIN_VALUE"), Long.MIN_VALUE) diff --git a/libraries/stdlib/jvm/test/numbers/BuiltinCompanionJVMTest.kt b/libraries/stdlib/jvm/test/numbers/BuiltinCompanionJVMTest.kt new file mode 100644 index 00000000000..0db0fb690d1 --- /dev/null +++ b/libraries/stdlib/jvm/test/numbers/BuiltinCompanionJVMTest.kt @@ -0,0 +1,70 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package test.numbers + +import kotlin.test.* + + +class BuiltinCompanionJVMTest { + @Test fun intTest() { + val i = Int + assertEquals(java.lang.Integer.MAX_VALUE, i.MAX_VALUE) + assertEquals(java.lang.Integer.MIN_VALUE, i.MIN_VALUE) + } + + @Test fun doubleTest() { + val d = Double + assertEquals(java.lang.Double.POSITIVE_INFINITY, d.POSITIVE_INFINITY) + assertEquals(java.lang.Double.NEGATIVE_INFINITY, d.NEGATIVE_INFINITY) + assertEquals(java.lang.Double.NaN, d.NaN) + + assertEquals(java.lang.Double.MAX_VALUE, d.MAX_VALUE) + assertEquals(java.lang.Double.MIN_VALUE, d.MIN_VALUE) + } + + @Test fun floatTest() { + val f = Float + assertEquals(java.lang.Float.POSITIVE_INFINITY, f.POSITIVE_INFINITY) + assertEquals(java.lang.Float.NEGATIVE_INFINITY, f.NEGATIVE_INFINITY) + assertEquals(java.lang.Float.NaN, f.NaN) + + assertEquals(java.lang.Float.MAX_VALUE, f.MAX_VALUE) + assertEquals(java.lang.Float.MIN_VALUE, f.MIN_VALUE) + } + + @Test fun longTest() { + val l = Long + assertEquals(java.lang.Long.MAX_VALUE, l.MAX_VALUE) + assertEquals(java.lang.Long.MIN_VALUE, l.MIN_VALUE) + } + + @Test fun shortTest() { + val s = Short + assertEquals(java.lang.Short.MAX_VALUE, s.MAX_VALUE) + assertEquals(java.lang.Short.MIN_VALUE, s.MIN_VALUE) + } + + @Test fun byteTest() { + val b = Byte + assertEquals(java.lang.Byte.MAX_VALUE, b.MAX_VALUE) + assertEquals(java.lang.Byte.MIN_VALUE, b.MIN_VALUE) + } + + @Test fun charTest() { + val ch = Char + assertEquals(java.lang.Character.MIN_SURROGATE, ch.MIN_SURROGATE) + assertEquals(java.lang.Character.MAX_SURROGATE, ch.MAX_SURROGATE) + assertEquals(java.lang.Character.MIN_LOW_SURROGATE, ch.MIN_LOW_SURROGATE) + assertEquals(java.lang.Character.MAX_LOW_SURROGATE, ch.MAX_LOW_SURROGATE) + assertEquals(java.lang.Character.MIN_HIGH_SURROGATE, ch.MIN_HIGH_SURROGATE) + assertEquals(java.lang.Character.MAX_HIGH_SURROGATE, ch.MAX_HIGH_SURROGATE) + } + + @Test fun stringTest() { + val s = String + s.CASE_INSENSITIVE_ORDER + } +} diff --git a/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt b/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt deleted file mode 100644 index 0b790030d40..00000000000 --- a/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package test.numbers - -import kotlin.test.* - - -class CompanionIntrinsicObjectsJVMTest { - @Test fun intTest() { - val i = Int - i.MAX_VALUE - - assertEquals(java.lang.Integer.MAX_VALUE, Int.MAX_VALUE) - assertEquals(java.lang.Integer.MIN_VALUE, Int.MIN_VALUE) - } - - @Test fun doubleTest() { - val d = Double - d.NaN - - assertEquals(java.lang.Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY) - assertEquals(java.lang.Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY) - assertEquals(java.lang.Double.NaN, Double.NaN) - - assertEquals(java.lang.Double.MAX_VALUE, Double.MAX_VALUE) - assertEquals(java.lang.Double.MIN_VALUE, Double.MIN_VALUE) - } - - @Test fun floatTest() { - val f = Float - f.NEGATIVE_INFINITY - - assertEquals(java.lang.Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY) - assertEquals(java.lang.Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY) - assertEquals(java.lang.Float.NaN, Float.NaN) - - assertEquals(java.lang.Float.MAX_VALUE, Float.MAX_VALUE) - assertEquals(java.lang.Float.MIN_VALUE, Float.MIN_VALUE) - } - - @Test fun longTest() { - val l = Long - l.MAX_VALUE - - assertEquals(java.lang.Long.MAX_VALUE, Long.MAX_VALUE) - assertEquals(java.lang.Long.MIN_VALUE, Long.MIN_VALUE) - } - - @Test fun shortTest() { - val s = Short - s.MIN_VALUE - - assertEquals(java.lang.Short.MAX_VALUE, Short.MAX_VALUE) - assertEquals(java.lang.Short.MIN_VALUE, Short.MIN_VALUE) - } - - @Test fun byteTest() { - val b = Byte - b.MAX_VALUE - - assertEquals(java.lang.Byte.MAX_VALUE, Byte.MAX_VALUE) - assertEquals(java.lang.Byte.MIN_VALUE, Byte.MIN_VALUE) - } - - @Test fun charTest() { - val ch = Char - ch.MIN_SURROGATE - - assertEquals(ch, Char) - } - - @Test fun stringTest() { - val s = String - s.CASE_INSENSITIVE_ORDER - - assertEquals(s, String) - } -} diff --git a/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt b/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt index b958065ee21..26950256363 100644 --- a/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt +++ b/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt @@ -5,46 +5,12 @@ package test.numbers -import java.math.BigDecimal import kotlin.test.* class NumbersJVMTest { - @Test fun intMinMaxValues() { - assertEquals(java.lang.Integer.MIN_VALUE, Int.MIN_VALUE) - assertEquals(java.lang.Integer.MAX_VALUE, Int.MAX_VALUE) - } - - @Test fun longMinMaxValues() { - assertEquals(java.lang.Long.MIN_VALUE, Long.MIN_VALUE) - assertEquals(java.lang.Long.MAX_VALUE, Long.MAX_VALUE) - } - - @Test fun shortMinMaxValues() { - assertEquals(java.lang.Short.MIN_VALUE, Short.MIN_VALUE) - assertEquals(java.lang.Short.MAX_VALUE, Short.MAX_VALUE) - } - - @Test fun byteMinMaxValues() { - assertEquals(java.lang.Byte.MIN_VALUE, Byte.MIN_VALUE) - assertEquals(java.lang.Byte.MAX_VALUE, Byte.MAX_VALUE) - } - - @Test fun doubleMinMaxValues() { - assertEquals(java.lang.Double.MIN_VALUE, Double.MIN_VALUE) - assertEquals(java.lang.Double.MAX_VALUE, Double.MAX_VALUE) - assertEquals(java.lang.Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY) - assertEquals(java.lang.Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY) - } - - @Test fun floatMinMaxValues() { - assertEquals(java.lang.Float.MIN_VALUE, Float.MIN_VALUE) - assertEquals(java.lang.Float.MAX_VALUE, Float.MAX_VALUE) - assertEquals(java.lang.Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY) - assertEquals(java.lang.Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY) - } - - @Test fun floatToBits() { + @Test + fun floatToBits() { val PI_F = kotlin.math.PI.toFloat() assertEquals(0x40490fdb, PI_F.toBits()) assertEquals(PI_F, Float.fromBits(0x40490fdb)) diff --git a/libraries/stdlib/test/numbers/BuiltinCompanionTest.kt b/libraries/stdlib/test/numbers/BuiltinCompanionTest.kt new file mode 100644 index 00000000000..cd30d1c1216 --- /dev/null +++ b/libraries/stdlib/test/numbers/BuiltinCompanionTest.kt @@ -0,0 +1,74 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package test.numbers + +import kotlin.test.* + +class BuiltinCompanionTest { + + @Test + fun intTest() { + val i = Int + i.MAX_VALUE + + assertSame(Int, i) + } + + @Test + fun doubleTest() { + val d = Double + d.NaN + + assertSame(Double, d) + } + + @Test + fun floatTest() { + val f = Float + f.NEGATIVE_INFINITY + + assertSame(Float, f) + } + + @Test + fun longTest() { + val l = Long + l.MAX_VALUE + + assertSame(Long, l) + } + + @Test + fun shortTest() { + val s = Short + s.MIN_VALUE + + assertSame(Short, s) + } + + @Test + fun byteTest() { + val b = Byte + b.MAX_VALUE + + assertSame(Byte, b) + } + + @Test + fun charTest() { + val ch = Char + ch.MIN_SURROGATE + + assertSame(Char, ch) + } + + @Test + fun stringTest() { + val s = String + + assertSame(String, s) + } +} \ No newline at end of file