Skip to content

Commit 74d744a

Browse files
committed
Minor test cleanup
1 parent 47f0080 commit 74d744a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/test/java/com/fasterxml/jackson/databind/deser/jdk/TimestampDeserializationTest.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
public class TimestampDeserializationTest
99
extends BaseMapTest
1010
{
11+
private final ObjectMapper MAPPER = newJsonMapper();
12+
1113
// As for TestDateDeserialization except we don't need to test date conversion routines, so
1214
// just check we pick up timestamp class
1315

@@ -17,27 +19,27 @@ public void testTimestampUtil() throws Exception
1719
java.sql.Timestamp value = new java.sql.Timestamp(now);
1820

1921
// First from long
20-
assertEquals(value, new ObjectMapper().readValue(""+now, java.sql.Timestamp.class));
22+
assertEquals(value, MAPPER.readValue(""+now, java.sql.Timestamp.class));
2123

2224
String dateStr = serializeTimestampAsString(value);
23-
java.sql.Timestamp result = new ObjectMapper().readValue("\""+dateStr+"\"", java.sql.Timestamp.class);
25+
java.sql.Timestamp result = MAPPER.readValue("\""+dateStr+"\"", java.sql.Timestamp.class);
2426

2527
assertEquals("Date: expect "+value+" ("+value.getTime()+"), got "+result+" ("+result.getTime()+")", value.getTime(), result.getTime());
2628
}
27-
29+
2830
public void testTimestampUtilSingleElementArray() throws Exception
2931
{
30-
final ObjectMapper mapper = new ObjectMapper();
31-
mapper.enable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS);
32+
final ObjectReader r = MAPPER.readerFor(java.sql.Timestamp.class)
33+
.with(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS);
3234

3335
long now = System.currentTimeMillis();
3436
java.sql.Timestamp value = new java.sql.Timestamp(now);
3537

3638
// First from long
37-
assertEquals(value, mapper.readValue("["+now+"]", java.sql.Timestamp.class));
39+
assertEquals(value, r.readValue("["+now+"]"));
3840

3941
String dateStr = serializeTimestampAsString(value);
40-
java.sql.Timestamp result = mapper.readValue("[\""+dateStr+"\"]", java.sql.Timestamp.class);
42+
java.sql.Timestamp result = r.readValue("[\""+dateStr+"\"]");
4143

4244
assertEquals("Date: expect "+value+" ("+value.getTime()+"), got "+result+" ("+result.getTime()+")", value.getTime(), result.getTime());
4345
}

0 commit comments

Comments
 (0)