diff --git a/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt b/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt index a89ae9efbbf..c365a83f8c8 100644 --- a/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt +++ b/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt @@ -43,44 +43,6 @@ class StringNumberConversionJVMTest { } } - - @Test fun byteToStringWithRadix() { - assertEquals("7a", 0x7a.toByte().toString(16)) - assertEquals("-80", Byte.MIN_VALUE.toString(radix = 16)) - assertEquals("3v", Byte.MAX_VALUE.toString(radix = 32)) - assertEquals("-40", Byte.MIN_VALUE.toString(radix = 32)) - - assertFailsWith("Expected to fail with radix 37") { 37.toByte().toString(radix = 37) } - assertFailsWith("Expected to fail with radix 1") { 1.toByte().toString(radix = 1) } - } - - @Test fun shortToStringWithRadix() { - assertEquals("7FFF", 0x7FFF.toShort().toString(radix = 16).toUpperCase()) - assertEquals("-8000", (-0x8000).toShort().toString(radix = 16)) - assertEquals("-sfs", (-29180).toShort().toString(radix = 32)) - - assertFailsWith("Expected to fail with radix 37") { 37.toShort().toString(radix = 37) } - assertFailsWith("Expected to fail with radix 1") { 1.toShort().toString(radix = 1) } - } - - @Test fun intToStringWithRadix() { - assertEquals("-ff", (-255).toString(radix = 16)) - assertEquals("1100110", 102.toString(radix = 2)) - assertEquals("kona", 411787.toString(radix = 27)) - assertFailsWith("Expected to fail with radix 37") { 37.toString(radix = 37) } - assertFailsWith("Expected to fail with radix 1") { 1.toString(radix = 1) } - - } - - @Test fun longToStringWithRadix() { - assertEquals("7f11223344556677", 0x7F11223344556677.toString(radix = 16)) - assertEquals("hazelnut", 1356099454469L.toString(radix = 36)) - assertEquals("-8000000000000000", Long.MIN_VALUE.toString(radix = 16)) - - assertFailsWith("Expected to fail with radix 37") { 37L.toString(radix = 37) } - assertFailsWith("Expected to fail with radix 1") { 1L.toString(radix = 1) } - } - @Test fun toBigInteger() { compareConversion(String::toBigInteger, String::toBigIntegerOrNull) { assertProduces("0", java.math.BigInteger.ZERO) diff --git a/libraries/stdlib/test/text/StringNumberConversionTest.kt b/libraries/stdlib/test/text/StringNumberConversionTest.kt index d06e505e3f4..3ecdca441ea 100644 --- a/libraries/stdlib/test/text/StringNumberConversionTest.kt +++ b/libraries/stdlib/test/text/StringNumberConversionTest.kt @@ -153,6 +153,43 @@ class StringNumberConversionTest { assertFailsOrNull(" ") } } + + @Test fun byteToStringWithRadix() { + assertEquals("7a", 0x7a.toByte().toString(16)) + assertEquals("-80", Byte.MIN_VALUE.toString(radix = 16)) + assertEquals("3v", Byte.MAX_VALUE.toString(radix = 32)) + assertEquals("-40", Byte.MIN_VALUE.toString(radix = 32)) + + assertFailsWith("Expected to fail with radix 37") { 37.toByte().toString(radix = 37) } + assertFailsWith("Expected to fail with radix 1") { 1.toByte().toString(radix = 1) } + } + + @Test fun shortToStringWithRadix() { + assertEquals("7FFF", 0x7FFF.toShort().toString(radix = 16).toUpperCase()) + assertEquals("-8000", (-0x8000).toShort().toString(radix = 16)) + assertEquals("-sfs", (-29180).toShort().toString(radix = 32)) + + assertFailsWith("Expected to fail with radix 37") { 37.toShort().toString(radix = 37) } + assertFailsWith("Expected to fail with radix 1") { 1.toShort().toString(radix = 1) } + } + + @Test fun intToStringWithRadix() { + assertEquals("-ff", (-255).toString(radix = 16)) + assertEquals("1100110", 102.toString(radix = 2)) + assertEquals("kona", 411787.toString(radix = 27)) + assertFailsWith("Expected to fail with radix 37") { 37.toString(radix = 37) } + assertFailsWith("Expected to fail with radix 1") { 1.toString(radix = 1) } + + } + + @Test fun longToStringWithRadix() { + assertEquals("7f11223344556677", 0x7F11223344556677.toString(radix = 16)) + assertEquals("hazelnut", 1356099454469L.toString(radix = 36)) + assertEquals("-8000000000000000", Long.MIN_VALUE.toString(radix = 16)) + + assertFailsWith("Expected to fail with radix 37") { 37L.toString(radix = 37) } + assertFailsWith("Expected to fail with radix 1") { 1L.toString(radix = 1) } + } } internal fun doubleTotalOrderEquals(a: Double?, b: Double?): Boolean = (a as Any?) == b