Mercurial > vim
changeset 9701:172855211978 v7.4.2126
commit https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 30 19:11:25 2016 +0200
patch 7.4.2126
Problem: No tests for :diffget and :diffput
Solution: Add tests.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 30 Jul 2016 19:15:04 +0200 |
| parents | 15ade5d67a0e |
| children | a8decd757ce5 |
| files | src/testdir/test_diffmode.vim src/version.c |
| diffstat | 2 files changed, 40 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -162,6 +162,43 @@ func Test_filler_lines() wincmd h call assert_equal(1, line('w0')) unlet! diff_fdm diff_fdc + windo diffoff + bwipe! + enew! +endfunc - windo bw! +func Test_diffget_diffput() + enew! + let l = range(50) + call setline(1, l) + call assert_fails('diffget', 'E99:') + diffthis + call assert_fails('diffget', 'E100:') + new + let l[10] = 'one' + let l[20] = 'two' + let l[30] = 'three' + let l[40] = 'four' + call setline(1, l) + diffthis + call assert_equal('one', getline(11)) + 11diffget + call assert_equal('10', getline(11)) + 21diffput + wincmd w + call assert_equal('two', getline(21)) + normal 31Gdo + call assert_equal('three', getline(31)) + call assert_equal('40', getline(41)) + normal 41Gdp + wincmd w + call assert_equal('40', getline(41)) + new + diffthis + call assert_fails('diffget', 'E101:') + + windo diffoff + bwipe! + bwipe! + enew! endfunc