mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 14:32:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gen: fix nested or

Browse source
This commit is contained in:
Enzo Baldisserri 2020-05-21 22:35:43 +02:00 • committed by GitHub
parent d3ce6fd2e7
commit 1633675c11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 224 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

50
vlib/json/json_test.v
View file

@ -2,7 +2,7 @@ import json
struct Employee {
name string
age int
age int
}
fn test_simple() {
@ -11,23 +11,24 @@ fn test_simple() {
assert s == '{"name":"Peter","age":28}'
y := json.decode(Employee, s) or {
assert false
Employee{}
}
assert y.name == 'Peter'
assert y.age == 28
}
struct User2 {
age int
nums []int
age int
nums []int
}
struct User {
age int
nums []int
last_name string [json:lastName]
is_registered bool [json:IsRegistered]
typ int [json:'type']
pets string [raw; json:'pet_animals']
age int
nums []int
last_name string [json:lastName]
is_registered bool [json:IsRegistered]
typ int [json:'type']
pets string [raw; json:'pet_animals']
}
fn test_parse_user() {
@ -51,8 +52,15 @@ fn test_parse_user() {
assert u.pets == '{"name":"Bob","animal":"Dog"}'
}
fn test_encode_user(){
usr := User{ age: 10, nums: [1,2,3], last_name: 'Johnson', is_registered: true, typ: 0, pets: 'foo'}
fn test_encode_user() {
usr := User{
age: 10
nums: [1, 2, 3]
last_name: 'Johnson'
is_registered: true
typ: 0
pets: 'foo'
}
expected := '{"age":10,"nums":[1,2,3],"lastName":"Johnson","IsRegistered":true,"type":0,"pet_animals":"foo"}'
out := json.encode(usr)
println(out)
@ -60,17 +68,17 @@ fn test_encode_user(){
}
struct Color {
space string
point string [raw]
space string
point string [raw]
}
fn test_raw_json_field() {
color := json.decode(Color, '{"space": "YCbCr", "point": {"Y": 123}}') or {
println('text')
return
}
assert color.point == '{"Y":123}'
assert color.space == 'YCbCr'
color := json.decode(Color, '{"space": "YCbCr", "point": {"Y": 123}}') or {
println('text')
return
}
assert color.point == '{"Y":123}'
assert color.space == 'YCbCr'
}
struct City {
@ -79,7 +87,7 @@ struct City {
struct Country {
cities []City
name string
name string
}
fn test_struct_in_struct() {
@ -92,6 +100,4 @@ fn test_struct_in_struct() {
assert country.cities[0].name == 'London'
assert country.cities[1].name == 'Manchester'
println(country.cities)
}