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

Rely on auto-boxing in tests

Browse Source
This commit is contained in:
Sam Brannen
2023-07-12 11:29:57 +02:00
parent 1edc0d8002
commit 68f2b0ca59
32 changed files with 185 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,26 +60,18 @@ class CollectionToCollectionConverterTests {
@Test
void scalarList() throws Exception {
List<String> list = new ArrayList<>();
list.add("9");
list.add("37");
List<String> list = List.of("9", "37");
TypeDescriptor sourceType = TypeDescriptor.forObject(list);
TypeDescriptor targetType = new TypeDescriptor(getClass().getField("scalarListTarget"));
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
try {
conversionService.convert(list, sourceType, targetType);
}
catch (ConversionFailedException ex) {
boolean condition = ex.getCause() instanceof ConverterNotFoundException;
assertThat(condition).isTrue();
}
assertThatExceptionOfType(ConversionFailedException.class)
.isThrownBy(() -> conversionService.convert(list, sourceType, targetType))
.withCauseInstanceOf(ConverterNotFoundException.class);
conversionService.addConverterFactory(new StringToNumberConverterFactory());
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
@SuppressWarnings("unchecked")
List<Integer> result = (List<Integer>) conversionService.convert(list, sourceType, targetType);
assertThat(list.equals(result)).isFalse();
assertThat(result.get(0).intValue()).isEqualTo(9);
assertThat(result.get(1).intValue()).isEqualTo(37);
assertThat(result).isNotEqualTo(list).containsExactly(9, 37);
}
@Test

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

@@ -42,7 +42,7 @@ class MethodInvokerTests {
mi.setTargetMethod("method1");
mi.prepare();
Integer i = (Integer) mi.invoke();
assertThat(i.intValue()).isEqualTo(1);
assertThat(i).isEqualTo(1);
// defensive check: singleton, non-static should work with null array
tc1 = new TestClass1();
@@ -52,7 +52,7 @@ class MethodInvokerTests {
mi.setArguments((Object[]) null);
mi.prepare();
i = (Integer) mi.invoke();
assertThat(i.intValue()).isEqualTo(1);
assertThat(i).isEqualTo(1);
// sanity check: check that argument count matching works
mi = new MethodInvoker();

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

@@ -104,8 +104,8 @@ class NumberUtilsTests {
@Test
void parseNumberAsHex() {
String aByte = "0x" + Integer.toHexString(Byte.valueOf(Byte.MAX_VALUE).intValue());
String aShort = "0x" + Integer.toHexString(Short.valueOf(Short.MAX_VALUE).intValue());
String aByte = "0x" + Integer.toHexString(Byte.valueOf(Byte.MAX_VALUE));
String aShort = "0x" + Integer.toHexString(Short.valueOf(Short.MAX_VALUE));
String anInteger = "0x" + Integer.toHexString(Integer.MAX_VALUE);
String aLong = "0x" + Long.toHexString(Long.MAX_VALUE);
String aReallyBigInt = "FEBD4E677898DFEBFFEE44";
@@ -368,35 +368,35 @@ class NumberUtilsTests {
private void assertLongEquals(String aLong) {
assertThat(NumberUtils.parseNumber(aLong, Long.class).longValue()).as("Long did not parse").isEqualTo(Long.MAX_VALUE);
assertThat(NumberUtils.parseNumber(aLong, Long.class)).as("Long did not parse").isEqualTo(Long.MAX_VALUE);
}
private void assertIntegerEquals(String anInteger) {
assertThat(NumberUtils.parseNumber(anInteger, Integer.class).intValue()).as("Integer did not parse").isEqualTo(Integer.MAX_VALUE);
assertThat(NumberUtils.parseNumber(anInteger, Integer.class)).as("Integer did not parse").isEqualTo(Integer.MAX_VALUE);
}
private void assertShortEquals(String aShort) {
assertThat(NumberUtils.parseNumber(aShort, Short.class).shortValue()).as("Short did not parse").isEqualTo(Short.MAX_VALUE);
assertThat(NumberUtils.parseNumber(aShort, Short.class)).as("Short did not parse").isEqualTo(Short.MAX_VALUE);
}
private void assertByteEquals(String aByte) {
assertThat(NumberUtils.parseNumber(aByte, Byte.class).byteValue()).as("Byte did not parse").isEqualTo(Byte.MAX_VALUE);
assertThat(NumberUtils.parseNumber(aByte, Byte.class)).as("Byte did not parse").isEqualTo(Byte.MAX_VALUE);
}
private void assertNegativeLongEquals(String aLong) {
assertThat(NumberUtils.parseNumber(aLong, Long.class).longValue()).as("Long did not parse").isEqualTo(Long.MIN_VALUE);
assertThat(NumberUtils.parseNumber(aLong, Long.class)).as("Long did not parse").isEqualTo(Long.MIN_VALUE);
}
private void assertNegativeIntegerEquals(String anInteger) {
assertThat(NumberUtils.parseNumber(anInteger, Integer.class).intValue()).as("Integer did not parse").isEqualTo(Integer.MIN_VALUE);
assertThat(NumberUtils.parseNumber(anInteger, Integer.class)).as("Integer did not parse").isEqualTo(Integer.MIN_VALUE);
}
private void assertNegativeShortEquals(String aShort) {
assertThat(NumberUtils.parseNumber(aShort, Short.class).shortValue()).as("Short did not parse").isEqualTo(Short.MIN_VALUE);
assertThat(NumberUtils.parseNumber(aShort, Short.class)).as("Short did not parse").isEqualTo(Short.MIN_VALUE);
}
private void assertNegativeByteEquals(String aByte) {
assertThat(NumberUtils.parseNumber(aByte, Byte.class).byteValue()).as("Byte did not parse").isEqualTo(Byte.MIN_VALUE);
assertThat(NumberUtils.parseNumber(aByte, Byte.class)).as("Byte did not parse").isEqualTo(Byte.MIN_VALUE);
}
private void assertToNumberOverflow(Number number, Class<? extends Number> targetClass) {

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

@@ -164,9 +164,9 @@ class ObjectUtilsTests {
void toObjectArray() {
int[] a = new int[] {1, 2, 3, 4, 5};
Integer[] wrapper = (Integer[]) ObjectUtils.toObjectArray(a);
assertThat(wrapper.length).isEqualTo(5);
assertThat(wrapper).hasSize(5);
for (int i = 0; i < wrapper.length; i++) {
assertThat(wrapper[i].intValue()).isEqualTo(a[i]);
assertThat(wrapper[i]).isEqualTo(a[i]);
}
}