vim/vim-easymotion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix test script

Browse Source
This commit is contained in:
haya14busa 2014-03-29 19:46:49 +09:00
parent 4fc630a4be
commit eecca8563a
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/easymotion_spec.vim
View File

@ -28,9 +28,9 @@
"============================================================================= "=============================================================================
" Avoid source test files {{{ " Avoid source test files {{{
if expand("%:p") ==# expand("<sfile>:p") " if expand("%:p") ==# expand("<sfile>:p")
finish " finish
endif " endif
"}}} "}}}
let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+') let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+')

60
t/smartsign_spec.vim
View File

@ -27,9 +27,9 @@
" Test for `smartsign` feature for find motions " Test for `smartsign` feature for find motions
" Avoid source test files {{{ " Avoid source test files {{{
if expand("%:p") ==# expand("<sfile>:p") " if expand("%:p") ==# expand("<sfile>:p")
finish " finish
endif " endif
"}}} "}}}
" Setup {{{ " Setup {{{
@ -50,21 +50,14 @@ endfunction
" Smartsign configulation {{{ " Smartsign configulation {{{
describe 'Smartsign configulation' describe 'Smartsign configulation'
before
new
end
after
close!
end
it 'provide default dictionary' it 'provide default dictionary'
let smartdict_us = g:EasyMotion#sticky_table#us let smartdict_us = g:EasyMotion#sticky_table#us
let smartdict_jp = g:EasyMotion#sticky_table#jp let smartdict_jp = g:EasyMotion#sticky_table#jp
Expect smartdict_us !=# {} Expect smartdict_us !=# {}
Expect smartdict_jp !=# {} Expect smartdict_jp !=# {}
end end
end "}}} end
"}}}
" Basic Smartsign feature with 1-key findmotions with US layout {{{ " Basic Smartsign feature with 1-key findmotions with US layout {{{
describe 'Basic Smartsign feature with 1-key findmotions with US layout' describe 'Basic Smartsign feature with 1-key findmotions with US layout'
@ -390,7 +383,8 @@ describe 'Basic Smartsign feature with 1-key findmotions with US layout'
Expect CursorPos() == [l+2,1,' '] Expect CursorPos() == [l+2,1,' ']
normal! 0 normal! 0
end end
end "}}} end
"}}}
" Smartsign with 2-key find motions with JP layout {{{ " Smartsign with 2-key find motions with JP layout {{{
describe 'Smartsign with 2-key find motions with JP layout' describe 'Smartsign with 2-key find motions with JP layout'
@ -398,11 +392,14 @@ describe 'Smartsign with 2-key find motions with JP layout'
new new
let g:EasyMotion_keys = '123456789' let g:EasyMotion_keys = '123456789'
let g:EasyMotion_use_smartsign_jp = 1 let g:EasyMotion_use_smartsign_jp = 1
map s2 <Plug>(easymotion-s2) map s <Plug>(easymotion-s2)
call EasyMotion#init() call EasyMotion#init()
call AddLine(' -= ^~ ;+ :* [{ ]} @` \|') call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_') call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
call AddLine(' ,< .> /?') call AddLine(' ,< .> /?')
call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
call AddLine(' ,< .> /?')
" 123456789012345678901234567890 " 123456789012345678901234567890
" 1 2 3 " 1 2 3
" "
@ -427,13 +424,11 @@ describe 'Smartsign with 2-key find motions with JP layout'
normal s,,1 normal s,,1
Expect CursorPos() == [l,2,','] Expect CursorPos() == [l,2,',']
normal! 0 normal! 0
normal s,,2 Expect CursorPos() == [l,1,' ']
normal s,,3
Expect CursorPos() == [l,1,' '] Expect CursorPos() == [l,1,' ']
normal! 0 normal! 0
normal s ,1 normal s, 1
Expect CursorPos() == [l,1,' ']
normal! 0
normal s, 2
Expect CursorPos() == [l,3,'<'] Expect CursorPos() == [l,3,'<']
normal! 0 normal! 0
normal s<<1 normal s<<1
@ -446,7 +441,16 @@ describe 'Smartsign with 2-key find motions with JP layout'
Expect CursorPos() == [l,1,' '] Expect CursorPos() == [l,1,' ']
normal! 0 normal! 0
end end
end "}}} it ': s,,3'
normal! 0
let l = line('.')
Expect CursorPos() == [l,1,' ']
normal s,,3
Expect CursorPos() == [l,1,' ']
normal! 0
end
end
"}}}
" Smartsign with n-key find search motions {{{ " Smartsign with n-key find search motions {{{
describe 'Smartsign with n-key find search motions' describe 'Smartsign with n-key find search motions'
@ -454,11 +458,14 @@ describe 'Smartsign with n-key find search motions'
new new
let g:EasyMotion_keys = '123456789' let g:EasyMotion_keys = '123456789'
let g:EasyMotion_use_smartsign_jp = 1 let g:EasyMotion_use_smartsign_jp = 1
map s2 <Plug>(easymotion-s2) map / <Plug>(easymotion-sn)
call EasyMotion#init() call EasyMotion#init()
call AddLine(' -= ^~ ;+ :* [{ ]} @` \|') call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_') call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
call AddLine(' ,< .> /?') call AddLine(' ,< .> /?')
call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
call AddLine(' ,< .> /?')
end end
after after
@ -472,14 +479,15 @@ describe 'Smartsign with n-key find search motions'
Expect CursorPos() == [l,1,' '] Expect CursorPos() == [l,1,' ']
" ,< " ,<
normal s,,1 normal /,,1
Expect CursorPos() != [l,2,','] Expect CursorPos() == [l,1,' ']
normal! 0 normal! 0
normal s,<1 normal /,<1
Expect CursorPos() == [l,2,','] Expect CursorPos() == [l,1,' ']
normal! 0 normal! 0
end end
end "}}} end
"}}}
" __END__ {{{ " __END__ {{{
" vim: expandtab softtabstop=4 shiftwidth=4 " vim: expandtab softtabstop=4 shiftwidth=4