vim-patch:8.1.2384: test 48 is old style #11509

Problem:    Test 48 is old style.
Solution:   Merge test cases into new style test. (Yegappan Lakshmanan,
            closes vim/vim#5307)
079119babe
This commit is contained in:
Jan Edmund Lazo 2019-12-03 23:54:53 -05:00 committed by Justin M. Keyes
parent b1e4ec1c2a
commit bcd5fc9764
4 changed files with 135 additions and 106 deletions

View File

@ -15,7 +15,6 @@ export TMPDIR := $(abspath Xtest-tmpdir)
SCRIPTS_DEFAULT = \
test42.out \
test48.out \
test64.out \
ifneq ($(OS),Windows_NT)

View File

@ -1,82 +0,0 @@
This is a test of 'virtualedit'.
STARTTEST
:set noswf
:set ve=all
j-dgg
:"
:" Insert "keyword keyw", ESC, C CTRL-N, shows "keyword ykeyword".
:" Repeating CTRL-N fixes it. (Mary Ellen Foster)
2/w
C
:"
:" Using "C" then then <CR> moves the last remaining character to the next
:" line. (Mary Ellen Foster)
j^/are
C are belong to vim
:"
:" When past the end of a line that ends in a single character "b" skips
:" that word.
^$15lbC7
:"
:" Make sure 'i' works
$4li<-- should be 3 ' '
:"
:" Make sure 'C' works
$4lC<-- should be 3 ' '
:"
:" Make sure 'a' works
$4la<-- should be 4 ' '
:"
:" Make sure 'A' works
$4lA<-- should be 0 ' '
:"
:" Make sure 'D' works
$4lDi<-- 'D' should be intact
:"
:" Test for yank bug reported by Mark Waggoner.
:set ve=block
^2w3jyGp
:"
:" Test "r" beyond the end of the line
:set ve=all
/^"r"
$5lrxa<-- should be 'x'
:"
:" Test "r" on a tab
:" Note that for this test, 'ts' must be 8 (the default).
^5lrxA<-- should be ' x '
:"
:" Test to make sure 'x' can delete control characters
:set display=uhex
^xxxxxxi[This line should contain only the text between the brackets.]
:set display=
:"
:" Test for ^Y/^E due to bad w_virtcol value, reported by
:" Roy <royl@netropolis.net>.
^O3li4li4li <-- should show the name of a noted text editor
^o4li4li4li <-- and its version number-dd
:"
:" Test for yanking and pasting using the small delete register
gg/^foo
dewve"-p
:wq! test.out
ENDTEST
foo, bar
keyword keyw
all your base are belong to us
1 2 3 4 5 6
'i'
'C'
'a'
'A'
'D'
this is a test
this is a test
this is a test
"r"
"r"
ab sd
abcv6efi.him0kl

View File

@ -1,23 +0,0 @@
, foo
keyword keyword
all your base
are belong to vim
1 2 3 4 5 7
'i' <-- should be 3 ' '
'C' <-- should be 3 ' '
'a' <-- should be 4 ' '
'A'<-- should be 0 ' '
'D' <-- 'D' should be intact
this is a test
this is a test
this is a test
"r" x<-- should be 'x'
"r" x <-- should be ' x '
[This line should contain only the text between the brackets.]
v i m <-- should show the name of a noted text editor
6 . 0 <-- and its version number
a
a
a

View File

@ -82,3 +82,138 @@ func Test_edit_change()
call assert_equal('x', getline(1))
bwipe!
endfunc
" Insert "keyword keyw", ESC, C CTRL-N, shows "keyword ykeyword".
" Repeating CTRL-N fixes it. (Mary Ellen Foster)
func Test_ve_completion()
new
set completeopt&vim
set virtualedit=all
exe "normal ikeyword keyw\<Esc>C\<C-N>"
call assert_equal('keyword keyword', getline(1))
bwipe!
set virtualedit=
endfunc
" Using "C" then then <CR> moves the last remaining character to the next
" line. (Mary Ellen Foster)
func Test_ve_del_to_eol()
new
set virtualedit=all
call append(0, 'all your base are belong to us')
call search('are', 'w')
exe "normal C\<CR>are belong to vim"
call assert_equal(['all your base ', 'are belong to vim'], getline(1, 2))
bwipe!
set virtualedit=
endfunc
" When past the end of a line that ends in a single character "b" skips
" that word.
func Test_ve_b_past_eol()
new
set virtualedit=all
call append(0, '1 2 3 4 5 6')
normal gg^$15lbC7
call assert_equal('1 2 3 4 5 7', getline(1))
bwipe!
set virtualedit=
endfunc
" Make sure 'i', 'C', 'a', 'A' and 'D' works
func Test_ve_ins_del()
new
set virtualedit=all
call append(0, ["'i'", "'C'", "'a'", "'A'", "'D'"])
call cursor(1, 1)
normal $4lix
call assert_equal("'i' x", getline(1))
call cursor(2, 1)
normal $4lCx
call assert_equal("'C' x", getline(2))
call cursor(3, 1)
normal $4lax
call assert_equal("'a' x", getline(3))
call cursor(4, 1)
normal $4lAx
call assert_equal("'A'x", getline(4))
call cursor(5, 1)
normal $4lDix
call assert_equal("'D' x", getline(5))
bwipe!
set virtualedit=
endfunc
" Test for yank bug reported by Mark Waggoner.
func Test_yank_block()
new
set virtualedit=block
call append(0, repeat(['this is a test'], 3))
exe "normal gg^2w\<C-V>3jy"
call assert_equal("a\na\na\n ", @")
bwipe!
set virtualedit=
endfunc
" Test "r" beyond the end of the line
func Test_replace_after_eol()
new
set virtualedit=all
call append(0, '"r"')
normal gg$5lrxa
call assert_equal('"r" x', getline(1))
bwipe!
set virtualedit=
endfunc
" Test "r" on a tab
" Note that for this test, 'ts' must be 8 (the default).
func Test_replace_on_tab()
new
set virtualedit=all
call append(0, "'r'\t")
normal gg^5lrxAy
call assert_equal("'r' x y", getline(1))
bwipe!
set virtualedit=
endfunc
" Test to make sure 'x' can delete control characters
func Test_ve_del_ctrl_chars()
new
set virtualedit=all
call append(0, "a\<C-V>b\<CR>sd")
set display=uhex
normal gg^xxxxxxi[text]
set display=
call assert_equal('[text]', getline(1))
bwipe!
set virtualedit=
endfunc
" Test for ^Y/^E due to bad w_virtcol value, reported by
" Roy <royl@netropolis.net>.
func Test_ins_copy_char()
new
set virtualedit=all
call append(0, 'abcv8efi.him2kl')
exe "normal gg^O\<Esc>3li\<C-E>\<Esc>4li\<C-E>\<Esc>4li\<C-E> <--"
exe "normal j^o\<Esc>4li\<C-Y>\<Esc>4li\<C-Y>\<Esc>4li\<C-Y> <--"
call assert_equal(' v i m <--', getline(1))
call assert_equal(' 8 . 2 <--', getline(3))
bwipe!
set virtualedit=
endfunc
" Test for yanking and pasting using the small delete register
func Test_yank_paste_small_del_reg()
new
set virtualedit=all
call append(0, "foo, bar")
normal ggdewve"-p
call assert_equal(', foo', getline(1))
bwipe!
set virtualedit=
endfunc
" vim: shiftwidth=2 sts=2 expandtab