GROOVY-5751: Adding milliseconds with TimeCategory gives incorrect to…

…String
groovy · Oct 12, 2012 · d7a7c33 · d7a7c33
1 parent c5b708f
commit d7a7c33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/groovy/time/BaseDuration.java b/src/main/groovy/time/BaseDuration.java
@@ -104,8 +104,11 @@ public String toString() {
         if (this.hours != 0) buffer.add(this.hours + " hours");
         if (this.minutes != 0) buffer.add(this.minutes + " minutes");
 
-        if (this.seconds != 0 || this.millis != 0)
-            buffer.add((seconds == 0 ? (millis < 0 ? "-0" : "0") : seconds) + "." + StringGroovyMethods.padLeft("" + Math.abs(millis), 3, "0") + " seconds");
+        if (this.seconds != 0 || this.millis != 0) {
+            int norm_millis = millis % 1000;
+            int norm_seconds = seconds + DefaultGroovyMethods.intdiv(millis - norm_millis, 1000).intValue();
+            buffer.add((norm_seconds == 0 ? (norm_millis < 0 ? "-0" : "0") : norm_seconds) + "." + StringGroovyMethods.padLeft("" + Math.abs(norm_millis), 3, "0") + " seconds");
+        }
 
         if (buffer.size() != 0) {
             return DefaultGroovyMethods.join(buffer, ", ");

diff --git a/src/test/groovy/time/TimeCategoryTest.groovy b/src/test/groovy/time/TimeCategoryTest.groovy
@@ -218,4 +218,11 @@ class TimeCategoryTest extends GroovyTestCase {
         }
     }
 
+    void testToStringForOverflow() {
+        use(TimeCategory) {
+            def t = 800.milliseconds + 300.milliseconds
+            assert t.toString() == '1.100 seconds'
+        }
+    }
+
 }