Skip to content

Commit 68f2b0c

Browse files
sbrannensbrannen
committed
Rely on auto-boxing in tests
1 parent 1edc0d8 commit 68f2b0c

File tree

32 files changed

+185
-202
lines changed

32 files changed

+185
-202
lines changed

‎spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -667,22 +667,22 @@ void setPrimitiveProperties() {
667667
accessor.setPropertyValue("myDouble", doubleValue);
668668

669669
assertThat(target.getMyPrimitiveByte()).isEqualTo(Byte.MAX_VALUE);
670-
assertThat(target.getMyByte().byteValue()).isEqualTo(Byte.MAX_VALUE);
670+
assertThat(target.getMyByte()).isEqualTo(Byte.MAX_VALUE);
671671

672672
assertThat(target.getMyPrimitiveShort()).isEqualTo(Short.MAX_VALUE);
673-
assertThat(target.getMyShort().shortValue()).isEqualTo(Short.MAX_VALUE);
673+
assertThat(target.getMyShort()).isEqualTo(Short.MAX_VALUE);
674674

675675
assertThat(target.getMyPrimitiveInt()).isEqualTo(Integer.MAX_VALUE);
676-
assertThat(target.getMyInteger().intValue()).isEqualTo(Integer.MAX_VALUE);
676+
assertThat(target.getMyInteger()).isEqualTo(Integer.MAX_VALUE);
677677

678678
assertThat(target.getMyPrimitiveLong()).isEqualTo(Long.MAX_VALUE);
679-
assertThat(target.getMyLong().longValue()).isEqualTo(Long.MAX_VALUE);
679+
assertThat(target.getMyLong()).isEqualTo(Long.MAX_VALUE);
680680

681681
assertThat((double) target.getMyPrimitiveFloat()).isCloseTo(Float.MAX_VALUE, within(0.001));
682682
assertThat((double) target.getMyFloat()).isCloseTo(Float.MAX_VALUE, within(0.001));
683683

684684
assertThat(target.getMyPrimitiveDouble()).isCloseTo(Double.MAX_VALUE, within(0.001));
685-
assertThat(target.getMyDouble().doubleValue()).isCloseTo(Double.MAX_VALUE, within(0.001));
685+
assertThat(target.getMyDouble()).isCloseTo(Double.MAX_VALUE, within(0.001));
686686
}
687687

688688
@Test

‎spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ void testGenericTypeNestingMapOfListOfInteger() {
335335

336336
Object obj = gb.getMapOfListOfInteger().get("testKey").get(0);
337337
assertThat(obj).isInstanceOf(Integer.class);
338-
assertThat(((Integer) obj).intValue()).isEqualTo(1);
338+
assertThat(obj).isEqualTo(1);
339339
}
340340

341341
@Test
@@ -351,7 +351,7 @@ void testGenericTypeNestingListOfMapOfInteger() {
351351

352352
Object obj = gb.getListOfMapOfInteger().get(0).get("testKey");
353353
assertThat(obj).isInstanceOf(Integer.class);
354-
assertThat(((Integer) obj).intValue()).isEqualTo(5);
354+
assertThat(obj).isEqualTo(5);
355355
}
356356

357357
@Test
@@ -366,7 +366,7 @@ void testGenericTypeNestingMapOfListOfListOfInteger() {
366366

367367
Object obj = gb.getMapOfListOfListOfInteger().get("testKey").get(0).get(0);
368368
assertThat(obj).isInstanceOf(Integer.class);
369-
assertThat(((Integer) obj).intValue()).isEqualTo(1);
369+
assertThat(obj).isEqualTo(1);
370370
}
371371

372372
@Test

