diff --git a/Plot/src/test/java/io/deephaven/plot/axistransformations/CalendarInit.java b/Plot/src/test/java/io/deephaven/plot/axistransformations/CalendarInit.java new file mode 100644 index 00000000000..ebdde9a5891 --- /dev/null +++ b/Plot/src/test/java/io/deephaven/plot/axistransformations/CalendarInit.java @@ -0,0 +1,19 @@ +/** + * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending + */ +package io.deephaven.plot.axistransformations; + +import io.deephaven.time.calendar.BusinessCalendar; +import io.deephaven.time.calendar.Calendars; + +final class CalendarInit { + static { + for (BusinessCalendar calendar : Calendars.calendarsFromConfiguration()) { + Calendars.addCalendar(calendar); + } + } + + static void noop() { + + } +} diff --git a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java index c4fb45c357f..9aac997fc67 100644 --- a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java +++ b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java @@ -3,22 +3,18 @@ */ package io.deephaven.plot.axistransformations; -import io.deephaven.base.testing.BaseArrayTestCase; import io.deephaven.time.DateTimeUtils; -import io.deephaven.time.calendar.BusinessCalendar; import io.deephaven.time.calendar.Calendars; +import junit.framework.TestCase; import java.nio.file.Paths; import java.time.Instant; import java.time.ZoneId; import java.util.Objects; -public class TestAxisTransformBusinessCalendar extends BaseArrayTestCase { - +public class TestAxisTransformBusinessCalendar extends TestCase { static { - for (BusinessCalendar calendar : Calendars.calendarsFromConfiguration()) { - Calendars.addCalendar(calendar); - } + CalendarInit.noop(); } private static final ZoneId TZ_JP = ZoneId.of("Asia/Tokyo"); diff --git a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java index bbec805b493..8e676e96af5 100644 --- a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java +++ b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java @@ -16,11 +16,8 @@ import static org.junit.Assert.assertTrue; public class TestAxisTransforms { - static { - for (BusinessCalendar calendar : Calendars.calendarsFromConfiguration()) { - Calendars.addCalendar(calendar); - } + CalendarInit.noop(); } final double d1 = 3.5; 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 new file mode 100644 index 00000000000..4632150154b --- /dev/null +++ b/engine/time/src/test/java/io/deephaven/time/calendar/CalendarInit.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending + */ +package io.deephaven.time.calendar; + +final class CalendarInit { + + static { + for (BusinessCalendar calendar : Calendars.calendarsFromConfiguration()) { + Calendars.addCalendar(calendar); + } + } + + static void noop() { + + } +} diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendars.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendars.java index 2faf5570248..e76e3cbbb0a 100644 --- a/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendars.java +++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendars.java @@ -13,9 +13,7 @@ public class TestCalendars extends BaseArrayTestCase { static { - for (BusinessCalendar calendar : Calendars.calendarsFromConfiguration()) { - Calendars.addCalendar(calendar); - } + CalendarInit.noop(); } public void testDefault() { diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestStaticCalendarMethods.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestStaticCalendarMethods.java index b50b26bd62f..684b643edd4 100644 --- a/engine/time/src/test/java/io/deephaven/time/calendar/TestStaticCalendarMethods.java +++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestStaticCalendarMethods.java @@ -23,9 +23,7 @@ public class TestStaticCalendarMethods extends BaseArrayTestCase { static { - for (BusinessCalendar calendar : Calendars.calendarsFromConfiguration()) { - Calendars.addCalendar(calendar); - } + CalendarInit.noop(); } private final Map, Object[]> data = new HashMap<>();