Mercurial > vim
diff src/json_test.c @ 7967:45ea5ebf3a98 v7.4.1279
commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 7 19:19:53 2016 +0100
patch 7.4.1279
Problem: jsonencode() is not producing strict JSON.
Solution: Add jsencode() and jsdecode(). Make jsonencode() and jsondecode()
strict.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 07 Feb 2016 19:30:05 +0100 |
parents | d14cf20b44dc |
children | 4aead6a9b7a9 |
line wrap: on
line diff
--- a/src/json_test.c +++ b/src/json_test.c @@ -35,107 +35,107 @@ test_decode_find_end(void) /* string and incomplete string */ reader.js_buf = (char_u *)"\"hello\""; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" \"hello\" "; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"\"hello"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); /* number and dash (incomplete number) */ reader.js_buf = (char_u *)"123"; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"-"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); /* false, true and null, also incomplete */ reader.js_buf = (char_u *)"false"; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"f"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"fa"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"fal"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"fals"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"true"; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"t"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"tr"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"tru"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"null"; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"n"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"nu"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"nul"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); /* object without white space */ reader.js_buf = (char_u *)"{\"a\":123}"; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"{\"a\":123"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{\"a\":"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{\"a\""; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{\"a"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{\""; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"{"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); /* object with white space */ reader.js_buf = (char_u *)" { \"a\" : 123 } "; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" { \"a\" : 123 "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" { \"a\" : "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" { \"a\" "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" { \"a "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" { "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); /* array without white space */ reader.js_buf = (char_u *)"[\"a\",123]"; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)"[\"a\",123"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"[\"a\","; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"[\"a\""; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"[\"a"; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"[\""; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)"["; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); /* array with white space */ reader.js_buf = (char_u *)" [ \"a\" , 123 ] "; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ \"a\" , 123 "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" [ \"a\" , "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" [ \"a\" "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" [ \"a "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); reader.js_buf = (char_u *)" [ "; - assert(json_find_end(&reader) == MAYBE); + assert(json_find_end(&reader, 0) == MAYBE); } static int @@ -157,15 +157,15 @@ test_fill_called_on_find_end(void) reader.js_used = 0; reader.js_buf = (char_u *)" [ \"a\" , 123 "; reader.js_cookie = " [ \"a\" , 123 ] "; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ \"a\" , "; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ \"a\" "; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ \"a"; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); reader.js_buf = (char_u *)" [ "; - assert(json_find_end(&reader) == OK); + assert(json_find_end(&reader, 0) == OK); } /*