From bc8ae1dd0d1848b09a7f3c9b12db8b9a137797f0 Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Wed, 17 Jan 2024 08:08:47 -0800
Subject: [PATCH] Fix a few additional failing calendar tests (#5046)

Failing tests introduced in #5037
---
 engine/table/build.gradle                                  | 1 +
 .../java/io/deephaven/engine/table/impl/FuzzerTest.java    | 7 +++++++
 .../engine/util/TestCalendarMethodsFromTable.java          | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/engine/table/build.gradle b/engine/table/build.gradle
index 261678a3c06..cef93c96f6c 100644
--- a/engine/table/build.gradle
+++ b/engine/table/build.gradle
@@ -57,6 +57,7 @@ dependencies {
     testImplementation TestTools.projectDependency(project, 'engine-vector')
     testImplementation TestTools.projectDependency(project, 'Numerics')
     testImplementation TestTools.projectDependency(project, 'engine-context')
+    testImplementation TestTools.projectDependency(project, 'engine-time')
     testImplementation project(':base-test-utils')
     testImplementation project(':engine-rowset-test-utils')
     testImplementation project(':engine-test-utils')
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/FuzzerTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/FuzzerTest.java
index a9160c0da2b..e2ad87c6a63 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/FuzzerTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/FuzzerTest.java
@@ -21,10 +21,12 @@
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.engine.util.GroovyDeephavenSession;
 import io.deephaven.test.types.SerialTest;
+import io.deephaven.time.calendar.CalendarInit;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.thread.ThreadInitializationFactory;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assume;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -83,6 +85,11 @@ private GroovyDeephavenSession getGroovySession(@Nullable Clock clock) throws IO
         return session;
     }
 
+    @Before
+    public void setUp() throws Exception {
+        CalendarInit.init();
+    }
+
     @Test
     public void testFuzzer() throws IOException, InterruptedException {
         testFuzzerScriptFile(0, "fuzzertest.groovy", true);
diff --git a/engine/table/src/test/java/io/deephaven/engine/util/TestCalendarMethodsFromTable.java b/engine/table/src/test/java/io/deephaven/engine/util/TestCalendarMethodsFromTable.java
index 44a6377fec4..adca4f05923 100644
--- a/engine/table/src/test/java/io/deephaven/engine/util/TestCalendarMethodsFromTable.java
+++ b/engine/table/src/test/java/io/deephaven/engine/util/TestCalendarMethodsFromTable.java
@@ -10,7 +10,9 @@
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
 import io.deephaven.test.types.OutOfBandTest;
 import io.deephaven.time.DateTimeUtils;
+import io.deephaven.time.calendar.CalendarInit;
 import io.deephaven.time.calendar.StaticCalendarMethods;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -114,6 +116,11 @@ private void executeTest(final Method m) throws InvocationTargetException, Illeg
         }
     }
 
+    @Before
+    public void setUp() throws Exception {
+        CalendarInit.init();
+    }
+
     @Test
     // test to make sure these methods work inside the query strings
     public void testAll() {