‎spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3201,9 +3201,9 @@ public CustomTypeConverter(NumberFormat numberFormat) {
32013201

32023202
@Override
32033203
public Object convertIfNecessary(Object value, @Nullable Class requiredType) {
3204-
if (value instanceof String && Float.class.isAssignableFrom(requiredType)) {
3204+
if (value instanceof String text && Float.class.isAssignableFrom(requiredType)) {
32053205
try {
3206-
return this.numberFormat.parse((String) value).floatValue();
3206+
return this.numberFormat.parse(text).floatValue();
32073207
}
32083208
catch (ParseException ex) {
32093209
throw new TypeMismatchException(value, requiredType, ex);

‎spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ public void testGetObject() throws Exception {
135135
mcfb.setTargetMethod("method1");
136136
mcfb.afterPropertiesSet();
137137
Integer i = (Integer) mcfb.getObject();
138-
assertThat(i.intValue()).isEqualTo(1);
138+
assertThat(i).isEqualTo(1);
139139
i = (Integer) mcfb.getObject();
140-
assertThat(i.intValue()).isEqualTo(1);
140+
assertThat(i).isEqualTo(1);
141141

142142
// non-singleton, non-static
143143
tc1 = new TestClass1();
@@ -147,9 +147,9 @@ public void testGetObject() throws Exception {
147147
mcfb.setSingleton(false);
148148
mcfb.afterPropertiesSet();
149149
i = (Integer) mcfb.getObject();
150-
assertThat(i.intValue()).isEqualTo(1);
150+
assertThat(i).isEqualTo(1);
151151
i = (Integer) mcfb.getObject();
152-
assertThat(i.intValue()).isEqualTo(2);
152+
assertThat(i).isEqualTo(2);
153153

154154
// singleton, static
155155
TestClass1._staticField1 = 0;
@@ -158,9 +158,9 @@ public void testGetObject() throws Exception {
158158
mcfb.setTargetMethod("staticMethod1");
159159
mcfb.afterPropertiesSet();
160160
i = (Integer) mcfb.getObject();
161-
assertThat(i.intValue()).isEqualTo(1);
161+
assertThat(i).isEqualTo(1);
162162
i = (Integer) mcfb.getObject();
163-
assertThat(i.intValue()).isEqualTo(1);
163+
assertThat(i).isEqualTo(1);
164164

165165
// non-singleton, static
166166
TestClass1._staticField1 = 0;
@@ -169,9 +169,9 @@ public void testGetObject() throws Exception {
169169
mcfb.setSingleton(false);
170170
mcfb.afterPropertiesSet();
171171
i = (Integer) mcfb.getObject();
172-
assertThat(i.intValue()).isEqualTo(1);
172+
assertThat(i).isEqualTo(1);
173173
i = (Integer) mcfb.getObject();
174-
assertThat(i.intValue()).isEqualTo(2);
174+
assertThat(i).isEqualTo(2);
175175

176176
// void return value
177177
mcfb = new MethodInvokingFactoryBean();

‎spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ void setUp() {
6565
@Test
6666
void testConstant() {
6767
Integer min = (Integer) this.beanFactory.getBean("min");
68-
assertThat(min.intValue()).isEqualTo(Integer.MIN_VALUE);
68+
assertThat(min).isEqualTo(Integer.MIN_VALUE);
6969
}
7070

7171
@Test
7272
void testConstantWithDefaultName() {
7373
Integer max = (Integer) this.beanFactory.getBean("java.lang.Integer.MAX_VALUE");
74-
assertThat(max.intValue()).isEqualTo(Integer.MAX_VALUE);
74+
assertThat(max).isEqualTo(Integer.MAX_VALUE);
7575
}
7676

7777
@Test

‎spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public String getConversationId() {
160160
ValueTestBean tb3 = ac.getBean("tb3", ValueTestBean.class);
161161
assertThat(tb3.name).isEqualTo("XXXmyNameYYY42ZZZ");
162162
assertThat(tb3.age).isEqualTo(42);
163-
assertThat(tb3.ageFactory.getObject().intValue()).isEqualTo(42);
163+
assertThat(tb3.ageFactory.getObject()).isEqualTo(42);
164164
assertThat(tb3.country).isEqualTo("123 UK");
165165
assertThat(tb3.countryFactory.getObject()).isEqualTo("123 UK");
166166
System.getProperties().put("country", "US");

‎spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ void propertiesCorrectInJmx() throws Exception {
5151
Integer age = (Integer) getServer().getAttribute(oname, "Age");
5252

5353
assertThat(name).as("Name is incorrect in JMX").isEqualTo("Rob Harrop");
54-
assertThat(age.intValue()).as("Age is incorrect in JMX").isEqualTo(100);
54+
assertThat(age).as("Age is incorrect in JMX").isEqualTo(100);
5555
}
5656

5757
}
58-

‎spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,18 @@ void setUp() {
6060

6161
@Test
6262
void scalarList() throws Exception {
63-
List<String> list = new ArrayList<>();
64-
list.add("9");
65-
list.add("37");
63+
List<String> list = List.of("9", "37");
6664
TypeDescriptor sourceType = TypeDescriptor.forObject(list);
6765
TypeDescriptor targetType = new TypeDescriptor(getClass().getField("scalarListTarget"));
6866
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
69-
try {
70-
conversionService.convert(list, sourceType, targetType);
71-
}
72-
catch (ConversionFailedException ex) {
73-
boolean condition = ex.getCause() instanceof ConverterNotFoundException;
74-
assertThat(condition).isTrue();
75-
}
67+
assertThatExceptionOfType(ConversionFailedException.class)
68+
.isThrownBy(() -> conversionService.convert(list, sourceType, targetType))
69+
.withCauseInstanceOf(ConverterNotFoundException.class);
7670
conversionService.addConverterFactory(new StringToNumberConverterFactory());
7771
assertThat(conversionService.canConvert(sourceType, targetType)).isTrue();
7872
@SuppressWarnings("unchecked")
7973
List<Integer> result = (List<Integer>) conversionService.convert(list, sourceType, targetType);
80-
assertThat(list.equals(result)).isFalse();
81-
assertThat(result.get(0).intValue()).isEqualTo(9);
82-
assertThat(result.get(1).intValue()).isEqualTo(37);
74+
assertThat(result).isNotEqualTo(list).containsExactly(9, 37);
8375
}
8476

8577
@Test

‎spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void plainMethodInvoker() throws Exception {
4242
mi.setTargetMethod("method1");
4343
mi.prepare();
4444
Integer i = (Integer) mi.invoke();
45-
assertThat(i.intValue()).isEqualTo(1);
45+
assertThat(i).isEqualTo(1);
4646

4747
// defensive check: singleton, non-static should work with null array
4848
tc1 = new TestClass1();
@@ -52,7 +52,7 @@ void plainMethodInvoker() throws Exception {
5252
mi.setArguments((Object[]) null);
5353
mi.prepare();
5454
i = (Integer) mi.invoke();
55-
assertThat(i.intValue()).isEqualTo(1);
55+
assertThat(i).isEqualTo(1);
5656

5757
// sanity check: check that argument count matching works
5858
mi = new MethodInvoker();

‎spring-core/src/test/java/org/springframework/util/NumberUtilsTests.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ void parseNumberRequiringTrimUsingNumberFormat() {
104104

105105
@Test
106106
void parseNumberAsHex() {
107-
String aByte = "0x" + Integer.toHexString(Byte.valueOf(Byte.MAX_VALUE).intValue());
108-
String aShort = "0x" + Integer.toHexString(Short.valueOf(Short.MAX_VALUE).intValue());
107+
String aByte = "0x" + Integer.toHexString(Byte.valueOf(Byte.MAX_VALUE));
108+
String aShort = "0x" + Integer.toHexString(Short.valueOf(Short.MAX_VALUE));
109109
String anInteger = "0x" + Integer.toHexString(Integer.MAX_VALUE);
110110
String aLong = "0x" + Long.toHexString(Long.MAX_VALUE);
111111
String aReallyBigInt = "FEBD4E677898DFEBFFEE44";
@@ -368,35 +368,35 @@ void convertToLong() {
368368

369369

370370
private void assertLongEquals(String aLong) {
371-
assertThat(NumberUtils.parseNumber(aLong, Long.class).longValue()).as("Long did not parse").isEqualTo(Long.MAX_VALUE);
371+
assertThat(NumberUtils.parseNumber(aLong, Long.class)).as("Long did not parse").isEqualTo(Long.MAX_VALUE);
372372
}
373373

374374
private void assertIntegerEquals(String anInteger) {
375-
assertThat(NumberUtils.parseNumber(anInteger, Integer.class).intValue()).as("Integer did not parse").isEqualTo(Integer.MAX_VALUE);
375+
assertThat(NumberUtils.parseNumber(anInteger, Integer.class)).as("Integer did not parse").isEqualTo(Integer.MAX_VALUE);
376376
}
377377

378378
private void assertShortEquals(String aShort) {
379-
assertThat(NumberUtils.parseNumber(aShort, Short.class).shortValue()).as("Short did not parse").isEqualTo(Short.MAX_VALUE);
379+
assertThat(NumberUtils.parseNumber(aShort, Short.class)).as("Short did not parse").isEqualTo(Short.MAX_VALUE);
380380
}
381381

382382
private void assertByteEquals(String aByte) {
383-
assertThat(NumberUtils.parseNumber(aByte, Byte.class).byteValue()).as("Byte did not parse").isEqualTo(Byte.MAX_VALUE);
383+
assertThat(NumberUtils.parseNumber(aByte, Byte.class)).as("Byte did not parse").isEqualTo(Byte.MAX_VALUE);
384384
}
385385

386386
private void assertNegativeLongEquals(String aLong) {
387-
assertThat(NumberUtils.parseNumber(aLong, Long.class).longValue()).as("Long did not parse").isEqualTo(Long.MIN_VALUE);
387+
assertThat(NumberUtils.parseNumber(aLong, Long.class)).as("Long did not parse").isEqualTo(Long.MIN_VALUE);
388388
}
389389

390390
private void assertNegativeIntegerEquals(String anInteger) {
391-
assertThat(NumberUtils.parseNumber(anInteger, Integer.class).intValue()).as("Integer did not parse").isEqualTo(Integer.MIN_VALUE);
391+
assertThat(NumberUtils.parseNumber(anInteger, Integer.class)).as("Integer did not parse").isEqualTo(Integer.MIN_VALUE);
392392
}
393393

394394
private void assertNegativeShortEquals(String aShort) {
395-
assertThat(NumberUtils.parseNumber(aShort, Short.class).shortValue()).as("Short did not parse").isEqualTo(Short.MIN_VALUE);
395+
assertThat(NumberUtils.parseNumber(aShort, Short.class)).as("Short did not parse").isEqualTo(Short.MIN_VALUE);
396396
}
397397

398398
private void assertNegativeByteEquals(String aByte) {
399-
assertThat(NumberUtils.parseNumber(aByte, Byte.class).byteValue()).as("Byte did not parse").isEqualTo(Byte.MIN_VALUE);
399+
assertThat(NumberUtils.parseNumber(aByte, Byte.class)).as("Byte did not parse").isEqualTo(Byte.MIN_VALUE);
400400
}
401401

402402
private void assertToNumberOverflow(Number number, Class<? extends Number> targetClass) {

0 commit comments

Comments
 (0)