Mercurial > vim
diff src/testdir/test_join.vim @ 16720:9c90cf08cfa8 v8.1.1362
patch 8.1.1362: code and data in tests can be hard to read
commit https://github.com/vim/vim/commit/c79745a82faeb5a6058e915ca49a4c69fa60ea01
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon May 20 22:12:34 2019 +0200
patch 8.1.1362: code and data in tests can be hard to read
Problem: Code and data in tests can be hard to read.
Solution: Use the new heredoc style. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/4400)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 20 May 2019 22:15:06 +0200 |
| parents | f776ce5d4ed8 |
| children | 6990c1160ea5 |
line wrap: on
line diff
--- a/src/testdir/test_join.vim +++ b/src/testdir/test_join.vim @@ -98,30 +98,27 @@ ert normal `xyl$p normal `yy2l$p - normal G - let last_line = line('$') + " Expected output + let expected =<< trim [DATA] + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + zx cvn. as dfg? hjkl iop! ert ernop + zx cvn. as dfg? hjkl iop! ert ernop + [DATA] - " Expected output - append -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -zx cvn. as dfg? hjkl iop! ert ernop -zx cvn. as dfg? hjkl iop! ert ernop -. - - call assert_equal(getline(last_line + 1, '$'), getline(1, last_line)) + call assert_equal(expected, getline(1, '$')) enew! call append(0, text) @@ -143,31 +140,28 @@ zx cvn. as dfg? hjkl iop! ert ernop normal `xyl$p normal `yy2l$p - normal G - let last_line = line('$') + " Expected output + let expected =<< trim [DATA] + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + zx cvn. as dfg? hjkl iop! ert enop + zx cvn. as dfg? hjkl iop! ert ernop - " Expected output - append -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -zx cvn. as dfg? hjkl iop! ert enop -zx cvn. as dfg? hjkl iop! ert ernop + [DATA] -. - - call assert_equal(getline(last_line + 1, '$'), getline(1, last_line)) + call assert_equal(expected, getline(1, '$')) enew! call append(0, text) @@ -180,29 +174,26 @@ zx cvn. as dfg? hjkl iop! ert ernop normal JjJjJjJjJjJjJjJjJjJjJjJjJjJ normal j4Jy3l$pjdG - normal G - let last_line = line('$') + " Expected output + let expected =<< trim [DATA] + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf. asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + asdfasdf asdf + zx cvn. as dfg? hjkl iop! ert a + [DATA] - " Expected output - append -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf. asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -asdfasdf asdf -zx cvn. as dfg? hjkl iop! ert a -. - - call assert_equal(getline(last_line + 1, '$'), getline(1, last_line)) + call assert_equal(expected, getline(1, '$')) set nocompatible set cpoptions&vim @@ -262,11 +253,8 @@ action(); .,+2join exe "normal jj3J\<CR>" - normal G - let last_line = line('$') - " Expected output - append + let expected =<< trim [CODE] { /* Make sure the previous comment leader is not removed. */ /* Make sure the previous comment leader is not removed. */ @@ -279,9 +267,9 @@ action(); if (condition) // Remove the next comment leader! OK, I will. action(); } -. + [CODE] - call assert_equal(getline(last_line + 1, '$'), getline(1, last_line)) + call assert_equal(expected, getline(1, '$')) set comments&vim set joinspaces&vim @@ -389,11 +377,8 @@ int i = 7 /* foo *// 3 exe "normal j6J\<CR>" exe "normal oSome code!\<CR>// Make sure backspacing does not remove this comment leader.\<Esc>0i\<C-H>\<Esc>" - normal G - let last_line = line('$') - " Expected output - append + let expected =<< [CODE] { /* Make sure the previous comment leader is not removed. */ /* Make sure the previous comment leader is not removed. */ @@ -416,8 +401,8 @@ int i = 7 /* foo *// 3 // comment Some code!// Make sure backspacing does not remove this comment leader. } -. +[CODE] - call assert_equal(getline(last_line + 1, '$'), getline(1, last_line)) + call assert_equal(expected, getline(1, '$')) close! endfunc