jyapayne/vimspector
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename AssertMatchist -> AssertMatchList

Browse source
This commit is contained in:
Ben Jackson 2021-05-15 16:03:02 +01:00
commit aacd62f09f
3 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/lib/plugin/shared.vim
View file

@ -99,7 +99,7 @@ function! ThisTestIsFlaky()
let g:test_is_flaky = v:true
endfunction
function! AssertMatchist( expected, actual ) abort
function! AssertMatchList( expected, actual ) abort
let ret = assert_equal( len( a:expected ), len( a:actual ) )
let len = min( [ len( a:expected ), len( a:actual ) ] )
let idx = 0

56
tests/stack_trace.test.vim
View file

@ -30,7 +30,7 @@ function! Test_Multiple_Threads_Continue()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call cursor( 1, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread [0-9]\+: .* (paused)',
\ ' .*: .*@threads.cpp:' . string( thread_l )
@ -45,7 +45,7 @@ function! Test_Multiple_Threads_Continue()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call cursor( 1, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread [0-9]\+: .* (paused)',
\ ' .*: .*@threads.cpp:' . string( thread_l )
@ -56,7 +56,7 @@ function! Test_Multiple_Threads_Continue()
\ )
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ ],
@ -70,7 +70,7 @@ function! Test_Multiple_Threads_Continue()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call cursor( 1, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread [0-9]\+: .* (paused)',
\ ' .*: .*@threads.cpp:' . string( thread_l )
@ -81,7 +81,7 @@ function! Test_Multiple_Threads_Continue()
\ )
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ ],
@ -95,7 +95,7 @@ function! Test_Multiple_Threads_Continue()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call cursor( 1, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread [0-9]\+: .* (paused)',
\ ' .*: .*@threads.cpp:' . string( thread_l )
@ -106,7 +106,7 @@ function! Test_Multiple_Threads_Continue()
\ )
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ ],
@ -121,7 +121,7 @@ function! Test_Multiple_Threads_Continue()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call cursor( 1, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread [0-9]\+: .* (paused)',
\ ' .*: .*@threads.cpp:' . string( thread_l )
@ -132,7 +132,7 @@ function! Test_Multiple_Threads_Continue()
\ )
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ ],
@ -146,7 +146,7 @@ function! Test_Multiple_Threads_Continue()
" So we break out of the loop
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, notify_l, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread [0-9]\+: .* (paused)',
\ ' .*: .*@threads.cpp:' . string( notify_l )
@ -157,7 +157,7 @@ function! Test_Multiple_Threads_Continue()
\ )
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ ],
@ -192,7 +192,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread [0-9]\+: .* (paused)',
\ ' .*: .*@threads.cpp:' . string( thread_l )
@ -205,7 +205,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#StepOver()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ ],
@ -218,7 +218,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ ],
@ -230,7 +230,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#StepOver()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ '+ Thread [0-9]\+: .* (paused)',
@ -244,7 +244,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ '+ Thread [0-9]\+: .* (paused)',
@ -257,7 +257,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#StepOver()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ '+ Thread [0-9]\+: .* (paused)',
@ -273,7 +273,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ '+ Thread [0-9]\+: .* (paused)',
@ -287,7 +287,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#StepOver()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ '+ Thread [0-9]\+: .* (paused)',
@ -304,7 +304,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_l, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ '+ Thread [0-9]\+: .* (paused)',
@ -319,7 +319,7 @@ function! Test_Multiple_Threads_Step()
call vimspector#StepOver()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, thread_n, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ '+ Thread [0-9]\+: .* (paused)',
@ -338,7 +338,7 @@ function! Test_Multiple_Threads_Step()
" So we break out of the loop
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, notify_l, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '+ Thread [0-9]\+: .* (paused)',
\ '+ Thread [0-9]\+: .* (paused)',
@ -366,7 +366,7 @@ function! Test_UpDownStack()
call vimspector#LaunchWithSettings( { 'configuration': 'run' } )
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 15, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread 1: MainThread (paused)',
\ ' 2: DoSomething@main.py:15',
@ -397,7 +397,7 @@ function! Test_UpDownStack()
call vimspector#DownFrame()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 15, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread 1: MainThread (paused)',
\ ' 2: DoSomething@main.py:15',
@ -429,7 +429,7 @@ function! Test_UpDownStack()
call vimspector#UpFrame()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 8, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread 1: MainThread (paused)',
\ ' 2: DoSomething@main.py:15',
@ -461,7 +461,7 @@ function! Test_UpDownStack()
call feedkeys( "\<Plug>VimspectorUpFrame", 'x' )
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 23, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread 1: MainThread (paused)',
\ ' 2: DoSomething@main.py:15',
@ -493,7 +493,7 @@ function! Test_UpDownStack()
call feedkeys( "\<Plug>VimspectorDownFrame", 'x' )
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 8, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread 1: MainThread (paused)',
\ ' 2: DoSomething@main.py:15',
@ -525,7 +525,7 @@ function! Test_UpDownStack()
call vimspector#DownFrame()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 15, 1 )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Thread 1: MainThread (paused)',
\ ' 2: DoSomething@main.py:15',

