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

vfmt: shorten main.const_name to just const_name

This commit is contained in:
Delyan Angelov
2021-01-25 13:08:43 +02:00
parent ea11488339
commit dbaccd4272
25 changed files with 183 additions and 175 deletions

View File

@@ -19,70 +19,70 @@ fn test_now_format() {
}
fn test_format() {
assert '11.07.1980 21:23' == main.time_to_test.get_fmt_str(.dot, .hhmm24, .ddmmyyyy)
assert '11.07.1980 21:23' == time_to_test.get_fmt_str(.dot, .hhmm24, .ddmmyyyy)
}
fn test_hhmm() {
assert '21:23' == main.time_to_test.hhmm()
assert '21:23' == time_to_test.hhmm()
}
fn test_hhmm12() {
assert '9:23 p.m.' == main.time_to_test.hhmm12()
assert '9:23 p.m.' == time_to_test.hhmm12()
}
fn test_hhmmss() {
assert '21:23:42' == main.time_to_test.hhmmss()
assert '21:23:42' == time_to_test.hhmmss()
}
fn test_ymmdd() {
assert '1980-07-11' == main.time_to_test.ymmdd()
assert '1980-07-11' == time_to_test.ymmdd()
}
fn test_ddmmy() {
assert '11.07.1980' == main.time_to_test.ddmmy()
assert '11.07.1980' == time_to_test.ddmmy()
}
fn test_md() {
assert 'Jul 11' == main.time_to_test.md()
assert 'Jul 11' == time_to_test.md()
}
fn test_get_fmt_time_str() {
assert '21:23:42' == main.time_to_test.get_fmt_time_str(.hhmmss24)
assert '21:23' == main.time_to_test.get_fmt_time_str(.hhmm24)
assert '9:23:42 p.m.' == main.time_to_test.get_fmt_time_str(.hhmmss12)
assert '9:23 p.m.' == main.time_to_test.get_fmt_time_str(.hhmm12)
assert '21:23:42' == time_to_test.get_fmt_time_str(.hhmmss24)
assert '21:23' == time_to_test.get_fmt_time_str(.hhmm24)
assert '9:23:42 p.m.' == time_to_test.get_fmt_time_str(.hhmmss12)
assert '9:23 p.m.' == time_to_test.get_fmt_time_str(.hhmm12)
}
fn test_get_fmt_date_str() {
assert '11.07.1980' == main.time_to_test.get_fmt_date_str(.dot, .ddmmyyyy)
assert '11/07/1980' == main.time_to_test.get_fmt_date_str(.slash, .ddmmyyyy)
assert '11-07-1980' == main.time_to_test.get_fmt_date_str(.hyphen, .ddmmyyyy)
assert '11 07 1980' == main.time_to_test.get_fmt_date_str(.space, .ddmmyyyy)
assert '07.11.1980' == main.time_to_test.get_fmt_date_str(.dot, .mmddyyyy)
assert '07/11/1980' == main.time_to_test.get_fmt_date_str(.slash, .mmddyyyy)
assert '07-11-1980' == main.time_to_test.get_fmt_date_str(.hyphen, .mmddyyyy)
assert '07 11 1980' == main.time_to_test.get_fmt_date_str(.space, .mmddyyyy)
assert '11.07.80' == main.time_to_test.get_fmt_date_str(.dot, .ddmmyy)
assert '11/07/80' == main.time_to_test.get_fmt_date_str(.slash, .ddmmyy)
assert '11-07-80' == main.time_to_test.get_fmt_date_str(.hyphen, .ddmmyy)
assert '11 07 80' == main.time_to_test.get_fmt_date_str(.space, .ddmmyy)
assert '07.11.80' == main.time_to_test.get_fmt_date_str(.dot, .mmddyy)
assert '07/11/80' == main.time_to_test.get_fmt_date_str(.slash, .mmddyy)
assert '07-11-80' == main.time_to_test.get_fmt_date_str(.hyphen, .mmddyy)
assert '07 11 80' == main.time_to_test.get_fmt_date_str(.space, .mmddyy)
assert 'Jul 11' == main.time_to_test.get_fmt_date_str(.space, .mmmd)
assert 'Jul 11' == main.time_to_test.get_fmt_date_str(.space, .mmmdd)
assert 'Jul 11 1980' == main.time_to_test.get_fmt_date_str(.space, .mmmddyyyy)
assert '1980-07-11' == main.time_to_test.get_fmt_date_str(.hyphen, .yyyymmdd)
assert '11.07.1980' == time_to_test.get_fmt_date_str(.dot, .ddmmyyyy)
assert '11/07/1980' == time_to_test.get_fmt_date_str(.slash, .ddmmyyyy)
assert '11-07-1980' == time_to_test.get_fmt_date_str(.hyphen, .ddmmyyyy)
assert '11 07 1980' == time_to_test.get_fmt_date_str(.space, .ddmmyyyy)
assert '07.11.1980' == time_to_test.get_fmt_date_str(.dot, .mmddyyyy)
assert '07/11/1980' == time_to_test.get_fmt_date_str(.slash, .mmddyyyy)
assert '07-11-1980' == time_to_test.get_fmt_date_str(.hyphen, .mmddyyyy)
assert '07 11 1980' == time_to_test.get_fmt_date_str(.space, .mmddyyyy)
assert '11.07.80' == time_to_test.get_fmt_date_str(.dot, .ddmmyy)
assert '11/07/80' == time_to_test.get_fmt_date_str(.slash, .ddmmyy)
assert '11-07-80' == time_to_test.get_fmt_date_str(.hyphen, .ddmmyy)
assert '11 07 80' == time_to_test.get_fmt_date_str(.space, .ddmmyy)
assert '07.11.80' == time_to_test.get_fmt_date_str(.dot, .mmddyy)
assert '07/11/80' == time_to_test.get_fmt_date_str(.slash, .mmddyy)
assert '07-11-80' == time_to_test.get_fmt_date_str(.hyphen, .mmddyy)
assert '07 11 80' == time_to_test.get_fmt_date_str(.space, .mmddyy)
assert 'Jul 11' == time_to_test.get_fmt_date_str(.space, .mmmd)
assert 'Jul 11' == time_to_test.get_fmt_date_str(.space, .mmmdd)
assert 'Jul 11 1980' == time_to_test.get_fmt_date_str(.space, .mmmddyyyy)
assert '1980-07-11' == time_to_test.get_fmt_date_str(.hyphen, .yyyymmdd)
}
fn test_get_fmt_str() {
// Since get_fmt_time_str and get_fmt_date_str do have comprehensive
// tests I don't want to exaggerate here with all possible
// combinations.
assert '11.07.1980 21:23:42' == main.time_to_test.get_fmt_str(.dot, .hhmmss24, .ddmmyyyy)
assert '11.07.1980 21:23:42' == time_to_test.get_fmt_str(.dot, .hhmmss24, .ddmmyyyy)
}
fn test_utc_string() {
assert 'Fri, 11 Jul 1980 21:23:42 UTC' == main.time_to_test.utc_string()
assert 'Fri, 11 Jul 1980 21:23:42 UTC' == time_to_test.utc_string()
}

