Fix minutes/seconds parsing

ical4j · Jun 28, 2020 · eea4a6c · eea4a6c
1 parent e6a002f
commit eea4a6c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/net/fortuna/ical4j/model/TemporalAmountAdapter.java b/src/main/java/net/fortuna/ical4j/model/TemporalAmountAdapter.java
@@ -92,11 +92,17 @@ private String durationToString(Duration duration) {
                 if (hours > 0) {
                     if (seconds > 0) {
                         retVal = String.format("P%dDT%dH%dM%dS", days, hours, minutes, seconds);
+                    } else if (minutes > 0) {
+                        retVal = String.format("P%dDT%dH%dM", days, hours, minutes);
                     } else {
                         retVal = String.format("P%dDT%dH", days, hours);
                     }
                 } else if (minutes > 0) {
-                    retVal = String.format("P%dDT%dM", days, minutes);
+                    if (seconds > 0) {
+                        retVal = String.format("P%dDT%dM%dS", days, minutes, seconds);
+                    } else {
+                        retVal = String.format("P%dDT%dM", days, minutes);
+                    }
                 } else if (seconds > 0) {
                     retVal = String.format("P%dDT%dS", days, seconds);
                 }

diff --git a/src/test/groovy/net/fortuna/ical4j/model/TemporalAmountAdapterTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/TemporalAmountAdapterTest.groovy
@@ -181,4 +181,7 @@ class TemporalAmountAdapterTest extends Specification {
         adapter1.duration == -adapter2.duration
     }
 
+    def 'testTemporalAmountAdapter_durationToString_DropsMinutes'() {
+        expect: "P1DT1H4M" == TemporalAmountAdapter.parse("P1DT1H4M") as String
+    }
 }