8000 fix StringLikeTest on JDK 17 · scala/scala@4b61e57 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4b61e57

Browse files
committed
fix StringLikeTest on JDK 17
1 parent eec304c commit 4b61e57

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

test/junit/scala/collection/immutable/StringLikeTest.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,14 @@ class StringLikeTest {
6464
assertEquals("no trim toDouble", 2.0d, sOk.toDouble, 0.1d)
6565
assertEquals("no trim toFloat", 2.0f, sOk.toFloat, 0.1f)
6666

67-
assertThrows[java.lang.NumberFormatException](sNull.toInt, {s => s == "null"})
68-
assertThrows[java.lang.NumberFormatException](sNull.toLong, {s => s == "null"})
69-
assertThrows[java.lang.NumberFormatException](sNull.toShort, {s => s == "null"})
70-
assertThrows[java.lang.NumberFormatException](sNull.toByte, {s => s == "null"})
67+
// JDK 17 gives the nicer message
68+
def isNullStringMessage(s: String) =
69+
s == "null" || s == "Cannot parse null string"
70+
71+
assertThrows[java.lang.NumberFormatException](sNull.toInt, isNullStringMessage)
72+
assertThrows[java.lang.NumberFormatException](sNull.toLong, isNullStringMessage)
73+
assertThrows[java.lang.NumberFormatException](sNull.toShort, isNullStringMessage)
74+
assertThrows[java.lang.NumberFormatException](sNull.toByte, isNullStringMessage)
7175

7276
assertThrows[java.lang.NullPointerException](sNull.toDouble)
7377
assertThrows[java.lang.NullPointerException](sNull.toFloat)

0 commit comments

Comments
 (0)
0