Small tidy up of the dates api - nice method names

Author: travis-ci

src/main/java/uk/co/evoco/testdata/Dates.java

@@ -58,7 +58,7 @@ public static String now(String dateFormat) {
      * @param dateFormat date format (e.g. "dd/MM/yyyy")
      * @return String representing resulting date
      */
-    public static String futureDateBusinessDays(String startDate, int numberOfBusinessDaysToAdd, String dateFormat) {
+    public static String futureDateAvoidingWeekends(String startDate, int numberOfBusinessDaysToAdd, String dateFormat) {
         DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
         LocalDate futureDate = DateTime.parse(startDate, dateTimeFormatter).toLocalDate();
         int addedDays = 0;
@@ -80,15 +80,15 @@ public static String futureDateBusinessDays(String startDate, int numberOfBusine
      * @return String representing resulting date
      * @throws JsonProcessingException if the JSON source for bank holidays cannot be read
      */
-    public static String futureDateBusinessDaysAvoidingBankHolidays(
+    public static String futureDataAvoidingWeekendsAndBankHolidays(
             Locale locale, String startDate,
             int numberOfBusinessDaysToAdd, String dateFormat) throws JsonProcessingException {
         BankHolidays bankHolidays = JsonUtils.fromString(
                 get("https://www.gov.uk/bank-holidays.json").body().asString(), BankHolidays.class);
         DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
         LocalDate now = DateTime.parse(startDate, dateTimeFormatter).toLocalDate();
         LocalDate futureDate = DateTime.parse(
-                futureDateBusinessDays(
+                futureDateAvoidingWeekends(
                         startDate,
                         numberOfBusinessDaysToAdd,
                         dateFormat), dateTimeFormatter).toLocalDate();

src/test/java/uk/co/evoco/testdata/DatesTests.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.junit.jupiter.api.Test;
-import uk.co.evoco.testdata.Locale;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -24,21 +23,21 @@ public void testCanGetDateInPast() {
     @Test
     public void testCanDataInFutureAvoidingWeekend() {
         assertThat(
-                futureDateBusinessDays("06/06/2019", 5, "dd/MM/yyyy"),
+                futureDateAvoidingWeekends("06/06/2019", 5, "dd/MM/yyyy"),
                 is("13/06/2019"));
     }
 
     @Test
     public void testCanGetDateInFutureAvoidingWeekendsAndBankHolidays() throws JsonProcessingException {
-        assertThat(futureDateBusinessDaysAvoidingBankHolidays(
+        assertThat(futureDataAvoidingWeekendsAndBankHolidays(
                 Locale.ENGLAND_AND_WALES, "28/08/2017", 2, "dd/MM/yyyy"),
                 is("31/08/2017"));
     }
 
     @Test
     public void testCanGetDateInFutureAvoidingWeekendsAndBankHolidaysWhenStartDateIsOnFriday()
             throws JsonProcessingException {
-        assertThat(futureDateBusinessDaysAvoidingBankHolidays(
+        assertThat(futureDataAvoidingWeekendsAndBankHolidays(
                 Locale.ENGLAND_AND_WALES, "25/08/2017", 2, "dd/MM/yyyy"),
                 is("30/08/2017"));
     }