diff --git a/core-java/src/main/java/com/baeldung/temporaladjuster/TemporalAdjusterUtil.java b/core-java/src/main/java/com/baeldung/temporaladjuster/TemporalAdjusterUtil.java deleted file mode 100644 index 1a1528456e..0000000000 --- a/core-java/src/main/java/com/baeldung/temporaladjuster/TemporalAdjusterUtil.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.baeldung.temporaladjuster; - -import java.text.SimpleDateFormat; -import java.util.Calendar; - -public class TemporalAdjusterUtil { - - public static Calendar nextDayOfWeek(int dayOfWeek) { - Calendar date = Calendar.getInstance(); - int difference = dayOfWeek - date.get(Calendar.DAY_OF_WEEK); - if (!(difference > 0)) { - difference += 7; - } - date.add(Calendar.DAY_OF_MONTH, difference); - return date; - } - - @SuppressWarnings("static-access") - public static String getNextWorkingDay() { - Calendar calendar = Calendar.getInstance(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - format.setCalendar(calendar); - if (calendar.DAY_OF_WEEK == Calendar.FRIDAY) - calendar.add(Calendar.DATE, 3); - if (calendar.DAY_OF_WEEK == Calendar.SATURDAY) - calendar.add(Calendar.DATE, 2); - else - calendar.add(Calendar.DATE, 1); - return format.format(calendar.getTime()); - } -} diff --git a/core-java/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterTest.java b/core-java/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterTest.java index 10dce5c498..a7acc9f743 100644 --- a/core-java/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterTest.java +++ b/core-java/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterTest.java @@ -1,56 +1,49 @@ package com.baeldung.temporaladjusters; -import java.text.SimpleDateFormat; import java.time.DayOfWeek; import java.time.LocalDate; import java.time.Period; import java.time.temporal.TemporalAdjuster; import java.time.temporal.TemporalAdjusters; -import java.util.Calendar; import org.junit.Assert; import org.junit.Test; import com.baeldung.temporaladjuster.CustomTemporalAdjuster; -import com.baeldung.temporaladjuster.TemporalAdjusterUtil; public class CustomTemporalAdjusterTest { @Test public void whenAdjustAndImplementInterface_thenNextWorkingDay() { - LocalDate localDate = LocalDate.now(); + LocalDate localDate = LocalDate.of(2017, 07, 8); CustomTemporalAdjuster temporalAdjuster = new CustomTemporalAdjuster(); LocalDate nextWorkingDay = localDate.with(temporalAdjuster); - Assert.assertEquals(TemporalAdjusterUtil.getNextWorkingDay(), nextWorkingDay.toString()); + Assert.assertEquals("2017-07-10", nextWorkingDay.toString()); } - + @Test public void whenAdjust_thenNextWorkingDay() { - LocalDate localDate = LocalDate.now(); + LocalDate localDate = LocalDate.of(2017, 07, 8); TemporalAdjuster temporalAdjuster = NEXT_WORKING_DAY; LocalDate date = localDate.with(temporalAdjuster); - Assert.assertEquals(TemporalAdjusterUtil.getNextWorkingDay(), date.toString()); + Assert.assertEquals("2017-07-10", date.toString()); } @Test - public void whenAdjust_thenFourteenDaysFromToday() { - LocalDate localDate = LocalDate.now(); + public void whenAdjust_thenFourteenDaysAfterDate() { + LocalDate localDate = LocalDate.of(2017, 07, 8); TemporalAdjuster temporalAdjuster = (t) -> t.plus(Period.ofDays(14)); LocalDate result = localDate.with(temporalAdjuster); - Calendar calendar = Calendar.getInstance(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - format.setCalendar(calendar); - calendar.add(Calendar.DATE, 14); - String fourteenDaysFromToday = format.format(calendar.getTime()); + String fourteenDaysAfterDate = "2017-07-22"; - Assert.assertEquals(fourteenDaysFromToday, result.toString()); + Assert.assertEquals(fourteenDaysAfterDate, result.toString()); } - static TemporalAdjuster NEXT_WORKING_DAY = TemporalAdjusters.ofDateAdjuster(today -> { - DayOfWeek dayOfWeek = today.getDayOfWeek(); + static TemporalAdjuster NEXT_WORKING_DAY = TemporalAdjusters.ofDateAdjuster(date -> { + DayOfWeek dayOfWeek = date.getDayOfWeek(); int daysToAdd; if (dayOfWeek == DayOfWeek.FRIDAY) daysToAdd = 3; @@ -58,6 +51,6 @@ public class CustomTemporalAdjusterTest { daysToAdd = 2; else daysToAdd = 1; - return today.plusDays(daysToAdd); + return date.plusDays(daysToAdd); }); } diff --git a/core-java/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersTest.java b/core-java/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersTest.java index f21da5cf75..d06da5a782 100644 --- a/core-java/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersTest.java +++ b/core-java/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersTest.java @@ -1,29 +1,22 @@ package com.baeldung.temporaladjusters; -import java.text.SimpleDateFormat; import java.time.DayOfWeek; import java.time.LocalDate; import java.time.temporal.TemporalAdjusters; -import java.util.Calendar; import org.junit.Assert; import org.junit.Test; -import com.baeldung.temporaladjuster.TemporalAdjusterUtil; - public class TemporalAdjustersTest { @Test public void whenAdjust_thenNextSunday() { - LocalDate localDate = LocalDate.now(); + LocalDate localDate = LocalDate.of(2017, 07, 8); LocalDate nextSunday = localDate.with(TemporalAdjusters.next(DayOfWeek.SUNDAY)); - Calendar calendar = TemporalAdjusterUtil.nextDayOfWeek(Calendar.SUNDAY); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - format.setCalendar(calendar); - String formattedDate = format.format(calendar.getTime()); + String expected = "2017-07-09"; - Assert.assertEquals(formattedDate, nextSunday.toString()); + Assert.assertEquals(expected, nextSunday.toString()); } }