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

Rely on automatic boxing/unboxing in tests

Browse Source 
Closes gh-29414
This commit is contained in:
Kulwant Singh
2022-11-02 01:11:28 +01:00
committed by Sam Brannen
parent 7d68d0625c
commit b2c8546013
35 changed files with 214 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
spring-core/src/test/java/org/springframework/core/ConstantsTests.java
View File

@@ -76,23 +76,23 @@ class ConstantsTests {
Set<?> values = c.getValues("");
assertThat(values.size()).isEqualTo(7);
assertThat(values.contains(Integer.valueOf(0))).isTrue();
assertThat(values.contains(Integer.valueOf(66))).isTrue();
assertThat(values.contains(0)).isTrue();
assertThat(values.contains(66)).isTrue();
assertThat(values.contains("")).isTrue();
values = c.getValues("D");
assertThat(values.size()).isEqualTo(1);
assertThat(values.contains(Integer.valueOf(0))).isTrue();
assertThat(values.contains(0)).isTrue();
values = c.getValues("prefix");
assertThat(values.size()).isEqualTo(2);
assertThat(values.contains(Integer.valueOf(1))).isTrue();
assertThat(values.contains(Integer.valueOf(2))).isTrue();
assertThat(values.contains(1)).isTrue();
assertThat(values.contains(2)).isTrue();
values = c.getValuesForProperty("myProperty");
assertThat(values.size()).isEqualTo(2);
assertThat(values.contains(Integer.valueOf(1))).isTrue();
assertThat(values.contains(Integer.valueOf(2))).isTrue();
assertThat(values.contains(1)).isTrue();
assertThat(values.contains(2)).isTrue();
}
@Test
@@ -104,23 +104,23 @@ class ConstantsTests {
Set<?> values = c.getValues("");
assertThat(values.size()).isEqualTo(7);
assertThat(values.contains(Integer.valueOf(0))).isTrue();
assertThat(values.contains(Integer.valueOf(66))).isTrue();
assertThat(values.contains(0)).isTrue();
assertThat(values.contains(66)).isTrue();
assertThat(values.contains("")).isTrue();
values = c.getValues("D");
assertThat(values.size()).isEqualTo(1);
assertThat(values.contains(Integer.valueOf(0))).isTrue();
assertThat(values.contains(0)).isTrue();
values = c.getValues("prefix");
assertThat(values.size()).isEqualTo(2);
assertThat(values.contains(Integer.valueOf(1))).isTrue();
assertThat(values.contains(Integer.valueOf(2))).isTrue();
assertThat(values.contains(1)).isTrue();
assertThat(values.contains(2)).isTrue();
values = c.getValuesForProperty("myProperty");
assertThat(values.size()).isEqualTo(2);
assertThat(values.contains(Integer.valueOf(1))).isTrue();
assertThat(values.contains(Integer.valueOf(2))).isTrue();
assertThat(values.contains(1)).isTrue();
assertThat(values.contains(2)).isTrue();
}
finally {
Locale.setDefault(oldLocale);
@@ -138,24 +138,24 @@ class ConstantsTests {
Set<?> values = c.getValuesForSuffix("_PROPERTY");
assertThat(values.size()).isEqualTo(2);
assertThat(values.contains(Integer.valueOf(3))).isTrue();
assertThat(values.contains(Integer.valueOf(4))).isTrue();
assertThat(values.contains(3)).isTrue();
assertThat(values.contains(4)).isTrue();
}
@Test
void toCode() {
Constants c = new Constants(A.class);
assertThat(c.toCode(Integer.valueOf(0), "")).isEqualTo("DOG");
assertThat(c.toCode(Integer.valueOf(0), "D")).isEqualTo("DOG");
assertThat(c.toCode(Integer.valueOf(0), "DO")).isEqualTo("DOG");
assertThat(c.toCode(Integer.valueOf(0), "DoG")).isEqualTo("DOG");
assertThat(c.toCode(Integer.valueOf(0), null)).isEqualTo("DOG");
assertThat(c.toCode(Integer.valueOf(66), "")).isEqualTo("CAT");
assertThat(c.toCode(Integer.valueOf(66), "C")).isEqualTo("CAT");
assertThat(c.toCode(Integer.valueOf(66), "ca")).isEqualTo("CAT");
assertThat(c.toCode(Integer.valueOf(66), "cAt")).isEqualTo("CAT");
assertThat(c.toCode(Integer.valueOf(66), null)).isEqualTo("CAT");
assertThat(c.toCode(0, "")).isEqualTo("DOG");
assertThat(c.toCode(0, "D")).isEqualTo("DOG");
assertThat(c.toCode(0, "DO")).isEqualTo("DOG");
assertThat(c.toCode(0, "DoG")).isEqualTo("DOG");
assertThat(c.toCode(0, null)).isEqualTo("DOG");
assertThat(c.toCode(66, "")).isEqualTo("CAT");
assertThat(c.toCode(66, "C")).isEqualTo("CAT");
assertThat(c.toCode(66, "ca")).isEqualTo("CAT");
assertThat(c.toCode(66, "cAt")).isEqualTo("CAT");
assertThat(c.toCode(66, null)).isEqualTo("CAT");
assertThat(c.toCode("", "")).isEqualTo("S1");
assertThat(c.toCode("", "s")).isEqualTo("S1");
assertThat(c.toCode("", "s1")).isEqualTo("S1");
@@ -165,21 +165,21 @@ class ConstantsTests {
assertThatExceptionOfType(Constants.ConstantException.class).isThrownBy(() ->
c.toCode("bogus", null));
assertThat(c.toCodeForProperty(Integer.valueOf(1), "myProperty")).isEqualTo("MY_PROPERTY_NO");
assertThat(c.toCodeForProperty(Integer.valueOf(2), "myProperty")).isEqualTo("MY_PROPERTY_YES");
assertThat(c.toCodeForProperty(1, "myProperty")).isEqualTo("MY_PROPERTY_NO");
assertThat(c.toCodeForProperty(2, "myProperty")).isEqualTo("MY_PROPERTY_YES");
assertThatExceptionOfType(Constants.ConstantException.class).isThrownBy(() ->
c.toCodeForProperty("bogus", "bogus"));
assertThat(c.toCodeForSuffix(Integer.valueOf(0), "")).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(Integer.valueOf(0), "G")).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(Integer.valueOf(0), "OG")).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(Integer.valueOf(0), "DoG")).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(Integer.valueOf(0), null)).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(Integer.valueOf(66), "")).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(Integer.valueOf(66), "T")).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(Integer.valueOf(66), "at")).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(Integer.valueOf(66), "cAt")).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(Integer.valueOf(66), null)).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(0, "")).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(0, "G")).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(0, "OG")).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(0, "DoG")).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(0, null)).isEqualTo("DOG");
assertThat(c.toCodeForSuffix(66, "")).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(66, "T")).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(66, "at")).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(66, "cAt")).isEqualTo("CAT");
assertThat(c.toCodeForSuffix(66, null)).isEqualTo("CAT");
assertThat(c.toCodeForSuffix("", "")).isEqualTo("S1");
assertThat(c.toCodeForSuffix("", "1")).isEqualTo("S1");
assertThat(c.toCodeForSuffix("", "s1")).isEqualTo("S1");

