|
17 | 17 | package org.springframework.util;
|
18 | 18 |
|
19 | 19 | import java.io.IOException;
|
| 20 | +import java.math.BigDecimal; |
| 21 | +import java.math.BigInteger; |
20 | 22 | import java.net.URI;
|
21 | 23 | import java.net.URL;
|
22 | 24 | import java.sql.SQLException;
|
@@ -224,22 +226,22 @@ void addObjectToSingleNullElementArray() {
|
224 | 226 | }
|
225 | 227 |
|
226 | 228 | @Test
|
227 |
| - void addObjectToNullArray() throws Exception { |
| 229 | + void addObjectToNullArray() { |
228 | 230 | String newElement = "foo";
|
229 | 231 | String[] newArray = ObjectUtils.addObjectToArray(null, newElement);
|
230 | 232 | assertThat(newArray).hasSize(1);
|
231 | 233 | assertThat(newArray[0]).isEqualTo(newElement);
|
232 | 234 | }
|
233 | 235 |
|
234 | 236 | @Test
|
235 |
| - void addNullObjectToNullArray() throws Exception { |
| 237 | + void addNullObjectToNullArray() { |
236 | 238 | Object[] newArray = ObjectUtils.addObjectToArray(null, null);
|
237 | 239 | assertThat(newArray).hasSize(1);
|
238 | 240 | assertThat(newArray[0]).isNull();
|
239 | 241 | }
|
240 | 242 |
|
241 | 243 | @Test
|
242 |
| - void nullSafeEqualsWithArrays() throws Exception { |
| 244 | + void nullSafeEqualsWithArrays() { |
243 | 245 | assertThat(ObjectUtils.nullSafeEquals(new String[] {"a", "b", "c"}, new String[] {"a", "b", "c"})).isTrue();
|
244 | 246 | assertThat(ObjectUtils.nullSafeEquals(new int[] {1, 2, 3}, new int[] {1, 2, 3})).isTrue();
|
245 | 247 | }
|
@@ -881,11 +883,19 @@ void nullSafeConciseToStringForEnum() {
|
881 | 883 | }
|
882 | 884 |
|
883 | 885 | @Test
|
884 |
| - void nullSafeConciseToStringForNumber() { |
| 886 | + void nullSafeConciseToStringForPrimitivesAndWrappers() { |
| 887 | + assertThat(ObjectUtils.nullSafeConciseToString(true)).isEqualTo("true"); |
| 888 | + assertThat(ObjectUtils.nullSafeConciseToString('X')).isEqualTo("X"); |
885 | 889 | assertThat(ObjectUtils.nullSafeConciseToString(42L)).isEqualTo("42");
|
886 | 890 | assertThat(ObjectUtils.nullSafeConciseToString(99.1234D)).isEqualTo("99.1234");
|
887 | 891 | }
|
888 | 892 |
|
| 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 | + |
889 | 899 | @Test
|
890 | 900 | void nullSafeConciseToStringForDate() {
|
891 | 901 | Date date = new Date();
|
@@ -943,6 +953,13 @@ void nullSafeConciseToStringForArraysAndCollections() {
|
943 | 953 | assertThat(ObjectUtils.nullSafeConciseToString(new HashSet<>(list))).startsWith(prefix(HashSet.class));
|
944 | 954 | }
|
945 | 955 |
|
| 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 | + |
946 | 963 | @Test
|
947 | 964 | void nullSafeConciseToStringForCustomTypes() {
|
948 | 965 | class ExplosiveType {
|
|
0 commit comments