Merge pull request #20 from digital-delivery-academy/add-future-or-past-dates-avoiding-weekends-#16

Adding new data generator for future dates avoiding weekends

Author: stevewalton28

src/main/java/uk/co/evoco/webdriver/utils/data/Dates.java

@@ -45,4 +45,23 @@ public static String now() {
         LocalDate date = DateTime.now().toLocalDate();
         return date.toString(dateTimeFormatter);
     }
+
+    /**
+     *
+     * @param startDate the date to start with
+     * @param numberOfBusinessDaysToAdd Days to add, avoiding weekends
+     * @return String representing resulting date
+     */
+    public static String futureDateBusinessDays(String startDate, int numberOfBusinessDaysToAdd) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(DATE_FORMAT);
+        LocalDate futureDate = DateTime.parse(startDate, dateTimeFormatter).toLocalDate();
+        int addedDays = 0;
+        while (addedDays < numberOfBusinessDaysToAdd) {
+            futureDate = futureDate.plusDays(1);
+            if (!((futureDate.getDayOfWeek() == 6) || (futureDate.getDayOfWeek() == 7))) {
+                ++addedDays;
+            }
+        }
+        return futureDate.toString(dateTimeFormatter);
+    }
 }

src/test/java/uk/co/evoco/webdriver/utils/data/DatesTests.java

@@ -4,8 +4,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static uk.co.evoco.webdriver.utils.data.Dates.futureDate;
-import static uk.co.evoco.webdriver.utils.data.Dates.pastDate;
+import static uk.co.evoco.webdriver.utils.data.Dates.*;
 
 public class DatesTests {
 
@@ -18,4 +17,9 @@ public void testCanGetDateInFuture() {
     public void testCanGetDateInPast() {
         assertThat(pastDate("06/06/2019", 5), is("01/06/2019"));
     }
+
+    @Test
+    public void testCanDataInFutureAvoidingWeekend() {
+        assertThat(futureDateBusinessDays("06/06/2019", 5), is("13/06/2019"));
+    }
 }