Skip to content

Commit 183fb4f

Browse files
committed
Fix CBOR/Smile tests wrt TRAILING_TOKEN check
1 parent c43a6cb commit 183fb4f

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/TreeReadViaMapperTest.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,29 @@ public void testSimple() throws Exception
8888
@Test
8989
public void testMultiple() throws Exception
9090
{
91-
JsonParser p = MAPPER.createParser(cborDoc("12 \"string\" [ 1, 2, 3 ]"));
92-
JsonNode result = MAPPER.readTree(p);
91+
ObjectMapper mapper = cborMapperBuilder()
92+
.disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
93+
.build();
94+
95+
JsonParser p = mapper.createParser(cborDoc("12 \"string\" [ 1, 2, 3 ]"));
96+
JsonNode result = mapper.readTree(p);
9397

9498
assertTrue(result.isIntegralNumber());
9599
assertTrue(result.isInt());
96100
assertFalse(result.isString());
97101
assertEquals(12, result.intValue());
98102

99-
result = MAPPER.readTree(p);
103+
result = mapper.readTree(p);
100104
assertTrue(result.isString());
101105
assertFalse(result.isIntegralNumber());
102106
assertFalse(result.isInt());
103107
assertEquals("string", result.stringValue());
104108

105-
result = MAPPER.readTree(p);
109+
result = mapper.readTree(p);
106110
assertTrue(result.isArray());
107111
assertEquals(3, result.size());
108112

109-
assertNull(MAPPER.readTree(p));
113+
assertNull(mapper.readTree(p));
110114
p.close();
111115
}
112116

smile/src/test/java/tools/jackson/dataformat/smile/mapper/TreeReadViaMapperTest.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,29 @@ public void testSimple() throws Exception
8888
@Test
8989
public void testMultiple() throws Exception
9090
{
91-
JsonParser p = MAPPER.createParser(_smileDoc("12 \"string\" [ 1, 2, 3 ]"));
92-
JsonNode result = MAPPER.readTree(p);
91+
ObjectMapper mapper = smileMapperBuilder()
92+
.disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
93+
.build();
94+
95+
JsonParser p = mapper.createParser(_smileDoc("12 \"string\" [ 1, 2, 3 ]"));
96+
JsonNode result = mapper.readTree(p);
9397

9498
assertTrue(result.isIntegralNumber());
9599
assertTrue(result.isInt());
96100
assertFalse(result.isString());
97101
assertEquals(12, result.intValue());
98102

99-
result = MAPPER.readTree(p);
103+
result = mapper.readTree(p);
100104
assertTrue(result.isString());
101105
assertFalse(result.isIntegralNumber());
102106
assertFalse(result.isInt());
103107
assertEquals("string", result.stringValue());
104108

105-
result = MAPPER.readTree(p);
109+
result = mapper.readTree(p);
106110
assertTrue(result.isArray());
107111
assertEquals(3, result.size());
108112

109-
assertNull(MAPPER.readTree(p));
113+
assertNull(mapper.readTree(p));
110114
p.close();
111115
}
112116

0 commit comments

Comments
 (0)