1
0
forked from aniani/vim

patch 9.0.1257: code style is not check in test scripts

Problem:    Code style is not check in test scripts.
Solution:   Add basic code style check for test files.
This commit is contained in:
Bram Moolenaar
2023-01-28 19:19:03 +00:00
parent 04e4f1d985
commit 94722c5107
56 changed files with 247 additions and 208 deletions

View File

@@ -44,7 +44,7 @@ def Test_expr1_ternary()
echo ['a'] + (1 ? ['b'] : ['c'] # comment
)
# with constant condition expression is not evaluated
# with constant condition expression is not evaluated
assert_equal('one', 1 ? 'one' : xxx)
var Some: func = function('len')
@@ -74,7 +74,7 @@ def Test_expr1_ternary_vimscript()
# check line continuation
var lines =<< trim END
var name = 1
? 'yes'
? 'yes'
: 'no'
assert_equal('yes', name)
END
@@ -82,7 +82,7 @@ def Test_expr1_ternary_vimscript()
lines =<< trim END
var name = v:false
? 'yes'
? 'yes'
: 'no'
assert_equal('no', name)
END
@@ -90,7 +90,7 @@ def Test_expr1_ternary_vimscript()
lines =<< trim END
var name = v:false ?
'yes' :
'yes' :
'no'
assert_equal('no', name)
END
@@ -98,7 +98,7 @@ def Test_expr1_ternary_vimscript()
lines =<< trim END
var name = v:false ? # comment
'yes' :
'yes' :
# comment
'no' # comment
assert_equal('no', name)
@@ -317,22 +317,22 @@ def Test_expr2_vimscript()
# check line continuation
var lines =<< trim END
var name = 0
|| 1
|| 1
assert_equal(true, name)
END
v9.CheckDefAndScriptSuccess(lines)
lines =<< trim END
var name = v:false
|| v:true
|| v:false
|| v:true
|| v:false
assert_equal(v:true, name)
END
v9.CheckDefAndScriptSuccess(lines)
lines =<< trim END
var name = v:false ||
v:true ||
v:true ||
v:false
assert_equal(v:true, name)
END
@@ -341,7 +341,7 @@ def Test_expr2_vimscript()
lines =<< trim END
var name = v:false || # comment
# comment
v:true ||
v:true ||
# comment
v:false # comment
assert_equal(v:true, name)
@@ -456,23 +456,23 @@ def Test_expr3_vimscript()
# check line continuation
var lines =<< trim END
var name = 0
&& 1
&& 1
assert_equal(false, name)
END
v9.CheckDefAndScriptSuccess(lines)
lines =<< trim END
var name = v:true
&& v:true
&& v:true
&& v:true
&& v:true
assert_equal(v:true, name)
END
v9.CheckDefAndScriptSuccess(lines)
lines =<< trim END
var name = v:true &&
v:true &&
v:true
v:true &&
v:true
assert_equal(v:true, name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -480,9 +480,9 @@ def Test_expr3_vimscript()
lines =<< trim END
var name = v:true && # comment
# comment
v:true &&
v:true &&
# comment
v:true
v:true
assert_equal(v:true, name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -887,7 +887,7 @@ def Test_expr4_compare_null()
# variables declared at script level used in a :def function
lines =<< trim END
vim9script
var l_decl: list<number>
var l_empty = []
var l_null = null_list
@@ -914,7 +914,7 @@ def Test_expr4_compare_null()
assert_true(caught)
enddef
TestList()
var b_decl: blob
var b_empty = 0z
var b_null = null_blob
@@ -941,7 +941,7 @@ def Test_expr4_compare_null()
assert_true(caught)
enddef
TestBlob()
var d_decl: dict<number>
var d_empty = {}
var d_null = null_dict
@@ -1274,7 +1274,7 @@ def Test_expr4_vim9script()
# check line continuation
var lines =<< trim END
var name = 0
< 1
< 1
assert_equal(true, name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -1282,14 +1282,14 @@ def Test_expr4_vim9script()
lines =<< trim END
var name = 123
# comment
!= 123
!= 123
assert_equal(false, name)
END
v9.CheckDefAndScriptSuccess(lines)
lines =<< trim END
var name = 123 ==
123
123
assert_equal(true, name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -1297,7 +1297,7 @@ def Test_expr4_vim9script()
lines =<< trim END
var list = [1, 2, 3]
var name = list
is list
is list
assert_equal(true, name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -1306,7 +1306,7 @@ def Test_expr4_vim9script()
var list = [1, 2, 3]
var name = list # comment
# comment
is list
is list
assert_equal(true, name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -1314,7 +1314,7 @@ def Test_expr4_vim9script()
lines =<< trim END
var myblob = 0z1234
var name = myblob
isnot 0z11
isnot 0z11
assert_equal(true, name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -1526,7 +1526,7 @@ def Test_expr6_vim9script()
# check line continuation
var lines =<< trim END
var name = 11
+ 77
+ 77
- 22
assert_equal(66, name)
END
@@ -1551,7 +1551,7 @@ def Test_expr6_vim9script()
lines =<< trim END
var name = 'one'
.. 'two'
.. 'two'
assert_equal('onetwo', name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -1859,7 +1859,7 @@ def Test_expr7_vim9script()
# check line continuation
var lines =<< trim END
var name = 11
* 22
* 22
/ 3
assert_equal(80, name)
END
@@ -1867,7 +1867,7 @@ def Test_expr7_vim9script()
lines =<< trim END
var name = 25
% 10
% 10
assert_equal(5, name)
END
v9.CheckDefAndScriptSuccess(lines)
@@ -1877,14 +1877,14 @@ def Test_expr7_vim9script()
# comment
# comment
% 10
% 10
assert_equal(5, name)
END
v9.CheckDefAndScriptSuccess(lines)
lines =<< trim END
var name = 11 *
22 /
22 /
3
assert_equal(80, name)
END
@@ -2775,7 +2775,7 @@ def Test_expr9_dict()
var dkeys = {['key']: 'string',
[12]: 'numberexpr',
34: 'number',
[true]: 'bool'}
[true]: 'bool'}
assert_equal('string', dkeys['key'])
assert_equal('numberexpr', dkeys[12])
assert_equal('number', dkeys[34])
@@ -2798,7 +2798,7 @@ def Test_expr9_dict()
assert_equal('dict<list<unknown>>', typename(dl))
END
v9.CheckDefAndScriptSuccess(lines)
# legacy syntax doesn't work
v9.CheckDefAndScriptFailure(["var x = #{key: 8}"], 'E1170:', 1)
v9.CheckDefAndScriptFailure(["var x = 'a' #{a: 1}"], 'E1170:', 1)
@@ -3206,7 +3206,7 @@ enddef
def Test_expr_member_vim9script()
var lines =<< trim END
var d = {one:
'one',
'one',
two: 'two',
1: 1,
_: 2}
@@ -3494,19 +3494,19 @@ def Test_expr9_legacy_script()
assert_equal('ok', g:LegacyReturn())
lines =<< trim END
vim9script
def GetNumber(): number
vim9script
def GetNumber(): number
legacy return notexists
enddef
enddef
echo GetNumber()
END
v9.CheckScriptFailure(lines, 'E121: Undefined variable: notexists')
lines =<< trim END
vim9script
def GetNumber(): number
legacy return range(3)->map('v:val + 1')
enddef
vim9script
def GetNumber(): number
legacy return range(3)->map('v:val + 1')
enddef
echo GetNumber()
END
v9.CheckScriptFailure(lines, 'E1012: Type mismatch; expected number but got list<number>')
@@ -3631,7 +3631,7 @@ def Test_expr9_method_call()
var Join = (l) => join(l, 'x')
assert_equal('axb', ['a', 'b']->(Join)())
var sorted = [3, 1, 2]
-> sort()
assert_equal([1, 2, 3], sorted)