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

Rename withComponents to toComponents and add two overloads of them

Browse Source
This commit is contained in:
Ilya Gorbunov
2019-05-25 14:57:14 +03:00
parent 796ad29637
commit 9deac2a591
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/time/DurationTest.kt
+13 -4
View File
@@ -136,13 +136,22 @@ class DurationTest {
val s = Random.nextInt(60)
val ns = Random.nextInt(1e9.toInt())
(h.hours + m.minutes + s.seconds + ns.nanoseconds).run {
withComponents { hours, minutes, seconds, nanoseconds ->
toComponents { seconds, nanoseconds ->
assertEquals(h.toLong() * 3600 + m * 60 + s, seconds)
assertEquals(ns, nanoseconds)
}
toComponents { minutes, seconds, nanoseconds ->
assertEquals(h * 60 + m, minutes)
assertEquals(s, seconds)
assertEquals(ns, nanoseconds)
}
toComponents { hours, minutes, seconds, nanoseconds ->
assertEquals(h, hours)
assertEquals(m, minutes)
assertEquals(s, seconds)
assertEquals(ns, nanoseconds, "ns component of duration ${this.toIsoString()} differs too much, expected: $ns, actual: $nanoseconds")
assertEquals(ns, nanoseconds, "ns component of duration ${toIsoString()} differs too much, expected: $ns, actual: $nanoseconds")
}
withComponents { days, hours, minutes, seconds, nanoseconds ->
toComponents { days, hours, minutes, seconds, nanoseconds ->
assertEquals(0, days)
assertEquals(h, hours)
assertEquals(m, minutes)
@@ -156,7 +165,7 @@ class DurationTest {
@Test
fun componentsOfCarriedSum() {
(36.hours + 90.minutes + 90.seconds + 1500.milliseconds).run {
withComponents { days, hours, minutes, seconds, nanoseconds ->
toComponents { days, hours, minutes, seconds, nanoseconds ->
assertEquals(1, days)
assertEquals(13, hours)
assertEquals(31, minutes)