Skip to content

Commit 8feb842

Browse files
committed
Upgrade to AssertJ 3.26.0
See assertj/assertj#3322
1 parent ea2931f commit 8feb842

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

framework-platform/framework-platform.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
1616
api(platform("org.apache.groovy:groovy-bom:4.0.21"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
18-
api(platform("org.assertj:assertj-bom:3.25.3"))
18+
api(platform("org.assertj:assertj-bom:3.26.0"))
1919
api(platform("org.eclipse.jetty:jetty-bom:12.0.9"))
2020
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.9"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))

spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import java.util.LinkedHashMap;
2222
import java.util.List;
2323
import java.util.Map;
24-
import java.util.Set;
2524

26-
import org.assertj.core.api.InstanceOfAssertFactories;
2725
import org.junit.jupiter.api.Test;
2826
import org.yaml.snakeyaml.composer.ComposerException;
2927
import org.yaml.snakeyaml.parser.ParserException;
@@ -34,6 +32,7 @@
3432
import static org.assertj.core.api.Assertions.assertThat;
3533
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3634
import static org.assertj.core.api.Assertions.entry;
35+
import static org.assertj.core.api.InstanceOfAssertFactories.set;
3736

3837
/**
3938
* Tests for {@link YamlProcessor}.
@@ -142,13 +141,11 @@ void flattenedMapIsSameAsPropertiesButOrdered() {
142141
}
143142

144143
@Test
145-
@SuppressWarnings("unchecked")
146144
void standardTypesSupportedByDefault() {
147145
setYaml("value: !!set\n ? first\n ? second");
148146
this.processor.process((properties, map) -> {
149147
assertThat(properties).containsExactly(entry("value[0]", "first"), entry("value[1]", "second"));
150-
assertThat(map.get("value")).asInstanceOf(InstanceOfAssertFactories.type(Set.class))
151-
.satisfies(set -> assertThat(set).containsExactly("first", "second"));
148+
assertThat(map.get("value")).asInstanceOf(set(String.class)).containsExactly("first", "second");
152149
});
153150
}
154151

spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import io.netty.handler.codec.http.DefaultHttpHeaders;
2929
import io.undertow.util.HeaderMap;
3030
import org.apache.tomcat.util.http.MimeHeaders;
31-
import org.assertj.core.api.StringAssert;
3231
import org.eclipse.jetty.http.HttpFields;
3332
import org.junit.jupiter.params.ParameterizedTest;
3433
import org.junit.jupiter.params.provider.Arguments;
@@ -90,7 +89,7 @@ void addShouldKeepOrdering(MultiValueMap<String, String> headers) {
9089
headers.add("TestHeader", "first");
9190
headers.add("TestHeader", "second");
9291
assertThat(headers.getFirst("TestHeader")).isEqualTo("first");
93-
assertThat(headers.get("TestHeader"), StringAssert.class).element(0).isEqualTo("first");
92+
assertThat(headers.get("TestHeader")).first().isEqualTo("first");
9493
}
9594

9695
@ParameterizedHeadersTest

0 commit comments

Comments
 (0)