Skip to content

Commit

Permalink
Added check to ConverterEverythingTest to ensure that null source val…
Browse files Browse the repository at this point in the history 
…ues are only coming from the sourceClass of Void.class. Otherwise, nonsense test data could be created.
  • Loading branch information
@jdereg
jdereg committed Feb 11, 2024
1 parent 47235c9 commit 520dbb4
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/cedarsoftware/util/ClassUtilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class ClassUtilities
{
private static final Set<Class<?>> prims = new HashSet<>();

private static final Map<String, Class<?>> nameToClass = new HashMap();
private static final Map<String, Class<?>> nameToClass = new HashMap<>();

static
{
Expand Down
20 changes: 14 additions & 6 deletions src/main/java/com/cedarsoftware/util/convert/StringConversions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ static String asString(Object from) {
}

static Byte toByte(Object from, Converter converter) {
String s = asString(from);
if (s.isEmpty()) {
String str = StringUtilities.trimToEmpty((String) from);
if (str.isEmpty()) {
return CommonValues.BYTE_ZERO;
}
try {
return Byte.valueOf(s);
return Byte.valueOf(str);
} catch (NumberFormatException e) {
Long value = toLong(s, bigDecimalMinByte, bigDecimalMaxByte);
Long value = toLong(str, bigDecimalMinByte, bigDecimalMaxByte);
if (value == null) {
throw new IllegalArgumentException("Value '" + s + "' not parseable as a byte value or outside " + Byte.MIN_VALUE + " to " + Byte.MAX_VALUE);
throw new IllegalArgumentException("Value '" + str + "' not parseable as a byte value or outside " + Byte.MIN_VALUE + " to " + Byte.MAX_VALUE);
}
return value.byteValue();
}
Expand Down Expand Up @@ -420,7 +420,15 @@ static OffsetTime toOffsetTime(Object from, Converter converter) {
}

static Instant toInstant(Object from, Converter converter) {
return parseDate(from, converter).map(ZonedDateTime::toInstant).orElse(null);
String s = (String)from;
if (StringUtilities.isEmpty(s)) {
return null;
}
try {
return Instant.parse(s);
} catch (Exception e) {
return parseDate(s, converter).map(ZonedDateTime::toInstant).orElse(null);
}
}

static char[] toCharArray(Object from, Converter converter) {
Expand Down
57 changes: 37 additions & 20 deletions src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,28 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
* @author John DeRegnaucourt ([email protected]) & Ken Partlow
* <br>
* Copyright (c) Cedar Software LLC
* <br><br>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <br><br>
* http://www.apache.org/licenses/LICENSE-2.0
* <br><br>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* @author John DeRegnaucourt ([email protected])
* @author Kenny Partlow ([email protected])
* <br>
* Copyright (c) Cedar Software LLC
* <br><br>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <br><br>
* <a href="http://www.apache.org/licenses/LICENSE-2.0">License</a>
* <br><br>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

class ConverterEverythingTest {
private static final TimeZone TZ_TOKYO = TimeZone.getTimeZone("Asia/Tokyo");
private Converter converter;
private ConverterOptions options = new ConverterOptions() {
private final ConverterOptions options = new ConverterOptions() {
public TimeZone getTimeZone() {
return TZ_TOKYO;
}
Expand Down Expand Up @@ -232,6 +234,9 @@ public TimeZone getTimeZone() {
{ mapOf("_v", 128), Byte.MIN_VALUE },
{ mapOf("_v", mapOf("_v", 128L)), Byte.MIN_VALUE }, // Prove use of recursive call to .convert()
});
TEST_DB.put(pair(Year.class, Byte.class), new Object[][] {
{Year.of(2024), new IllegalArgumentException("Unsupported conversion, source type [Year (2024)] target type 'Byte'")},
});
TEST_DB.put(pair(String.class, Byte.class), new Object[][] {
{ "-1", (byte) -1 },
{ "-1.1", (byte) -1 },
Expand All @@ -243,6 +248,7 @@ public TimeZone getTimeZone() {
{ "-128", (byte) -128 },
{ "127", (byte) 127 },
{ "", (byte) 0 },
{ " ", (byte) 0 },
{ "crapola", new IllegalArgumentException("Value 'crapola' not parseable as a byte value or outside -128 to 127") },
{ "54 crapola", new IllegalArgumentException("Value '54 crapola' not parseable as a byte value or outside -128 to 127") },
{ "54crapola", new IllegalArgumentException("Value '54crapola' not parseable as a byte value or outside -128 to 127") },
Expand Down Expand Up @@ -406,6 +412,7 @@ public TimeZone getTimeZone() {
{ "-32768", (short) -32768 },
{ "32767", (short) 32767 },
{ "", (short) 0 },
{ " ", (short) 0 },
{ "crapola", new IllegalArgumentException("Value 'crapola' not parseable as a short value or outside -32768 to 32767") },
{ "54 crapola", new IllegalArgumentException("Value '54 crapola' not parseable as a short value or outside -32768 to 32767") },
{ "54crapola", new IllegalArgumentException("Value '54crapola' not parseable as a short value or outside -32768 to 32767") },
Expand All @@ -425,6 +432,14 @@ public TimeZone getTimeZone() {
{ Year.of(9999), (short) 9999 },
});

// Instant
TEST_DB.put(pair(String.class, Instant.class), new Object[][] {
{ "", null },
{ " ", null },
{ "1980-01-01T00:00Z", Instant.parse("1980-01-01T00:00:00Z") },
{ "2024-12-31T23:59:59.999999999Z", Instant.parse("2024-12-31T23:59:59.999999999Z") },
});

// MonthDay
TEST_DB.put(pair(Void.class, MonthDay.class), new Object[][] {
{ null, null },
Expand Down Expand Up @@ -886,9 +901,7 @@ private static Stream<Arguments> generateTestEverythingParams() {
String targetName = Converter.getShortName(targetClass);
Object[][] testData = entry.getValue();

for (int i = 0; i < testData.length; i++) {
Object[] testPair = testData[i];

for (Object[] testPair : testData) {
Object source = possiblyConvertSupplier(testPair[0]);
Object target = possiblyConvertSupplier(testPair[1]);

Expand All @@ -903,7 +916,11 @@ private static Stream<Arguments> generateTestEverythingParams() {
@MethodSource("generateTestEverythingParams")
void testConvert(String shortNameSource, String shortNameTarget, Object source, Object target, Class<?> sourceClass, Class<?> targetClass) {
// Make sure source instance is of the sourceClass
assertTrue(source == null || Converter.toPrimitiveWrapperClass(sourceClass).isInstance(source), "source type mismatch");
if (source == null) {
assertEquals(sourceClass, Void.class);
} else {
assertTrue(Converter.toPrimitiveWrapperClass(sourceClass).isInstance(source), "source type mismatch");
}
assertTrue(target == null || target instanceof Throwable || Converter.toPrimitiveWrapperClass(targetClass).isInstance(target), "target type mismatch");

// if the source/target are the same Class, then ensure identity lambda is used.
Expand Down

0 comments on commit 520dbb4

Please sign in to comment.