azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quote invalid strings in exception messages

Browse Source
This commit is contained in:
Ilya Gorbunov
2021-07-07 02:52:54 +03:00
committed by Space
parent 3f6e2be687
commit 0427eec20f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/time/Duration.kt
+2 -2
View File
@@ -186,7 +186,7 @@ public value class Duration internal constructor(private val rawValue: Long) : C
public fun parse(value: String): Duration = try {
parseDuration(value, strictIso = false)
} catch (e: IllegalArgumentException) {
throw IllegalArgumentException("Invalid duration string format: $value", e.takeIf { it.message != null })
throw IllegalArgumentException("Invalid duration string format: '$value'.", e)
}
/**
@@ -198,7 +198,7 @@ public value class Duration internal constructor(private val rawValue: Long) : C
public fun parseIsoString(value: String): Duration = try {
parseDuration(value, strictIso = true)
} catch (e: IllegalArgumentException) {
throw IllegalArgumentException("Invalid ISO duration string format: $value", e.takeIf { it.message != null })
throw IllegalArgumentException("Invalid ISO duration string format: '$value'.", e)
}
/**
libraries/stdlib/test/time/DurationTest.kt
+6 -2
View File
@@ -515,7 +515,9 @@ class DurationTest {
"PT1.5H", "PT0.5D", "PT.5S", "PT0.25.25S",
)) {
assertNull(Duration.parseIsoStringOrNull(invalidValue), invalidValue)
assertFailsWith<IllegalArgumentException>(invalidValue) { Duration.parseIsoString(invalidValue) }
assertFailsWith<IllegalArgumentException>(invalidValue) { Duration.parseIsoString(invalidValue) }.let { e ->
assertContains(e.message!!, "'$invalidValue'")
}
}
}
@@ -690,7 +692,9 @@ class DurationTest {
"PT1.5H", "PT0.5D", "PT.5S", "PT0.25.25S",
)) {
assertNull(Duration.parseOrNull(invalidValue), invalidValue)
assertFailsWith<IllegalArgumentException>(invalidValue) { Duration.parse(invalidValue) }
assertFailsWith<IllegalArgumentException>(invalidValue) { Duration.parse(invalidValue) }.let { e ->
assertContains(e.message!!, "'$invalidValue'")
}
}
}