diff options
| author | Eric Haszlakiewicz <erh+git@nimenees.com> | 2015-03-03 22:41:31 -0500 |
|---|---|---|
| committer | Eric Haszlakiewicz <erh+git@nimenees.com> | 2015-03-03 22:41:31 -0500 |
| commit | 68d856f618fac279f7ff3e7439c90f3ecaee57ad (patch) | |
| tree | 0d800d5373b62b63d60afea6e3de8e0cb8989861 /tests | |
| parent | 7e3a6c6b9d5e54032aa7e5ef593f898a7ca9bb50 (diff) | |
| parent | 99d8fc975e059a5e1749d4dc6c07a02e9a629921 (diff) | |
Tightening the number parsing algorithm
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_parse.c | 20 | ||||
| -rw-r--r-- | tests/test_parse.expected | 7 |
2 files changed, 26 insertions, 1 deletions
diff --git a/tests/test_parse.c b/tests/test_parse.c index 8808d0f..bc5389b 100644 --- a/tests/test_parse.c +++ b/tests/test_parse.c @@ -91,6 +91,23 @@ static void test_basic_parse() printf("new_obj.to_string()=%s\n", json_object_to_json_string(new_obj)); json_object_put(new_obj); + new_obj = json_tokener_parse("12.3.4"); /* non-sensical, returns null */ + printf("new_obj.to_string()=%s\n", json_object_to_json_string(new_obj)); + json_object_put(new_obj); + + /* was returning (int)2015 before patch, should return null */ + new_obj = json_tokener_parse("2015-01-15"); + printf("new_obj.to_string()=%s\n", json_object_to_json_string(new_obj)); + json_object_put(new_obj); + + new_obj = json_tokener_parse("{\"FoO\" : -12.3E512}"); + printf("new_obj.to_string()=%s\n", json_object_to_json_string(new_obj)); + json_object_put(new_obj); + + new_obj = json_tokener_parse("{\"FoO\" : -12.3E51.2}"); /* non-sensical, returns null */ + printf("new_obj.to_string()=%s\n", json_object_to_json_string(new_obj)); + json_object_put(new_obj); + new_obj = json_tokener_parse("[\"\\n\"]"); printf("new_obj.to_string()=%s\n", json_object_to_json_string(new_obj)); json_object_put(new_obj); @@ -195,6 +212,9 @@ struct incremental_step { { "1", 1, 1, json_tokener_continue, 0 }, { "2", 2, 1, json_tokener_success, 0 }, + /* Some bad formatting. Check we get the correct error status */ + { "2015-01-15", 10, 4, json_tokener_error_parse_number, 1 }, + /* Strings have a well defined end point, so we can stop at the quote */ { "\"blue\"", -1, -1, json_tokener_success, 0 }, diff --git a/tests/test_parse.expected b/tests/test_parse.expected index d49cbbb..6606260 100644 --- a/tests/test_parse.expected +++ b/tests/test_parse.expected @@ -14,6 +14,10 @@ new_obj.to_string()=-Infinity new_obj.to_string()=true new_obj.to_string()=12 new_obj.to_string()=12.3 +new_obj.to_string()=null +new_obj.to_string()=null +new_obj.to_string()={ "FoO": -12.3E512 } +new_obj.to_string()=null new_obj.to_string()=[ "\n" ] new_obj.to_string()=[ "\nabc\n" ] new_obj.to_string()=[ null ] @@ -48,6 +52,7 @@ json_tokener_parse_ex(tok, {"x": 123 }"X", 14) ... OK: got object of type [obje json_tokener_parse_ex(tok, "Y" , 3) ... OK: got object of type [string]: "Y" json_tokener_parse_ex(tok, 1 , 1) ... OK: got correct error: continue json_tokener_parse_ex(tok, 2 , 2) ... OK: got object of type [int]: 12 +json_tokener_parse_ex(tok, 2015-01-15 , 10) ... OK: got correct error: number expected json_tokener_parse_ex(tok, "blue" , 6) ... OK: got object of type [string]: "blue" json_tokener_parse_ex(tok, "\"" , 4) ... OK: got object of type [string]: "\"" json_tokener_parse_ex(tok, "\\" , 4) ... OK: got object of type [string]: "\\" @@ -61,5 +66,5 @@ json_tokener_parse_ex(tok, [1,2,3,] , 8) ... OK: got object of type [array] json_tokener_parse_ex(tok, [1,2,,3,] , 9) ... OK: got correct error: unexpected character json_tokener_parse_ex(tok, [1,2,3,] , 8) ... OK: got correct error: unexpected character json_tokener_parse_ex(tok, {"a":1,} , 8) ... OK: got correct error: unexpected character -End Incremental Tests OK=29 ERROR=0 +End Incremental Tests OK=30 ERROR=0 ================================== |