spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-22 05:49:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-03-20 11:13:01 +01:00
parent b31f78de50 e1e4d52b61
commit 5d45036c09
135 changed files with 509 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
+1 -1
View File
@@ -356,7 +356,7 @@ class MockHttpServletRequestTests {
Locale.setDefault(newDefaultLocale);
// Create the request after changing the default locale.
MockHttpServletRequest request = new MockHttpServletRequest();
assertThat(newDefaultLocale.equals(request.getLocale())).isFalse();
assertThat(newDefaultLocale).isNotEqualTo(request.getLocale());
assertThat(request.getLocale()).isEqualTo(Locale.ENGLISH);
}
finally {
spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideHandlerTests.java
+1 -2
View File
@@ -21,7 +21,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.function.Consumer;
@@ -180,7 +179,7 @@ class BeanOverrideHandlerTests {
Field field2 = field(ConfigB.class, "qualifiedDummyBean");
// Prerequisite
assertThat(Arrays.equals(field1.getAnnotations(), field2.getAnnotations())).isFalse();
assertThat(field1.getAnnotations()).isNotEqualTo(field2.getAnnotations());
BeanOverrideHandler handler1 = createBeanOverrideHandler(field1);
BeanOverrideHandler handler2 = createBeanOverrideHandler(field2);