root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Upgrade to Assertj 3.17.2 

See gh-23179
This commit is contained in:
Eddú Meléndez 2020-09-05 21:26:38 -05:00 committed by Stephane Nicoll
parent f50927f7a1
commit db8d117d38
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -102,7 +102,7 @@ bom {
] ]
} }
} }
library("AssertJ", "3.16.1") { library("AssertJ", "3.17.2") {
group("org.assertj") { group("org.assertj") {
modules = [ modules = [
"assertj-core" "assertj-core"

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ArrayBinderTests.java
View File

@ -99,7 +99,7 @@ class ArrayBinderTests {
ResolvableType type = ResolvableType.forArrayComponent(INTEGER_ARRAY.getType()); ResolvableType type = ResolvableType.forArrayComponent(INTEGER_ARRAY.getType());
Bindable<Integer[][]> target = Bindable.of(type); Bindable<Integer[][]> target = Bindable.of(type);
Integer[][] result = this.binder.bind("foo", target).get(); 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[0]).containsExactly(1, 2);
assertThat(result[1]).containsExactly(3, 4); assertThat(result[1]).containsExactly(3, 4);
} }

18
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/NumberToPeriodConverterTests.java
View File

@ -41,21 +41,21 @@ class NumberToPeriodConverterTests {
@ConversionServiceTest @ConversionServiceTest
void convertWhenSimpleWithoutSuffixShouldReturnPeriod(ConversionService conversionService) { void convertWhenSimpleWithoutSuffixShouldReturnPeriod(ConversionService conversionService) {
assertThat(convert(conversionService, 10)).isEqualTo(Period.ofDays(10)); assertThat(convert(conversionService, 10)).hasDays(10);
assertThat(convert(conversionService, +10)).isEqualTo(Period.ofDays(10)); assertThat(convert(conversionService, +10)).hasDays(10);
assertThat(convert(conversionService, -10)).isEqualTo(Period.ofDays(-10)); assertThat(convert(conversionService, -10)).hasDays(-10);
} }
@ConversionServiceTest @ConversionServiceTest
void convertWhenSimpleWithoutSuffixButWithAnnotationShouldReturnPeriod(ConversionService conversionService) { void convertWhenSimpleWithoutSuffixButWithAnnotationShouldReturnPeriod(ConversionService conversionService) {
assertThat(convert(conversionService, 10, ChronoUnit.DAYS)).isEqualTo(Period.ofDays(10)); assertThat(convert(conversionService, 10, ChronoUnit.DAYS)).hasDays(10);
assertThat(convert(conversionService, -10, ChronoUnit.DAYS)).isEqualTo(Period.ofDays(-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.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)).hasMonths(10);
assertThat(convert(conversionService, -10, ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(-10)); assertThat(convert(conversionService, -10, ChronoUnit.MONTHS)).hasMonths(-10);
assertThat(convert(conversionService, 10, ChronoUnit.YEARS)).isEqualTo(Period.ofYears(10)); assertThat(convert(conversionService, 10, ChronoUnit.YEARS)).hasYears(10);
assertThat(convert(conversionService, -10, ChronoUnit.YEARS)).isEqualTo(Period.ofYears(-10)); assertThat(convert(conversionService, -10, ChronoUnit.YEARS)).hasYears(-10);
} }
private Period convert(ConversionService conversionService, Integer source) { private Period convert(ConversionService conversionService, Integer source) {

42
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/PeriodStyleTests.java
View File

@ -50,10 +50,10 @@ class PeriodStyleTests {
@Test @Test
void detectAndParseWhenSimpleDaysShouldReturnPeriod() { void detectAndParseWhenSimpleDaysShouldReturnPeriod() {
assertThat(PeriodStyle.detectAndParse("10d")).isEqualTo(Period.ofDays(10)); assertThat(PeriodStyle.detectAndParse("10d")).hasDays(10);
assertThat(PeriodStyle.detectAndParse("10D")).isEqualTo(Period.ofDays(10)); assertThat(PeriodStyle.detectAndParse("10D")).hasDays(10);
assertThat(PeriodStyle.detectAndParse("+10d")).isEqualTo(Period.ofDays(10)); assertThat(PeriodStyle.detectAndParse("+10d")).hasDays(10);
assertThat(PeriodStyle.detectAndParse("-10D")).isEqualTo(Period.ofDays(-10)); assertThat(PeriodStyle.detectAndParse("-10D")).hasDays(-10);
} }
@Test @Test
@ -66,32 +66,32 @@ class PeriodStyleTests {
@Test @Test
void detectAndParseWhenSimpleMonthsShouldReturnPeriod() { void detectAndParseWhenSimpleMonthsShouldReturnPeriod() {
assertThat(PeriodStyle.detectAndParse("10m")).isEqualTo(Period.ofMonths(10)); assertThat(PeriodStyle.detectAndParse("10m")).hasMonths(10);
assertThat(PeriodStyle.detectAndParse("10M")).isEqualTo(Period.ofMonths(10)); assertThat(PeriodStyle.detectAndParse("10M")).hasMonths(10);
assertThat(PeriodStyle.detectAndParse("+10m")).isEqualTo(Period.ofMonths(10)); assertThat(PeriodStyle.detectAndParse("+10m")).hasMonths(10);
assertThat(PeriodStyle.detectAndParse("-10M")).isEqualTo(Period.ofMonths(-10)); assertThat(PeriodStyle.detectAndParse("-10M")).hasMonths(-10);
} }
@Test @Test
void detectAndParseWhenSimpleYearsShouldReturnPeriod() { void detectAndParseWhenSimpleYearsShouldReturnPeriod() {
assertThat(PeriodStyle.detectAndParse("10y")).isEqualTo(Period.ofYears(10)); assertThat(PeriodStyle.detectAndParse("10y")).hasYears(10);
assertThat(PeriodStyle.detectAndParse("10Y")).isEqualTo(Period.ofYears(10)); assertThat(PeriodStyle.detectAndParse("10Y")).hasYears(10);
assertThat(PeriodStyle.detectAndParse("+10y")).isEqualTo(Period.ofYears(10)); assertThat(PeriodStyle.detectAndParse("+10y")).hasYears(10);
assertThat(PeriodStyle.detectAndParse("-10Y")).isEqualTo(Period.ofYears(-10)); assertThat(PeriodStyle.detectAndParse("-10Y")).hasYears(-10);
} }
@Test @Test
void detectAndParseWhenSimpleWithoutSuffixShouldReturnPeriod() { void detectAndParseWhenSimpleWithoutSuffixShouldReturnPeriod() {
assertThat(PeriodStyle.detectAndParse("10")).isEqualTo(Period.ofDays(10)); assertThat(PeriodStyle.detectAndParse("10")).hasDays(10);
assertThat(PeriodStyle.detectAndParse("+10")).isEqualTo(Period.ofDays(10)); assertThat(PeriodStyle.detectAndParse("+10")).hasDays(10);
assertThat(PeriodStyle.detectAndParse("-10")).isEqualTo(Period.ofDays(-10)); assertThat(PeriodStyle.detectAndParse("-10")).hasDays(-10);
} }
@Test @Test
void detectAndParseWhenSimpleWithoutSuffixButWithChronoUnitShouldReturnPeriod() { void detectAndParseWhenSimpleWithoutSuffixButWithChronoUnitShouldReturnPeriod() {
assertThat(PeriodStyle.detectAndParse("10", ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(10)); assertThat(PeriodStyle.detectAndParse("10", ChronoUnit.MONTHS)).hasMonths(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)).isEqualTo(Period.ofMonths(-10)); assertThat(PeriodStyle.detectAndParse("-10", ChronoUnit.MONTHS)).hasMonths(-10);
} }
@Test @Test
@ -168,13 +168,13 @@ class PeriodStyleTests {
@Test @Test
void parseSimpleShouldParse() { void parseSimpleShouldParse() {
assertThat(PeriodStyle.SIMPLE.parse("10m")).isEqualTo(Period.ofMonths(10)); assertThat(PeriodStyle.SIMPLE.parse("10m")).hasMonths(10);
} }
@Test @Test
void parseSimpleWithUnitShouldUseUnitAsFallback() { void parseSimpleWithUnitShouldUseUnitAsFallback() {
assertThat(PeriodStyle.SIMPLE.parse("10m", ChronoUnit.DAYS)).isEqualTo(Period.ofMonths(10)); assertThat(PeriodStyle.SIMPLE.parse("10m", ChronoUnit.DAYS)).hasMonths(10);
assertThat(PeriodStyle.SIMPLE.parse("10", ChronoUnit.MONTHS)).isEqualTo(Period.ofMonths(10)); assertThat(PeriodStyle.SIMPLE.parse("10", ChronoUnit.MONTHS)).hasMonths(10);
} }
@Test @Test