iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[JAVA-6221] Test clean up

This commit is contained in:
Haroon Khan 2021-08-17 12:12:55 +01:00
parent f9dc97d25e
commit 6f11290160
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core-java-modules/core-java-date-operations-1/src/test/java/com/baeldung/java9/time/TimeApiUnitTest.java
View File

@ -1,12 +1,13 @@
package com.baeldung.java9.time; package com.baeldung.java9.time;
import org.junit.Test;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import static org.junit.Assert.assertEquals; import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
public class TimeApiUnitTest { public class TimeApiUnitTest {
@ -18,19 +19,18 @@ public class TimeApiUnitTest {
Date endDate = endCalendar.getTime(); Date endDate = endCalendar.getTime();
List<Date> dates = TimeApi.getDatesBetweenUsingJava7(startDate, endDate); List<Date> dates = TimeApi.getDatesBetweenUsingJava7(startDate, endDate);
assertEquals(2, dates.size());
assertThat(dates).hasSize(2);
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
Date date1 = calendar.getTime(); Date expectedDate1 = calendar.getTime();
assertEquals(date1.getDay(), dates.get(0).getDay()); assertThat(dates.get(0)).isInSameDayAs(expectedDate1);
assertEquals(date1.getMonth(), dates.get(0).getMonth()); assertThatTimeFieldsAreZero(dates.get(0));
assertEquals(date1.getYear(), dates.get(0).getYear());
calendar.add(Calendar.DATE, 1); calendar.add(Calendar.DATE, 1);
Date date2 = calendar.getTime(); Date expectedDate2 = calendar.getTime();
assertEquals(date2.getDay(), dates.get(1).getDay()); assertThat(dates.get(1)).isInSameDayAs(expectedDate2);
assertEquals(date2.getMonth(), dates.get(1).getMonth()); assertThatTimeFieldsAreZero(dates.get(1));
assertEquals(date2.getYear(), dates.get(1).getYear());
} }
@Test @Test
@ -39,9 +39,8 @@ public class TimeApiUnitTest {
LocalDate endDate = LocalDate.now().plusDays(2); LocalDate endDate = LocalDate.now().plusDays(2);
List<LocalDate> dates = TimeApi.getDatesBetweenUsingJava8(startDate, endDate); List<LocalDate> dates = TimeApi.getDatesBetweenUsingJava8(startDate, endDate);
assertEquals(dates.size(), 2);
assertEquals(dates.get(0), LocalDate.now()); assertThat(dates).containsExactly(LocalDate.now(), LocalDate.now().plusDays(1));
assertEquals(dates.get(1), LocalDate.now().plusDays(1));
} }
@Test @Test
@ -50,9 +49,15 @@ public class TimeApiUnitTest {
LocalDate endDate = LocalDate.now().plusDays(2); LocalDate endDate = LocalDate.now().plusDays(2);
List<LocalDate> dates = TimeApi.getDatesBetweenUsingJava9(startDate, endDate); List<LocalDate> dates = TimeApi.getDatesBetweenUsingJava9(startDate, endDate);
assertEquals(dates.size(), 2);
assertEquals(dates.get(0), LocalDate.now()); assertThat(dates).containsExactly(LocalDate.now(), LocalDate.now().plusDays(1));
assertEquals(dates.get(1), LocalDate.now().plusDays(1)); }
private static void assertThatTimeFieldsAreZero(Date date) {
assertThat(date).hasHourOfDay(0);
assertThat(date).hasMinute(0);
assertThat(date).hasSecond(0);
assertThat(date).hasMillisecond(0);
} }
} }