mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

toml: fix date-time and time ms test inconsistency (#12593)

Browse Source
This commit is contained in:
Larpon 2021-11-28 11:42:32 +01:00 committed by GitHub
parent 783aba4552
commit 0fc47b50a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
vlib/toml/tests/iarna.toml-spec-tests_test.v
View File

@ -21,13 +21,7 @@ const (
'errors/inline-table-imutable-1.toml', 'errors/inline-table-imutable-1.toml',
] ]
valid_value_exceptions = [ valid_value_exceptions = []string{}
'values/spec-date-local-1.toml',
'values/spec-date-time-local-1.toml',
'values/spec-date-time-local-2.toml',
'values/spec-time-1.toml',
'values/spec-time-2.toml',
]
jq = os.find_abs_path_of_executable('jq') or { '' } jq = os.find_abs_path_of_executable('jq') or { '' }
compare_work_dir_root = os.join_path(os.temp_dir(), 'v', 'toml', 'iarna') compare_work_dir_root = os.join_path(os.temp_dir(), 'v', 'toml', 'iarna')
@ -191,6 +185,22 @@ fn test_iarna_toml_spec_tests() {
} }
} }
// to_iarna_time
fn to_iarna_time(time_str string) string {
if time_str.contains('.') {
date_and_time := time_str.all_before('.')
mut ms := time_str.all_after('.')
z := if ms.contains('Z') { 'Z' } else { '' }
ms = ms.replace('Z', '')
if ms.len > 3 {
ms = ms[..3]
}
return date_and_time + '.' + ms + z
} else {
return time_str + '.000'
}
}
// to_iarna returns a iarna compatible json string converted from the `value` ast.Value. // to_iarna returns a iarna compatible json string converted from the `value` ast.Value.
fn to_iarna(value ast.Value) string { fn to_iarna(value ast.Value) string {
match value { match value {
@ -200,22 +210,29 @@ fn to_iarna(value ast.Value) string {
} }
ast.DateTime { ast.DateTime {
// Normalization for json // Normalization for json
json_text := json2.Any(value.text).json_str().to_upper().replace(' ', 'T') mut json_text := json2.Any(value.text).json_str().to_upper().replace(' ',
'T')
typ := if json_text.ends_with('Z') || json_text.all_after('T').contains('-') typ := if json_text.ends_with('Z') || json_text.all_after('T').contains('-')
|| json_text.all_after('T').contains('+') { || json_text.all_after('T').contains('+') {
'datetime' 'datetime'
} else { } else {
'datetime-local' 'datetime-local'
} }
// NOTE test suite inconsistency.
// It seems it's implementation specific how time and
// date-time values are represented in detail. For now we follow the BurntSushi format
// that expands to 6 digits which is also a valid RFC 3339 representation.
json_text = to_iarna_time(json_text)
return '{ "type": "$typ", "value": "$json_text" }' return '{ "type": "$typ", "value": "$json_text" }'
} }
ast.Date { ast.Date {
json_text := json2.Any(value.text).json_str() json_text := json2.Any(value.text).json_str()
return '{ "type": "date-local", "value": "$json_text" }' return '{ "type": "date", "value": "$json_text" }'
} }
ast.Time { ast.Time {
json_text := json2.Any(value.text).json_str() mut json_text := json2.Any(value.text).json_str()
return '{ "type": "time-local", "value": "$json_text" }' json_text = to_iarna_time(json_text)
return '{ "type": "time", "value": "$json_text" }'
} }
ast.Bool { ast.Bool {
json_text := json2.Any(value.text.bool()).json_str() json_text := json2.Any(value.text.bool()).json_str()