Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source 
# Conflicts:
#	framework-platform/framework-platform.gradle
This commit is contained in:
Juergen Hoeller
2024-08-13 19:05:20 +02:00
parent 552936627a 63486bf19c
commit e1cf203295
6 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
View File

@@ -648,6 +648,10 @@ class CustomEditorTests {
assertThat(localeEditor.getValue()).isEqualTo(Locale.CANADA);
assertThat(localeEditor.getAsText()).isEqualTo("en_CA");
localeEditor = new LocaleEditor();
localeEditor.setAsText("zh-Hans");
assertThat(localeEditor.getValue()).isEqualTo(Locale.forLanguageTag("zh-Hans"));
localeEditor = new LocaleEditor();
assertThat(localeEditor.getAsText()).isEmpty();
}