aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-22 19:27:53 -04:00
Code

patch 9.0.0034: spell tests do not always clear the word list

Browse Source 
Problem:    Spell tests do not always clear the word list.
Solution:   Clear the word list in TearDown(). (closes #10659)
This commit is contained in:
zeertzjq 2022-07-04 11:03:07 +01:00 committed by Bram Moolenaar
parent 4dd9252d6f
commit 288ed23e39
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/testdir/test_spell.vim
View File

@ -14,6 +14,8 @@ func TearDown()
call delete('Xtest.latin1.add.spl') call delete('Xtest.latin1.add.spl')
call delete('Xtest.latin1.spl') call delete('Xtest.latin1.spl')
call delete('Xtest.latin1.sug') call delete('Xtest.latin1.sug')
" set 'encoding' to clear the word list
set encoding=utf-8
endfunc endfunc
func Test_wrap_search() func Test_wrap_search()
@ -781,6 +783,10 @@ func Test_zz_sal_and_addition()
set spl=Xtest_ca.latin1.spl set spl=Xtest_ca.latin1.spl
call assert_equal("elequint", FirstSpellWord()) call assert_equal("elequint", FirstSpellWord())
call assert_equal("elekwint", SecondSpellWord()) call assert_equal("elekwint", SecondSpellWord())
bwipe!
set spellfile=
set spl&
endfunc endfunc
func Test_spellfile_value() func Test_spellfile_value()
@ -864,9 +870,6 @@ func Test_spell_good_word_invalid()
sil! norm z= sil! norm z=
bwipe! bwipe!
" clear the internal word list
set enc=latin1
set enc=utf-8
endfunc endfunc
func LoadAffAndDic(aff_contents, dic_contents) func LoadAffAndDic(aff_contents, dic_contents)

7
src/testdir/test_spell_utf8.vim
View File

@ -13,6 +13,8 @@ func TearDown()
call delete('Xtest.utf-8.add.spl') call delete('Xtest.utf-8.add.spl')
call delete('Xtest.utf-8.spl') call delete('Xtest.utf-8.spl')
call delete('Xtest.utf-8.sug') call delete('Xtest.utf-8.sug')
" set 'encoding' to clear the word list
set encoding=utf-8
endfunc endfunc
let g:test_data_aff1 = [ let g:test_data_aff1 = [
@ -484,7 +486,6 @@ let g:test_data_aff_sal = [
\ ] \ ]
func LoadAffAndDic(aff_contents, dic_contents) func LoadAffAndDic(aff_contents, dic_contents)
set enc=utf-8
set spellfile= set spellfile=
call writefile(a:aff_contents, "Xtest.aff") call writefile(a:aff_contents, "Xtest.aff")
call writefile(a:dic_contents, "Xtest.dic") call writefile(a:dic_contents, "Xtest.dic")
@ -759,6 +760,7 @@ func Test_spell_sal_and_addition()
call assert_equal("elequint", FirstSpellWord()) call assert_equal("elequint", FirstSpellWord())
call assert_equal("elekwint", SecondSpellWord()) call assert_equal("elekwint", SecondSpellWord())
bwipe!
set spellfile= set spellfile=
set spl& set spl&
endfunc endfunc
@ -802,8 +804,6 @@ func Test_word_index()
sil norm z= sil norm z=
bwipe! bwipe!
" clear the word list
set enc=utf-8
call delete('Xtmpfile') call delete('Xtmpfile')
endfunc endfunc
@ -816,7 +816,6 @@ func Test_check_empty_line()
sil! norm P]svc sil! norm P]svc
norm P]s norm P]s
" TODO: should we clear the word list?
bwipe! bwipe!
endfunc endfunc

2
src/version.c
View File

@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
34,
/**/ /**/
33, 33,
/**/ /**/