Skip to content

Commit a7f0732

Browse files
committed
Add tests for status quo in ObjectUtils.nullSafeConciseToString()
1 parent 45f747f commit a7f0732

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package org.springframework.util;
1818

1919
import java.io.IOException;
20+
import java.math.BigDecimal;
21+
import java.math.BigInteger;
2022
import java.net.URI;
2123
import java.net.URL;
2224
import java.sql.SQLException;
@@ -224,22 +226,22 @@ void addObjectToSingleNullElementArray() {
224226
}
225227

226228
@Test
227-
void addObjectToNullArray() throws Exception {
229+
void addObjectToNullArray() {
228230
String newElement = "foo";
229231
String[] newArray = ObjectUtils.addObjectToArray(null, newElement);
230232
assertThat(newArray).hasSize(1);
231233
assertThat(newArray[0]).isEqualTo(newElement);
232234
}
233235

234236
@Test
235-
void addNullObjectToNullArray() throws Exception {
237+
void addNullObjectToNullArray() {
236238
Object[] newArray = ObjectUtils.addObjectToArray(null, null);
237239
assertThat(newArray).hasSize(1);
238240
assertThat(newArray[0]).isNull();
239241
}
240242

241243
@Test
242-
void nullSafeEqualsWithArrays() throws Exception {
244+
void nullSafeEqualsWithArrays() {
243245
assertThat(ObjectUtils.nullSafeEquals(new String[] {"a", "b", "c"}, new String[] {"a", "b", "c"})).isTrue();
244246
assertThat(ObjectUtils.nullSafeEquals(new int[] {1, 2, 3}, new int[] {1, 2, 3})).isTrue();
245247
}
@@ -881,11 +883,19 @@ void nullSafeConciseToStringForEnum() {
881883
}
882884

883885
@Test
884-
void nullSafeConciseToStringForNumber() {
886+
void nullSafeConciseToStringForPrimitivesAndWrappers() {
887+
assertThat(ObjectUtils.nullSafeConciseToString(true)).isEqualTo("true");
888+
assertThat(ObjectUtils.nullSafeConciseToString('X')).isEqualTo("X");
885889
assertThat(ObjectUtils.nullSafeConciseToString(42L)).isEqualTo("42");
886890
assertThat(ObjectUtils.nullSafeConciseToString(99.1234D)).isEqualTo("99.1234");
887891
}
888892

893+
@Test
894+
void nullSafeConciseToStringForBigNumbers() {
895+
assertThat(ObjectUtils.nullSafeConciseToString(BigInteger.valueOf(42L))).isEqualTo("42");
896+
assertThat(ObjectUtils.nullSafeConciseToString(BigDecimal.valueOf(99.1234D))).isEqualTo("99.1234");
897+
}
898+
889899
@Test
890900
void nullSafeConciseToStringForDate() {
891901
Date date = new Date();
@@ -943,6 +953,13 @@ void nullSafeConciseToStringForArraysAndCollections() {
943953
assertThat(ObjectUtils.nullSafeConciseToString(new HashSet<>(list))).startsWith(prefix(HashSet.class));
944954
}
945955

956+
@Test
957+
void nullSafeConciseToStringForMaps() {
958+
HashMap<String, Object> map = new HashMap<>();
959+
map.put("foo", 42L);
960+
assertThat(ObjectUtils.nullSafeConciseToString(map)).startsWith(prefix(map.getClass()));
961+
}
962+
946963
@Test
947964
void nullSafeConciseToStringForCustomTypes() {
948965
class ExplosiveType {

0 commit comments

Comments
 (0)