Move new internal Calendar APIs to CalendarUtils and refactor.

2 files changed, 38 insertions, 35 deletions

diff --git a/src/test/java/org/apache/commons/lang3/time/CalendarUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/CalendarUtilsTest.java
index 3ae5a9651..76f802494 100644
--- a/src/test/java/org/apache/commons/lang3/time/CalendarUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/CalendarUtilsTest.java
@@ -20,6 +20,7 @@ package org.apache.commons.lang3.time;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Calendar;
+import java.util.Locale;
 
 import org.junit.jupiter.api.Test;
 
@@ -36,8 +37,45 @@ public class CalendarUtilsTest {
     }
 
     @Test
+    public void testGetStandaloneLongMonthNames() {
+        final String[] monthNames = CalendarUtils.getInstance(Locale.GERMAN).getStandaloneLongMonthNames();
+        assertEquals(12, monthNames.length);
+        assertEquals("Januar", monthNames[0]);
+        assertEquals("Februar", monthNames[1]);
+        assertEquals("M\u00e4rz", monthNames[2]);
+        assertEquals("April", monthNames[3]);
+        assertEquals("Mai", monthNames[4]);
+        assertEquals("Juni", monthNames[5]);
+        assertEquals("Juli", monthNames[6]);
+        assertEquals("August", monthNames[7]);
+        assertEquals("September", monthNames[8]);
+        assertEquals("Oktober", monthNames[9]);
+        assertEquals("November", monthNames[10]);
+        assertEquals("Dezember", monthNames[11]);
+    }
+
+    @Test
+    public void testGetStandaloneShortMonthNames() {
+        final String[] monthNames = CalendarUtils.getInstance(Locale.GERMAN).getStandaloneShortMonthNames();
+        assertEquals(12, monthNames.length);
+        assertEquals("Jan", monthNames[0]);
+        assertEquals("Feb", monthNames[1]);
+        assertEquals("M\u00e4r", monthNames[2]);
+        assertEquals("Apr", monthNames[3]);
+        assertEquals("Mai", monthNames[4]);
+        assertEquals("Jun", monthNames[5]);
+        assertEquals("Jul", monthNames[6]);
+        assertEquals("Aug", monthNames[7]);
+        assertEquals("Sep", monthNames[8]);
+        assertEquals("Okt", monthNames[9]);
+        assertEquals("Nov", monthNames[10]);
+        assertEquals("Dez", monthNames[11]);
+    }
+
+    @Test
     public void testGetYear() {
         assertEquals(Calendar.getInstance().get(Calendar.YEAR), CalendarUtils.INSTANCE.getYear());
     }
 
+
 }
diff --git a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
index 7e9b40fad..1d5127f19 100644
--- a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
@@ -1695,40 +1695,5 @@ public class DateUtilsTest {
         }
     }
 
-    @Test
-    public void testGetStandaloneLongMonthNames() {
-        final String[] monthNames = DateUtils.getStandaloneLongMonths(Locale.GERMAN);
-        assertEquals(12, monthNames.length);
-        assertEquals("Januar", monthNames[0]);
-        assertEquals("Februar", monthNames[1]);
-        assertEquals("M\u00e4rz", monthNames[2]);
-        assertEquals("April", monthNames[3]);
-        assertEquals("Mai", monthNames[4]);
-        assertEquals("Juni", monthNames[5]);
-        assertEquals("Juli", monthNames[6]);
-        assertEquals("August", monthNames[7]);
-        assertEquals("September", monthNames[8]);
-        assertEquals("Oktober", monthNames[9]);
-        assertEquals("November", monthNames[10]);
-        assertEquals("Dezember", monthNames[11]);
-    }
-
-    @Test
-    public void testGetStandaloneShortMonthNames() {
-        final String[] monthNames = DateUtils.getStandaloneShortMonths(Locale.GERMAN);
-        assertEquals(12, monthNames.length);
-        assertEquals("Jan", monthNames[0]);
-        assertEquals("Feb", monthNames[1]);
-        assertEquals("M\u00e4r", monthNames[2]);
-        assertEquals("Apr", monthNames[3]);
-        assertEquals("Mai", monthNames[4]);
-        assertEquals("Jun", monthNames[5]);
-        assertEquals("Jul", monthNames[6]);
-        assertEquals("Aug", monthNames[7]);
-        assertEquals("Sep", monthNames[8]);
-        assertEquals("Okt", monthNames[9]);
-        assertEquals("Nov", monthNames[10]);
-        assertEquals("Dez", monthNames[11]);
-    }
 }