From a605e168fc7e89eb94e34a31548f231642cb4be0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 23 Jun 2017 08:43:12 +0200 Subject: [PATCH] DATACMNS-1091 - Polishing. Extract patterns to constants. Add ticket id's to tests. Formatting, method names. Original pull request: #228. --- .../convert/Jsr310ConvertersUnitTests.java | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java b/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java index 13f49844e..d15768d54 100644 --- a/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java @@ -52,10 +52,11 @@ import org.springframework.data.convert.Jsr310ConvertersUnitTests.PeriodConversi /** * Unit tests for {@link Jsr310Converters}. - * + * * @author Oliver Gierke * @author Barak Schoster * @author Jens Schauder + * @author Mark Paluch */ @RunWith(Suite.class) @SuiteClasses({ CommonTests.class, DurationConversionTests.class, PeriodConversionTests.class }) @@ -77,44 +78,44 @@ public class Jsr310ConvertersUnitTests { public static class CommonTests { - @Test // DATACMNS-606 - public void convertsDateToLocalDateTime() { + static final String FORMAT_DATE = "yyyy-MM-dd"; + static final String FORMAT_TIME = "HH:mm:ss.SSS"; + static final String FORMAT_FULL = String.format("%s'T'%s", FORMAT_DATE, FORMAT_TIME); - assertThat(CONVERSION_SERVICE.convert(NOW, LocalDateTime.class)) // - .matches(date(NOW, "yyyy-MM-dd'T'HH:mm:ss.SSS")); + @Test // DATACMNS-606, DATACMNS-1091 + public void convertsDateToLocalDateTime() { + assertThat(CONVERSION_SERVICE.convert(NOW, LocalDateTime.class)).matches(formatted(NOW, FORMAT_FULL)); } - @Test // DATACMNS-606 + @Test // DATACMNS-606, DATACMNS-1091 public void convertsLocalDateTimeToDate() { LocalDateTime now = LocalDateTime.now(); - assertThat(CONVERSION_SERVICE.convert(now, Date.class)) // - .matches(temporal(now, "yyyy-MM-dd'T'HH:mm:ss.SSS")); + assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_FULL)); } - @Test // DATACMNS-606 + @Test // DATACMNS-606, DATACMNS-1091 public void convertsDateToLocalDate() { - assertThat(CONVERSION_SERVICE.convert(NOW, LocalDate.class)).matches(date(NOW, "yyyy-MM-dd")); + assertThat(CONVERSION_SERVICE.convert(NOW, LocalDate.class)).matches(formatted(NOW, FORMAT_DATE)); } - @Test // DATACMNS-606 + @Test // DATACMNS-606, DATACMNS-1091 public void convertsLocalDateToDate() { LocalDate now = LocalDate.now(); - assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(temporal(now, "yyyy-MM-dd")); + assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_DATE)); } - @Test // DATACMNS-606 + @Test // DATACMNS-606, DATACMNS-1091 public void convertsDateToLocalTime() { - - assertThat(CONVERSION_SERVICE.convert(NOW, LocalTime.class)).matches(date(NOW, "HH:mm:ss.SSS")); + assertThat(CONVERSION_SERVICE.convert(NOW, LocalTime.class)).matches(formatted(NOW, FORMAT_TIME)); } - @Test // DATACMNS-606 + @Test // DATACMNS-606, DATACMNS-1091 public void convertsLocalTimeToDate() { LocalTime now = LocalTime.now(); - assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(temporal(now, "HH:mm:ss.SSS")); + assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_TIME)); } @Test // DATACMNS-623 @@ -144,21 +145,21 @@ public class Jsr310ConvertersUnitTests { } } - private static String format(Date date, String format) { - return new SimpleDateFormat(format).format(date); - } - - private static Predicate temporal(Temporal expected, String format) { + private static Predicate formatted(Temporal expected, String format) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); return d -> format(d, format).equals(formatter.format(expected)); } - private static Predicate date(Date expected, String format) { + private static Predicate formatted(Date expected, String format) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); return d -> formatter.format(d).equals(format(expected, format)); } + + private static String format(Date date, String format) { + return new SimpleDateFormat(format).format(date); + } } @RunWith(Parameterized.class)