8
spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
View File

@@ -524,7 +524,7 @@ class TypeDescriptorTests {
@Test
void narrow() {
TypeDescriptor desc = TypeDescriptor.valueOf(Number.class);
Integer value = Integer.valueOf(3);
Integer value = 3;
desc = desc.narrow(value);
assertThat(desc.getType()).isEqualTo(Integer.class);
}
@@ -532,7 +532,7 @@ class TypeDescriptorTests {
@Test
void elementType() {
TypeDescriptor desc = TypeDescriptor.valueOf(List.class);
Integer value = Integer.valueOf(3);
Integer value = 3;
desc = desc.elementTypeDescriptor(value);
assertThat(desc.getType()).isEqualTo(Integer.class);
}
@@ -550,7 +550,7 @@ class TypeDescriptorTests {
@Test
void mapKeyType() {
TypeDescriptor desc = TypeDescriptor.valueOf(Map.class);
Integer value = Integer.valueOf(3);
Integer value = 3;
desc = desc.getMapKeyTypeDescriptor(value);
assertThat(desc.getType()).isEqualTo(Integer.class);
}
@@ -568,7 +568,7 @@ class TypeDescriptorTests {
@Test
void mapValueType() {
TypeDescriptor desc = TypeDescriptor.valueOf(Map.class);
Integer value = Integer.valueOf(3);
Integer value = 3;
desc = desc.getMapValueTypeDescriptor(value);
assertThat(desc.getType()).isEqualTo(Integer.class);
}

70
spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
View File

@@ -154,7 +154,7 @@ class DefaultConversionServiceTests {
@Test
void stringToInteger() {
assertThat(conversionService.convert("1", Integer.class)).isEqualTo((int) Integer.valueOf(1));
assertThat(conversionService.convert("1", Integer.class)).isEqualTo((int) 1);
}
@Test
@@ -259,7 +259,7 @@ class DefaultConversionServiceTests {
@Test
void enumToInteger() {
assertThat(conversionService.convert(Foo.BAR, Integer.class)).isEqualTo((int) Integer.valueOf(0));
assertThat(conversionService.convert(Foo.BAR, Integer.class)).isEqualTo((int) 0);
}
@Test
@@ -353,9 +353,9 @@ class DefaultConversionServiceTests {
@SuppressWarnings("unchecked")
List<Integer> result = (List<Integer>) conversionService.convert(new String[] {"1", "2", "3"}, TypeDescriptor
.valueOf(String[].class), new TypeDescriptor(getClass().getDeclaredField("genericList")));
assertThat((int) result.get(0)).isEqualTo((int) Integer.valueOf(1));
assertThat((int) result.get(1)).isEqualTo((int) Integer.valueOf(2));
assertThat((int) result.get(2)).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result.get(0)).isEqualTo((int) 1);
assertThat((int) result.get(1)).isEqualTo((int) 2);
assertThat((int) result.get(2)).isEqualTo((int) 3);
}
@Test
@@ -426,9 +426,9 @@ class DefaultConversionServiceTests {
void convertStringToArrayWithElementConversion() {
Integer[] result = conversionService.convert("1,2,3", Integer[].class);
assertThat(result.length).isEqualTo(3);
assertThat((int) result[0]).isEqualTo((int) Integer.valueOf(1));
assertThat((int) result[1]).isEqualTo((int) Integer.valueOf(2));
assertThat((int) result[2]).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result[0]).isEqualTo((int) 1);
assertThat((int) result[1]).isEqualTo((int) 2);
assertThat((int) result[2]).isEqualTo((int) 3);
}
@Test
@@ -457,7 +457,7 @@ class DefaultConversionServiceTests {
void convertArrayToObjectWithElementConversion() {
String[] array = new String[] {"3"};
Integer result = conversionService.convert(array, Integer.class);
assertThat((int) result).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result).isEqualTo((int) 3);
}
@Test
@@ -478,7 +478,7 @@ class DefaultConversionServiceTests {
void convertObjectToArrayWithElementConversion() {
Integer[] result = conversionService.convert(3L, Integer[].class);
assertThat(result.length).isEqualTo(1);
assertThat((int) result[0]).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result[0]).isEqualTo((int) 3);
}
@Test
@@ -500,9 +500,9 @@ class DefaultConversionServiceTests {
list.add("2");
list.add("3");
Integer[] result = conversionService.convert(list, Integer[].class);
assertThat((int) result[0]).isEqualTo((int) Integer.valueOf(1));
assertThat((int) result[1]).isEqualTo((int) Integer.valueOf(2));
assertThat((int) result[2]).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result[0]).isEqualTo((int) 1);
assertThat((int) result[1]).isEqualTo((int) 2);
assertThat((int) result[2]).isEqualTo((int) 3);
}
@Test
@@ -556,7 +556,7 @@ class DefaultConversionServiceTests {
void convertCollectionToObjectWithElementConversion() {
List<String> list = Collections.singletonList("3");
Integer result = conversionService.convert(list, Integer.class);
assertThat((int) result).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result).isEqualTo((int) 3);
}
@Test
@@ -590,15 +590,15 @@ class DefaultConversionServiceTests {
List<Integer> result = (List<Integer>) conversionService.convert(3L, TypeDescriptor.valueOf(Long.class),
new TypeDescriptor(getClass().getField("genericList")));
assertThat(result.size()).isEqualTo(1);
assertThat((int) result.get(0)).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result.get(0)).isEqualTo((int) 3);
}
@Test
void convertStringArrayToIntegerArray() {
Integer[] result = conversionService.convert(new String[] {"1", "2", "3"}, Integer[].class);
assertThat((int) result[0]).isEqualTo((int) Integer.valueOf(1));
assertThat((int) result[1]).isEqualTo((int) Integer.valueOf(2));
assertThat((int) result[2]).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result[0]).isEqualTo((int) 1);
assertThat((int) result[1]).isEqualTo((int) 2);
assertThat((int) result[2]).isEqualTo((int) 3);
}
@Test
@@ -612,9 +612,9 @@ class DefaultConversionServiceTests {
@Test
void convertIntegerArrayToIntegerArray() {
Integer[] result = conversionService.convert(new Integer[] {1, 2, 3}, Integer[].class);
assertThat((int) result[0]).isEqualTo((int) Integer.valueOf(1));
assertThat((int) result[1]).isEqualTo((int) Integer.valueOf(2));
assertThat((int) result[2]).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result[0]).isEqualTo((int) 1);
assertThat((int) result[1]).isEqualTo((int) 2);
assertThat((int) result[2]).isEqualTo((int) 3);
}
@Test
@@ -628,9 +628,9 @@ class DefaultConversionServiceTests {
@Test
void convertObjectArrayToIntegerArray() {
Integer[] result = conversionService.convert(new Object[] {1, 2, 3}, Integer[].class);
assertThat((int) result[0]).isEqualTo((int) Integer.valueOf(1));
assertThat((int) result[1]).isEqualTo((int) Integer.valueOf(2));
assertThat((int) result[2]).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result[0]).isEqualTo((int) 1);
assertThat((int) result[1]).isEqualTo((int) 2);
assertThat((int) result[2]).isEqualTo((int) 3);
}
@Test
@@ -697,9 +697,9 @@ class DefaultConversionServiceTests {
@SuppressWarnings("unchecked")
List<Integer> bar = (List<Integer>) conversionService.convert(foo, TypeDescriptor.forObject(foo),
new TypeDescriptor(getClass().getField("genericList")));
assertThat((int) bar.get(0)).isEqualTo((int) Integer.valueOf(1));
assertThat((int) bar.get(1)).isEqualTo((int) Integer.valueOf(2));
assertThat((int) bar.get(2)).isEqualTo((int) Integer.valueOf(3));
assertThat((int) bar.get(0)).isEqualTo((int) 1);
assertThat((int) bar.get(1)).isEqualTo((int) 2);
assertThat((int) bar.get(2)).isEqualTo((int) 3);
}
@Test
@@ -735,9 +735,9 @@ class DefaultConversionServiceTests {
List<Integer> bar = (List<Integer>) conversionService.convert(values,
TypeDescriptor.forObject(values), new TypeDescriptor(getClass().getField("genericList")));
assertThat(bar.size()).isEqualTo(3);
assertThat((int) bar.get(0)).isEqualTo((int) Integer.valueOf(1));
assertThat((int) bar.get(1)).isEqualTo((int) Integer.valueOf(2));
assertThat((int) bar.get(2)).isEqualTo((int) Integer.valueOf(3));
assertThat((int) bar.get(0)).isEqualTo((int) 1);
assertThat((int) bar.get(1)).isEqualTo((int) 2);
assertThat((int) bar.get(2)).isEqualTo((int) 3);
}
@Test
@@ -748,8 +748,8 @@ class DefaultConversionServiceTests {
@SuppressWarnings("unchecked")
List<Integer> integers = (List<Integer>) conversionService.convert(strings,
TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Integer.class)));
assertThat((int) integers.get(0)).isEqualTo((int) Integer.valueOf(3));
assertThat((int) integers.get(1)).isEqualTo((int) Integer.valueOf(9));
assertThat((int) integers.get(0)).isEqualTo((int) 3);
assertThat((int) integers.get(1)).isEqualTo((int) 9);
}
@Test
@@ -781,8 +781,8 @@ class DefaultConversionServiceTests {
@SuppressWarnings("unchecked")
Map<Integer, Integer> integers = (Map<Integer, Integer>) conversionService.convert(strings,
TypeDescriptor.map(Map.class, TypeDescriptor.valueOf(Integer.class), TypeDescriptor.valueOf(Integer.class)));
assertThat((int) integers.get(3)).isEqualTo((int) Integer.valueOf(9));
assertThat((int) integers.get(6)).isEqualTo((int) Integer.valueOf(31));
assertThat((int) integers.get(3)).isEqualTo((int) 9);
assertThat((int) integers.get(6)).isEqualTo((int) 31);
}
@Test
@@ -879,7 +879,7 @@ class DefaultConversionServiceTests {
@Test
void convertObjectToObjectNoValueOfMethodOrConstructor() {
assertThatExceptionOfType(ConverterNotFoundException.class).isThrownBy(() ->
conversionService.convert(Long.valueOf(3), SSN.class));
conversionService.convert(3L, SSN.class));
}
@Test

