Adding some dates utils

Author: stevewalton28

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

@@ -2,6 +2,7 @@
 
 import net.andreinc.mockneat.abstraction.MockUnitBase;
 import org.joda.time.DateTime;
+import org.joda.time.Duration;
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -52,6 +53,21 @@ public static String now(String dateFormat) {
         return dateTime.toString(dateTimeFormatter);
     }
 
+    /**
+     * Returns boolean result on if the two given dates are within the given tolerance
+     * @param dateFormat
+     * @param baseDate
+     * @param comparisonDate
+     * @param toleranceInMinutes
+     * @return
+     */
+    public static boolean isDateWithinTolerance(String dateFormat, String baseDate, String comparisonDate, long toleranceInMinutes) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
+        long differenceInMillis = DateTime.parse(comparisonDate, dateTimeFormatter).getMillis() - DateTime.parse(baseDate, dateTimeFormatter).getMillis();
+        long differenceInMinutes = (differenceInMillis/1000)/60;
+        return differenceInMinutes <= toleranceInMinutes;
+    }
+
     /**
      *
      * @param startDate the date to start with

src/main/java/uk/co/evoco/webdriver/utils/FindByUtils.java

@@ -32,13 +32,14 @@ private FindByUtils() {
      * Finds the first element that is displayed with given locator.
      * Useful for instances where there are multiple elements on the DOM with the same locator and one (or more)
      * of them are hidden (e.g. used in mobile layouts or hold a different z-index given some other element is present)
+     *
      * @param webDriver active WebDriver instance
-     * @param locator selector for target WebElement
+     * @param locator   selector for target WebElement
      * @return active WebElement, already located
      */
     public static WebElement multipleLocatorMatchGetDisplayed(WebDriver webDriver, By locator)
             throws WebDriverException {
-        try(final Timer.Context ignored = multipleLocatorMatchGetDisplayedAction.time()) {
+        try (final Timer.Context ignored = multipleLocatorMatchGetDisplayedAction.time()) {
             List<WebElement> elements = webDriver.findElements(locator);
             logger.info("Found {} elements with locator: {}", elements.size(), locator.toString());
             for (WebElement element : elements) {
@@ -52,14 +53,14 @@ public static WebElement multipleLocatorMatchGetDisplayed(WebDriver webDriver, B
 
     /**
      * Finds elements by either the HTML name or id attribute using the given selector text
+     *
      * @param webDriver active WebDriver instance
-     * @param idOrName the variable locator
+     * @param idOrName  the variable locator
      * @return active WebElement, already located
      */
     public static WebElement byIdOrName(WebDriver webDriver, String idOrName) {
-        try(final Timer.Context ignored = byIdOrNameAction.time()) {
+        try (final Timer.Context ignored = byIdOrNameAction.time()) {
             return webDriver.findElement(new ByIdOrName(idOrName));
         }
     }
-}
-
+}

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

@@ -6,10 +6,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static uk.co.evoco.testdata.Dates.futureDateAvoidingWeekends;
-import static uk.co.evoco.testdata.Dates.futureDate;
-import static uk.co.evoco.testdata.Dates.pastDate;
-import static uk.co.evoco.testdata.Dates.futureDataAvoidingWeekendsAndBankHolidays;
+import static uk.co.evoco.testdata.Dates.*;
 
 public class DatesTests {
 
@@ -64,4 +61,28 @@ public void testCanDataTimeInFutureAvoidingWeekend() {
                 is("13/06/2019 13:54"));
     }
 
+    @Test
+    public void testCanCheckDateWithinGivenToleranceOnUpperBoundary() {
+        assertThat(isDateWithinTolerance("dd/MM/yyyy HH:mm","27/06/2021 19:55", "27/06/2021 20:00", 5), is(true));
+    }
+
+    @Test
+    public void testCanCheckDateWithinGivenToleranceOverUpperBoundary() {
+        assertThat(isDateWithinTolerance("dd/MM/yyyy HH:mm","27/06/2021 19:55", "27/06/2021 20:01", 5), is(false));
+    }
+
+    @Test
+    public void testCanCheckDateWithinGivenToleranceWithinUpperBoundary() {
+        assertThat(isDateWithinTolerance("dd/MM/yyyy HH:mm","27/06/2021 19:55", "27/06/2021 19:59", 5), is(true));
+    }
+
+    @Test
+    public void testCanCheckDateWithinGivenToleranceOneDayOverOnUpper() {
+        assertThat(isDateWithinTolerance("dd/MM/yyyy HH:mm","27/06/2021 19:55", "28/06/2021 19:59", 5), is(false));
+    }
+
+    @Test
+    public void testCanCheckDateWithinGivenToleranceOneDayUnderOnLower() {
+        assertThat(isDateWithinTolerance("dd/MM/yyyy HH:mm","26/06/2021 19:55", "27/06/2021 19:59", 5), is(false));
+    }
 }