Consolidate calendar init test logic

deephaven · Jan 16, 2024 · 56c5b05 · 56c5b05
1 parent 4ac96ef
commit 56c5b05
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 55 deletions.
diff --git a/Integrations/build.gradle b/Integrations/build.gradle
@@ -19,6 +19,7 @@ dependencies {
     implementation project(':log-factory')
 
     testImplementation project(':engine-test-utils')
+    testImplementation TestTools.projectDependency(project, 'engine-time')
 
     testRuntimeOnly project(':log-to-slf4j')
     // add configs, and some runtime dependencies to test classpaths

diff --git a/Integrations/src/test/java/io/deephaven/integrations/python/CalendarsHelper.java b/Integrations/src/test/java/io/deephaven/integrations/python/CalendarsHelper.java
diff --git a/Plot/Plot.gradle b/Plot/Plot.gradle
@@ -27,6 +27,7 @@ dependencies {
 
     testImplementation TestTools.projectDependency(project, 'Util')
     testImplementation TestTools.projectDependency(project, 'engine-table')
+    testImplementation TestTools.projectDependency(project, 'engine-time')
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')

diff --git a/Plot/src/test/java/io/deephaven/plot/axistransformations/CalendarInit.java b/Plot/src/test/java/io/deephaven/plot/axistransformations/CalendarInit.java
diff --git a/...rc/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java b/...rc/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java
@@ -4,6 +4,7 @@
 package io.deephaven.plot.axistransformations;
 
 import io.deephaven.time.DateTimeUtils;
+import io.deephaven.time.calendar.CalendarInit;
 import io.deephaven.time.calendar.Calendars;
 import junit.framework.TestCase;
 

diff --git a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java
@@ -4,6 +4,7 @@
 package io.deephaven.plot.axistransformations;
 
 import io.deephaven.time.calendar.BusinessCalendar;
+import io.deephaven.time.calendar.CalendarInit;
 import io.deephaven.time.calendar.Calendars;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/CalendarInit.java b/engine/time/src/test/java/io/deephaven/time/calendar/CalendarInit.java
@@ -3,15 +3,15 @@
  */
 package io.deephaven.time.calendar;
 
-final class CalendarInit {
+public final class CalendarInit {
 
     private static volatile boolean initialized = false;
 
     /**
      * This is a guarded initialization of {@link Calendars#addCalendar(BusinessCalendar)} for all the
      * {@link Calendars#calendarsFromConfiguration()}.
      */
-    static void init() {
+    public static void init() {
         if (!initialized) {
             synchronized (CalendarInit.class) {
                 if (!initialized) {

diff --git a/py/server/tests/test_calendar.py b/py/server/tests/test_calendar.py
@@ -18,8 +18,7 @@ class CalendarTestCase(BaseTestCase):
     @classmethod
     def setUpClass(cls) -> None:
         super().setUpClass()
-        jpy.get_type('io.deephaven.integrations.python.CalendarsHelper').addCalendarsFromConfiguration()
-
+        jpy.get_type('io.deephaven.time.calendar.CalendarInit').init()
 
     def setUp(self) -> None:
         super().setUp()