fix: datetime expressions where the time modifier rolls the date

Ronald Holshausen · Ronald Holshausen · commit 053d8969eac8 · 2020-04-18T16:20:53.000+10:00
diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateTimeExpression.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateTimeExpression.kt
@@ -3,21 +3,21 @@ package au.com.dius.pact.core.model.generators
 import au.com.dius.pact.com.github.michaelbull.result.Err
 import au.com.dius.pact.com.github.michaelbull.result.Ok
 import au.com.dius.pact.com.github.michaelbull.result.Result
-import au.com.dius.pact.com.github.michaelbull.result.get
-import au.com.dius.pact.com.github.michaelbull.result.map
 import au.com.dius.pact.com.github.michaelbull.result.mapError
 import mu.KLogging
 import java.lang.Integer.parseInt
 import java.time.OffsetDateTime
-import java.time.temporal.ChronoUnit
 
 object DateTimeExpression : KLogging() {
   fun executeExpression(base: OffsetDateTime, expression: String?): Result<OffsetDateTime, String> {
     return if (!expression.isNullOrEmpty()) {
       val split = expression.split("@", limit = 2)
       if (split.size > 1) {
         val datePart = DateExpression.executeDateExpression(base, split[0])
-        val timePart = TimeExpression.executeTimeExpression(base.toOffsetTime(), split[1])
+        val timePart = if (datePart is Ok<OffsetDateTime>)
+          TimeExpression.executeTimeExpression(datePart.value, split[1])
+        else
+          TimeExpression.executeTimeExpression(base, split[1])
         when {
           datePart is Err<String> && timePart is Err<String> -> datePart.mapError { "$it, " +
             Regex("1:(\\d+)").replace(timePart.error) { mr ->
@@ -32,7 +32,7 @@ object DateTimeExpression : KLogging() {
               "1:${pos + split[0].length + 1}"
             }
           }
-          else -> datePart.map { it.truncatedTo(ChronoUnit.DAYS).with(timePart.get()!!.toLocalTime()) }
+          else -> timePart
         }
       } else {
         DateExpression.executeDateExpression(base, split[0])
diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt
@@ -14,7 +14,6 @@ import org.apache.commons.lang3.RandomStringUtils
 import org.apache.commons.lang3.RandomUtils
 import java.math.BigDecimal
 import java.time.OffsetDateTime
-import java.time.OffsetTime
 import java.time.format.DateTimeFormatter
 import java.util.UUID
 import java.util.concurrent.ThreadLocalRandom
@@ -276,7 +275,7 @@ data class TimeGenerator @JvmOverloads constructor(val format: String? = null, v
   }
 
   override fun generate(context: Map<String, Any?>): Any {
-    val base = if (context.containsKey("baseTime")) context["baseTime"] as OffsetTime else OffsetTime.now()
+    val base = if (context.containsKey("baseTime")) context["baseTime"] as OffsetDateTime else OffsetDateTime.now()
     val time = TimeExpression.executeTimeExpression(base, expression).getOr { base }
     return if (!format.isNullOrEmpty()) {
       time.format(DateTimeFormatter.ofPattern(format))
diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/TimeExpression.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/TimeExpression.kt
@@ -13,20 +13,20 @@ import mu.KLogging
 import org.antlr.v4.runtime.CharStreams
 import org.antlr.v4.runtime.CommonTokenStream
 import java.time.LocalTime
-import java.time.OffsetTime
+import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.time.temporal.ChronoUnit
 
 data class ParsedTimeExpression(val base: TimeBase, val adjustments: MutableList<Adjustment<TimeOffsetType>>)
 
 object TimeExpression : KLogging() {
-  fun executeTimeExpression(base: OffsetTime, expression: String?): Result<OffsetTime, String> {
+  fun executeTimeExpression(base: OffsetDateTime, expression: String?): Result<OffsetDateTime, String> {
     return if (!expression.isNullOrEmpty()) {
       return when (val result = parseTimeExpression(expression)) {
         is Err -> result
         is Ok -> {
-          val midnight = OffsetTime.of(LocalTime.MIDNIGHT, ZoneOffset.from(base))
-          val noon = OffsetTime.of(LocalTime.NOON, ZoneOffset.from(base))
+          val midnight = OffsetDateTime.of(base.toLocalDate(), LocalTime.MIDNIGHT, ZoneOffset.from(base))
+          val noon = OffsetDateTime.of(base.toLocalDate(), LocalTime.NOON, ZoneOffset.from(base))
           var time = when (val valBase = result.value.base) {
             TimeBase.Now -> base
             TimeBase.Midnight -> midnight
diff --git a/core/model/src/test/groovy/au/com/dius/pact/core/model/generators/DateTimeExpressionSpec.groovy b/core/model/src/test/groovy/au/com/dius/pact/core/model/generators/DateTimeExpressionSpec.groovy
@@ -83,7 +83,7 @@ class DateTimeExpressionSpec extends Specification {
         expression                                         | expected
         'today @ 1 o\'clock'                               | '2000-01-01T13:00Z'
         'yesterday @ midnight'                             | '1999-12-31T00:00Z'
-        'yesterday @ midnight - 1 hour'                    | '1999-12-31T23:00Z'
+        'yesterday @ midnight - 1 hour'                    | '1999-12-30T23:00Z'
         'tomorrow @ now'                                   | '2000-01-02T10:00Z'
         '+ 1 day @ noon'                                   | '2000-01-02T12:00Z'
         '+ 1 week @ +1 hour'                               | '2000-01-08T11:00Z'
@@ -111,4 +111,13 @@ class DateTimeExpressionSpec extends Specification {
         'now @ now +'   | 'Error parsing expression: line 1:11 mismatched input \'<EOF>\' expecting INT'
         'now @ noo'     | /^Error parsing expression.*/
     }
+
+    def 'Time expressions that cause the date to roll'() {
+        expect:
+        DateTimeExpression.INSTANCE.executeExpression(base, '+ 1 day @ + 1 hour').value.toString() == datetime
+
+        where:
+        base = OffsetDateTime.parse('2020-04-14T23:20:00.311Z')
+        datetime = base.plusDays(1).plusHours(1).format('yyyy-MM-dd\'T\'HH:mm:ss.SSSX')
+    }
 }
diff --git a/core/model/src/test/groovy/au/com/dius/pact/core/model/generators/DateTimeGeneratorSpec.groovy b/core/model/src/test/groovy/au/com/dius/pact/core/model/generators/DateTimeGeneratorSpec.groovy
@@ -1,6 +1,5 @@
 package au.com.dius.pact.core.model.generators
 
-import spock.lang.Ignore
 import spock.lang.Specification
 
 import java.time.OffsetDateTime
@@ -14,18 +13,6 @@ class DateTimeGeneratorSpec extends Specification {
       /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[-+]\d+/
   }
 
-  // This fails on CI before 11am AEST
-  // FAILED
-  //    Condition not satisfied:
-  //    new DateTimeGenerator('yyyy-MM-dd\'T\'HH:mm:ssZ', '+ 1 day @ + 1 hour') .generate([baseDateTime: base]) == datetime
-  //    |                                                                        |                       |      |  |
-  //    |                                                                        2020-04-15T00:20:00+0000|      |  2020-04-16T00:20:00+0000
-  //    DateTimeGenerator(format=yyyy-MM-dd'T'HH:mm:ssZ, expression=+ 1 day @ + 1 hour)                  |      false
-  //                                                                                                     |      1 difference (95% similarity)
-  //                                                                                                     |      2020-04-1(5)T00:20:00+0000
-  //                                                                                                     |      2020-04-1(6)T00:20:00+0000
-  //                                                                                                     2020-04-14T23:20:00.311Z
-  @Ignore
   def 'Uses any defined expression to generate the datetime value'() {
     expect:
     new DateTimeGenerator('yyyy-MM-dd\'T\'HH:mm:ssZ', '+ 1 day @ + 1 hour')
diff --git a/core/model/src/test/groovy/au/com/dius/pact/core/model/generators/TimeExpressionSpec.groovy b/core/model/src/test/groovy/au/com/dius/pact/core/model/generators/TimeExpressionSpec.groovy
@@ -4,7 +4,7 @@ import au.com.dius.pact.core.model.generators.TimeExpression
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import java.time.OffsetTime
+import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
@@ -13,7 +13,7 @@ class TimeExpressionSpec extends Specification {
   private time
 
   def setup() {
-    time = OffsetTime.of(10, 0, 0, 0, ZoneOffset.UTC)
+    time = OffsetDateTime.of(2000, 4, 3, 10, 0, 0, 0, ZoneOffset.UTC)
   }
 
   @Unroll
diff --git a/core/model/src/test/groovy/au/com/dius/pact/core/model/generators/TimeGeneratorSpec.groovy b/core/model/src/test/groovy/au/com/dius/pact/core/model/generators/TimeGeneratorSpec.groovy
@@ -2,7 +2,7 @@ package au.com.dius.pact.core.model.generators
 
 import spock.lang.Specification
 
-import java.time.OffsetTime
+import java.time.OffsetDateTime
 
 class TimeGeneratorSpec extends Specification {
 
@@ -16,7 +16,7 @@ class TimeGeneratorSpec extends Specification {
     new TimeGenerator('HH:mm:ss', '+ 1 hour').generate([baseTime: base]) == time
 
     where:
-    base = OffsetTime.now()
+    base = OffsetDateTime.now()
     time = base.plusHours(1).format('HH:mm:ss')
   }
 
