From 6d75001e78f1259c317727d3f3ae8444e8987215 Mon Sep 17 00:00:00 2001 From: Fabrice Bibonne Date: Fri, 17 Oct 2025 22:50:15 +0200 Subject: [PATCH] test (URI components) correct tests impacted by feature - order of params change in result expressions in a few tests : expected results have to be changed Signed-off-by: Fabrice Bibonne --- .../reactive/MockServerHttpRequestTests.java | 2 +- .../web/filter/RequestLoggingFilterTests.java | 5 +++-- .../web/util/UriComponentsBuilderTests.java | 18 +++++++++++++----- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java b/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java index b2a4dff2ea2..b2bac3ea887 100644 --- a/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java @@ -65,7 +65,7 @@ class MockServerHttpRequestTests { .queryParam("name B", "value B1") .build(); - assertThat(request.getURI().toString()).isEqualTo("/foo%20bar?a=b&name%20A=value%20A1&name%20A=value%20A2&name%20B=value%20B1"); + assertThat(request.getURI().toString()).isEqualTo("/foo%20bar?a=b&name%20B=value%20B1&name%20A=value%20A1&name%20A=value%20A2"); } /** diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java index 34983476049..6e6de919728 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java @@ -114,8 +114,9 @@ class RequestLoggingFilterTests { applyFilter(); - assertThat(filter.beforeRequestMessage).contains("/hotels?booking=42&code=masked&category=hotel&category=resort&ignore=masked"); - assertThat(filter.afterRequestMessage).contains("/hotels?booking=42&code=masked&category=hotel&category=resort&ignore=masked"); + String expectedRequest = "/hotels?booking=42&code=masked&ignore=masked&category=hotel&category=resort"; + assertThat(filter.beforeRequestMessage).contains(expectedRequest); + assertThat(filter.afterRequestMessage).contains(expectedRequest); } @Test diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java index 2088b0702ec..94e6a46ac56 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java @@ -16,19 +16,27 @@ package org.springframework.web.util; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.BiConsumer; +import java.util.stream.Stream; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.EnumSource; + import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.util.UriComponentsBuilder.ParserType; -import java.net.URI; -import java.util.*; -import java.util.function.BiConsumer; -import java.util.stream.Stream; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;