root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2023-12-12 14:46:39 +01:00
parent 8de0fadd09
commit 1c58511cb2
8 changed files with 89 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -34,7 +34,7 @@ import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifie
* @author Chris Beams
* @since 07.01.2005
*/
public class LazyInitTargetSourceTests {
class LazyInitTargetSourceTests {
private static final Class<?> CLASS = LazyInitTargetSourceTests.class;
@ -42,9 +42,11 @@ public class LazyInitTargetSourceTests {
private static final Resource CUSTOM_TARGET_CONTEXT = qualifiedResource(CLASS, "customTarget.xml");
private static final Resource FACTORY_BEAN_CONTEXT = qualifiedResource(CLASS, "factoryBean.xml");
private final DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
@Test
public void testLazyInitSingletonTargetSource() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
void lazyInitSingletonTargetSource() {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(SINGLETON_CONTEXT);
bf.preInstantiateSingletons();
@ -55,8 +57,7 @@ public class LazyInitTargetSourceTests {
}
@Test
public void testCustomLazyInitSingletonTargetSource() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
void customLazyInitSingletonTargetSource() {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CUSTOM_TARGET_CONTEXT);
bf.preInstantiateSingletons();
@ -67,8 +68,8 @@ public class LazyInitTargetSourceTests {
}
@Test
public void testLazyInitFactoryBeanTargetSource() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
@SuppressWarnings("unchecked")
void lazyInitFactoryBeanTargetSource() {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(FACTORY_BEAN_CONTEXT);
bf.preInstantiateSingletons();
@ -85,7 +86,7 @@ public class LazyInitTargetSourceTests {
@SuppressWarnings("serial")
public static class CustomLazyInitTargetSource extends LazyInitTargetSource {
static class CustomLazyInitTargetSource extends LazyInitTargetSource {
@Override
protected void postProcessTargetObject(Object targetObject) {

1
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
View File

@ -406,6 +406,7 @@ abstract class AbstractPropertyAccessorTests {
}
@Test
@SuppressWarnings("unchecked")
void setPropertyIntermediateListIsNullWithAutoGrow() {
Foo target = new Foo();
AbstractPropertyAccessor accessor = createAccessor(target);

2
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@ -3416,7 +3416,7 @@ class DefaultListableBeanFactoryTests {
}
private static class PriorityTestBeanFactory {
static class PriorityTestBeanFactory {
public static LowPriorityTestBean lowPriorityTestBean() {
return new LowPriorityTestBean();

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

@ -67,7 +67,7 @@ import static org.assertj.core.api.Assertions.within;
class CustomEditorTests {
@Test
void testComplexObject() {
void complexObject() {
TestBean tb = new TestBean();
String newName = "Rod";
String tbString = "Kerry_34";
@ -85,7 +85,7 @@ class CustomEditorTests {
}
@Test
void testComplexObjectWithOldValueAccess() {
void complexObjectWithOldValueAccess() {
TestBean tb = new TestBean();
String newName = "Rod";
String tbString = "Kerry_34";
@ -109,7 +109,7 @@ class CustomEditorTests {
}
@Test
void testCustomEditorForSingleProperty() {
void customEditorForSingleProperty() {
TestBean tb = new TestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() {
@ -127,7 +127,7 @@ class CustomEditorTests {
}
@Test
void testCustomEditorForAllStringProperties() {
void customEditorForAllStringProperties() {
TestBean tb = new TestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@ -145,7 +145,7 @@ class CustomEditorTests {
}
@Test
void testCustomEditorForSingleNestedProperty() {
void customEditorForSingleNestedProperty() {
TestBean tb = new TestBean();
tb.setSpouse(new TestBean());
BeanWrapper bw = new BeanWrapperImpl(tb);
@ -164,7 +164,7 @@ class CustomEditorTests {
}
@Test
void testCustomEditorForAllNestedStringProperties() {
void customEditorForAllNestedStringProperties() {
TestBean tb = new TestBean();
tb.setSpouse(new TestBean());
BeanWrapper bw = new BeanWrapperImpl(tb);
@ -183,7 +183,7 @@ class CustomEditorTests {
}
@Test
void testDefaultBooleanEditorForPrimitiveType() {
void defaultBooleanEditorForPrimitiveType() {
BooleanTestBean tb = new BooleanTestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
@ -224,7 +224,7 @@ class CustomEditorTests {
}
@Test
void testDefaultBooleanEditorForWrapperType() {
void defaultBooleanEditorForWrapperType() {
BooleanTestBean tb = new BooleanTestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
@ -259,7 +259,7 @@ class CustomEditorTests {
}
@Test
void testCustomBooleanEditorWithAllowEmpty() {
void customBooleanEditorWithAllowEmpty() {
BooleanTestBean tb = new BooleanTestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
bw.registerCustomEditor(Boolean.class, new CustomBooleanEditor(true));
@ -296,7 +296,7 @@ class CustomEditorTests {
}
@Test
void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() {
void customBooleanEditorWithSpecialTrueAndFalseStrings() {
String trueString = "pechorin";
String falseString = "nash";
@ -320,7 +320,7 @@ class CustomEditorTests {
}
@Test
void testDefaultNumberEditor() {
void defaultNumberEditor() {
NumberTestBean tb = new NumberTestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
@ -364,7 +364,7 @@ class CustomEditorTests {
}
@Test
void testCustomNumberEditorWithoutAllowEmpty() {
void customNumberEditorWithoutAllowEmpty() {
NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN);
NumberTestBean tb = new NumberTestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
@ -421,7 +421,7 @@ class CustomEditorTests {
}
@Test
void testCustomNumberEditorWithAllowEmpty() {
void customNumberEditorWithAllowEmpty() {
NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN);
NumberTestBean tb = new NumberTestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
@ -445,7 +445,7 @@ class CustomEditorTests {
}
@Test
void testCustomNumberEditorWithFrenchBigDecimal() {
void customNumberEditorWithFrenchBigDecimal() {
NumberFormat nf = NumberFormat.getNumberInstance(Locale.FRENCH);
NumberTestBean tb = new NumberTestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
@ -462,14 +462,14 @@ class CustomEditorTests {
}
@Test
void testParseShortGreaterThanMaxValueWithoutNumberFormat() {
void parseShortGreaterThanMaxValueWithoutNumberFormat() {
CustomNumberEditor editor = new CustomNumberEditor(Short.class, true);
assertThatExceptionOfType(NumberFormatException.class).as("greater than Short.MAX_VALUE + 1").isThrownBy(() ->
editor.setAsText(String.valueOf(Short.MAX_VALUE + 1)));
}
@Test
void testByteArrayPropertyEditor() {
void byteArrayPropertyEditor() {
PrimitiveArrayBean bean = new PrimitiveArrayBean();
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.setPropertyValue("byteArray", "myvalue");
@ -477,7 +477,7 @@ class CustomEditorTests {
}
@Test
void testCharArrayPropertyEditor() {
void charArrayPropertyEditor() {
PrimitiveArrayBean bean = new PrimitiveArrayBean();
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.setPropertyValue("charArray", "myvalue");
@ -485,7 +485,7 @@ class CustomEditorTests {
}
@Test
void testCharacterEditor() {
void characterEditor() {
CharBean cb = new CharBean();
BeanWrapper bw = new BeanWrapperImpl(cb);
@ -507,7 +507,7 @@ class CustomEditorTests {
}
@Test
void testCharacterEditorWithAllowEmpty() {
void characterEditorWithAllowEmpty() {
CharBean cb = new CharBean();
BeanWrapper bw = new BeanWrapperImpl(cb);
bw.registerCustomEditor(Character.class, new CharacterEditor(true));
@ -529,14 +529,14 @@ class CustomEditorTests {
}
@Test
void testCharacterEditorSetAsTextWithStringLongerThanOneCharacter() {
void characterEditorSetAsTextWithStringLongerThanOneCharacter() {
PropertyEditor charEditor = new CharacterEditor(false);
assertThatIllegalArgumentException().isThrownBy(() ->
charEditor.setAsText("ColdWaterCanyon"));
}
@Test
void testCharacterEditorGetAsTextReturnsEmptyStringIfValueIsNull() {
void characterEditorGetAsTextReturnsEmptyStringIfValueIsNull() {
PropertyEditor charEditor = new CharacterEditor(false);
assertThat(charEditor.getAsText()).isEmpty();
charEditor = new CharacterEditor(true);
@ -549,14 +549,14 @@ class CustomEditorTests {
}
@Test
void testCharacterEditorSetAsTextWithNullNotAllowingEmptyAsNull() {
void characterEditorSetAsTextWithNullNotAllowingEmptyAsNull() {
PropertyEditor charEditor = new CharacterEditor(false);
assertThatIllegalArgumentException().isThrownBy(() ->
charEditor.setAsText(null));
}
@Test
void testClassEditor() {
void classEditor() {
PropertyEditor classEditor = new ClassEditor();
classEditor.setAsText(TestBean.class.getName());
assertThat(classEditor.getValue()).isEqualTo(TestBean.class);
@ -571,14 +571,14 @@ class CustomEditorTests {
}
@Test
void testClassEditorWithNonExistentClass() {
void classEditorWithNonExistentClass() {
PropertyEditor classEditor = new ClassEditor();
assertThatIllegalArgumentException().isThrownBy(() ->
classEditor.setAsText("hairdresser.on.Fire"));
}
@Test
void testClassEditorWithArray() {
void classEditorWithArray() {
PropertyEditor classEditor = new ClassEditor();
classEditor.setAsText("org.springframework.beans.testfixture.beans.TestBean[]");
assertThat(classEditor.getValue()).isEqualTo(TestBean[].class);
@ -589,7 +589,7 @@ class CustomEditorTests {
* SPR_2165 - ClassEditor is inconsistent with multidimensional arrays
*/
@Test
void testGetAsTextWithTwoDimensionalArray() {
void getAsTextWithTwoDimensionalArray() {
String[][] chessboard = new String[8][8];
ClassEditor editor = new ClassEditor();
editor.setValue(chessboard.getClass());
@ -600,7 +600,7 @@ class CustomEditorTests {
* SPR_2165 - ClassEditor is inconsistent with multidimensional arrays
*/
@Test
void testGetAsTextWithRidiculousMultiDimensionalArray() {
void getAsTextWithRidiculousMultiDimensionalArray() {
String[][][][][] ridiculousChessboard = new String[8][4][0][1][3];
ClassEditor editor = new ClassEditor();
editor.setValue(ridiculousChessboard.getClass());
@ -608,7 +608,7 @@ class CustomEditorTests {
}
@Test
void testFileEditor() {
void fileEditor() {
PropertyEditor fileEditor = new FileEditor();
fileEditor.setAsText("file:myfile.txt");
assertThat(fileEditor.getValue()).isEqualTo(new File("myfile.txt"));
@ -616,7 +616,7 @@ class CustomEditorTests {
}
@Test
void testFileEditorWithRelativePath() {
void fileEditorWithRelativePath() {
PropertyEditor fileEditor = new FileEditor();
try {
fileEditor.setAsText("myfile.txt");
@ -628,7 +628,7 @@ class CustomEditorTests {
}
@Test
void testFileEditorWithAbsolutePath() {
void fileEditorWithAbsolutePath() {
PropertyEditor fileEditor = new FileEditor();
// testing on Windows
if (new File("C:/myfile.txt").isAbsolute()) {
@ -643,7 +643,7 @@ class CustomEditorTests {
}
@Test
void testLocaleEditor() {
void localeEditor() {
PropertyEditor localeEditor = new LocaleEditor();
localeEditor.setAsText("en_CA");
assertThat(localeEditor.getValue()).isEqualTo(Locale.CANADA);
@ -654,7 +654,7 @@ class CustomEditorTests {
}
@Test
void testPatternEditor() {
void patternEditor() {
final String REGEX = "a.*";
PropertyEditor patternEditor = new PatternEditor();
@ -671,7 +671,7 @@ class CustomEditorTests {
}
@Test
void testCustomBooleanEditor() {
void customBooleanEditor() {
CustomBooleanEditor editor = new CustomBooleanEditor(false);
editor.setAsText("true");
@ -691,7 +691,7 @@ class CustomEditorTests {
}
@Test
void testCustomBooleanEditorWithEmptyAsNull() {
void customBooleanEditorWithEmptyAsNull() {
CustomBooleanEditor editor = new CustomBooleanEditor(true);
editor.setAsText("true");
@ -708,7 +708,7 @@ class CustomEditorTests {
}
@Test
void testCustomDateEditor() {
void customDateEditor() {
CustomDateEditor editor = new CustomDateEditor(new SimpleDateFormat("MM/dd/yyyy"), false);
editor.setValue(null);
assertThat(editor.getValue()).isNull();
@ -716,7 +716,7 @@ class CustomEditorTests {
}
@Test
void testCustomDateEditorWithEmptyAsNull() {
void customDateEditorWithEmptyAsNull() {
CustomDateEditor editor = new CustomDateEditor(new SimpleDateFormat("MM/dd/yyyy"), true);
editor.setValue(null);
assertThat(editor.getValue()).isNull();
@ -724,7 +724,7 @@ class CustomEditorTests {
}
@Test
void testCustomDateEditorWithExactDateLength() {
void customDateEditorWithExactDateLength() {
int maxLength = 10;
String validDate = "01/01/2005";
String invalidDate = "01/01/05";
@ -740,7 +740,7 @@ class CustomEditorTests {
}
@Test
void testCustomNumberEditor() {
void customNumberEditor() {
CustomNumberEditor editor = new CustomNumberEditor(Integer.class, false);
editor.setAsText("5");
assertThat(editor.getValue()).isEqualTo(5);
@ -751,14 +751,14 @@ class CustomEditorTests {
}
@Test
void testCustomNumberEditorWithHex() {
void customNumberEditorWithHex() {
CustomNumberEditor editor = new CustomNumberEditor(Integer.class, false);
editor.setAsText("0x" + Integer.toHexString(64));
assertThat(editor.getValue()).isEqualTo(64);
}
@Test
void testCustomNumberEditorWithEmptyAsNull() {
void customNumberEditorWithEmptyAsNull() {
CustomNumberEditor editor = new CustomNumberEditor(Integer.class, true);
editor.setAsText("5");
assertThat(editor.getValue()).isEqualTo(5);
@ -772,7 +772,7 @@ class CustomEditorTests {
}
@Test
void testStringTrimmerEditor() {
void stringTrimmerEditor() {
StringTrimmerEditor editor = new StringTrimmerEditor(false);
editor.setAsText("test");
assertThat(editor.getValue()).isEqualTo("test");
@ -790,7 +790,7 @@ class CustomEditorTests {
}
@Test
void testStringTrimmerEditorWithEmptyAsNull() {
void stringTrimmerEditorWithEmptyAsNull() {
StringTrimmerEditor editor = new StringTrimmerEditor(true);
editor.setAsText("test");
assertThat(editor.getValue()).isEqualTo("test");
@ -806,7 +806,7 @@ class CustomEditorTests {
}
@Test
void testStringTrimmerEditorWithCharsToDelete() {
void stringTrimmerEditorWithCharsToDelete() {
StringTrimmerEditor editor = new StringTrimmerEditor("\r\n\f", false);
editor.setAsText("te\ns\ft");
assertThat(editor.getValue()).isEqualTo("test");
@ -822,7 +822,7 @@ class CustomEditorTests {
}
@Test
void testStringTrimmerEditorWithCharsToDeleteAndEmptyAsNull() {
void stringTrimmerEditorWithCharsToDeleteAndEmptyAsNull() {
StringTrimmerEditor editor = new StringTrimmerEditor("\r\n\f", true);
editor.setAsText("te\ns\ft");
assertThat(editor.getValue()).isEqualTo("test");
@ -838,7 +838,7 @@ class CustomEditorTests {
}
@Test
void testIndexedPropertiesWithCustomEditorForType() {
void indexedPropertiesWithCustomEditorForType() {
IndexedTestBean bean = new IndexedTestBean();
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@ -891,7 +891,7 @@ class CustomEditorTests {
}
@Test
void testIndexedPropertiesWithCustomEditorForProperty() {
void indexedPropertiesWithCustomEditorForProperty() {
IndexedTestBean bean = new IndexedTestBean(false);
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() {
@ -958,7 +958,7 @@ class CustomEditorTests {
}
@Test
void testIndexedPropertiesWithIndividualCustomEditorForProperty() {
void indexedPropertiesWithIndividualCustomEditorForProperty() {
IndexedTestBean bean = new IndexedTestBean(false);
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.registerCustomEditor(String.class, "array[0].name", new PropertyEditorSupport() {
@ -1043,7 +1043,7 @@ class CustomEditorTests {
}
@Test
void testNestedIndexedPropertiesWithCustomEditorForProperty() {
void nestedIndexedPropertiesWithCustomEditorForProperty() {
IndexedTestBean bean = new IndexedTestBean();
TestBean tb0 = bean.getArray()[0];
TestBean tb1 = bean.getArray()[1];
@ -1127,7 +1127,7 @@ class CustomEditorTests {
}
@Test
void testNestedIndexedPropertiesWithIndexedCustomEditorForProperty() {
void nestedIndexedPropertiesWithIndexedCustomEditorForProperty() {
IndexedTestBean bean = new IndexedTestBean();
TestBean tb0 = bean.getArray()[0];
TestBean tb1 = bean.getArray()[1];
@ -1178,7 +1178,7 @@ class CustomEditorTests {
}
@Test
void testIndexedPropertiesWithDirectAccessAndPropertyEditors() {
void indexedPropertiesWithDirectAccessAndPropertyEditors() {
IndexedTestBean bean = new IndexedTestBean();
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() {
@ -1232,7 +1232,7 @@ class CustomEditorTests {
}
@Test
void testIndexedPropertiesWithDirectAccessAndSpecificPropertyEditors() {
void indexedPropertiesWithDirectAccessAndSpecificPropertyEditors() {
IndexedTestBean bean = new IndexedTestBean();
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.registerCustomEditor(TestBean.class, "array[0]", new PropertyEditorSupport() {
@ -1319,7 +1319,8 @@ class CustomEditorTests {
}
@Test
void testIndexedPropertiesWithListPropertyEditor() {
@SuppressWarnings("unchecked")
void indexedPropertiesWithListPropertyEditor() {
IndexedTestBean bean = new IndexedTestBean();
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.registerCustomEditor(List.class, "list", new PropertyEditorSupport() {
@ -1337,7 +1338,7 @@ class CustomEditorTests {
}
@Test
void testConversionToOldCollections() throws PropertyVetoException {
void conversionToOldCollections() throws PropertyVetoException {
OldCollectionsBean tb = new OldCollectionsBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
bw.registerCustomEditor(Vector.class, new CustomCollectionEditor(Vector.class));
@ -1354,7 +1355,8 @@ class CustomEditorTests {
}
@Test
void testUninitializedArrayPropertyWithCustomEditor() {
@SuppressWarnings("unchecked")
void uninitializedArrayPropertyWithCustomEditor() {
IndexedTestBean bean = new IndexedTestBean(false);
BeanWrapper bw = new BeanWrapperImpl(bean);
PropertyEditor pe = new CustomNumberEditor(Integer.class, true);
@ -1370,7 +1372,7 @@ class CustomEditorTests {
}
@Test
void testArrayToArrayConversion() throws PropertyVetoException {
void arrayToArrayConversion() throws PropertyVetoException {
IndexedTestBean tb = new IndexedTestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() {
@ -1386,7 +1388,7 @@ class CustomEditorTests {
}
@Test
void testArrayToStringConversion() throws PropertyVetoException {
void arrayToStringConversion() throws PropertyVetoException {
TestBean tb = new TestBean();
BeanWrapper bw = new BeanWrapperImpl(tb);
bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@ -1400,7 +1402,7 @@ class CustomEditorTests {
}
@Test
void testClassArrayEditorSunnyDay() {
void classArrayEditorSunnyDay() {
ClassArrayEditor classArrayEditor = new ClassArrayEditor();
classArrayEditor.setAsText("java.lang.String,java.util.HashMap");
Class<?>[] classes = (Class<?>[]) classArrayEditor.getValue();
@ -1413,7 +1415,7 @@ class CustomEditorTests {
}
@Test
void testClassArrayEditorSunnyDayWithArrayTypes() {
void classArrayEditorSunnyDayWithArrayTypes() {
ClassArrayEditor classArrayEditor = new ClassArrayEditor();
classArrayEditor.setAsText("java.lang.String[],java.util.Map[],int[],float[][][]");
Class<?>[] classes = (Class<?>[]) classArrayEditor.getValue();
@ -1428,7 +1430,7 @@ class CustomEditorTests {
}
@Test
void testClassArrayEditorSetAsTextWithNull() {
void classArrayEditorSetAsTextWithNull() {
ClassArrayEditor editor = new ClassArrayEditor();
editor.setAsText(null);
assertThat(editor.getValue()).isNull();
@ -1436,7 +1438,7 @@ class CustomEditorTests {
}
@Test
void testClassArrayEditorSetAsTextWithEmptyString() {
void classArrayEditorSetAsTextWithEmptyString() {
ClassArrayEditor editor = new ClassArrayEditor();
editor.setAsText("");
assertThat(editor.getValue()).isNull();
@ -1444,7 +1446,7 @@ class CustomEditorTests {
}
@Test
void testClassArrayEditorSetAsTextWithWhitespaceString() {
void classArrayEditorSetAsTextWithWhitespaceString() {
ClassArrayEditor editor = new ClassArrayEditor();
editor.setAsText("\n");
assertThat(editor.getValue()).isNull();
@ -1452,7 +1454,7 @@ class CustomEditorTests {
}
@Test
void testCharsetEditor() {
void charsetEditor() {
CharsetEditor editor = new CharsetEditor();
String name = "UTF-8";
editor.setAsText(name);

1
spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java vendored
View File

@ -153,6 +153,7 @@ class EnableCachingTests extends AbstractCacheAnnotationTests {
ServiceWithMutableKey service = ctx.getBean(ServiceWithMutableKey.class);
String result = service.find(new ArrayList<>(List.of("id")));
assertThat(service.find(new ArrayList<>(List.of("id")))).isSameAs(result);
ctx.close();
}

4
spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
View File

@ -99,7 +99,7 @@ class PayloadApplicationEventTests {
@Test
@SuppressWarnings("resource")
void testPayloadObjectWithPayloadType() {
final NumberHolder payload = new NumberHolder<>(42);
final NumberHolder<Integer> payload = new NumberHolder<>(42);
AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext(NumberHolderListener.class) {
@Override
@ -117,7 +117,7 @@ class PayloadApplicationEventTests {
@Test
@SuppressWarnings("resource")
void testPayloadObjectWithPayloadTypeOnParentContext() {
final NumberHolder payload = new NumberHolder<>(42);
final NumberHolder<Integer> payload = new NumberHolder<>(42);
ConfigurableApplicationContext parent = new AnnotationConfigApplicationContext(NumberHolderListener.class);
ConfigurableApplicationContext ac = new GenericApplicationContext(parent) {

16
spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
View File

@ -134,10 +134,10 @@ class CollectionToCollectionConverterTests {
TypeDescriptor targetType = new TypeDescriptor(getClass().getField("objectToCollection"));
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
List<List<List<Integer>>> result = (List<List<List<Integer>>>) conversionService.convert(list, sourceType, targetType);
assertThat(result.get(0).get(0)).element(0).isEqualTo((Integer) 9);
assertThat(result.get(0).get(1)).element(0).isEqualTo((Integer) 12);
assertThat(result.get(1).get(0)).element(0).isEqualTo((Integer) 37);
assertThat(result.get(1).get(1)).element(0).isEqualTo((Integer) 23);
assertThat(result.get(0).get(0)).element(0).isEqualTo(9);
assertThat(result.get(0).get(1)).element(0).isEqualTo(12);
assertThat(result.get(1).get(0)).element(0).isEqualTo(37);
assertThat(result.get(1).get(1)).element(0).isEqualTo(23);
}
@Test
@ -154,10 +154,10 @@ class CollectionToCollectionConverterTests {
TypeDescriptor targetType = new TypeDescriptor(getClass().getField("objectToCollection"));
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
List<List<List<Integer>>> result = (List<List<List<Integer>>>) conversionService.convert(list, sourceType, targetType);
assertThat(result.get(0).get(0)).element(0).isEqualTo((Integer) 9);
assertThat(result.get(0).get(0)).element(1).isEqualTo((Integer) 12);
assertThat(result.get(1).get(0)).element(0).isEqualTo((Integer) 37);
assertThat(result.get(1).get(0)).element(1).isEqualTo((Integer) 23);
assertThat(result.get(0).get(0)).element(0).isEqualTo(9);
assertThat(result.get(0).get(0)).element(1).isEqualTo(12);
assertThat(result.get(1).get(0)).element(0).isEqualTo(37);
assertThat(result.get(1).get(0)).element(1).isEqualTo(23);
}
@Test

5
spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
View File

@ -1375,7 +1375,7 @@ class SpelReproTests extends AbstractExpressionTests {
Object value = expr.getValue(coll);
assertThat(value).isInstanceOf(ArrayList.class);
@SuppressWarnings("rawtypes")
ArrayList list = (ArrayList) value;
ArrayList<?> list = (ArrayList) value;
assertThat(list).element(0).isEqualTo("one");
assertThat(list).element(1).isEqualTo("two");
}
@ -1443,13 +1443,12 @@ class SpelReproTests extends AbstractExpressionTests {
}
@Test
@SuppressWarnings("rawtypes")
void SPR12522() {
SpelExpressionParser parser = new SpelExpressionParser();
Expression expression = parser.parseExpression("T(java.util.Arrays).asList('')");
Object value = expression.getValue();
assertThat(value).isInstanceOf(List.class);
assertThat(((List) value)).isEmpty();
assertThat(((List<?>) value)).isEmpty();
}
@Test