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

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

@@ -667,22 +667,22 @@ abstract class AbstractPropertyAccessorTests {
accessor.setPropertyValue("myDouble", doubleValue);
assertThat(target.getMyPrimitiveByte()).isEqualTo(Byte.MAX_VALUE);
assertThat(target.getMyByte().byteValue()).isEqualTo(Byte.MAX_VALUE);
assertThat(target.getMyByte()).isEqualTo(Byte.MAX_VALUE);
assertThat(target.getMyPrimitiveShort()).isEqualTo(Short.MAX_VALUE);
assertThat(target.getMyShort().shortValue()).isEqualTo(Short.MAX_VALUE);
assertThat(target.getMyShort()).isEqualTo(Short.MAX_VALUE);
assertThat(target.getMyPrimitiveInt()).isEqualTo(Integer.MAX_VALUE);
assertThat(target.getMyInteger().intValue()).isEqualTo(Integer.MAX_VALUE);
assertThat(target.getMyInteger()).isEqualTo(Integer.MAX_VALUE);
assertThat(target.getMyPrimitiveLong()).isEqualTo(Long.MAX_VALUE);
assertThat(target.getMyLong().longValue()).isEqualTo(Long.MAX_VALUE);
assertThat(target.getMyLong()).isEqualTo(Long.MAX_VALUE);
assertThat((double) target.getMyPrimitiveFloat()).isCloseTo(Float.MAX_VALUE, within(0.001));
assertThat((double) target.getMyFloat()).isCloseTo(Float.MAX_VALUE, within(0.001));
assertThat(target.getMyPrimitiveDouble()).isCloseTo(Double.MAX_VALUE, within(0.001));
assertThat(target.getMyDouble().doubleValue()).isCloseTo(Double.MAX_VALUE, within(0.001));
assertThat(target.getMyDouble()).isCloseTo(Double.MAX_VALUE, within(0.001));
}
@Test

6
spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
View File

@@ -335,7 +335,7 @@ class BeanWrapperGenericsTests {
Object obj = gb.getMapOfListOfInteger().get("testKey").get(0);
assertThat(obj).isInstanceOf(Integer.class);
assertThat(((Integer) obj).intValue()).isEqualTo(1);
assertThat(obj).isEqualTo(1);
}
@Test
@@ -351,7 +351,7 @@ class BeanWrapperGenericsTests {
Object obj = gb.getListOfMapOfInteger().get(0).get("testKey");
assertThat(obj).isInstanceOf(Integer.class);
assertThat(((Integer) obj).intValue()).isEqualTo(5);
assertThat(obj).isEqualTo(5);
}
@Test
@@ -366,7 +366,7 @@ class BeanWrapperGenericsTests {
Object obj = gb.getMapOfListOfListOfInteger().get("testKey").get(0).get(0);
assertThat(obj).isInstanceOf(Integer.class);
assertThat(((Integer) obj).intValue()).isEqualTo(1);
assertThat(obj).isEqualTo(1);
}
@Test

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

@@ -3201,9 +3201,9 @@ class DefaultListableBeanFactoryTests {
@Override
public Object convertIfNecessary(Object value, @Nullable Class requiredType) {
if (value instanceof String && Float.class.isAssignableFrom(requiredType)) {
if (value instanceof String text && Float.class.isAssignableFrom(requiredType)) {
try {
return this.numberFormat.parse((String) value).floatValue();
return this.numberFormat.parse(text).floatValue();
}
catch (ParseException ex) {
throw new TypeMismatchException(value, requiredType, ex);

16
spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
View File

@@ -135,9 +135,9 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setTargetMethod("method1");
mcfb.afterPropertiesSet();
Integer i = (Integer) mcfb.getObject();
assertThat(i.intValue()).isEqualTo(1);
assertThat(i).isEqualTo(1);
i = (Integer) mcfb.getObject();
assertThat(i.intValue()).isEqualTo(1);
assertThat(i).isEqualTo(1);
// non-singleton, non-static
tc1 = new TestClass1();
@@ -147,9 +147,9 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setSingleton(false);
mcfb.afterPropertiesSet();
i = (Integer) mcfb.getObject();
assertThat(i.intValue()).isEqualTo(1);
assertThat(i).isEqualTo(1);
i = (Integer) mcfb.getObject();
assertThat(i.intValue()).isEqualTo(2);
assertThat(i).isEqualTo(2);
// singleton, static
TestClass1._staticField1 = 0;
@@ -158,9 +158,9 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setTargetMethod("staticMethod1");
mcfb.afterPropertiesSet();
i = (Integer) mcfb.getObject();
assertThat(i.intValue()).isEqualTo(1);
assertThat(i).isEqualTo(1);
i = (Integer) mcfb.getObject();
assertThat(i.intValue()).isEqualTo(1);
assertThat(i).isEqualTo(1);
// non-singleton, static
TestClass1._staticField1 = 0;
@@ -169,9 +169,9 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setSingleton(false);
mcfb.afterPropertiesSet();
i = (Integer) mcfb.getObject();
assertThat(i.intValue()).isEqualTo(1);
assertThat(i).isEqualTo(1);
i = (Integer) mcfb.getObject();
assertThat(i.intValue()).isEqualTo(2);
assertThat(i).isEqualTo(2);
// void return value
mcfb = new MethodInvokingFactoryBean();

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
View File

@@ -65,13 +65,13 @@ public class UtilNamespaceHandlerTests {
@Test
void testConstant() {
Integer min = (Integer) this.beanFactory.getBean("min");
assertThat(min.intValue()).isEqualTo(Integer.MIN_VALUE);
assertThat(min).isEqualTo(Integer.MIN_VALUE);
}
@Test
void testConstantWithDefaultName() {
Integer max = (Integer) this.beanFactory.getBean("java.lang.Integer.MAX_VALUE");
assertThat(max.intValue()).isEqualTo(Integer.MAX_VALUE);
assertThat(max).isEqualTo(Integer.MAX_VALUE);
}
@Test