Fix tests.

hs-lsong · hs-lsong · commit 2d4f109cfe50 · 2024-01-12T14:14:44.000-05:00
diff --git a/src/main/java/com/hubspot/jinjava/lib/fn/Functions.java b/src/main/java/com/hubspot/jinjava/lib/fn/Functions.java
@@ -169,8 +169,13 @@ public static ZonedDateTime today(String... var) {
         );
       }
     }
-
-    ZonedDateTime dateTime = getDateTimeArg(System.currentTimeMillis(), zoneOffset);
+    long currentMillis = JinjavaInterpreter
+      .getCurrentMaybe()
+      .map(JinjavaInterpreter::getConfig)
+      .map(JinjavaConfig::getDateTimeProvider)
+      .map(DateTimeProvider::getCurrentTimeMillis)
+      .orElse(System.currentTimeMillis());
+    ZonedDateTime dateTime = getDateTimeArg(currentMillis, zoneOffset);
     return dateTime.toLocalDate().atStartOfDay(zoneOffset);
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/TodayFunctionTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/TodayFunctionTest.java
@@ -6,7 +6,6 @@
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.Context;
-import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.InvalidArgumentException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.mode.EagerExecutionMode;
@@ -65,7 +64,6 @@ public void itIgnoresNullTimezone() {
     assertThat(Functions.today((String) null).getZone()).isEqualTo(ZoneOffset.UTC);
   }
 
-  @Test(expected = DeferredValueException.class)
   public void itDefersWhenExecutingEagerly() {
     JinjavaInterpreter.pushCurrent(
       new JinjavaInterpreter(
@@ -77,10 +75,8 @@ public void itDefersWhenExecutingEagerly() {
           .build()
       )
     );
-    try {
-      Functions.today(ZONE_NAME);
-    } finally {
-      JinjavaInterpreter.popCurrent();
-    }
+
+    ZonedDateTime today = Functions.today(ZONE_NAME);
+    assertThat(today.getYear()).isGreaterThan(2023);
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
@@ -772,13 +772,6 @@ public void itSplitsResolvedExpression() {
       .containsExactlyInAnyOrder("['a', 'b']", "'a'", "'b'");
   }
 
-  @Test
-  public void itHandlesToday() {
-    context.put("foo", "bar");
-    assertThat(eagerResolveExpression("foo ~ today()").toString())
-      .isEqualTo("'bar' ~ today()");
-  }
-
   @Test
   public void itHandlesRandom() {
     assertThat(eagerResolveExpression("range(1)|random").toString())

Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,13 @@ public static ZonedDateTime today(String... var) {`
`169`	`169`	`);`
`170`	`170`	`}`
`171`	`171`	`}`
`172`		`-`
`173`		`- ZonedDateTime dateTime = getDateTimeArg(System.currentTimeMillis(), zoneOffset);`
	`172`	`+ long currentMillis = JinjavaInterpreter`
	`173`	`+ .getCurrentMaybe()`
	`174`	`+ .map(JinjavaInterpreter::getConfig)`
	`175`	`+ .map(JinjavaConfig::getDateTimeProvider)`
	`176`	`+ .map(DateTimeProvider::getCurrentTimeMillis)`
	`177`	`+ .orElse(System.currentTimeMillis());`
	`178`	`+ ZonedDateTime dateTime = getDateTimeArg(currentMillis, zoneOffset);`
`174`	`179`	`return dateTime.toLocalDate().atStartOfDay(zoneOffset);`
`175`	`180`	`}`
`176`	`181`