@@ -152,36 +152,31 @@ private static void assertJsonEquals(JsonNode expected, JsonNode actual) {
152
152
public void decodeAs_booleanJson () {
153
153
JsonNode json = objectMapper .valueToTree (true );
154
154
Assert .assertTrue (JacksonCodec .decodeAs (json , Boolean .class ));
155
- Assert .assertEquals ("true" , JacksonCodec .decodeAs (json , String .class ));
156
- Assert .assertEquals (Integer .valueOf (0 ),
157
- JacksonCodec .decodeAs (json , Integer .class ));
158
- Assert .assertEquals (Double .valueOf (0.0 ),
159
- JacksonCodec .decodeAs (json , Double .class ));
160
155
Assert .assertEquals (json , JacksonCodec .decodeAs (json , JsonNode .class ));
161
156
}
162
157
163
158
@ Test
164
159
public void decodeAs_stringJson () {
165
160
JsonNode json = objectMapper .valueToTree ("Test123 String\n !%" );
166
- Assert .assertFalse (JacksonCodec .decodeAs (json , Boolean .class ));
167
161
Assert .assertEquals ("Test123 String\n !%" ,
168
162
JacksonCodec .decodeAs (json , String .class ));
169
- Assert .assertEquals (Integer .valueOf (0 ),
170
- JacksonCodec .decodeAs (json , Integer .class ));
171
- Assert .assertFalse (JacksonCodec .decodeAs (json , Double .class ).isNaN ());
172
163
Assert .assertEquals (json , JacksonCodec .decodeAs (json , JsonNode .class ));
173
164
}
174
165
175
166
@ Test
176
167
public void decodeAs_numberJson () {
177
- JsonNode json = objectMapper .valueToTree (15.7 );
178
- Assert .assertFalse (JacksonCodec .decodeAs (json , Boolean .class ));
179
- Assert .assertEquals ("15.7" , JacksonCodec .decodeAs (json , String .class ));
168
+ // Test integer
169
+ JsonNode intJson = objectMapper .valueToTree (15 );
180
170
Assert .assertEquals (Integer .valueOf (15 ),
181
- JacksonCodec .decodeAs (json , Integer .class ));
171
+ JacksonCodec .decodeAs (intJson , Integer .class ));
172
+ Assert .assertEquals (Double .valueOf (15.0 ),
173
+ JacksonCodec .decodeAs (intJson , Double .class ));
174
+
175
+ // Test double
176
+ JsonNode doubleJson = objectMapper .valueToTree (15.7 );
182
177
Assert .assertEquals (Double .valueOf (15.7 ),
183
- JacksonCodec .decodeAs (json , Double .class ));
184
- Assert .assertEquals (json , JacksonCodec .decodeAs (json , JsonNode .class ));
178
+ JacksonCodec .decodeAs (doubleJson , Double .class ));
179
+ Assert .assertEquals (doubleJson , JacksonCodec .decodeAs (doubleJson , JsonNode .class ));
185
180
}
186
181
187
182
@ Test
@@ -198,34 +193,7 @@ public void decodeAs_nullJson() {
198
193
public void decodeAs_jsonValue () {
199
194
ObjectNode json = objectMapper .createObjectNode ();
200
195
json .put ("foo" , "bar" );
201
- Assert .assertEquals ("" , JacksonCodec .decodeAs (json , String .class ));
202
196
Assert .assertEquals (json , JacksonCodec .decodeAs (json , JsonNode .class ));
203
- // boolean
204
- Assert .assertFalse (JacksonCodec .decodeAs (json , Boolean .class ));
205
- Assert .assertNull (
206
- JacksonCodec .decodeAs (objectMapper .nullNode (), Boolean .class ));
207
- Assert .assertFalse (JacksonCodec .decodeAs (json , boolean .class ));
208
- Assert .assertFalse (
209
- JacksonCodec .decodeAs (objectMapper .nullNode (), boolean .class ));
210
- // integer
211
- Assert .assertEquals (Integer .valueOf (0 ),
212
- JacksonCodec .decodeAs (json , Integer .class ));
213
- Assert .assertNull (
214
- JacksonCodec .decodeAs (objectMapper .nullNode (), Integer .class ));
215
- Assert .assertEquals (Integer .valueOf (0 ),
216
- JacksonCodec .decodeAs (json , int .class ));
217
- Assert .assertEquals (Integer .valueOf (0 ),
218
- JacksonCodec .decodeAs (objectMapper .nullNode (), int .class ));
219
- // double
220
- Assert .assertNull (
221
- JacksonCodec .decodeAs (objectMapper .nullNode (), Double .class ));
222
- Assert .assertEquals (Double .valueOf (0.0 ),
223
- JacksonCodec .decodeAs (json , Double .class ));
224
- Assert .assertEquals (Double .valueOf (0.0 ),
225
- JacksonCodec .decodeAs (json , double .class ));
226
- Assert .assertEquals (0.0d ,
227
- JacksonCodec .decodeAs (objectMapper .nullNode (), double .class ),
228
- 0.0001d );
229
197
}
230
198
231
199
@ Test (expected = ClassCastException .class )
0 commit comments