diff --git a/libraries/stdlib/test/numbers/MathJVMTest.kt b/libraries/stdlib/test/numbers/BigNumbersTest.kt similarity index 90% rename from libraries/stdlib/test/numbers/MathJVMTest.kt rename to libraries/stdlib/test/numbers/BigNumbersTest.kt index d836838dacd..8e2caac8a0e 100644 --- a/libraries/stdlib/test/numbers/MathJVMTest.kt +++ b/libraries/stdlib/test/numbers/BigNumbersTest.kt @@ -9,7 +9,7 @@ import org.junit.Test import java.math.MathContext import java.math.RoundingMode -class MathTest { +class BigNumbersTest { @Test fun testBigInteger() { val a = BigInteger("2") val b = BigInteger("3") @@ -92,5 +92,15 @@ class MathTest { assertEquals(BigDecimal("1.5"), c) } + @Test fun bigDecimalDivRounding() { + val (d1, d2, d3, d4, d5) = (1..5).map { BigDecimal(it.toString()) } + val d7 = BigDecimal("7") + + assertEquals(d1, d2 / d3) + assertEquals(d2, d3 / d2) + assertEquals(d2, d5 / d2) + assertEquals(d4, d7 / d2) + assertEquals(d1, d7 / d5) + } } diff --git a/libraries/stdlib/test/numbers/NumbersJVMTest.kt b/libraries/stdlib/test/numbers/NumbersJVMTest.kt index 2b17658681c..1d38b8ab9dd 100644 --- a/libraries/stdlib/test/numbers/NumbersJVMTest.kt +++ b/libraries/stdlib/test/numbers/NumbersJVMTest.kt @@ -41,14 +41,5 @@ class NumbersJVMTest { assertEquals(java.lang.Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY) } - @Test fun bigDecimalDivRounding() { - val (d1, d2, d3, d4, d5) = (1..5).map { BigDecimal(it.toString()) } - val d7 = BigDecimal("7") - assertEquals(d1, d2 / d3) - assertEquals(d2, d3 / d2) - assertEquals(d2, d5 / d2) - assertEquals(d4, d7 / d2) - assertEquals(d1, d7 / d5) - } } \ No newline at end of file diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt index dae068e2f7d..72453d69388 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt @@ -4040,6 +4040,10 @@ public final class kotlin/text/StringsKt { public static final fun takeLastWhile (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/String; public static final fun takeWhile (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/CharSequence; public static final fun takeWhile (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/String; + public static final fun toBigDecimalOrNull (Ljava/lang/String;)Ljava/math/BigDecimal; + public static final fun toBigDecimalOrNull (Ljava/lang/String;Ljava/math/MathContext;)Ljava/math/BigDecimal; + public static final fun toBigIntegerOrNull (Ljava/lang/String;)Ljava/math/BigInteger; + public static final fun toBigIntegerOrNull (Ljava/lang/String;I)Ljava/math/BigInteger; public static final fun toByteOrNull (Ljava/lang/String;)Ljava/lang/Byte; public static final fun toByteOrNull (Ljava/lang/String;I)Ljava/lang/Byte; public static final fun toCollection (Ljava/lang/CharSequence;Ljava/util/Collection;)Ljava/util/Collection; diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt index 343765ac261..35ad4cb64e1 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt @@ -2735,6 +2735,10 @@ public final class kotlin/text/StringsKt { public static final fun takeLastWhile (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/String; public static final fun takeWhile (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/CharSequence; public static final fun takeWhile (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/String; + public static final fun toBigDecimalOrNull (Ljava/lang/String;)Ljava/math/BigDecimal; + public static final fun toBigDecimalOrNull (Ljava/lang/String;Ljava/math/MathContext;)Ljava/math/BigDecimal; + public static final fun toBigIntegerOrNull (Ljava/lang/String;)Ljava/math/BigInteger; + public static final fun toBigIntegerOrNull (Ljava/lang/String;I)Ljava/math/BigInteger; public static final fun toByteOrNull (Ljava/lang/String;)Ljava/lang/Byte; public static final fun toByteOrNull (Ljava/lang/String;I)Ljava/lang/Byte; public static final fun toCollection (Ljava/lang/CharSequence;Ljava/util/Collection;)Ljava/util/Collection;