Skip to content

Commit 11672b9

Browse files
committed
Upgrade to AssertJ 3.26.0
Closes gh-41401
1 parent d96cc21 commit 11672b9

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ org.gradle.caching=true
55
org.gradle.parallel=true
66
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
77

8-
assertjVersion=3.25.3
8+
assertjVersion=3.26.0
99
commonsCodecVersion=1.16.1
1010
graalVersion=22.3
1111
hamcrestVersion=2.2

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ void fromValueAsIntShouldAdaptValue() {
5757

5858
@Test
5959
void fromValueAlwaysApplyingWhenNonNullShouldAlwaysApplyNonNullToSource() {
60-
this.map.alwaysApplyingWhenNonNull().from((String) null).toCall(() -> fail(null));
60+
this.map.alwaysApplyingWhenNonNull().from((String) null).toCall(() -> fail());
6161
}
6262

6363
@Test
@@ -101,14 +101,14 @@ void asShouldAdaptSupplier() {
101101

102102
@Test
103103
void whenNonNullWhenSuppliedNullShouldNotMap() {
104-
this.map.from(() -> null).whenNonNull().as(String::valueOf).toCall(() -> fail(null));
104+
this.map.from(() -> null).whenNonNull().as(String::valueOf).toCall(() -> fail());
105105
}
106106

107107
@Test
108108
void whenNonNullWhenSuppliedThrowsNullPointerExceptionShouldNotMap() {
109109
this.map.from(() -> {
110110
throw new NullPointerException();
111-
}).whenNonNull().as(String::valueOf).toCall(() -> fail(null));
111+
}).whenNonNull().as(String::valueOf).toCall(() -> fail());
112112
}
113113

114114
@Test
@@ -119,7 +119,7 @@ void whenTrueWhenValueIsTrueShouldMap() {
119119

120120
@Test
121121
void whenTrueWhenValueIsFalseShouldNotMap() {
122-
this.map.from(false).whenTrue().toCall(() -> fail(null));
122+
this.map.from(false).whenTrue().toCall(() -> fail());
123123
}
124124

125125
@Test
@@ -130,17 +130,17 @@ void whenFalseWhenValueIsFalseShouldMap() {
130130

131131
@Test
132132
void whenFalseWhenValueIsTrueShouldNotMap() {
133-
this.map.from(true).whenFalse().toCall(() -> fail(null));
133+
this.map.from(true).whenFalse().toCall(() -> fail());
134134
}
135135

136136
@Test
137137
void whenHasTextWhenValueIsNullShouldNotMap() {
138-
this.map.from(() -> null).whenHasText().toCall(() -> fail(null));
138+
this.map.from(() -> null).whenHasText().toCall(() -> fail());
139139
}
140140

141141
@Test
142142
void whenHasTextWhenValueIsEmptyShouldNotMap() {
143-
this.map.from("").whenHasText().toCall(() -> fail(null));
143+
this.map.from("").whenHasText().toCall(() -> fail());
144144
}
145145

146146
@Test
@@ -157,7 +157,7 @@ void whenEqualToWhenValueIsEqualShouldMatch() {
157157

158158
@Test
159159
void whenEqualToWhenValueIsNotEqualShouldNotMatch() {
160-
this.map.from("123").whenEqualTo("321").toCall(() -> fail(null));
160+
this.map.from("123").whenEqualTo("321").toCall(() -> fail());
161161
}
162162

163163
@Test
@@ -169,7 +169,7 @@ void whenInstanceOfWhenValueIsTargetTypeShouldMatch() {
169169
@Test
170170
void whenInstanceOfWhenValueIsNotTargetTypeShouldNotMatch() {
171171
Supplier<Number> supplier = () -> 123L;
172-
this.map.from(supplier).whenInstanceOf(Double.class).toCall(() -> fail(null));
172+
this.map.from(supplier).whenInstanceOf(Double.class).toCall(() -> fail());
173173
}
174174

175175
@Test
@@ -180,7 +180,7 @@ void whenWhenValueMatchesShouldMap() {
180180

181181
@Test
182182
void whenWhenValueDoesNotMatchShouldNotMap() {
183-
this.map.from("123").when("321"::equals).toCall(() -> fail(null));
183+
this.map.from("123").when("321"::equals).toCall(() -> fail());
184184
}
185185

186186
@Test
@@ -198,12 +198,12 @@ void whenWhenCombinedWithAsUsesSourceValue() {
198198

199199
@Test
200200
void alwaysApplyingWhenNonNullShouldAlwaysApplyNonNullToSource() {
201-
this.map.alwaysApplyingWhenNonNull().from(() -> null).toCall(() -> fail(null));
201+
this.map.alwaysApplyingWhenNonNull().from(() -> null).toCall(() -> fail());
202202
}
203203

204204
@Test
205205
void whenWhenValueNotMatchesShouldSupportChainedCalls() {
206-
this.map.from("123").when("456"::equals).when("123"::equals).toCall(() -> fail(null));
206+
this.map.from("123").when("456"::equals).when("123"::equals).toCall(() -> fail());
207207
}
208208

209209
@Test

0 commit comments

Comments
 (0)