patch 8.1.2384: test 48 is old style

Problem:    Test 48 is old style.
Solution:   Merge test cases into new style test. (Yegappan Lakshmanan,
            closes #5307)

diff --git a/src/Makefile b/src/Makefile
index e1968ba86f4538fac6d300e17da7af51d1405d5c..e0926a63b7d37b1bc84480af7b97fb3c06f781f5 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2252,7 +2252,7 @@ test_libvterm:
 test1 \
        test_eval \
        test39 \
-       test42 test44 test48 test49 \
+       test42 test44 test49 \
        test52 test59 \
        test64 test69 \
        test70 test72 \

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index f6d6c17176e46d9f9e693c983b400885dea0f5e1..e664217aa48fcf875960683684d9da38855fb050 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -16,7 +16,6 @@ SCRIPTS_ALL = \
        test39.out \
        test42.out \
        test44.out \
-       test48.out \
        test64.out \
        test69.out \
        test70.out \

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index bb30618f9f070ff007b38e9515c435dd077315db..6a2dc674a25c9c757580305614692c948c57308b 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -75,7 +75,7 @@ VIMPROG = <->vim.exe
 
 SCRIPT = test1.out \
        test39.out \
-       test42.out test44.out test48.out test49.out \
+       test42.out test44.out test49.out \
        test64.out test69.out \
        test72.out test77a.out test88.out \
        test94.out test95.out test99.out \

diff --git a/src/testdir/test48.in b/src/testdir/test48.in
deleted file mode 100644 (file)
index d480f8c..0000000
--- a/src/testdir/test48.in
+++ /dev/null
@@ -1,83 +0,0 @@
-This is a test of 'virtualedit'.
-
-STARTTEST
-:so small.vim
-:set noswf
-:set ve=all
--dgg
-:"
-:"   Insert "keyword keyw", ESC, C CTRL-N, shows "keyword ykeyword".
-:"    Repeating CTRL-N fixes it. (Mary Ellen Foster)
-2/w
-C\ e\e
-:"
-:"   Using "C" then then <CR> moves the last remaining character to the next
-:"    line.  (Mary Ellen Foster)
-j^/are
-C\rare belong to vim\e
-:"
-:"   When past the end of a line that ends in a single character "b" skips
-:"    that word.
-^$15lbC7\e
-:"
-:"   Make sure 'i' works
-$4li<-- should be 3 ' '\e
-:"
-:"   Make sure 'C' works
-$4lC<-- should be 3 ' '\e
-:"
-:"   Make sure 'a' works
-$4la<-- should be 4 ' '\e
-:"
-:"   Make sure 'A' works
-$4lA<-- should be 0 ' '\e
-:"
-:"   Make sure 'D' works
-$4lDi<-- 'D' should be intact\e
-:"
-:"   Test for yank bug reported by Mark Waggoner.
-:set ve=block
-^2w\163jyGp
-:"
-:" Test "r" beyond the end of the line
-:set ve=all
-/^"r"
-$5lrxa<-- should be 'x'\e
-:"
-:" Test "r" on a tab
-:" Note that for this test, 'ts' must be 8 (the default).
-^5lrxA<-- should be '  x  '\e
-:"
-:"   Test to make sure 'x' can delete control characters
-:set display=uhex
-^xxxxxxi[This line should contain only the text between the brackets.]\e
-:set display=
-:"
-:"   Test for ^Y/^E due to bad w_virtcol value, reported by
-:"   Roy <royl@netropolis.net>.
-^O\e3li\ 5\e4li\ 5\e4li\ 5   <-- should show the name of a noted text editor\e
-^o\e4li\19\e4li\19\e4li\19   <-- and its version number\e-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"    
-a\16b\rsd
-abcv6efi.him0kl
-
-

diff --git a/src/testdir/test48.ok b/src/testdir/test48.ok
deleted file mode 100644 (file)
index 14cd9b1..0000000
--- a/src/testdir/test48.ok
+++ /dev/null
@@ -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
- 

diff --git a/src/testdir/test_virtualedit.vim b/src/testdir/test_virtualedit.vim
index 6379d0d72be7be50b0b4068a06d9c8ed694d6dc4..25ca33f8ebc46e66cb40a4450441f3a02b64c55c 100644 (file)
--- a/src/testdir/test_virtualedit.vim
+++ b/src/testdir/test_virtualedit.vim
@@ -210,4 +210,137 @@ func Test_yank_in_tab()
   set virtualedit=
 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

diff --git a/src/version.c b/src/version.c
index e46160e6abc3eaecb17310a436cd3d1b331a8009..f7c6e343a99e368278b0a088c4e6b81841b05190 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2384,
 /**/
     2383,
 /**/