Add more tests for 'until'

Author: ilya-g

core/commonTest/src/InstantTest.kt

@@ -137,6 +137,29 @@ class InstantTest {
         assertEquals(0, instant6.minus(instant1, DateTimeUnit.DAY, zone))
     }
 
+    @OptIn(ExperimentalTime::class)
+    @Test
+    fun unitMultiplesUntil() {
+        val unit1000days = DateTimeUnit.DAY * 1000
+        val unit4years = DateTimeUnit.YEAR * 4 // longer than 1000-DAY
+
+        val zone = TimeZone.UTC
+        val min = LocalDateTime.MIN.toInstant(zone)
+        val max = LocalDateTime.MAX.toInstant(zone)
+        val diffDays = min.until(max, unit1000days, zone)
+        val diffYears = min.until(max, unit4years, zone)
+        assertTrue(diffDays in 0..Int.MAX_VALUE, "difference in $unit1000days should fit in Int, was $diffDays")
+        assertTrue(diffDays > diffYears, "difference in $unit1000days unit must be more than in $unit4years unit, was $diffDays $diffYears")
+
+        val unit500ns = DateTimeUnit.NANOSECOND * 500
+        val start = Instant.parse("1700-01-01T00:00:00Z")
+        val end = start.plus(300, DateTimeUnit.YEAR, zone)
+        val diffNs = start.until(end, unit500ns, zone)
+        val diffUs = start.until(end, DateTimeUnit.MICROSECOND, zone)
+        // TODO: avoid clamping/overflowing in intermediate results
+//        assertEquals(diffUs * 2, diffNs)
+    }
+
     @OptIn(ExperimentalTime::class)
     @Test
     fun instantOffset() {

core/commonTest/src/LocalDateTest.kt

@@ -101,7 +101,7 @@ class LocalDateTest {
 
     // based on threetenbp test for until()
     @Test
-    fun until() {
+    fun unitsUntil() {
         val data = listOf(
                 Pair(Pair("2012-06-30", "2012-06-30"), Pair(DateTimeUnit.DAY, 0)),
                 Pair(Pair("2012-06-30", "2012-06-30"), Pair(DateTimeUnit.WEEK, 0)),
@@ -136,6 +136,18 @@ class LocalDateTest {
 
     }
 
+    @Test
+    fun unitMultiplesUntil() {
+        val unit1000days = DateTimeUnit.DAY * 1000
+        val unit4years = DateTimeUnit.YEAR * 4 // longer than 1000-DAY
+
+        val diffDays = LocalDate.MIN.until(LocalDate.MAX, unit1000days)
+        val diffYears = LocalDate.MIN.until(LocalDate.MAX, unit4years)
+        assertTrue(diffDays in 0..Int.MAX_VALUE, "difference in $unit1000days should fit in Int, was $diffDays")
+        // TODO: make pass in JVM
+        //  assertTrue(diffDays > diffYears, "difference in $unit1000days unit must be more than in $unit4years unit, was $diffDays $diffYears")
+    }
+
     @Test
     fun constructInvalidDate() = checkInvalidDate(::LocalDate)