Merge pull request #21090 from zeertzjq/vim-8.2.2945

vim-patch:8.2.{2945,2952,2960,2973,2981,3080,3103,3440,3498},9.0.0895: recover tests
This commit is contained in:
zeertzjq 2022-11-17 23:53:58 +08:00 committed by GitHub
commit 1f6d36c2c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 531 additions and 2 deletions

View File

@ -131,7 +131,8 @@ struct data_block {
unsigned db_free; // free space available
unsigned db_txt_start; // byte where text starts
unsigned db_txt_end; // byte just after data block
linenr_T db_line_count; // number of lines in this block
// linenr_T db_line_count;
long db_line_count; // number of lines in this block
unsigned db_index[1]; // index for start of line (actually bigger)
// followed by empty space up to db_txt_start
// followed by the text in the lines until

View File

@ -243,6 +243,36 @@ func Test_diffput_two()
bwipe! b
endfunc
" Test for :diffget/:diffput with a range that is inside a diff chunk
func Test_diffget_diffput_range()
call setline(1, range(1, 10))
new
call setline(1, range(11, 20))
windo diffthis
3,5diffget
call assert_equal(['13', '14', '15'], getline(3, 5))
call setline(1, range(1, 10))
4,8diffput
wincmd p
call assert_equal(['13', '4', '5', '6', '7', '8', '19'], getline(3, 9))
%bw!
endfunc
" Test for :diffget/:diffput with an empty buffer and a non-empty buffer
func Test_diffget_diffput_empty_buffer()
%d _
new
call setline(1, 'one')
windo diffthis
diffget
call assert_equal(['one'], getline(1, '$'))
%d _
diffput
wincmd p
call assert_equal([''], getline(1, '$'))
%bw!
endfunc
" :diffput and :diffget completes names of buffers which
" are in diff mode and which are different then current buffer.
" No completion when the current window is not in diff mode.
@ -645,7 +675,11 @@ func Test_diffexpr()
call assert_equal(normattr, screenattr(1, 1))
call assert_equal(normattr, screenattr(2, 1))
call assert_notequal(normattr, screenattr(3, 1))
diffoff!
" Try using an non-existing function for 'diffexpr'.
set diffexpr=NewDiffFunc()
call assert_fails('windo diffthis', ['E117:', 'E97:'])
diffoff!
%bwipe!
set diffexpr& diffopt&
@ -1316,6 +1350,89 @@ func Test_diff_filler_cursorcolumn()
call delete('Xtest_diff_cuc')
endfunc
" Test for adding/removing lines inside diff chunks, between diff chunks
" and before diff chunks
func Test_diff_modify_chunks()
enew!
let w2_id = win_getid()
call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
new
let w1_id = win_getid()
call setline(1, ['a', '2', '3', 'd', 'e', 'f', '7', '8', 'i'])
windo diffthis
" remove a line between two diff chunks and create a new diff chunk
call win_gotoid(w2_id)
5d
call win_gotoid(w1_id)
call diff_hlID(5, 1)->synIDattr('name')->assert_equal('DiffAdd')
" add a line between two diff chunks
call win_gotoid(w2_id)
normal! 4Goe
call win_gotoid(w1_id)
call diff_hlID(4, 1)->synIDattr('name')->assert_equal('')
call diff_hlID(5, 1)->synIDattr('name')->assert_equal('')
" remove all the lines in a diff chunk.
call win_gotoid(w2_id)
7,8d
call win_gotoid(w1_id)
let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
call assert_equal(['', 'DiffText', 'DiffText', '', '', '', 'DiffAdd',
\ 'DiffAdd', ''], hl)
" remove lines from one diff chunk to just before the next diff chunk
call win_gotoid(w2_id)
call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
2,6d
call win_gotoid(w1_id)
let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
call assert_equal(['', 'DiffText', 'DiffText', 'DiffAdd', 'DiffAdd',
\ 'DiffAdd', 'DiffAdd', 'DiffAdd', ''], hl)
" remove lines just before the top of a diff chunk
call win_gotoid(w2_id)
call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
5,6d
call win_gotoid(w1_id)
let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
call assert_equal(['', 'DiffText', 'DiffText', '', 'DiffText', 'DiffText',
\ 'DiffAdd', 'DiffAdd', ''], hl)
" remove line after the end of a diff chunk
call win_gotoid(w2_id)
call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
4d
call win_gotoid(w1_id)
let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
call assert_equal(['', 'DiffText', 'DiffText', 'DiffAdd', '', '', 'DiffText',
\ 'DiffText', ''], hl)
" remove lines starting from the end of one diff chunk and ending inside
" another diff chunk
call win_gotoid(w2_id)
call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
4,7d
call win_gotoid(w1_id)
let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
call assert_equal(['', 'DiffText', 'DiffText', 'DiffText', 'DiffAdd',
\ 'DiffAdd', 'DiffAdd', 'DiffAdd', ''], hl)
" removing the only remaining diff chunk should make the files equal
call win_gotoid(w2_id)
call setline(1, ['a', '2', '3', 'x', 'd', 'e', 'f', 'x', '7', '8', 'i'])
8d
let hl = range(1, 10)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
call assert_equal(['', '', '', 'DiffAdd', '', '', '', '', '', ''], hl)
call win_gotoid(w2_id)
4d
call win_gotoid(w1_id)
let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
call assert_equal(['', '', '', '', '', '', '', '', ''], hl)
%bw!
endfunc
func Test_diff_binary()
CheckScreendump

View File

@ -78,6 +78,14 @@ func Test_file_cmd()
call assert_fails('3file', 'E474:')
call assert_fails('0,0file', 'E474:')
call assert_fails('0file abc', 'E474:')
if !has('win32')
" Change the name of the buffer to the same name
new Xfile1
file Xfile1
call assert_equal('Xfile1', @%)
call assert_equal('Xfile1', @#)
bw!
endif
endfunc
" Test for the :drop command

View File

@ -180,6 +180,8 @@ func Test_prompt_buffer_edit()
call assert_beeps('normal! S')
call assert_beeps("normal! \<C-A>")
call assert_beeps("normal! \<C-X>")
call assert_beeps("normal! dp")
call assert_beeps("normal! do")
" pressing CTRL-W in the prompt buffer should trigger the window commands
call assert_equal(1, winnr())
exe "normal A\<C-W>\<C-W>"

View File

@ -126,7 +126,6 @@ func Test_nocatch_process_still_running()
call test_override("uptime", 0)
sleep 1
call rename('Xswap', swname)
call feedkeys('e', 'tL')
redir => editOutput
edit Xswaptest
@ -138,4 +137,331 @@ func Test_nocatch_process_still_running()
call delete(swname)
endfunc
" Test for :recover with multiple swap files
func Test_recover_multiple_swap_files()
CheckUnix
new Xfile1
call setline(1, ['a', 'b', 'c'])
preserve
let b = readblob(swapname(''))
call writefile(b, '.Xfile1.swm')
call writefile(b, '.Xfile1.swn')
call writefile(b, '.Xfile1.swo')
%bw!
call feedkeys(":recover Xfile1\<CR>3\<CR>q", 'xt')
call assert_equal(['a', 'b', 'c'], getline(1, '$'))
" try using out-of-range number to select a swap file
bw!
call feedkeys(":recover Xfile1\<CR>4\<CR>q", 'xt')
call assert_equal('Xfile1', @%)
call assert_equal([''], getline(1, '$'))
bw!
call feedkeys(":recover Xfile1\<CR>0\<CR>q", 'xt')
call assert_equal('Xfile1', @%)
call assert_equal([''], getline(1, '$'))
bw!
call delete('.Xfile1.swm')
call delete('.Xfile1.swn')
call delete('.Xfile1.swo')
endfunc
" Test for :recover using an empty swap file
func Test_recover_empty_swap_file()
CheckUnix
call writefile([], '.Xfile1.swp')
let msg = execute('recover Xfile1')
call assert_match('Unable to read block 0 from .Xfile1.swp', msg)
call assert_equal('Xfile1', @%)
bw!
" make sure there are no old swap files laying around
for f in glob('.sw?', 0, 1)
call delete(f)
endfor
" :recover from an empty buffer
call assert_fails('recover', 'E305:')
call delete('.Xfile1.swp')
endfunc
" Test for :recover using a corrupted swap file
" Refer to the comments in the memline.c file for the swap file headers
" definition.
func Test_recover_corrupted_swap_file()
CheckUnix
" recover using a partial swap file
call writefile(0z1234, '.Xfile1.swp')
call assert_fails('recover Xfile1', 'E295:')
bw!
" recover using invalid content in the swap file
call writefile([repeat('1', 2*1024)], '.Xfile1.swp')
call assert_fails('recover Xfile1', 'E307:')
call delete('.Xfile1.swp')
" :recover using a swap file with a corrupted header
edit Xfile1
preserve
let sn = swapname('')
let b = readblob(sn)
let save_b = copy(b)
bw!
" Not all fields are written in a system-independent manner. Detect whether
" the test is running on a little or big-endian system, so the correct
" corruption values can be set.
" The B0_MAGIC_LONG field may be 32-bit or 64-bit, depending on the system,
" even though the value stored is only 32-bits. Therefore, need to check
" both the high and low 32-bits to compute these values.
let little_endian = (b[1008:1011] == 0z33323130) || (b[1012:1015] == 0z33323130)
let system_64bit = little_endian ? (b[1012:1015] == 0z00000000) : (b[1008:1011] == 0z00000000)
" clear the B0_MAGIC_LONG field
if system_64bit
let b[1008:1015] = 0z00000000.00000000
else
let b[1008:1011] = 0z00000000
endif
call writefile(b, sn)
let msg = execute('recover Xfile1')
call assert_match('the file has been damaged', msg)
call assert_equal('Xfile1', @%)
call assert_equal([''], getline(1, '$'))
bw!
" reduce the page size
let b = copy(save_b)
let b[12:15] = 0z00010000
call writefile(b, sn)
let msg = execute('recover Xfile1')
call assert_match('page size is smaller than minimum value', msg)
call assert_equal('Xfile1', @%)
call assert_equal([''], getline(1, '$'))
bw!
" clear the pointer ID
let b = copy(save_b)
let b[4096:4097] = 0z0000
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E310:')
call assert_equal('Xfile1', @%)
call assert_equal([''], getline(1, '$'))
bw!
" set the number of pointers in a pointer block to zero
let b = copy(save_b)
let b[4098:4099] = 0z0000
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
call assert_equal(['???EMPTY BLOCK'], getline(1, '$'))
bw!
" set the block number in a pointer entry to a negative number
let b = copy(save_b)
if system_64bit
let b[4104:4111] = little_endian ? 0z00000000.00000080 : 0z80000000.00000000
else
let b[4104:4107] = little_endian ? 0z00000080 : 0z80000000
endif
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
call assert_equal(['???LINES MISSING'], getline(1, '$'))
bw!
" clear the data block ID
let b = copy(save_b)
let b[8192:8193] = 0z0000
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
call assert_equal(['???BLOCK MISSING'], getline(1, '$'))
bw!
" set the number of lines in the data block to zero
let b = copy(save_b)
if system_64bit
let b[8208:8215] = 0z00000000.00000000
else
let b[8208:8211] = 0z00000000
endif
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
call assert_equal(['??? from here until ???END lines may have been inserted/deleted',
\ '???END'], getline(1, '$'))
bw!
" use an invalid text start for the lines in a data block
let b = copy(save_b)
if system_64bit
let b[8216:8219] = 0z00000000
else
let b[8212:8215] = 0z00000000
endif
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
call assert_equal(['???'], getline(1, '$'))
bw!
" use an incorrect text end (db_txt_end) for the data block
let b = copy(save_b)
let b[8204:8207] = little_endian ? 0z80000000 : 0z00000080
call writefile(b, sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
call assert_equal(['??? from here until ???END lines may be messed up', '',
\ '???END'], getline(1, '$'))
bw!
" remove the data block
let b = copy(save_b)
call writefile(b[:8191], sn)
call assert_fails('recover Xfile1', 'E312:')
call assert_equal('Xfile1', @%)
call assert_equal(['???MANY LINES MISSING'], getline(1, '$'))
bw!
call delete(sn)
endfunc
" Test for :recover using an encrypted swap file
func Test_recover_encrypted_swap_file()
CheckFeature cryptv
CheckUnix
" Recover an encrypted file from the swap file without the original file
new Xfile1
call feedkeys(":X\<CR>vim\<CR>vim\<CR>", 'xt')
call setline(1, ['aaa', 'bbb', 'ccc'])
preserve
let b = readblob('.Xfile1.swp')
call writefile(b, '.Xfile1.swm')
bw!
call feedkeys(":recover Xfile1\<CR>vim\<CR>\<CR>", 'xt')
call assert_equal(['aaa', 'bbb', 'ccc'], getline(1, '$'))
bw!
call delete('.Xfile1.swm')
" Recover an encrypted file from the swap file with the original file
new Xfile1
call feedkeys(":X\<CR>vim\<CR>vim\<CR>", 'xt')
call setline(1, ['aaa', 'bbb', 'ccc'])
update
call setline(1, ['111', '222', '333'])
preserve
let b = readblob('.Xfile1.swp')
call writefile(b, '.Xfile1.swm')
bw!
call feedkeys(":recover Xfile1\<CR>vim\<CR>\<CR>", 'xt')
call assert_equal(['111', '222', '333'], getline(1, '$'))
call assert_true(&modified)
bw!
call delete('.Xfile1.swm')
call delete('Xfile1')
endfunc
" Test for :recover using a unreadable swap file
func Test_recover_unreadble_swap_file()
CheckUnix
CheckNotRoot
new Xfile1
let b = readblob('.Xfile1.swp')
call writefile(b, '.Xfile1.swm')
bw!
call setfperm('.Xfile1.swm', '-w-------')
call assert_fails('recover Xfile1', 'E306:')
call delete('.Xfile1.swm')
endfunc
" Test for using :recover when the original file and the swap file have the
" same contents.
func Test_recover_unmodified_file()
CheckUnix
call writefile(['aaa', 'bbb', 'ccc'], 'Xfile1')
edit Xfile1
preserve
let b = readblob('.Xfile1.swp')
%bw!
call writefile(b, '.Xfile1.swz')
let msg = execute('recover Xfile1')
call assert_equal(['aaa', 'bbb', 'ccc'], getline(1, '$'))
call assert_false(&modified)
call assert_match('Buffer contents equals file contents', msg)
bw!
call delete('Xfile1')
call delete('.Xfile1.swz')
endfunc
" Test for recovering a file when editing a symbolically linked file
func Test_recover_symbolic_link()
CheckUnix
call writefile(['aaa', 'bbb', 'ccc'], 'Xfile1')
silent !ln -s Xfile1 Xfile2
edit Xfile2
call assert_equal('.Xfile1.swp', fnamemodify(swapname(''), ':t'))
preserve
let b = readblob('.Xfile1.swp')
%bw!
call writefile([], 'Xfile1')
call writefile(b, '.Xfile1.swp')
silent! recover Xfile2
call assert_equal(['aaa', 'bbb', 'ccc'], getline(1, '$'))
call assert_true(&modified)
update
%bw!
call assert_equal(['aaa', 'bbb', 'ccc'], readfile('Xfile1'))
call delete('Xfile1')
call delete('Xfile2')
call delete('.Xfile1.swp')
endfunc
" Test for recovering a file when an autocmd moves the cursor to an invalid
" line. This used to result in an internal error (E315) which is fixed
" by 8.2.2966.
func Test_recover_invalid_cursor_pos()
call writefile([], 'Xfile1')
edit Xfile1
preserve
let b = readblob('.Xfile1.swp')
bw!
augroup Test
au!
au BufReadPost Xfile1 normal! 3G
augroup END
call writefile(range(1, 3), 'Xfile1')
call writefile(b, '.Xfile1.swp')
try
recover Xfile1
catch /E308:/
" this test is for the :E315 internal error.
" ignore the 'E308: Original file may have been changed' error
endtry
redraw!
augroup Test
au!
augroup END
augroup! Test
call delete('Xfile1')
call delete('.Xfile1.swp')
endfunc
" Test for recovering a buffer without a name
func Test_noname_buffer()
new
call setline(1, ['one', 'two'])
preserve
let sn = swapname('')
let b = readblob(sn)
bw!
call writefile(b, sn)
exe "recover " .. sn
call assert_equal(['one', 'two'], getline(1, '$'))
call delete(sn)
endfunc
" vim: shiftwidth=2 sts=2 expandtab

View File

@ -501,6 +501,81 @@ func Test_swap_auto_delete()
augroup! test_swap_recover_ext
endfunc
" Test for renaming a buffer when the swap file is deleted out-of-band
func Test_missing_swap_file()
CheckUnix
new Xfile2
call delete(swapname(''))
call assert_fails('file Xfile3', 'E301:')
call assert_equal('Xfile3', bufname())
call assert_true(bufexists('Xfile2'))
call assert_true(bufexists('Xfile3'))
%bw!
endfunc
" Test for :preserve command
func Test_preserve()
new Xfile4
setlocal noswapfile
call assert_fails('preserve', 'E313:')
bw!
endfunc
" Test for the v:swapchoice variable
func Test_swapchoice()
call writefile(['aaa', 'bbb'], 'Xfile5')
edit Xfile5
preserve
let swapfname = swapname('')
let b = readblob(swapfname)
bw!
call writefile(b, swapfname)
autocmd! SwapExists
" Test for v:swapchoice = 'o' (readonly)
augroup test_swapchoice
autocmd!
autocmd SwapExists * let v:swapchoice = 'o'
augroup END
edit Xfile5
call assert_true(&readonly)
call assert_equal(['aaa', 'bbb'], getline(1, '$'))
%bw!
call assert_true(filereadable(swapfname))
" Test for v:swapchoice = 'a' (abort)
augroup test_swapchoice
autocmd!
autocmd SwapExists * let v:swapchoice = 'a'
augroup END
try
edit Xfile5
catch /^Vim:Interrupt$/
endtry
call assert_equal('', @%)
call assert_true(bufexists('Xfile5'))
%bw!
call assert_true(filereadable(swapfname))
" Test for v:swapchoice = 'd' (delete)
augroup test_swapchoice
autocmd!
autocmd SwapExists * let v:swapchoice = 'd'
augroup END
edit Xfile5
call assert_equal('Xfile5', @%)
%bw!
call assert_false(filereadable(swapfname))
call delete('Xfile5')
call delete(swapfname)
augroup test_swapchoice
autocmd!
augroup END
augroup! test_swapchoice
endfunc
func Test_no_swap_file()
call assert_equal("\nNo swap file", execute('swapname'))
endfunc