View File

@@ -83,17 +83,17 @@ fn test_unix() {
}
fn test_format_ss() {
assert '11.07.1980 21:23:42' == main.time_to_test.get_fmt_str(.dot, .hhmmss24, .ddmmyyyy)
assert '11.07.1980 21:23:42' == time_to_test.get_fmt_str(.dot, .hhmmss24, .ddmmyyyy)
}
fn test_format_ss_milli() {
assert '11.07.1980 21:23:42.123' == main.time_to_test.get_fmt_str(.dot, .hhmmss24_milli, .ddmmyyyy)
assert '1980-07-11 21:23:42.123' == main.time_to_test.format_ss_milli()
assert '11.07.1980 21:23:42.123' == time_to_test.get_fmt_str(.dot, .hhmmss24_milli, .ddmmyyyy)
assert '1980-07-11 21:23:42.123' == time_to_test.format_ss_milli()
}
fn test_format_ss_micro() {
assert '11.07.1980 21:23:42.123456' == main.time_to_test.get_fmt_str(.dot, .hhmmss24_micro, .ddmmyyyy)
assert '1980-07-11 21:23:42.123456' == main.time_to_test.format_ss_micro()
assert '11.07.1980 21:23:42.123456' == time_to_test.get_fmt_str(.dot, .hhmmss24_micro, .ddmmyyyy)
assert '1980-07-11 21:23:42.123456' == time_to_test.format_ss_micro()
}
fn test_smonth() {
@@ -153,12 +153,12 @@ fn test_add() {
d_seconds := 3
d_microseconds := 13
duration := time.Duration(d_seconds * time.second + d_microseconds * time.microsecond)
t1 := main.time_to_test
t2 := main.time_to_test.add(duration)
t1 := time_to_test
t2 := time_to_test.add(duration)
assert t2.second == t1.second + d_seconds
assert t2.microsecond == t1.microsecond + d_microseconds
assert t2.unix == t1.unix + u64(d_seconds)
t3 := main.time_to_test.add(-duration)
t3 := time_to_test.add(-duration)
assert t3.second == t1.second - d_seconds
assert t3.microsecond == t1.microsecond - d_microseconds
assert t3.unix == t1.unix - u64(d_seconds)
@@ -166,13 +166,13 @@ fn test_add() {
fn test_add_days() {
num_of_days := 3
t := main.time_to_test.add_days(num_of_days)
assert t.day == main.time_to_test.day + num_of_days
assert t.unix == main.time_to_test.unix + 86400 * u64(num_of_days)
t := time_to_test.add_days(num_of_days)
assert t.day == time_to_test.day + num_of_days
assert t.unix == time_to_test.unix + 86400 * u64(num_of_days)
}
fn test_str() {
assert '1980-07-11 21:23:42' == main.time_to_test.str()
assert '1980-07-11 21:23:42' == time_to_test.str()
}
// not optimal test but will find obvious bugs