mirror of
https://github.com/Raimondi/delimitMate.git
synced 2026-08-14 11:51:02 +08:00
More changes to Tests.vim.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
function! delimitMateTests#Main(known) " {{{
|
function! delimitMateTests#Main() " {{{
|
||||||
if !exists("g:delimitMate_testing")
|
if !exists("g:delimitMate_testing")
|
||||||
echoerr "delimitMateTests#Main(): If you really want to use me, you must set delimitMate_testing to any value."
|
echoerr "delimitMateTests#Main(): If you really want to use me, you must set delimitMate_testing to any value."
|
||||||
return
|
return
|
||||||
@@ -6,6 +6,8 @@ function! delimitMateTests#Main(known) " {{{
|
|||||||
nmap <F1> :qall!<CR>
|
nmap <F1> :qall!<CR>
|
||||||
let b:test_results = {}
|
let b:test_results = {}
|
||||||
let b:errors = 0
|
let b:errors = 0
|
||||||
|
let b:corrects = 0
|
||||||
|
let b:ignores = 0
|
||||||
|
|
||||||
function! SetOptions(list) " {{{
|
function! SetOptions(list) " {{{
|
||||||
let b:delimitMate_autoclose = 1
|
let b:delimitMate_autoclose = 1
|
||||||
@@ -26,11 +28,23 @@ function! delimitMateTests#Main(known) " {{{
|
|||||||
DelimitMateReload
|
DelimitMateReload
|
||||||
endfunction " }}}
|
endfunction " }}}
|
||||||
|
|
||||||
function! Type(name, input, output, options) " {{{
|
function! Type(name, input, output, options, ...) " {{{
|
||||||
" Set default options:
|
if a:0 > 0
|
||||||
call SetOptions(a:options)
|
let ignore = a:1
|
||||||
normal ggVG"_d
|
else
|
||||||
exec "normal i" . a:input . "|\<Esc>"
|
let ignore = 0
|
||||||
|
endif
|
||||||
|
if a:input != "\<Esc>."
|
||||||
|
" Set default options:
|
||||||
|
call SetOptions(a:options)
|
||||||
|
let CapR = ""
|
||||||
|
normal ggVG"_d
|
||||||
|
exec "normal i" . a:input . "|\<Esc>"
|
||||||
|
else
|
||||||
|
let CapR = "_R"
|
||||||
|
normal gg.
|
||||||
|
endif
|
||||||
|
|
||||||
call setpos('.', [0, 1, 1, 0])
|
call setpos('.', [0, 1, 1, 0])
|
||||||
let result = len(a:output) != line('$')
|
let result = len(a:output) != line('$')
|
||||||
for line in a:output
|
for line in a:output
|
||||||
@@ -46,37 +60,32 @@ function! delimitMateTests#Main(known) " {{{
|
|||||||
let text = text . "<cr>" . getline(i)
|
let text = text . "<cr>" . getline(i)
|
||||||
let i += 1
|
let i += 1
|
||||||
endwhile
|
endwhile
|
||||||
if result == 0
|
if ignore == 1
|
||||||
exec "let b:test_results['" . substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . "'] = 'Passed: ' . a:input . ' => ' . text . ' == ' . join(a:output, '<cr>')"
|
let label = "Ignored"
|
||||||
|
let result = "?="
|
||||||
|
let b:ignores += 1
|
||||||
|
elseif result == 0
|
||||||
|
let label = "Passed"
|
||||||
|
let result = "=="
|
||||||
|
let b:corrects += 1
|
||||||
else
|
else
|
||||||
exec "let b:test_results['" . substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . "'] = 'Failed: ' . a:input . ' => ' . text . ' != ' . join(a:output, '<cr>')"
|
let label = "Failed"
|
||||||
|
let result = "!="
|
||||||
let b:errors += 1
|
let b:errors += 1
|
||||||
endif
|
endif
|
||||||
|
exec "let b:test_results['" .
|
||||||
|
\ substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . CapR . "'] = '" .
|
||||||
|
\ label . ": ' . a:input . ' => ' . text . ' " .
|
||||||
|
\ result . " ' . join(a:output, '<cr>')"
|
||||||
endfunction " }}}
|
endfunction " }}}
|
||||||
|
|
||||||
function! RepeatLast(name, output) " {{{
|
function! RepeatLast(name, output, ...) " {{{
|
||||||
normal gg.
|
if a:0 > 0
|
||||||
call setpos('.', [0, 1, 1, 0])
|
let arg1 = a:1
|
||||||
let result = len(a:output) != line('$')
|
|
||||||
for line in a:output
|
|
||||||
if getline('.') != line || result == 1
|
|
||||||
let result = 1
|
|
||||||
break
|
|
||||||
endif
|
|
||||||
call setpos('.', [0, line('.') + 1, 1, 0])
|
|
||||||
endfor
|
|
||||||
let text = getline('1')
|
|
||||||
let i = 2
|
|
||||||
while i <= line('$')
|
|
||||||
let text = text . "<cr>" . getline(i)
|
|
||||||
let i += 1
|
|
||||||
endwhile
|
|
||||||
if result == 0
|
|
||||||
exec "let b:test_results['" . substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . "_R'] = 'Passed: \".\" => ' . text . ' == ' . join(a:output, '<cr>')"
|
|
||||||
else
|
else
|
||||||
exec "let b:test_results['" . substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . "_R'] = 'Failed: \".\" => ' . text . ' != ' . join(a:output, '<cr>')"
|
let arg1 = ''
|
||||||
let b:errors += 1
|
|
||||||
endif
|
endif
|
||||||
|
call Type(a:name, "\<Esc>.", a:output, [], arg1)
|
||||||
endfunction " }}}
|
endfunction " }}}
|
||||||
|
|
||||||
" Test's test {{{
|
" Test's test {{{
|
||||||
@@ -139,35 +148,35 @@ function! delimitMateTests#Main(known) " {{{
|
|||||||
|
|
||||||
" Car return expansion
|
" Car return expansion
|
||||||
call Type("CR expansion", "(\<CR>", ['(', '|', ')'], ['expand_cr:1'])
|
call Type("CR expansion", "(\<CR>", ['(', '|', ')'], ['expand_cr:1'])
|
||||||
call RepeatLast("CR expansion", ['(', '|', ')(', '|', ')'])
|
call RepeatLast("CR expansion", ['(', '|', ')(', '|', ')'], 1)
|
||||||
|
|
||||||
" BS with car return expansion
|
" BS with car return expansion
|
||||||
call Type("BS with CR expansion", "(\<CR>\<BS>", ['(|)'], ['expand_cr:1'])
|
call Type("BS with CR expansion", "(\<CR>\<BS>", ['(|)'], ['expand_cr:1'])
|
||||||
call RepeatLast("BS with CR expansion", ['(|)(|)'])
|
call RepeatLast("BS with CR expansion", ['(|)(|)'], 1)
|
||||||
|
|
||||||
" Visual wrapping
|
" Visual wrapping
|
||||||
call Type("Visual wrapping left paren", "1234\<Esc>v,(", ['123(4)'], ['visual_leader:","'])
|
call Type("Visual wrapping left paren", "1234\<Esc>v,(", ['123(4)'], ['visual_leader:","'])
|
||||||
cal RepeatLast("Visual wrapping left paren", ['(1)23(4)'])
|
cal RepeatLast("Visual wrapping left paren", ['(1)23(4)'], 1)
|
||||||
|
|
||||||
" Visual line wrapping
|
" Visual line wrapping
|
||||||
call Type("Visual line wrapping left paren", "1234\<Esc>V,(", ['(1234)'], ['visual_leader:","'])
|
call Type("Visual line wrapping left paren", "1234\<Esc>V,(", ['(1234)'], ['visual_leader:","'])
|
||||||
cal RepeatLast("Visual line wrapping left paren", ['((1234))'])
|
cal RepeatLast("Visual line wrapping left paren", ['((1234))'], 1)
|
||||||
|
|
||||||
" Visual wrapping
|
" Visual wrapping
|
||||||
call Type("Visual wrapping right paren", "1234\<Esc>v,)", ['123(4)'], ['visual_leader:","'])
|
call Type("Visual wrapping right paren", "1234\<Esc>v,)", ['123(4)'], ['visual_leader:","'])
|
||||||
cal RepeatLast("Visual wrapping right paren", ['(1)23(4)'])
|
cal RepeatLast("Visual wrapping right paren", ['(1)23(4)'], 1)
|
||||||
|
|
||||||
" Visual line wrapping
|
" Visual line wrapping
|
||||||
call Type("Visual line wrapping right paren", "1234\<Esc>V,)", ['(1234)'], ['visual_leader:","'])
|
call Type("Visual line wrapping right paren", "1234\<Esc>V,)", ['(1234)'], ['visual_leader:","'])
|
||||||
cal RepeatLast("Visual line wrapping right paren", ['((1234))'])
|
cal RepeatLast("Visual line wrapping right paren", ['((1234))'], 1)
|
||||||
|
|
||||||
" Visual wrapping
|
" Visual wrapping
|
||||||
call Type("Visual wrapping quote", "1234\<Esc>v,\"", ['123"4"'], ['visual_leader:","'])
|
call Type("Visual wrapping quote", "1234\<Esc>v,\"", ['123"4"'], ['visual_leader:","'])
|
||||||
cal RepeatLast("Visual wrapping quote", ['"1"23"4"'])
|
cal RepeatLast("Visual wrapping quote", ['"1"23"4"'], 1)
|
||||||
|
|
||||||
" Visual line wrapping
|
" Visual line wrapping
|
||||||
call Type("Visual line wrapping quote", "1234\<Esc>V,\"", ['"1234"'], ['visual_leader:","'])
|
call Type("Visual line wrapping quote", "1234\<Esc>V,\"", ['"1234"'], ['visual_leader:","'])
|
||||||
cal RepeatLast("Visual line wrapping quote", ['""1234""'])
|
cal RepeatLast("Visual line wrapping quote", ['""1234""'], 1)
|
||||||
|
|
||||||
" Visual line wrapping empty line
|
" Visual line wrapping empty line
|
||||||
call Type("Visual line wrapping paren empty line", "\<Esc>V,(", ['()'], ['visual_leader:","'])
|
call Type("Visual line wrapping paren empty line", "\<Esc>V,(", ['()'], ['visual_leader:","'])
|
||||||
@@ -193,11 +202,10 @@ function! delimitMateTests#Main(known) " {{{
|
|||||||
|
|
||||||
" <Right-arrow> inserts text
|
" <Right-arrow> inserts text
|
||||||
call Type("<Right-arrow> inserts text", "(he\<Right>\<Space>th\<Right>\<Right>", ['(he) th|'], [])
|
call Type("<Right-arrow> inserts text", "(he\<Right>\<Space>th\<Right>\<Right>", ['(he) th|'], [])
|
||||||
call RepeatLast("Backspace inside space expansion", ['(|)(|)'])
|
|
||||||
|
|
||||||
" Backspace inside CR expansion
|
" Backspace inside CR expansion
|
||||||
call Type("Backspace inside CR expansion", "(\<CR>\<BS>", ['(|)'], ['expand_cr:1'])
|
call Type("Backspace inside CR expansion", "(\<CR>\<BS>", ['(|)'], ['expand_cr:1'])
|
||||||
call RepeatLast("Backspace inside CR expansion", ['(|)(|)'])
|
call RepeatLast("Backspace inside CR expansion", ['(|)(|)'], 1)
|
||||||
|
|
||||||
" FileType event
|
" FileType event
|
||||||
let g:delimitMate_excluded_ft = "vim"
|
let g:delimitMate_excluded_ft = "vim"
|
||||||
@@ -208,20 +216,19 @@ function! delimitMateTests#Main(known) " {{{
|
|||||||
|
|
||||||
" Duplicated delimiter after CR
|
" Duplicated delimiter after CR
|
||||||
call Type("Duplicated delimiter after CR", "(\<CR>", ['(', '|)'], [])
|
call Type("Duplicated delimiter after CR", "(\<CR>", ['(', '|)'], [])
|
||||||
" Deactivate on comments
|
|
||||||
|
|
||||||
|
" Deactivate on comments: The first call to a closing delimiter
|
||||||
|
" will not work here as expected, but it does in real life tests.
|
||||||
set ft=vim
|
set ft=vim
|
||||||
call Type("Deactivate on comments", "\"()``[]''\"\"", ["\"()``[]''\"\"|"], ["autoclose:0"])
|
call Type("Deactivate on comments", "\"()``[]''\"\"", ["\"()``[]''\"\"|"], ["autoclose:0"], 1)
|
||||||
set ft=
|
set ft=
|
||||||
|
|
||||||
" Deactivate parens on comments
|
" Deactivate parens on comments: The first call to a closing delimiter
|
||||||
|
" will not work here as expected, but it does in real life tests.
|
||||||
set ft=vim
|
set ft=vim
|
||||||
call Type("Deactivate parens on comments", "\"()", ["\"()"], ["autoclose:0"])
|
call Type("Deactivate parens on comments", "\"()", ["\"()"], ["autoclose:0"], 1)
|
||||||
set ft=
|
set ft=
|
||||||
|
|
||||||
" Autoclose and beginning of line
|
|
||||||
call Type("Autoclose and beginning of line", "'\<Left>\<Left>\<Esc>i'", ["'|\"'"], ["autoclose:0"])
|
|
||||||
|
|
||||||
" Manual close at start of line
|
" Manual close at start of line
|
||||||
call Type("Manual close at start of line", "m)\<Left>\<Left>)", [')|m)'], ["autoclose:0"])
|
call Type("Manual close at start of line", "m)\<Left>\<Left>)", [')|m)'], ["autoclose:0"])
|
||||||
|
|
||||||
@@ -230,20 +237,23 @@ function! delimitMateTests#Main(known) " {{{
|
|||||||
" Show results: {{{
|
" Show results: {{{
|
||||||
normal ggVG"_d
|
normal ggVG"_d
|
||||||
call append(0, split(string(b:test_results)[1:-2], ', '))
|
call append(0, split(string(b:test_results)[1:-2], ', '))
|
||||||
call append(0, "*NEW BROKEN TESTS: " . (b:errors - a:known))
|
call append(0, "*TESTS REPORT: " . b:errors . " failed, " . b:corrects . " passed and " . b:ignores . " ignored.")
|
||||||
normal "_ddgg
|
normal "_ddgg
|
||||||
let @/ = ".\\+Failed:.*!="
|
let @/ = ".\\+Failed:.*!="
|
||||||
set nohlsearch
|
set nohlsearch
|
||||||
"syntax match failedLine "^.*Failed.*$" contains=ALL
|
"syntax match failedLine "^.*Failed.*$" contains=ALL
|
||||||
"syn match passedLine ".*Passed.*"
|
"syn match passedLine ".*Passed.*"
|
||||||
|
syn match lineIgnored ".*Ignored.*"
|
||||||
syn match labelPassed "'\@<=.\+\(': 'Passed\)\@="
|
syn match labelPassed "'\@<=.\+\(': 'Passed\)\@="
|
||||||
syn match labelFailed "'\@<=.\+\(': 'Failed\)\@="
|
syn match labelFailed "'\@<=.\+\(': 'Failed\)\@="
|
||||||
syn match resultPassed "\('Passed: \)\@<=.\+\('$\)\@="
|
syn match resultPassed "\('Passed: \)\@<=.\+\('$\)\@="
|
||||||
syn match resultFailed "\('Failed: \)\@<=.\+\('$\)\@=" contains=resultInequal
|
syn match resultFailed "\('Failed: \)\@<=.\+\('$\)\@=" contains=resultInequal
|
||||||
|
syn match resultIgnored "\('Ignored: \)\@<=.\+\('$\)\@="
|
||||||
syn match resultInequal "!="
|
syn match resultInequal "!="
|
||||||
syn match resultSummary "^\*.\+" contains=resultSummaryNumber
|
syn match resultSummary "^\*.\+" contains=resultSummaryNumber
|
||||||
syn match resultSummaryNumber "[1-9][0-9]*" contained
|
syn match resultSummaryNumber "[1-9][0-9]* failed*" contained
|
||||||
|
|
||||||
|
hi def link lineIgnored Ignore
|
||||||
hi def link labelPassed Comment
|
hi def link labelPassed Comment
|
||||||
hi def link labelFailed Special
|
hi def link labelFailed Special
|
||||||
hi def link resultPassed Ignore
|
hi def link resultPassed Ignore
|
||||||
|
|||||||
Reference in New Issue
Block a user