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

Match the output on linux and mac

Browse source
This commit is contained in:
Ben Jackson 2020-07-12 22:16:59 +01:00
commit 4f0847bcf8
1 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

39
tests/variables.test.vim
View file

@ -8,6 +8,17 @@ function! ClearDown()
call vimspector#test#setup#ClearDown() call vimspector#test#setup#ClearDown()
endfunction endfunction
function! s:assert_match_list( 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
while idx < len
let ret += assert_match( a:expected[ idx ], a:actual[ idx ] )
let idx += 1
endwhile
return ret
endfunction
function! s:StartDebugging( ... ) function! s:StartDebugging( ... )
if a:0 == 0 if a:0 == 0
let config = #{ let config = #{
@ -181,10 +192,10 @@ endfunction
function! Test_ExpandWatch() function! Test_ExpandWatch()
let fn = 'testdata/cpp/simple/struct.cpp' let fn = 'testdata/cpp/simple/struct.cpp'
" TODO: This stops at a different point on linux/gdb
call s:StartDebugging( #{ fn: fn, line: 24, col: 1, launch: #{ call s:StartDebugging( #{ fn: fn, line: 24, col: 1, launch: #{
\ configuration: 'run-to-breakpoint' \ configuration: 'run-to-breakpoint'
\ } } ) \ } } )
" Make sure the Test t is initialised " Make sure the Test t is initialised
call vimspector#StepOver() call vimspector#StepOver()
call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 26, 1 ) call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 26, 1 )
@ -211,14 +222,14 @@ function! Test_ExpandWatch()
call feedkeys( "\<CR>", 'xt' ) call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {-> call WaitForAssert( {->
\ assert_equal( \ s:assert_match_list(
\ [ \ [
\ '- Scope: Locals', \ '- Scope: Locals',
\ ' *- t (Test): {...}', \ ' \*- t (Test): {...}',
\ ' *- i (int): 0', \ ' \*- i (int): 0',
\ " *- c (char): 0 '\\0'", \ ' \*- c (char): 0 ''\\0\{1,3}''',
\ ' *- fffff (float): 0', \ ' \*- fffff (float): 0',
\ ' *+ another_test (AnotherTest): {...}', \ ' \*+ another_test (AnotherTest):\( {...}\)\?',
\ ], \ ],
\ getbufline( winbufnr( g:vimspector_session_windows.variables ), \ getbufline( winbufnr( g:vimspector_session_windows.variables ),
\ 1, \ 1,
@ -229,14 +240,14 @@ function! Test_ExpandWatch()
" Step - stays expanded " Step - stays expanded
call vimspector#StepOver() call vimspector#StepOver()
call WaitForAssert( {-> call WaitForAssert( {->
\ assert_equal( \ s:assert_match_list(
\ [ \ [
\ '- Scope: Locals', \ '- Scope: Locals',
\ ' - t (Test): {...}', \ ' - t (Test): {...}',
\ ' *- i (int): 1', \ ' \*- i (int): 1',
\ " - c (char): 0 '\\0'", \ ' - c (char): 0 ''\\0\{1,3}''',
\ ' - fffff (float): 0', \ ' - fffff (float): 0',
\ ' + another_test (AnotherTest): {...}', \ ' + another_test (AnotherTest):\( {...}\)\?',
\ ], \ ],
\ getbufline( winbufnr( g:vimspector_session_windows.variables ), \ getbufline( winbufnr( g:vimspector_session_windows.variables ),
\ 1, \ 1,
@ -278,14 +289,14 @@ function! Test_ExpandWatch()
call setpos( '.', [ 0, 2, 1 ] ) call setpos( '.', [ 0, 2, 1 ] )
call feedkeys( "\<CR>", 'xt' ) call feedkeys( "\<CR>", 'xt' )
call WaitForAssert( {-> call WaitForAssert( {->
\ assert_equal( \ s:assert_match_list(
\ [ \ [
\ '- Scope: Locals', \ '- Scope: Locals',
\ ' - t (Test): {...}', \ ' - t (Test): {...}',
\ ' - i (int): 1', \ ' - i (int): 1',
\ " *- c (char): 99 'c'", \ ' \*- c (char): 99 ''c''',
\ ' - fffff (float): 0', \ ' - fffff (float): 0',
\ ' + another_test (AnotherTest): {...}', \ ' + another_test (AnotherTest):\( {...}\)\?',
\ ], \ ],
\ getbufline( winbufnr( g:vimspector_session_windows.variables ), \ getbufline( winbufnr( g:vimspector_session_windows.variables ),
\ 1, \ 1,