Skip to content

Commit 2b7f8a7

Browse files
authored
Merge pull request #24 from pjrt/fix-nano-bug
Fix #23: Bug in Instant.toString
2 parents bcb5146 + 7107955 commit 2b7f8a7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/main/scala/java/time/Instant.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ final class Instant private (private val seconds: Long, private val nanos: Int)
271271

272272
val timePart = {
273273
val timeStr = time.toString
274-
if (time.getSecond == 0) timeStr + ":00"
274+
if (time.getSecond == 0 && time.getNano == 0) timeStr + ":00"
275275
else timeStr
276276
}
277277

testSuite/shared/src/test/scala/org/scalajs/testsuite/javalib/time/InstantTest.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,10 @@ class InstantTest extends TemporalTest[Instant] {
373373
@Test def toStringOutput(): Unit = {
374374
assertEquals("1970-01-01T00:00:00Z", Instant.EPOCH.toString)
375375
assertEquals("-1000000000-01-01T00:00:00Z", Instant.MIN.toString)
376+
377+
// https://github.com/scala-js/scala-js-java-time/issues/23
378+
assertEquals("1970-01-01T00:10:00.100Z", Instant.EPOCH.plus(10, MINUTES).plusMillis(100).toString)
379+
376380
assertEquals("+1000000000-12-31T23:59:59.999999999Z", Instant.MAX.toString)
377381
assertEquals("1999-06-03T06:56:23.942Z", somePositiveInstant.toString)
378382
assertEquals("-0687-08-07T23:38:33.088936253Z", someNegativeInstant.toString)

0 commit comments

Comments
 (0)