Calendar updated

src/com/bilgeadam/java/tutorials/date_time/Calendars.java

@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 
 public class Calendars {
     private static final String calendarFormatString = "yyyy/MMMM/dd hh:mm:ss:SSSS";
@@ -14,25 +15,43 @@ public Calendars() {
         simpleDateFormat = new SimpleDateFormat();
         simpleDateFormat.applyPattern(calendarFormatString);
 
-
+        // Initialize calendar with current time
         this.calendar  = new GregorianCalendar();
     }
 
-    public Calendar getCalendar() {
-
-        return this.calendar;
-        /*
-        return calendar.getDisplayName((Calendar.MONTH, Calendar.DAY_OF_MONTH, Calendar.YEAR),
+    /**
+     * This fucntion uses getDispalyName method with Locale
+     * @param locale requested
+     * @return String of the Month
+     */
+    public String getCalendarMonth(Locale locale) {
+        return calendar.getDisplayName(Calendar.MONTH,
                 Calendar.LONG,
-                Locale.ENGLISH);*/
+                locale);
+    }
+
+    /**
+     * This method only returns integer representation of the year
+     * @return Current Year
+     */
+    public int getCalendarYear() {
+        return calendar.get(Calendar.YEAR);
+
     }
 
+    /**
+     *
+     * @return True if leap year, false otherwise
+     */
     public boolean isLeapYear(){
         return calendar.isLeapYear(calendar.get(Calendar.YEAR));
     }
 
+    /**
+     * Calendar also includes Date object which can be retrieved and parsed as needed.
+     * @return Formatted Date object
+     */
     public String getCalendarString() {
-
         return this.simpleDateFormat.format(this.calendar.getTime());
     }
 }

test/com/bilgeadam/java/tutorials/date_time/CalendarsTest.java

@@ -5,6 +5,8 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -23,19 +25,21 @@ void tearDown() {
 
     @Test
     void getCalendar() {
-        System.out.println("testCalendars.getCalendar() = " + testCalendars.getCalendar().get(Calendar.YEAR));
-        System.out.println("testCalendars.getCalendar() = " + testCalendars.getCalendar().get(Calendar.MONTH));
-        System.out.println("testCalendars.getCalendar() = " + testCalendars.getCalendar().get(Calendar.DAY_OF_MONTH));
-        System.out.println("testCalendars.getCalendar() = " + testCalendars.getCalendar().isLenient());
+        // Locale object can be set with language and country separately.
+        Locale locale = new Locale("tr", "TR");
+
+        // Get the current month for given locale
+        String testMonth = new GregorianCalendar().getDisplayName(Calendar.MONTH, Calendar.LONG, locale);
+
+        assertEquals(testMonth, testCalendars.getCalendarMonth(locale));
     }
 
     @Test
     void testLeapYear() {
-        assertEquals(true, testCalendars.isLeapYear());
-    }
+        // Get current year
+        int year = testCalendars.getCalendarYear();
 
-    @Test
-    void getCalendarString() {
-        System.out.println("testCalendars.getCalendarString() = " + testCalendars.getCalendarString());
+        // If year can be divided by 4, it is a leap year
+        assertEquals(year % 4 == 0, testCalendars.isLeapYear());
     }
 }