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 <fabrice.bibonne@gmail.com>

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");
 	}
 
 	/**

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

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;