From 9b421eb7a4eab1cb86969e4b5f856ce7ba179a0c Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 28 Nov 2016 18:14:06 +0300
Subject: [PATCH] Throw IllegalArgumentException instead of
 NumberFormatException on incorrect radix.

---
 libraries/stdlib/src/kotlin/text/ParsePrimitivesJVM.kt | 2 +-
 libraries/stdlib/test/text/ParsePrimitivesJVMTest.kt   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/text/ParsePrimitivesJVM.kt b/libraries/stdlib/src/kotlin/text/ParsePrimitivesJVM.kt
index 66b2e1032f8..2b2de35d59a 100644
--- a/libraries/stdlib/src/kotlin/text/ParsePrimitivesJVM.kt
+++ b/libraries/stdlib/src/kotlin/text/ParsePrimitivesJVM.kt
@@ -283,6 +283,6 @@ private inline fun <T> screenFloatValue(str: String, parse: (String) -> T): T? {
 internal fun digitOf(char: Char, radix: Int): Int = Character.digit(char.toInt(), radix)
 internal fun checkRadix(radix: Int) {
     if(radix !in Character.MIN_RADIX..Character.MAX_RADIX) {
-        throw NumberFormatException("radix $radix was not in valid range ${Character.MIN_RADIX..Character.MAX_RADIX}")
+        throw IllegalArgumentException("radix $radix was not in valid range ${Character.MIN_RADIX..Character.MAX_RADIX}")
     }
 }
\ No newline at end of file
diff --git a/libraries/stdlib/test/text/ParsePrimitivesJVMTest.kt b/libraries/stdlib/test/text/ParsePrimitivesJVMTest.kt
index 5a90a11d081..4f57a2fb0b2 100644
--- a/libraries/stdlib/test/text/ParsePrimitivesJVMTest.kt
+++ b/libraries/stdlib/test/text/ParsePrimitivesJVMTest.kt
@@ -73,8 +73,8 @@ class ParsePrimitivesJVMTest {
             assertFailsOrNull(10, "Kona")
         }
 
-        assertFailsWith<NumberFormatException>("Expected to fail with radix 1") { "1".toInt(radix = 1) }
-        assertFailsWith<NumberFormatException>("Expected to fail with radix 37") { "37".toIntOrNull(radix = 37) }
+        assertFailsWith<IllegalArgumentException>("Expected to fail with radix 1") { "1".toInt(radix = 1) }
+        assertFailsWith<IllegalArgumentException>("Expected to fail with radix 37") { "37".toIntOrNull(radix = 37) }
     }
 
     @JvmVersion
@@ -114,8 +114,8 @@ class ParsePrimitivesJVMTest {
             assertFailsOrNull(10, "Hazelnut")
         }
 
-        assertFailsWith<NumberFormatException>("Expected to fail with radix 37") { "37".toLong(radix = 37) }
-        assertFailsWith<NumberFormatException>("Expected to fail with radix 1") { "1".toLongOrNull(radix = 1) }
+        assertFailsWith<IllegalArgumentException>("Expected to fail with radix 37") { "37".toLong(radix = 37) }
+        assertFailsWith<IllegalArgumentException>("Expected to fail with radix 1") { "1".toLongOrNull(radix = 1) }
     }
 
     @JvmVersion