From db8d117d3839701b2b65f8b5fdf6db5f2fe37f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Sat, 5 Sep 2020 21:26:38 -0500 Subject: [PATCH] Upgrade to Assertj 3.17.2 See gh-23179 --- .../spring-boot-dependencies/build.gradle | 2 +- .../properties/bind/ArrayBinderTests.java | 2 +- .../convert/NumberToPeriodConverterTests.java | 18 ++++---- .../boot/convert/PeriodStyleTests.java | 42 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 0edf6a60dbc..fa983902cb9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -102,7 +102,7 @@ bom { ] } } - library("AssertJ", "3.16.1") { + library("AssertJ", "3.17.2") { group("org.assertj") { modules = [ "assertj-core" diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java index 5882c4a9494..37b3a8d7930 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java @@ -99,7 +99,7 @@ class ArrayBinderTests { ResolvableType type = ResolvableType.forArrayComponent(INTEGER_ARRAY.getType()); Bindable target = Bindable.of(type); Integer[][] result = this.binder.bind("foo", target).get(); - assertThat(result).hasSize(2); + assertThat(result).hasDimensions(2, 2); assertThat(result[0]).containsExactly(1, 2); assertThat(result[1]).containsExactly(3, 4); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/NumberToPeriodConverterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/NumberToPeriodConverterTests.java index 460502406c0..169191f0290 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/NumberToPeriodConverterTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/NumberToPeriodConverterTests.java @@ -41,21 +41,21 @@ class NumberToPeriodConverterTests { @ConversionServiceTest void convertWhenSimpleWithoutSuffixShouldReturnPeriod(ConversionService conversionService) { - assertThat(convert(conversionService, 10)).isEqualTo(Period.ofDays(10)); - assertThat(convert(conversionService, +10)).isEqualTo(Period.ofDays(10)); - assertThat(convert(conversionService, -10)).isEqualTo(Period.ofDays(-10)); + assertThat(convert(conversionService, 10)).hasDays(10); + assertThat(convert(conversionService, +10)).hasDays(10); + assertThat(convert(conversionService, -10)).hasDays(-10); } @ConversionServiceTest void convertWhenSimpleWithoutSuffixButWithAnnotationShouldReturnPeriod(ConversionService conversionService) { - assertThat(convert(conversionService, 10, ChronoUnit.DAYS)).isEqualTo(Period.ofDays(10)); - assertThat(convert(conversionService, -10, ChronoUnit.DAYS)).isEqualTo(Period.ofDays(-10)); + assertThat(convert(conversionService, 10, ChronoUnit.DAYS)).hasDays(10); + assertThat(convert(conversionService, -10, ChronoUnit.DAYS)).hasDays(-10); assertThat(convert(conversionService, 10, ChronoUnit.WEEKS)).isEqualTo(Period.ofWeeks(10)); assertThat(convert(conversionService, -10, ChronoUnit.WEEKS)).isEqualTo(Period.ofWeeks(-10)); - assertThat(convert(conversionService, 10, ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(10)); - assertThat(convert(conversionService, -10, ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(-10)); - assertThat(convert(conversionService, 10, ChronoUnit.YEARS)).isEqualTo(Period.ofYears(10)); - assertThat(convert(conversionService, -10, ChronoUnit.YEARS)).isEqualTo(Period.ofYears(-10)); + assertThat(convert(conversionService, 10, ChronoUnit.MONTHS)).hasMonths(10); + assertThat(convert(conversionService, -10, ChronoUnit.MONTHS)).hasMonths(-10); + assertThat(convert(conversionService, 10, ChronoUnit.YEARS)).hasYears(10); + assertThat(convert(conversionService, -10, ChronoUnit.YEARS)).hasYears(-10); } private Period convert(ConversionService conversionService, Integer source) { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/PeriodStyleTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/PeriodStyleTests.java index 7dfc4012404..5a1bb0fe6e5 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/PeriodStyleTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/PeriodStyleTests.java @@ -50,10 +50,10 @@ class PeriodStyleTests { @Test void detectAndParseWhenSimpleDaysShouldReturnPeriod() { - assertThat(PeriodStyle.detectAndParse("10d")).isEqualTo(Period.ofDays(10)); - assertThat(PeriodStyle.detectAndParse("10D")).isEqualTo(Period.ofDays(10)); - assertThat(PeriodStyle.detectAndParse("+10d")).isEqualTo(Period.ofDays(10)); - assertThat(PeriodStyle.detectAndParse("-10D")).isEqualTo(Period.ofDays(-10)); + assertThat(PeriodStyle.detectAndParse("10d")).hasDays(10); + assertThat(PeriodStyle.detectAndParse("10D")).hasDays(10); + assertThat(PeriodStyle.detectAndParse("+10d")).hasDays(10); + assertThat(PeriodStyle.detectAndParse("-10D")).hasDays(-10); } @Test @@ -66,32 +66,32 @@ class PeriodStyleTests { @Test void detectAndParseWhenSimpleMonthsShouldReturnPeriod() { - assertThat(PeriodStyle.detectAndParse("10m")).isEqualTo(Period.ofMonths(10)); - assertThat(PeriodStyle.detectAndParse("10M")).isEqualTo(Period.ofMonths(10)); - assertThat(PeriodStyle.detectAndParse("+10m")).isEqualTo(Period.ofMonths(10)); - assertThat(PeriodStyle.detectAndParse("-10M")).isEqualTo(Period.ofMonths(-10)); + assertThat(PeriodStyle.detectAndParse("10m")).hasMonths(10); + assertThat(PeriodStyle.detectAndParse("10M")).hasMonths(10); + assertThat(PeriodStyle.detectAndParse("+10m")).hasMonths(10); + assertThat(PeriodStyle.detectAndParse("-10M")).hasMonths(-10); } @Test void detectAndParseWhenSimpleYearsShouldReturnPeriod() { - assertThat(PeriodStyle.detectAndParse("10y")).isEqualTo(Period.ofYears(10)); - assertThat(PeriodStyle.detectAndParse("10Y")).isEqualTo(Period.ofYears(10)); - assertThat(PeriodStyle.detectAndParse("+10y")).isEqualTo(Period.ofYears(10)); - assertThat(PeriodStyle.detectAndParse("-10Y")).isEqualTo(Period.ofYears(-10)); + assertThat(PeriodStyle.detectAndParse("10y")).hasYears(10); + assertThat(PeriodStyle.detectAndParse("10Y")).hasYears(10); + assertThat(PeriodStyle.detectAndParse("+10y")).hasYears(10); + assertThat(PeriodStyle.detectAndParse("-10Y")).hasYears(-10); } @Test void detectAndParseWhenSimpleWithoutSuffixShouldReturnPeriod() { - assertThat(PeriodStyle.detectAndParse("10")).isEqualTo(Period.ofDays(10)); - assertThat(PeriodStyle.detectAndParse("+10")).isEqualTo(Period.ofDays(10)); - assertThat(PeriodStyle.detectAndParse("-10")).isEqualTo(Period.ofDays(-10)); + assertThat(PeriodStyle.detectAndParse("10")).hasDays(10); + assertThat(PeriodStyle.detectAndParse("+10")).hasDays(10); + assertThat(PeriodStyle.detectAndParse("-10")).hasDays(-10); } @Test void detectAndParseWhenSimpleWithoutSuffixButWithChronoUnitShouldReturnPeriod() { - assertThat(PeriodStyle.detectAndParse("10", ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(10)); - assertThat(PeriodStyle.detectAndParse("+10", ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(10)); - assertThat(PeriodStyle.detectAndParse("-10", ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(-10)); + assertThat(PeriodStyle.detectAndParse("10", ChronoUnit.MONTHS)).hasMonths(10); + assertThat(PeriodStyle.detectAndParse("+10", ChronoUnit.MONTHS)).hasMonths(10); + assertThat(PeriodStyle.detectAndParse("-10", ChronoUnit.MONTHS)).hasMonths(-10); } @Test @@ -168,13 +168,13 @@ class PeriodStyleTests { @Test void parseSimpleShouldParse() { - assertThat(PeriodStyle.SIMPLE.parse("10m")).isEqualTo(Period.ofMonths(10)); + assertThat(PeriodStyle.SIMPLE.parse("10m")).hasMonths(10); } @Test void parseSimpleWithUnitShouldUseUnitAsFallback() { - assertThat(PeriodStyle.SIMPLE.parse("10m", ChronoUnit.DAYS)).isEqualTo(Period.ofMonths(10)); - assertThat(PeriodStyle.SIMPLE.parse("10", ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(10)); + assertThat(PeriodStyle.SIMPLE.parse("10m", ChronoUnit.DAYS)).hasMonths(10); + assertThat(PeriodStyle.SIMPLE.parse("10", ChronoUnit.MONTHS)).hasMonths(10); } @Test