From 0d84a49456772369d2fc49d8e826f6740b8f7f4f Mon Sep 17 00:00:00 2001 From: amitabhmandal Date: Thu, 28 Jun 2018 15:42:30 +0530 Subject: [PATCH 1/5] BAEL-1896: Guide to GregorianCalendar --- .../calendar/GregorianCalendarExample.java | 69 +++++++ .../calendar/GregorianCalendarTester.java | 168 ++++++++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/gregorian/calendar/GregorianCalendarExample.java create mode 100644 core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java diff --git a/core-java/src/main/java/com/baeldung/gregorian/calendar/GregorianCalendarExample.java b/core-java/src/main/java/com/baeldung/gregorian/calendar/GregorianCalendarExample.java new file mode 100644 index 0000000000..d8018cefd5 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/gregorian/calendar/GregorianCalendarExample.java @@ -0,0 +1,69 @@ +package com.baeldung.gregorian.calendar; + +import java.time.format.DateTimeFormatter; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; +import java.util.TimeZone; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + +public class GregorianCalendarExample { + + + public Date setMonth(GregorianCalendar calendar, int amount) { + calendar.set(Calendar.MONTH, amount); + return calendar.getTime(); + } + + + public Date rollAdd(GregorianCalendar calendar, int amount) { + calendar.roll(GregorianCalendar.MONTH, amount); + return calendar.getTime(); + } + + public boolean isLeapYearExample(int year) { + GregorianCalendar cal = (GregorianCalendar) GregorianCalendar.getInstance(); + return cal.isLeapYear(year); + } + + + + public Date subtractDays(GregorianCalendar calendar, int daysToSubtract) { + GregorianCalendar cal = calendar; + cal.add(Calendar.DATE, -daysToSubtract); + return cal.getTime(); + } + + public Date addDays(GregorianCalendar calendar, int daysToAdd) { + GregorianCalendar cal = calendar; + cal.add(Calendar.DATE, daysToAdd); + return cal.getTime(); + } + + public XMLGregorianCalendar toXMLGregorianCalendar(GregorianCalendar calendar) throws DatatypeConfigurationException { + DatatypeFactory datatypeFactory = DatatypeFactory.newInstance(); + return datatypeFactory.newXMLGregorianCalendar(calendar); + } + + public Date toDate(XMLGregorianCalendar calendar) { + return calendar.toGregorianCalendar() + .getTime(); + } + + public int compareDates(GregorianCalendar firstDate, GregorianCalendar secondDate) { + return firstDate.compareTo(secondDate); + } + + public String formatDate(GregorianCalendar calendar) { + return calendar.toZonedDateTime() + .format(DateTimeFormatter.ofPattern("d MMM uuuu")); + } + +} diff --git a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java new file mode 100644 index 0000000000..0dd48f8dff --- /dev/null +++ b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java @@ -0,0 +1,168 @@ +package com.baeldung.gregorian.calendar; + +import static org.junit.Assert.*; + +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.Locale; +import java.util.TimeZone; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.junit.Test; + +import com.baeldung.gregorian.calendar.GregorianCalendarExample; + +public class GregorianCalendarTester { + + @Test + public void test_Calendar_Return_Type_Valid() { + Calendar calendar = Calendar.getInstance(); + assert ("gregory".equals(calendar.getCalendarType())); + } + + @Test + public void test_Calendar_Return_Type_InValid() { + Calendar calendar = Calendar.getInstance(); + assertNotEquals("gregorys", calendar.getCalendarType()); + } + + @Test(expected = ClassCastException.class) + public void test_Class_Cast_Exception() { + TimeZone tz = TimeZone.getTimeZone("GMT+9:00"); + Locale loc = new Locale("ja", "JP", "JP"); + Calendar calendar = Calendar.getInstance(loc); + GregorianCalendar gc = (GregorianCalendar) calendar; + } + + @Test + public void test_Getting_Calendar_information() { + GregorianCalendar calendar = new GregorianCalendar(2018, 5, 28); + assertTrue(false == calendar.isLeapYear(calendar.YEAR)); + assertTrue(52 == calendar.getWeeksInWeekYear()); + assertTrue(2018 == calendar.getWeekYear()); + assertTrue(30 == calendar.getActualMaximum(calendar.DAY_OF_MONTH)); + assertTrue(1 == calendar.getActualMinimum(calendar.DAY_OF_MONTH)); + assertTrue(1 == calendar.getGreatestMinimum(calendar.DAY_OF_MONTH)); + assertTrue(28 == calendar.getLeastMaximum(calendar.DAY_OF_MONTH)); + assertTrue(31 == calendar.getMaximum(calendar.DAY_OF_MONTH)); + assertTrue(1 == calendar.getMinimum(calendar.DAY_OF_MONTH)); + assertTrue(52 == calendar.getWeeksInWeekYear()); + + } + + @Test + public void test_Compare_Date_FirstDate_Greater_SecondDate() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); + GregorianCalendar secondDate = new GregorianCalendar(2018, 5, 28); + assertTrue(1 == calendarDemo.compareDates(firstDate, secondDate)); + + } + + @Test + public void test_Compare_Date_FirstDate_Smaller_SecondDate() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar firstDate = new GregorianCalendar(2018, 5, 28); + GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); + assertTrue(-1 == calendarDemo.compareDates(firstDate, secondDate)); + + } + + @Test + public void test_Compare_Date_Both_Dates_Equal() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); + GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); + assertTrue(0 == calendarDemo.compareDates(firstDate, secondDate)); + + } + + @Test + public void test_date_format() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar calendar = new GregorianCalendar(2018, 6, 28); + assertEquals("28 Jul 2018", calendarDemo.formatDate(calendar)); + } + + @Test + public void test_addDays() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.add(Calendar.DATE, 1); + Date expectedDate = calendarExpected.getTime(); + assertEquals(expectedDate, calendarDemo.addDays(calendarActual, 1)); + + } + + @Test + public void test_subDays() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.add(Calendar.DATE, -1); + Date expectedDate = calendarExpected.getTime(); + assertEquals(expectedDate, calendarDemo.subtractDays(calendarActual, 1)); + + } + + @Test + public void test_rollAdd() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.roll(Calendar.MONTH, 8); + Date expectedDate = calendarExpected.getTime(); + assertEquals(expectedDate, calendarDemo.rollAdd(calendarActual, 8)); + } + + @Test + public void test_rollSubtract() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.roll(Calendar.MONTH, -8); + Date expectedDate = calendarExpected.getTime(); + assertEquals(expectedDate, calendarDemo.rollAdd(calendarActual, -8)); + } + + @Test + public void test_setMonth() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.set(Calendar.MONTH, 3); + Date expectedDate = calendarExpected.getTime(); + assertEquals(expectedDate, calendarDemo.setMonth(calendarActual, 3)); + + } + + @Test + public void test_toXMLGregorianCalendar() throws DatatypeConfigurationException { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + DatatypeFactory datatypeFactory = DatatypeFactory.newInstance(); + GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + XMLGregorianCalendar expectedXMLGregorianCalendar = datatypeFactory.newXMLGregorianCalendar(calendarExpected); + assertEquals(expectedXMLGregorianCalendar, calendarDemo.toXMLGregorianCalendar(calendarActual)); + + } + + @Test + public void test_isLeapYear_True() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + assertEquals(true, calendarDemo.isLeapYearExample(2016)); + + } + + @Test + public void test_isLeapYear_False() { + GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); + assertEquals(false, calendarDemo.isLeapYearExample(2018)); + + } +} From 2191bb639d1f4d6dac8d9d474bdef2fc6b456ad5 Mon Sep 17 00:00:00 2001 From: amitabhmandal Date: Sat, 30 Jun 2018 14:37:38 +0530 Subject: [PATCH 2/5] BAEL-1896 Added test cases --- .../calendar/GregorianCalendarTester.java | 87 +++++++++++++++++-- 1 file changed, 81 insertions(+), 6 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java index 0dd48f8dff..2832f416bf 100644 --- a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java +++ b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java @@ -2,6 +2,7 @@ package com.baeldung.gregorian.calendar; import static org.junit.Assert.*; +import java.time.format.DateTimeFormatter; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -51,7 +52,6 @@ public class GregorianCalendarTester { assertTrue(31 == calendar.getMaximum(calendar.DAY_OF_MONTH)); assertTrue(1 == calendar.getMinimum(calendar.DAY_OF_MONTH)); assertTrue(52 == calendar.getWeeksInWeekYear()); - } @Test @@ -60,8 +60,15 @@ public class GregorianCalendarTester { GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); GregorianCalendar secondDate = new GregorianCalendar(2018, 5, 28); assertTrue(1 == calendarDemo.compareDates(firstDate, secondDate)); - } + + @Test + public void test_CompareFirstDateGreaterSecondDate() { + GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); + GregorianCalendar secondDate = new GregorianCalendar(2018, 5, 28); + assertTrue(1 == firstDate.compareTo(secondDate)); + } + @Test public void test_Compare_Date_FirstDate_Smaller_SecondDate() { @@ -69,7 +76,13 @@ public class GregorianCalendarTester { GregorianCalendar firstDate = new GregorianCalendar(2018, 5, 28); GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); assertTrue(-1 == calendarDemo.compareDates(firstDate, secondDate)); - + } + + @Test + public void test_CompareFirstDateSmallerSecondDate() { + GregorianCalendar firstDate = new GregorianCalendar(2018, 5, 28); + GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); + assertTrue(-1 == firstDate.compareTo(secondDate)); } @Test @@ -78,7 +91,13 @@ public class GregorianCalendarTester { GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); assertTrue(0 == calendarDemo.compareDates(firstDate, secondDate)); - + } + + @Test + public void test_CompareDatesEqual() { + GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); + GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); + assertTrue(0 == firstDate.compareTo(secondDate)); } @Test @@ -88,6 +107,13 @@ public class GregorianCalendarTester { assertEquals("28 Jul 2018", calendarDemo.formatDate(calendar)); } + @Test + public void test_dateFormatdMMMuuuu() { + String expectedDate = new GregorianCalendar(2018, 6, 28).toZonedDateTime() + .format(DateTimeFormatter.ofPattern("d MMM uuuu")); + assertEquals("28 Jul 2018", expectedDate); + } + @Test public void test_addDays() { GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); @@ -96,7 +122,22 @@ public class GregorianCalendarTester { calendarExpected.add(Calendar.DATE, 1); Date expectedDate = calendarExpected.getTime(); assertEquals(expectedDate, calendarDemo.addDays(calendarActual, 1)); + } + @Test + public void test_addOneDay() { + final int finalDay29 = 29; + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.add(Calendar.DATE, 1); + assertEquals(calendarExpected.get(Calendar.DATE), finalDay29); + } + + @Test + public void test_subtractOneDay() { + final int finalDay27 = 27; + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.add(Calendar.DATE, -1); + assertEquals(calendarExpected.get(Calendar.DATE), finalDay27); } @Test @@ -107,7 +148,6 @@ public class GregorianCalendarTester { calendarExpected.add(Calendar.DATE, -1); Date expectedDate = calendarExpected.getTime(); assertEquals(expectedDate, calendarDemo.subtractDays(calendarActual, 1)); - } @Test @@ -120,6 +160,24 @@ public class GregorianCalendarTester { assertEquals(expectedDate, calendarDemo.rollAdd(calendarActual, 8)); } + @Test + public void test_rollAddEightMonths() { + final int rolledUpMonthMarch = 2, orginalYear2018 = 2018; + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.roll(Calendar.MONTH, 8); + assertEquals(calendarExpected.get(Calendar.MONTH), rolledUpMonthMarch); + assertEquals(calendarExpected.get(Calendar.YEAR), orginalYear2018); + } + + @Test + public void test_rollSubstractEightMonths() { + final int rolledDownMonthNovember = 10, orginalYear2018 = 2018; + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.roll(Calendar.MONTH, -8); + assertEquals(calendarExpected.get(Calendar.MONTH), rolledDownMonthNovember); + assertEquals(calendarExpected.get(Calendar.YEAR), orginalYear2018); + } + @Test public void test_rollSubtract() { GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); @@ -138,7 +196,16 @@ public class GregorianCalendarTester { calendarExpected.set(Calendar.MONTH, 3); Date expectedDate = calendarExpected.getTime(); assertEquals(expectedDate, calendarDemo.setMonth(calendarActual, 3)); + } + @Test + public void test_setMonthApril() { + final int setMonthApril = 3, orginalYear2018 = 2018, originalDate28 = 28; + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + calendarExpected.set(Calendar.MONTH, 3); + assertEquals(calendarExpected.get(Calendar.MONTH), setMonthApril); + assertEquals(calendarExpected.get(Calendar.YEAR), orginalYear2018); + assertEquals(calendarExpected.get(Calendar.DATE), originalDate28); } @Test @@ -149,7 +216,6 @@ public class GregorianCalendarTester { GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); XMLGregorianCalendar expectedXMLGregorianCalendar = datatypeFactory.newXMLGregorianCalendar(calendarExpected); assertEquals(expectedXMLGregorianCalendar, calendarDemo.toXMLGregorianCalendar(calendarActual)); - } @Test @@ -165,4 +231,13 @@ public class GregorianCalendarTester { assertEquals(false, calendarDemo.isLeapYearExample(2018)); } + + @Test + public void test_toDate() throws DatatypeConfigurationException { + GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); + DatatypeFactory datatypeFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar expectedXMLGregorianCalendar = datatypeFactory.newXMLGregorianCalendar(calendarActual); + expectedXMLGregorianCalendar.toGregorianCalendar().getTime(); + assertEquals(calendarActual.getTime(), expectedXMLGregorianCalendar.toGregorianCalendar().getTime() ); + } } From 1487b9195bf1aeb5e3b0afc35634b4216c71cdef Mon Sep 17 00:00:00 2001 From: amitabhmandal Date: Tue, 3 Jul 2018 14:52:42 +0530 Subject: [PATCH 3/5] BAEL-1896. Fixed Junits --- .../calendar/GregorianCalendarTester.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java index 2832f416bf..cd7d090631 100644 --- a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java +++ b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java @@ -161,20 +161,20 @@ public class GregorianCalendarTester { } @Test - public void test_rollAddEightMonths() { - final int rolledUpMonthMarch = 2, orginalYear2018 = 2018; + public void test_whenRollUpOneMonth_thenYearIsUnchanged() { + final int rolledUpMonthJuly = 7, orginalYear2018 = 2018; GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); - calendarExpected.roll(Calendar.MONTH, 8); - assertEquals(calendarExpected.get(Calendar.MONTH), rolledUpMonthMarch); + calendarExpected.roll(Calendar.MONTH, 1); + assertEquals(calendarExpected.get(Calendar.MONTH), rolledUpMonthJuly); assertEquals(calendarExpected.get(Calendar.YEAR), orginalYear2018); } @Test - public void test_rollSubstractEightMonths() { - final int rolledDownMonthNovember = 10, orginalYear2018 = 2018; + public void test_whenRollDownOneMonth_thenYearIsUnchanged() { + final int rolledDownMonthJune = 5, orginalYear2018 = 2018; GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); - calendarExpected.roll(Calendar.MONTH, -8); - assertEquals(calendarExpected.get(Calendar.MONTH), rolledDownMonthNovember); + calendarExpected.roll(Calendar.MONTH, -1); + assertEquals(calendarExpected.get(Calendar.MONTH), rolledDownMonthJune); assertEquals(calendarExpected.get(Calendar.YEAR), orginalYear2018); } @@ -214,8 +214,10 @@ public class GregorianCalendarTester { DatatypeFactory datatypeFactory = DatatypeFactory.newInstance(); GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); - XMLGregorianCalendar expectedXMLGregorianCalendar = datatypeFactory.newXMLGregorianCalendar(calendarExpected); - assertEquals(expectedXMLGregorianCalendar, calendarDemo.toXMLGregorianCalendar(calendarActual)); + XMLGregorianCalendar expectedXMLGregorianCalendar = datatypeFactory + .newXMLGregorianCalendar(calendarExpected); + assertEquals(expectedXMLGregorianCalendar, + calendarDemo.toXMLGregorianCalendar(calendarActual)); } @Test @@ -236,8 +238,10 @@ public class GregorianCalendarTester { public void test_toDate() throws DatatypeConfigurationException { GregorianCalendar calendarActual = new GregorianCalendar(2018, 6, 28); DatatypeFactory datatypeFactory = DatatypeFactory.newInstance(); - XMLGregorianCalendar expectedXMLGregorianCalendar = datatypeFactory.newXMLGregorianCalendar(calendarActual); + XMLGregorianCalendar expectedXMLGregorianCalendar = datatypeFactory + .newXMLGregorianCalendar(calendarActual); expectedXMLGregorianCalendar.toGregorianCalendar().getTime(); - assertEquals(calendarActual.getTime(), expectedXMLGregorianCalendar.toGregorianCalendar().getTime() ); + assertEquals(calendarActual.getTime(), + expectedXMLGregorianCalendar.toGregorianCalendar().getTime() ); } } From 6d60eabea8e90db656b79b775c2dc3f7392993e7 Mon Sep 17 00:00:00 2001 From: amitabhmandal Date: Wed, 4 Jul 2018 07:42:37 +0530 Subject: [PATCH 4/5] BAEL-1896: Refactored names --- .../baeldung/gregorian/calendar/GregorianCalendarTester.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java index cd7d090631..7c5904fccc 100644 --- a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java +++ b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java @@ -125,7 +125,7 @@ public class GregorianCalendarTester { } @Test - public void test_addOneDay() { + public void test_whenAddOneDay_thenMonthIsUnchanged() { final int finalDay29 = 29; GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); calendarExpected.add(Calendar.DATE, 1); @@ -133,7 +133,7 @@ public class GregorianCalendarTester { } @Test - public void test_subtractOneDay() { + public void test_whenSubtractOneDay_thenMonthIsUnchanged() { final int finalDay27 = 27; GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); calendarExpected.add(Calendar.DATE, -1); From 9c8973f83f1250effd2e11ffd01e3b51a83dcb42 Mon Sep 17 00:00:00 2001 From: amitabhmandal Date: Sun, 8 Jul 2018 22:02:45 +0530 Subject: [PATCH 5/5] Refactored Junits --- .../calendar/GregorianCalendarTester.java | 45 ++++++------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java index 7c5904fccc..a1d084cf9a 100644 --- a/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java +++ b/core-java/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java @@ -56,14 +56,6 @@ public class GregorianCalendarTester { @Test public void test_Compare_Date_FirstDate_Greater_SecondDate() { - GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); - GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); - GregorianCalendar secondDate = new GregorianCalendar(2018, 5, 28); - assertTrue(1 == calendarDemo.compareDates(firstDate, secondDate)); - } - - @Test - public void test_CompareFirstDateGreaterSecondDate() { GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); GregorianCalendar secondDate = new GregorianCalendar(2018, 5, 28); assertTrue(1 == firstDate.compareTo(secondDate)); @@ -72,14 +64,6 @@ public class GregorianCalendarTester { @Test public void test_Compare_Date_FirstDate_Smaller_SecondDate() { - GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); - GregorianCalendar firstDate = new GregorianCalendar(2018, 5, 28); - GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); - assertTrue(-1 == calendarDemo.compareDates(firstDate, secondDate)); - } - - @Test - public void test_CompareFirstDateSmallerSecondDate() { GregorianCalendar firstDate = new GregorianCalendar(2018, 5, 28); GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); assertTrue(-1 == firstDate.compareTo(secondDate)); @@ -87,14 +71,6 @@ public class GregorianCalendarTester { @Test public void test_Compare_Date_Both_Dates_Equal() { - GregorianCalendarExample calendarDemo = new GregorianCalendarExample(); - GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); - GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); - assertTrue(0 == calendarDemo.compareDates(firstDate, secondDate)); - } - - @Test - public void test_CompareDatesEqual() { GregorianCalendar firstDate = new GregorianCalendar(2018, 6, 28); GregorianCalendar secondDate = new GregorianCalendar(2018, 6, 28); assertTrue(0 == firstDate.compareTo(secondDate)); @@ -125,19 +101,24 @@ public class GregorianCalendarTester { } @Test - public void test_whenAddOneDay_thenMonthIsUnchanged() { - final int finalDay29 = 29; - GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + public void test_whenAddOneDay_thenMonthIsChanged() { + final int finalDay1 = 1; + final int finalMonthJul = 6; + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 5, 30); calendarExpected.add(Calendar.DATE, 1); - assertEquals(calendarExpected.get(Calendar.DATE), finalDay29); + System.out.println(calendarExpected.getTime()); + assertEquals(calendarExpected.get(Calendar.DATE), finalDay1); + assertEquals(calendarExpected.get(Calendar.MONTH), finalMonthJul); } @Test - public void test_whenSubtractOneDay_thenMonthIsUnchanged() { - final int finalDay27 = 27; - GregorianCalendar calendarExpected = new GregorianCalendar(2018, 6, 28); + public void test_whenSubtractOneDay_thenMonthIsChanged() { + final int finalDay31 = 31; + final int finalMonthMay = 4; + GregorianCalendar calendarExpected = new GregorianCalendar(2018, 5, 1); calendarExpected.add(Calendar.DATE, -1); - assertEquals(calendarExpected.get(Calendar.DATE), finalDay27); + assertEquals(calendarExpected.get(Calendar.DATE), finalDay31); + assertEquals(calendarExpected.get(Calendar.MONTH), finalMonthMay); } @Test