Browse Source

Add tests for status quo in ObjectUtils.nullSafeConciseToString()

pull/30915/head
Sam Brannen 3 years ago
parent
commit
08bce69d3d
  1. 25
      spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java

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

@ -17,6 +17,8 @@
package org.springframework.util; package org.springframework.util;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import java.sql.SQLException; import java.sql.SQLException;
@ -28,6 +30,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -232,7 +235,7 @@ class ObjectUtilsTests {
} }
@Test @Test
void addObjectToNullArray() throws Exception { void addObjectToNullArray() {
String newElement = "foo"; String newElement = "foo";
String[] newArray = ObjectUtils.addObjectToArray(null, newElement); String[] newArray = ObjectUtils.addObjectToArray(null, newElement);
assertThat(newArray).hasSize(1); assertThat(newArray).hasSize(1);
@ -240,14 +243,14 @@ class ObjectUtilsTests {
} }
@Test @Test
void addNullObjectToNullArray() throws Exception { void addNullObjectToNullArray() {
Object[] newArray = ObjectUtils.addObjectToArray(null, null); Object[] newArray = ObjectUtils.addObjectToArray(null, null);
assertThat(newArray).hasSize(1); assertThat(newArray).hasSize(1);
assertThat(newArray[0]).isNull(); assertThat(newArray[0]).isNull();
} }
@Test @Test
void nullSafeEqualsWithArrays() throws Exception { void nullSafeEqualsWithArrays() {
assertThat(ObjectUtils.nullSafeEquals(new String[] {"a", "b", "c"}, new String[] {"a", "b", "c"})).isTrue(); assertThat(ObjectUtils.nullSafeEquals(new String[] {"a", "b", "c"}, new String[] {"a", "b", "c"})).isTrue();
assertThat(ObjectUtils.nullSafeEquals(new int[] {1, 2, 3}, new int[] {1, 2, 3})).isTrue(); assertThat(ObjectUtils.nullSafeEquals(new int[] {1, 2, 3}, new int[] {1, 2, 3})).isTrue();
} }
@ -855,11 +858,19 @@ class ObjectUtilsTests {
} }
@Test @Test
void nullSafeConciseToStringForNumber() { void nullSafeConciseToStringForPrimitivesAndWrappers() {
assertThat(ObjectUtils.nullSafeConciseToString(true)).isEqualTo("true");
assertThat(ObjectUtils.nullSafeConciseToString('X')).isEqualTo("X");
assertThat(ObjectUtils.nullSafeConciseToString(42L)).isEqualTo("42"); assertThat(ObjectUtils.nullSafeConciseToString(42L)).isEqualTo("42");
assertThat(ObjectUtils.nullSafeConciseToString(99.1234D)).isEqualTo("99.1234"); assertThat(ObjectUtils.nullSafeConciseToString(99.1234D)).isEqualTo("99.1234");
} }
@Test
void nullSafeConciseToStringForBigNumbers() {
assertThat(ObjectUtils.nullSafeConciseToString(BigInteger.valueOf(42L))).isEqualTo("42");
assertThat(ObjectUtils.nullSafeConciseToString(BigDecimal.valueOf(99.1234D))).isEqualTo("99.1234");
}
@Test @Test
void nullSafeConciseToStringForDate() { void nullSafeConciseToStringForDate() {
Date date = new Date(); Date date = new Date();
@ -917,6 +928,12 @@ class ObjectUtilsTests {
assertThat(ObjectUtils.nullSafeConciseToString(new HashSet<>(list))).startsWith(prefix(HashSet.class)); assertThat(ObjectUtils.nullSafeConciseToString(new HashSet<>(list))).startsWith(prefix(HashSet.class));
} }
@Test
void nullSafeConciseToStringForMaps() {
Map<String, Integer> map = Map.of("a", 1, "b", 2, "c", 3);
assertThat(ObjectUtils.nullSafeConciseToString(map)).startsWith(prefix(map.getClass()));
}
@Test @Test
void nullSafeConciseToStringForCustomTypes() { void nullSafeConciseToStringForCustomTypes() {
class ExplosiveType { class ExplosiveType {

Loading…
Cancel
Save