@@ -195,7 +195,7 @@ class TestDuration extends AnyFunSuite with AssertionsHelper {
195
195
assertEquals(test.toDaysPart, test.toSeconds / SECONDS_PER_DAY )
196
196
assertEquals(test.toMinutesPart, test.toMinutes % MINUTES_PER_HOUR )
197
197
assertEquals(test.toSecondsPart, test.toSeconds % SECONDS_PER_MINUTE )
198
- assertEquals(test.getNano, Long .MaxValue % 1000000000 )
198
+ assertEquals(test.getNano, Long .MaxValue % 1000000000 )
199
199
}
200
200
201
201
test(" factory_nanos_min" ) {
@@ -205,7 +205,7 @@ class TestDuration extends AnyFunSuite with AssertionsHelper {
205
205
assertEquals(test.toDays, test.toSeconds / SECONDS_PER_DAY )
206
206
assertEquals(test.toDaysPart, test.toSeconds / SECONDS_PER_DAY )
207
207
assertEquals(test.toMinutesPart, test.toMinutes % MINUTES_PER_HOUR )
208
- assertEquals(test.getNano, Long .MinValue % 1000000000 + 1000000000 )
208
+ assertEquals(test.getNano, Long .MinValue % 1000000000 + 1000000000 )
209
209
}
210
210
211
211
test(" factory_minutes" ) {
@@ -1898,18 +1898,72 @@ class TestDuration extends AnyFunSuite with AssertionsHelper {
1898
1898
assertEquals(Duration .ofSeconds(59 ).toSecondsPart, 59 )
1899
1899
assertEquals(Duration .ofSeconds(61 ).toSecondsPart, 1 )
1900
1900
assertEquals(Duration .ofSeconds(187 ).toSecondsPart, 7 )
1901
- assertEquals(Duration .ofDays(387 ).plusHours(18 ).plusMinutes(29 ).plusSeconds(88 ).plusMillis(234 ).toDaysPart, 387 )
1902
- assertEquals(Duration .ofDays(387 ).plusHours(18 ).plusMinutes(29 ).plusSeconds(88 ).plusMillis(234 ).toHoursPart, 18 )
1903
- assertEquals(Duration .ofDays(387 ).plusHours(18 ).plusMinutes(29 ).plusSeconds(38 ).plusMillis(234 ).toMinutesPart, 29 )
1904
- assertEquals(Duration .ofDays(387 ).plusHours(18 ).plusMinutes(29 ).plusSeconds(88 ).plusMillis(234 ).toSecondsPart, 28 )
1905
- assertEquals(Duration .ofDays(387 ).plusHours(18 ).plusMinutes(29 ).plusSeconds(88 ).plusMillis(234 ).toMillisPart, 234 )
1901
+ assertEquals(
1902
+ Duration .ofDays(387 ).plusHours(18 ).plusMinutes(29 ).plusSeconds(88 ).plusMillis(234 ).toDaysPart,
1903
+ 387
1904
+ )
1905
+ assertEquals(Duration
1906
+ .ofDays(387 )
1907
+ .plusHours(18 )
1908
+ .plusMinutes(29 )
1909
+ .plusSeconds(88 )
1910
+ .plusMillis(234 )
1911
+ .toHoursPart,
1912
+ 18
1913
+ )
1914
+ assertEquals(Duration
1915
+ .ofDays(387 )
1916
+ .plusHours(18 )
1917
+ .plusMinutes(29 )
1918
+ .plusSeconds(38 )
1919
+ .plusMillis(234 )
1920
+ .toMinutesPart,
1921
+ 29
1922
+ )
1923
+ assertEquals(Duration
1924
+ .ofDays(387 )
1925
+ .plusHours(18 )
1926
+ .plusMinutes(29 )
1927
+ .plusSeconds(88 )
1928
+ .plusMillis(234 )
1929
+ .toSecondsPart,
1930
+ 28
1931
+ )
1932
+ assertEquals(Duration
1933
+ .ofDays(387 )
1934
+ .plusHours(18 )
1935
+ .plusMinutes(29 )
1936
+ .plusSeconds(88 )
1937
+ .plusMillis(234 )
1938
+ .plusNanos(4000 )
1939
+ .toNanosPart,
1940
+ 234004000
1941
+ )
1906
1942
}
1907
1943
1908
1944
test(" test_*_part_with_overflow" ) {
1909
1945
assertEquals(Duration .ofDays(3 ).plusHours(38 ).toDaysPart, 4 )
1910
1946
assertEquals(Duration .ofDays(0 ).plusHours(18 ).plusMinutes(79 ).toHoursPart, 19 )
1911
1947
assertEquals(Duration .ofDays(0 ).plusHours(18 ).plusMinutes(19 ).plusSeconds(90 ).toSecondsPart, 30 )
1912
- assertEquals(Duration .ofDays(0 ).plusHours(18 ).plusMinutes(19 ).plusSeconds(90 ).plusMillis(10000 ).toSecondsPart, 40 )
1948
+ assertEquals(Duration
1949
+ .ofDays(0 )
1950
+ .plusHours(18 )
1951
+ .plusMinutes(19 )
1952
+ .plusSeconds(90 )
1953
+ .plusMillis(10000 )
1954
+ .toSecondsPart,
1955
+ 40
1956
+ )
1957
+ assertEquals(Duration
1958
+ .ofDays(0 )
1959
+ .plusHours(18 )
1960
+ .plusMinutes(19 )
1961
+ .plusSeconds(90 )
1962
+ .plusMillis(10000 )
1963
+ .plusNanos(666666 )
1964
+ .toNanosPart,
1965
+ 666666
1966
+ )
1913
1967
}
1914
1968
1915
1969
test(" test_negated_overflow" ) {
@@ -1938,11 +1992,13 @@ class TestDuration extends AnyFunSuite with AssertionsHelper {
1938
1992
test(" test_toNanos" ) {
1939
1993
val test : Duration = Duration .ofSeconds(321 , 123456789 )
1940
1994
assertEquals(test.toNanos, 321123456789L )
1995
+ assertEquals(test.toNanosPart, 123456789L )
1941
1996
}
1942
1997
1943
1998
test(" test_toNanos_max" ) {
1944
1999
val test : Duration = Duration .ofSeconds(0 , Long .MaxValue )
1945
2000
assertEquals(test.toNanos, Long .MaxValue )
2001
+ assertEquals(test.toNanosPart, 854775807L )
1946
2002
}
1947
2003
1948
2004
test(" test_toNanos_tooBig" ) {
0 commit comments