4
spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
View File

@@ -104,7 +104,7 @@ class GenericConversionServiceTests {
@Test
void convert() {
conversionService.addConverterFactory(new StringToNumberConverterFactory());
assertThat(conversionService.convert("3", Integer.class)).isEqualTo((int) Integer.valueOf(3));
assertThat(conversionService.convert("3", Integer.class)).isEqualTo((int) 3);
}
@Test
@@ -192,7 +192,7 @@ class GenericConversionServiceTests {
void convertSuperSourceType() {
conversionService.addConverter(CharSequence.class, Integer.class, source -> Integer.valueOf(source.toString()));
Integer result = conversionService.convert("3", Integer.class);
assertThat((int) result).isEqualTo((int) Integer.valueOf(3));
assertThat((int) result).isEqualTo((int) 3);
}
// SPR-8718

12
spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
View File

@@ -70,12 +70,12 @@ class CollectionUtilsTests {
void mergePrimitiveArrayIntoCollection() {
int[] arr = new int[] {1, 2};
List<Comparable<?>> list = new ArrayList<>();
list.add(Integer.valueOf(3));
list.add(3);
CollectionUtils.mergeArrayIntoCollection(arr, list);
assertThat(list.get(0)).isEqualTo(Integer.valueOf(3));
assertThat(list.get(1)).isEqualTo(Integer.valueOf(1));
assertThat(list.get(2)).isEqualTo(Integer.valueOf(2));
assertThat(list.get(0)).isEqualTo(3);
assertThat(list.get(1)).isEqualTo(1);
assertThat(list.get(2)).isEqualTo(2);
}
@Test
@@ -84,7 +84,7 @@ class CollectionUtilsTests {
defaults.setProperty("prop1", "value1");
Properties props = new Properties(defaults);
props.setProperty("prop2", "value2");
props.put("prop3", Integer.valueOf(3));
props.put("prop3", 3);
Map<String, Object> map = new HashMap<>();
map.put("prop4", "value4");
@@ -92,7 +92,7 @@ class CollectionUtilsTests {
CollectionUtils.mergePropertiesIntoMap(props, map);
assertThat(map.get("prop1")).isEqualTo("value1");
assertThat(map.get("prop2")).isEqualTo("value2");
assertThat(map.get("prop3")).isEqualTo(Integer.valueOf(3));
assertThat(map.get("prop3")).isEqualTo(3);
assertThat(map.get("prop4")).isEqualTo("value4");
}

128
spring-core/src/test/java/org/springframework/util/NumberUtilsTests.java
View File

@@ -134,7 +134,7 @@ class NumberUtilsTests {
@Test
void convertDoubleToBigInteger() {
Double decimal = Double.valueOf(3.14d);
Double decimal = 3.14d;
assertThat(NumberUtils.convertNumberToTargetClass(decimal, BigInteger.class)).isEqualTo(new BigInteger("3"));
}
@@ -272,48 +272,48 @@ class NumberUtilsTests {
@Test
void convertToInteger() {
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(-1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(0), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(-1), Integer.class)).isEqualTo(Integer.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(0), Integer.class)).isEqualTo(Integer.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(1), Integer.class)).isEqualTo(Integer.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(Integer.MAX_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(Integer.MAX_VALUE + 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(Integer.MIN_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(Integer.MIN_VALUE - 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(-1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(0), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass((long) -1, Integer.class)).isEqualTo(Integer.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass(0L, Integer.class)).isEqualTo(Integer.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass(1L, Integer.class)).isEqualTo(Integer.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(Integer.MAX_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(Integer.MAX_VALUE + 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(Integer.MIN_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(Integer.MIN_VALUE - 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((long) (Integer.MAX_VALUE + 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((long) Integer.MIN_VALUE, Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((long) (Integer.MIN_VALUE - 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(-1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(0), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(Integer.MAX_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(Integer.MAX_VALUE + 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(Integer.MIN_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(Integer.MIN_VALUE - 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(-1, Integer.class)).isEqualTo(Integer.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass(0, Integer.class)).isEqualTo(Integer.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass(1, Integer.class)).isEqualTo(Integer.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.MAX_VALUE, Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.MAX_VALUE + 1, Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.MIN_VALUE, Integer.class)).isEqualTo(Integer.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.MIN_VALUE - 1, Integer.class)).isEqualTo(Integer.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) -1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) 0), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf(Short.MAX_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Short.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) (Short.MAX_VALUE + 1)), Integer.class)).isEqualTo(Integer.valueOf(Short.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf(Short.MIN_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Short.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) (Short.MIN_VALUE - 1)), Integer.class)).isEqualTo(Integer.valueOf(Short.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((short) -1, Integer.class)).isEqualTo(Integer.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass((short) 0, Integer.class)).isEqualTo(Integer.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass((short) 1, Integer.class)).isEqualTo(Integer.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(Short.MAX_VALUE, Integer.class)).isEqualTo(Integer.valueOf(Short.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((short) (Short.MAX_VALUE + 1), Integer.class)).isEqualTo(Integer.valueOf(Short.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.MIN_VALUE, Integer.class)).isEqualTo(Integer.valueOf(Short.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((short) (Short.MIN_VALUE - 1), Integer.class)).isEqualTo(Integer.valueOf(Short.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) -1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) 0), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) 1), Integer.class)).isEqualTo(Integer.valueOf(Integer.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf(Byte.MAX_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Byte.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) (Byte.MAX_VALUE + 1)), Integer.class)).isEqualTo(Integer.valueOf(Byte.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf(Byte.MIN_VALUE), Integer.class)).isEqualTo(Integer.valueOf(Byte.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) (Byte.MIN_VALUE - 1)), Integer.class)).isEqualTo(Integer.valueOf(Byte.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((byte) -1, Integer.class)).isEqualTo(Integer.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass((byte) 0, Integer.class)).isEqualTo(Integer.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass((byte) 1, Integer.class)).isEqualTo(Integer.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.MAX_VALUE, Integer.class)).isEqualTo(Integer.valueOf(Byte.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((byte) (Byte.MAX_VALUE + 1), Integer.class)).isEqualTo(Integer.valueOf(Byte.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.MIN_VALUE, Integer.class)).isEqualTo(Integer.valueOf(Byte.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((byte) (Byte.MIN_VALUE - 1), Integer.class)).isEqualTo(Integer.valueOf(Byte.MAX_VALUE));
assertToNumberOverflow(Long.valueOf(Long.MAX_VALUE + 1), Integer.class);
assertToNumberOverflow(Long.valueOf(Long.MIN_VALUE - 1), Integer.class);
assertToNumberOverflow(Long.MAX_VALUE + 1, Integer.class);
assertToNumberOverflow(Long.MIN_VALUE - 1, Integer.class);
assertToNumberOverflow(BigInteger.valueOf(Integer.MAX_VALUE).add(BigInteger.ONE), Integer.class);
assertToNumberOverflow(BigInteger.valueOf(Integer.MIN_VALUE).subtract(BigInteger.ONE), Integer.class);
assertToNumberOverflow(new BigDecimal("18446744073709551611"), Integer.class);
@@ -321,45 +321,45 @@ class NumberUtilsTests {
@Test
void convertToLong() {
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(-1), Long.class)).isEqualTo(Long.valueOf(Long.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(0), Long.class)).isEqualTo(Long.valueOf(Long.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(1), Long.class)).isEqualTo(Long.valueOf(Long.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(-1), Long.class)).isEqualTo(Long.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(0), Long.class)).isEqualTo(Long.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(1), Long.class)).isEqualTo(Long.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(Long.MAX_VALUE), Long.class)).isEqualTo(Long.valueOf(Long.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(Long.MAX_VALUE + 1), Long.class)).isEqualTo(Long.valueOf(Long.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(Long.MIN_VALUE), Long.class)).isEqualTo(Long.valueOf(Long.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(BigInteger.valueOf(Long.MIN_VALUE - 1), Long.class)).isEqualTo(Long.valueOf(Long.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(-1), Long.class)).isEqualTo(Long.valueOf(Long.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(0), Long.class)).isEqualTo(Long.valueOf(Long.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(1), Long.class)).isEqualTo(Long.valueOf(Long.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(Long.MAX_VALUE), Long.class)).isEqualTo(Long.valueOf(Long.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(Long.MAX_VALUE + 1), Long.class)).isEqualTo(Long.valueOf(Long.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(Long.MIN_VALUE), Long.class)).isEqualTo(Long.valueOf(Long.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.valueOf(Long.MIN_VALUE - 1), Long.class)).isEqualTo(Long.valueOf(Long.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((long) -1, Long.class)).isEqualTo(Long.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass(0L, Long.class)).isEqualTo(Long.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass(1L, Long.class)).isEqualTo(Long.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(Long.MAX_VALUE, Long.class)).isEqualTo(Long.valueOf(Long.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.MAX_VALUE + 1, Long.class)).isEqualTo(Long.valueOf(Long.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.MIN_VALUE, Long.class)).isEqualTo(Long.valueOf(Long.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Long.MIN_VALUE - 1, Long.class)).isEqualTo(Long.valueOf(Long.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(-1), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(0), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(1), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(Integer.MAX_VALUE), Long.class)).isEqualTo(Long.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(Integer.MAX_VALUE + 1), Long.class)).isEqualTo(Long.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(Integer.MIN_VALUE), Long.class)).isEqualTo(Long.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.valueOf(Integer.MIN_VALUE - 1), Long.class)).isEqualTo(Long.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(-1, Long.class)).isEqualTo(Long.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass(0, Long.class)).isEqualTo(Long.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass(1, Long.class)).isEqualTo(Long.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.MAX_VALUE, Long.class)).isEqualTo(Long.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.MAX_VALUE + 1, Long.class)).isEqualTo(Long.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.MIN_VALUE, Long.class)).isEqualTo(Long.valueOf(Integer.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Integer.MIN_VALUE - 1, Long.class)).isEqualTo(Long.valueOf(Integer.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) -1), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) 0), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) 1), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf(Short.MAX_VALUE), Long.class)).isEqualTo(Long.valueOf(Short.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) (Short.MAX_VALUE + 1)), Long.class)).isEqualTo(Long.valueOf(Short.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf(Short.MIN_VALUE), Long.class)).isEqualTo(Long.valueOf(Short.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.valueOf((short) (Short.MIN_VALUE - 1)), Long.class)).isEqualTo(Long.valueOf(Short.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((short) -1, Long.class)).isEqualTo(Long.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass((short) 0, Long.class)).isEqualTo(Long.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass((short) 1, Long.class)).isEqualTo(Long.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(Short.MAX_VALUE, Long.class)).isEqualTo(Long.valueOf(Short.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((short) (Short.MAX_VALUE + 1), Long.class)).isEqualTo(Long.valueOf(Short.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Short.MIN_VALUE, Long.class)).isEqualTo(Long.valueOf(Short.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((short) (Short.MIN_VALUE - 1), Long.class)).isEqualTo(Long.valueOf(Short.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) -1), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(-1)));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) 0), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(0)));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) 1), Long.class)).isEqualTo(Long.valueOf(Integer.valueOf(1)));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf(Byte.MAX_VALUE), Long.class)).isEqualTo(Long.valueOf(Byte.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) (Byte.MAX_VALUE + 1)), Long.class)).isEqualTo(Long.valueOf(Byte.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf(Byte.MIN_VALUE), Long.class)).isEqualTo(Long.valueOf(Byte.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.valueOf((byte) (Byte.MIN_VALUE - 1)), Long.class)).isEqualTo(Long.valueOf(Byte.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((byte) -1, Long.class)).isEqualTo(Long.valueOf(-1));
assertThat(NumberUtils.convertNumberToTargetClass((byte) 0, Long.class)).isEqualTo(Long.valueOf(0));
assertThat(NumberUtils.convertNumberToTargetClass((byte) 1, Long.class)).isEqualTo(Long.valueOf(1));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.MAX_VALUE, Long.class)).isEqualTo(Long.valueOf(Byte.MAX_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((byte) (Byte.MAX_VALUE + 1), Long.class)).isEqualTo(Long.valueOf(Byte.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass(Byte.MIN_VALUE, Long.class)).isEqualTo(Long.valueOf(Byte.MIN_VALUE));
assertThat(NumberUtils.convertNumberToTargetClass((byte) (Byte.MIN_VALUE - 1), Long.class)).isEqualTo(Long.valueOf(Byte.MAX_VALUE));
assertToNumberOverflow(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE), Long.class);
assertToNumberOverflow(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE), Long.class);

2
spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
View File

@@ -703,7 +703,7 @@ class ObjectUtilsTests {
@Test
void nullSafeToStringWithObjectArray() {
Object[] array = {"Han", Long.valueOf(43)};
Object[] array = {"Han", 43L};
assertThat(ObjectUtils.nullSafeToString(array)).isEqualTo("{Han, 43}");
}

4
spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
View File

@@ -305,13 +305,13 @@ class ReflectionUtilsTests {
class Parent {
@SuppressWarnings("unused")
public Number m1() {
return Integer.valueOf(42);
return 42;
}
}
class Leaf extends Parent {
@Override
public Integer m1() {
return Integer.valueOf(42);
return 42;
}
}
Method[] methods = ReflectionUtils.getUniqueDeclaredMethods(Leaf.class);