Merge 8b76f98 into e32866c

eXparity · Sep 22, 2019 · 2e6981c · 2e6981c
2 parents e32866c + 8b76f98
commit 2e6981c
Show file tree

Hide file tree

Showing 23 changed files with 147 additions and 3 deletions.
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsAfter.java b/src/main/java/org/exparity/hamcrest/date/core/IsAfter.java
@@ -57,4 +57,10 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsAfter<>(converter, expected, functions, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsAfter<>(converter, expected, functions, zone, locale);
+    }
+
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsBefore.java b/src/main/java/org/exparity/hamcrest/date/core/IsBefore.java
@@ -57,4 +57,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsBefore<>(converter, expected, functions, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsBefore<>(converter, expected, functions, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsDayOfMonth.java b/src/main/java/org/exparity/hamcrest/date/core/IsDayOfMonth.java
@@ -53,4 +53,9 @@ public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsDayOfMonth<>(converter, expected, zone, locale);
 	}
 
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsDayOfMonth<>(converter, expected, zone, locale);
+    }
+
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsDayOfWeek.java b/src/main/java/org/exparity/hamcrest/date/core/IsDayOfWeek.java
@@ -66,6 +66,11 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsDayOfWeek<>(converter, expected, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsDayOfWeek<>(converter, expected, zone, locale);
+    }
 
 	private String describe(DayOfWeek actualValue) {
 		return actualValue.getDisplayName(TextStyle.FULL, locale);

diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsFirstDayOfMonth.java b/src/main/java/org/exparity/hamcrest/date/core/IsFirstDayOfMonth.java
@@ -51,4 +51,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsFirstDayOfMonth<>(converter, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsFirstDayOfMonth<>(converter, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsHour.java b/src/main/java/org/exparity/hamcrest/date/core/IsHour.java
@@ -52,4 +52,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsHour<>(converter, expected, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsHour<>(converter, expected, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsLastDayOfMonth.java b/src/main/java/org/exparity/hamcrest/date/core/IsLastDayOfMonth.java
@@ -51,4 +51,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsLastDayOfMonth<>(converter, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsLastDayOfMonth<>(converter, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsLeapYear.java b/src/main/java/org/exparity/hamcrest/date/core/IsLeapYear.java
@@ -48,4 +48,8 @@ public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsLeapYear<>(converter, zone, locale);
 	}
 
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsLeapYear<>(converter, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsMaximum.java b/src/main/java/org/exparity/hamcrest/date/core/IsMaximum.java
@@ -64,4 +64,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsMaximum<>(converter, field, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsMaximum<>(converter, field, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsMillisecond.java b/src/main/java/org/exparity/hamcrest/date/core/IsMillisecond.java
@@ -53,4 +53,8 @@ public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsMillisecond<>(converter, expected, zone, locale);
 	}
 
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsMillisecond<>(converter, expected, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsMinimum.java b/src/main/java/org/exparity/hamcrest/date/core/IsMinimum.java
@@ -61,4 +61,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsMinimum<>(converter, field, zone, locale);
 	}
+
+	@Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsMinimum<>(converter, field, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsMinute.java b/src/main/java/org/exparity/hamcrest/date/core/IsMinute.java
@@ -52,4 +52,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsMinute<>(converter, expected, zone, locale);
 	}
+
+	@Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsMinute<>(converter, expected, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsMonth.java b/src/main/java/org/exparity/hamcrest/date/core/IsMonth.java
@@ -54,6 +54,11 @@ public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsMonth<>(converter, expected, zone, locale);
 	}
 
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsMonth<>(converter, expected, zone, locale);
+    }
+
 	private String describe(Month actualValue) {
 		return actualValue.getDisplayName(TextStyle.FULL, locale);
 	}

diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsSame.java b/src/main/java/org/exparity/hamcrest/date/core/IsSame.java
@@ -55,4 +55,8 @@ public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsSame<>(converter, expected, functions, zone, locale);
 	}
 
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsSame<>(converter, expected, functions, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsSameDay.java b/src/main/java/org/exparity/hamcrest/date/core/IsSameDay.java
@@ -54,6 +54,11 @@ public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsSameDay<>(converter, expected, zone, locale);
 	}
 
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsSameDay<>(converter, expected, zone, locale);
+    }
+
 	private String describe(LocalDate actualValue) {
 		return TemporalFunctions.LOCALDATE.describe(actualValue, locale);
 	}

diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsSameOrAfter.java b/src/main/java/org/exparity/hamcrest/date/core/IsSameOrAfter.java
@@ -55,4 +55,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsSameOrAfter<>(converter, expected, functions, zone, locale);
 	}
+
+	@Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsSameOrAfter<>(converter, expected, functions, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsSameOrBefore.java b/src/main/java/org/exparity/hamcrest/date/core/IsSameOrBefore.java
@@ -55,4 +55,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsSameOrBefore<>(converter, expected, functions, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsSameOrBefore<>(converter, expected, functions, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsSecond.java b/src/main/java/org/exparity/hamcrest/date/core/IsSecond.java
@@ -52,4 +52,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsSecond<>(converter, expected, zone, locale);
 	}
+
+	@Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsSecond<>(converter, expected, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsWithin.java b/src/main/java/org/exparity/hamcrest/date/core/IsWithin.java
@@ -70,4 +70,8 @@ public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsWithin<>(expectedInterval, converter, reference, functions, zone, locale);
 	}
 
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsWithin<>(expectedInterval, converter, reference, functions, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/IsYear.java b/src/main/java/org/exparity/hamcrest/date/core/IsYear.java
@@ -53,4 +53,9 @@ public void describeTo(final Description description) {
 	public TemporalMatcher<T> atZone(ZoneId zone) {
 		return new IsYear<>(converter, expected, zone, locale);
 	}
+
+    @Override
+    public TemporalMatcher<T> atLocale(Locale locale) {
+        return new IsYear<>(converter, expected, zone, locale);
+    }
 }
diff --git a/src/main/java/org/exparity/hamcrest/date/core/TemporalMatcher.java b/src/main/java/org/exparity/hamcrest/date/core/TemporalMatcher.java
@@ -2,6 +2,7 @@
 
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.util.Locale;
 
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 
@@ -17,11 +18,19 @@ public abstract class TemporalMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
     /**
      * Creates a copy of this matcher using a specific time zone.
      *
-     * @param zone the new time zone
+     * @param zone a {@link ZoneId}
      * @return a copy of this matcher based on the new time zone
      */
     public abstract TemporalMatcher<T> atZone(ZoneId zone);
 
+    /**
+     * Creates a copy of this matcher using a specific locale.
+     *
+     * @param locale a {@link Locale}
+     * @return a copy of this matcher using the new locale
+     */
+    public abstract TemporalMatcher<T> atLocale(Locale locale);
+
     /**
      * Creates a copy of this matcher using a specific time offset.
      *

diff --git a/src/test/java/org/exparity/hamcrest/date/core/IsDayOfWeekTest.java b/src/test/java/org/exparity/hamcrest/date/core/IsDayOfWeekTest.java
@@ -6,6 +6,8 @@
 import static org.exparity.hamcrest.date.testutils.Dates.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.util.Locale;
+
 import org.exparity.hamcrest.date.DateMatchers;
 import org.exparity.hamcrest.date.LocalDateMatchers;
 import org.exparity.hamcrest.date.LocalDateTimeMatchers;
@@ -467,6 +469,11 @@ public void isLocalDateNotMonday() {
         assertThat(AUG_04_2015, LocalDateMatchers.isMonday());
     }
 
+    @Test(expectedExceptions = AssertionError.class, expectedExceptionsMessageRegExp = "\\sExpected: the date is on a lundi+?\\s     but: the date is on a mardi+")
+    public void isLocalDateNotMondayInDifferentLocale() {
+        assertThat(AUG_04_2015, LocalDateMatchers.isMonday().atLocale(Locale.FRENCH));
+    }
+
     @Test
     public void isLocalDateTuesday() {
         assertThat(AUG_04_2015, LocalDateMatchers.isTuesday());
@@ -477,6 +484,11 @@ public void isLocalDateNotTuesday() {
         assertThat(AUG_05_2015, LocalDateMatchers.isTuesday());
     }
 
+    @Test(expectedExceptions = AssertionError.class, expectedExceptionsMessageRegExp = "\\sExpected: the date is on a mardi+?\\s     but: the date is on a mercredi+")
+    public void isLocalDateNotTuesdayInDifferentLocale() {
+        assertThat(AUG_05_2015, LocalDateMatchers.isTuesday().atLocale(Locale.FRENCH));
+    }
+
     @Test
     public void isLocalDateWednesday() {
         assertThat(AUG_05_2015, LocalDateMatchers.isWednesday());
@@ -487,6 +499,11 @@ public void isLocalDateNotWednesday() {
         assertThat(AUG_06_2015, LocalDateMatchers.isWednesday());
     }
 
+    @Test//(expectedExceptions = AssertionError.class, expectedExceptionsMessageRegExp = ASSERTION_PATTERN)
+    public void isLocalDateNotWednesdayInDifferentLocale() {
+        assertThat(AUG_05_2015, LocalDateMatchers.isWednesday().atLocale(Locale.FRENCH));
+    }
+
     @Test
     public void isLocalDateThursday() {
         assertThat(AUG_06_2015, LocalDateMatchers.isThursday());
@@ -497,6 +514,11 @@ public void isLocalDateNotThursday() {
         assertThat(AUG_07_2015, LocalDateMatchers.isThursday());
     }
 
+    @Test(expectedExceptions = AssertionError.class, expectedExceptionsMessageRegExp = "\\sExpected: the date is on a jeudi+?\\s     but: the date is on a mercredi+")
+    public void isLocalDateNotThursdayInDifferentLocale() {
+        assertThat(AUG_05_2015, LocalDateMatchers.isThursday().atLocale(Locale.FRENCH));
+    }
+
     @Test
     public void isLocalDateFriday() {
         assertThat(AUG_07_2015, LocalDateMatchers.isFriday());
@@ -507,6 +529,11 @@ public void isLocalDateNotFriday() {
         assertThat(AUG_08_2015, LocalDateMatchers.isFriday());
     }
 
+    @Test(expectedExceptions = AssertionError.class, expectedExceptionsMessageRegExp = "\\sExpected: the date is on a vendredi+?\\s     but: the date is on a mercredi+")
+    public void isLocalDateNotFridayInDifferentLocale() {
+        assertThat(AUG_05_2015, LocalDateMatchers.isFriday().atLocale(Locale.FRENCH));
+    }
+
     @Test
     public void isLocalDateSaturday() {
         assertThat(AUG_08_2015, LocalDateMatchers.isSaturday());
@@ -517,6 +544,11 @@ public void isLocalDateNotSaturday() {
         assertThat(AUG_09_2015, LocalDateMatchers.isSaturday());
     }
 
+    @Test(expectedExceptions = AssertionError.class, expectedExceptionsMessageRegExp = "\\sExpected: the date is on a samedi+?\\s     but: the date is on a mercredi+")
+    public void isLocalDateNotSaturdayInDifferentLocale() {
+        assertThat(AUG_05_2015, LocalDateMatchers.isSaturday().atLocale(Locale.FRENCH));
+    }
+
     @Test
     public void isLocalDateSunday() {
         assertThat(AUG_09_2015, LocalDateMatchers.isSunday());
@@ -527,6 +559,11 @@ public void isLocalDateNotSunday() {
         assertThat(AUG_03_2015, LocalDateMatchers.isSunday());
     }
 
+    @Test(expectedExceptions = AssertionError.class, expectedExceptionsMessageRegExp = "\\sExpected: the date is on a dimanche+?\\s     but: the date is on a mercredi+")
+    public void isLocalDateNotSundayInDifferentLocale() {
+        assertThat(AUG_05_2015, LocalDateMatchers.isSunday().atLocale(Locale.FRENCH));
+    }
+
     @Test
     public void isLocalDateWeekday() {
         assertThat(AUG_03_2015, LocalDateMatchers.isWeekday());

diff --git a/src/test/java/org/exparity/hamcrest/date/core/IsSameDayTest.java b/src/test/java/org/exparity/hamcrest/date/core/IsSameDayTest.java
@@ -5,6 +5,8 @@
 import static org.exparity.hamcrest.date.testutils.ZoneIds.UTC;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.util.Locale;
+
 import org.exparity.hamcrest.date.DateMatchers;
 import org.exparity.hamcrest.date.DayMonthYear;
 import org.exparity.hamcrest.date.LocalDateMatchers;
@@ -71,7 +73,7 @@ public void isDateSameDayEarlierLocalDate() {
 	public void isDateSameDayLaterLocalDate() {
 		assertThat(JUN_15_2012_11AM_UTC_AS_DATE, DateMatchers.sameDay(JUN_16_2012).atZone(UTC));
 	}
-
+	
 	@Test
 	public void isDateSameDaySameLocalDate() {
 		assertThat(JUN_15_2012_11PM_UTC_AS_DATE, DateMatchers.sameDay(JUN_15_2012).atZone(UTC));
@@ -284,5 +286,4 @@ public void isOffsetDateTimeSameDayLaterDay() {
     public void isOffsetDateTimeSameDayLaterSameDay() {
         assertThat(AUG_04_2015_NOON_OFFSET_UTC, OffsetDateTimeMatchers.isDay(2015, AUGUST, 4, UTC).atZone(UTC));
     }
-
 }