44
tests/variables.test.vim
View file

@ -211,7 +211,7 @@ function! Test_ExpandVariables()
call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Scope: Locals',
\ ' \*- t (Test): {...}',
@ -229,7 +229,7 @@ function! Test_ExpandVariables()
" Step - stays expanded
call vimspector#StepOver()
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Scope: Locals',
\ ' - t (Test): {...}',
@ -278,7 +278,7 @@ function! Test_ExpandVariables()
call setpos( '.', [ 0, 2, 1 ] )
call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Scope: Locals',
\ ' - t (Test): {...}',
@ -378,7 +378,7 @@ function! Test_ExpandWatch()
call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ 'Watches: ----',
\ 'Expression: t',
@ -397,7 +397,7 @@ function! Test_ExpandWatch()
" Step - stays expanded
call vimspector#StepOver()
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ 'Watches: ----',
\ 'Expression: t',
@ -449,7 +449,7 @@ function! Test_ExpandWatch()
call setpos( '.', [ 0, 3, 1 ] )
call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ 'Watches: ----',
\ 'Expression: t',
@ -607,7 +607,7 @@ function! Test_EvaluateFailure()
" Add a wtch
call vimspector#AddWatch( 'test' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ 'Watches: ----',
\ 'Expression: test',
@ -658,7 +658,7 @@ function! Test_VariableEval()
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '{...}',
\ ' - i: 0',
@ -690,7 +690,7 @@ function! Test_VariableEval()
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '{...}',
\ ' - i: 0',
@ -724,7 +724,7 @@ function! Test_VariableEval()
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ 'Evaluation error',
\ ],
@ -768,7 +768,7 @@ function! Test_VariableEvalExpand()
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '{...}',
\ ' - i: 0',
@ -786,7 +786,7 @@ function! Test_VariableEvalExpand()
call feedkeys( "jjjj\<CR>", 'xt' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '{...}',
\ ' - i: 0',
@ -806,7 +806,7 @@ function! Test_VariableEvalExpand()
call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '{...}',
\ ' - i: 0',
@ -863,7 +863,7 @@ function! Test_SetVariableValue_Local()
call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Scope: Locals',
\ ' \*- t (Test): {...}',
@ -889,7 +889,7 @@ with mock.patch( 'vimspector.utils.InputSave' ):
EOF
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Scope: Locals',
\ ' \*- t (Test): {...}',
@ -908,7 +908,7 @@ EOF
call vimspector#SetVariableValue( '1234' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Scope: Locals',
\ ' \*- t (Test): {...}',
@ -927,7 +927,7 @@ EOF
call vimspector#SetVariableValue( 'this is invalid' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '- Scope: Locals',
\ ' \*- t (Test): {...}',
@ -983,7 +983,7 @@ function! Test_SetVariableValue_Watch()
call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ 'Watches: ----',
\ 'Expression: t',
@ -1012,7 +1012,7 @@ EOF
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ 'Watches: ----',
\ 'Expression: t',
@ -1032,7 +1032,7 @@ EOF
call vimspector#SetVariableValue( '1234' )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ 'Watches: ----',
\ 'Expression: t',
@ -1075,7 +1075,7 @@ function! Test_SetVariableValue_Balloon()
\ } )
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '{...}',
\ ' - i: 0',
@ -1102,7 +1102,7 @@ with mock.patch( 'vimspector.utils.InputSave' ):
EOF
call WaitForAssert( {->
\ AssertMatchist(
\ AssertMatchList(
\ [
\ '{...}',
\ ' - i: 0',