1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

json2: decode refactor/fix (#16588)

This commit is contained in:
Hitalo Souza
2022-12-05 11:58:44 -03:00
committed by GitHub
parent 50110d4c19
commit 5288c613ef
11 changed files with 251 additions and 243 deletions

View File

@@ -1,48 +1,48 @@
module json2
import x.json2 as json
fn test_raw_decode_string() {
str := raw_decode('"Hello!"')!
str := json.raw_decode('"Hello!"')!
assert str.str() == 'Hello!'
}
fn test_raw_decode_string_escape() {
jstr := raw_decode('"\u001b"')!
jstr := json.raw_decode('"\u001b"')!
str := jstr.str()
assert str.len == 1
assert str[0] == 27
}
fn test_raw_decode_number() {
num := raw_decode('123')!
num := json.raw_decode('123')!
assert num.int() == 123
}
fn test_raw_decode_array() {
raw_arr := raw_decode('["Foo", 1]')!
raw_arr := json.raw_decode('["Foo", 1]')!
arr := raw_arr.arr()
assert arr[0] or { 0 }.str() == 'Foo'
assert arr[1] or { 0 }.int() == 1
}
fn test_raw_decode_bool() {
bol := raw_decode('false')!
bol := json.raw_decode('false')!
assert bol.bool() == false
}
fn test_raw_decode_map() {
raw_mp := raw_decode('{"name":"Bob","age":20}')!
raw_mp := json.raw_decode('{"name":"Bob","age":20}')!
mp := raw_mp.as_map()
assert mp['name'] or { 0 }.str() == 'Bob'
assert mp['age'] or { 0 }.int() == 20
}
fn test_raw_decode_null() {
nul := raw_decode('null')!
assert nul is Null
nul := json.raw_decode('null')!
assert nul is json.Null
}
fn test_raw_decode_invalid() {
raw_decode('1z') or {
json.raw_decode('1z') or {
assert err.msg() == '[x.json2] invalid token `z` (0:17)'
return
}
@@ -50,25 +50,25 @@ fn test_raw_decode_invalid() {
}
fn test_raw_decode_string_with_dollarsign() {
str := raw_decode(r'"Hello $world"')!
str := json.raw_decode(r'"Hello $world"')!
assert str.str() == r'Hello $world'
}
fn test_raw_decode_map_with_whitespaces() {
raw_mp := raw_decode(' \n\t{"name":"Bob","age":20}\n\t')!
raw_mp := json.raw_decode(' \n\t{"name":"Bob","age":20}\n\t')!
mp := raw_mp.as_map()
assert mp['name'] or { 0 }.str() == 'Bob'
assert mp['age'] or { 0 }.int() == 20
}
fn test_nested_array_object() {
mut parser := new_parser(r'[[[[[],[],[]]]],{"Test":{}},[[]]]', false)
mut parser := json.new_parser(r'[[[[[],[],[]]]],{"Test":{}},[[]]]', false)
decoded := parser.decode()!
assert parser.n_level == 0
}
fn test_raw_decode_map_invalid() {
raw_decode('{"name","Bob","age":20}') or {
json.raw_decode('{"name","Bob","age":20}') or {
assert err.msg() == '[x.json2] invalid token `comma`, expecting `colon` (0:5)'
return
}
@@ -76,7 +76,7 @@ fn test_raw_decode_map_invalid() {
}
fn test_raw_decode_array_invalid() {
raw_decode('["Foo", 1,}') or {
json.raw_decode('["Foo", 1,}') or {
assert err.msg() == '[x.json2] invalid token `rcbr` (0:5)'
return
}