aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.0.1266: Test_swap_directory was commented out

Browse Source 
Problem:    Test_swap_directory was accidentally commented out.
Solution:   Uncomment the test.
This commit is contained in:
Bram Moolenaar
2017-11-04 22:30:40 +01:00
parent ad7dac85c3
commit ffe010fa03
2 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/testdir/test_swap.vim
View File

@@ -1,51 +1,51 @@
" Tests for the swap feature " Tests for the swap feature
"" Tests for 'directory' option. " Tests for 'directory' option.
"func Test_swap_directory() func Test_swap_directory()
" if !has("unix") if !has("unix")
" return return
" endif endif
" let content = ['start of testfile', let content = ['start of testfile',
" \ 'line 2 Abcdefghij', \ 'line 2 Abcdefghij',
" \ 'line 3 Abcdefghij', \ 'line 3 Abcdefghij',
" \ 'end of testfile'] \ 'end of testfile']
" call writefile(content, 'Xtest1') call writefile(content, 'Xtest1')
"
" " '.', swap file in the same directory as file " '.', swap file in the same directory as file
" set dir=.,~ set dir=.,~
"
" " Verify that the swap file doesn't exist in the current directory " Verify that the swap file doesn't exist in the current directory
" call assert_equal([], glob(".Xtest1*.swp", 1, 1, 1)) call assert_equal([], glob(".Xtest1*.swp", 1, 1, 1))
" edit Xtest1 edit Xtest1
" let swfname = split(execute("swapname"))[0] let swfname = split(execute("swapname"))[0]
" call assert_equal([swfname], glob(swfname, 1, 1, 1)) call assert_equal([swfname], glob(swfname, 1, 1, 1))
"
" " './dir', swap file in a directory relative to the file " './dir', swap file in a directory relative to the file
" set dir=./Xtest2,.,~ set dir=./Xtest2,.,~
"
" call mkdir("Xtest2") call mkdir("Xtest2")
" edit Xtest1 edit Xtest1
" call assert_equal([], glob(swfname, 1, 1, 1)) call assert_equal([], glob(swfname, 1, 1, 1))
" let swfname = "Xtest2/Xtest1.swp" let swfname = "Xtest2/Xtest1.swp"
" call assert_equal(swfname, split(execute("swapname"))[0]) call assert_equal(swfname, split(execute("swapname"))[0])
" call assert_equal([swfname], glob("Xtest2/*", 1, 1, 1)) call assert_equal([swfname], glob("Xtest2/*", 1, 1, 1))
"
" " 'dir', swap file in directory relative to the current dir " 'dir', swap file in directory relative to the current dir
" set dir=Xtest.je,~ set dir=Xtest.je,~
"
" call mkdir("Xtest.je") call mkdir("Xtest.je")
" call writefile(content, 'Xtest2/Xtest3') call writefile(content, 'Xtest2/Xtest3')
" edit Xtest2/Xtest3 edit Xtest2/Xtest3
" call assert_equal(["Xtest2/Xtest3"], glob("Xtest2/*", 1, 1, 1)) call assert_equal(["Xtest2/Xtest3"], glob("Xtest2/*", 1, 1, 1))
" let swfname = "Xtest.je/Xtest3.swp" let swfname = "Xtest.je/Xtest3.swp"
" call assert_equal(swfname, split(execute("swapname"))[0]) call assert_equal(swfname, split(execute("swapname"))[0])
" call assert_equal([swfname], glob("Xtest.je/*", 1, 1, 1)) call assert_equal([swfname], glob("Xtest.je/*", 1, 1, 1))
"
" set dir& set dir&
" call delete("Xtest1") call delete("Xtest1")
" call delete("Xtest2", "rf") call delete("Xtest2", "rf")
" call delete("Xtest.je", "rf") call delete("Xtest.je", "rf")
"endfunc endfunc
func Test_swap_group() func Test_swap_group()
if !has("unix") if !has("unix")

2
src/version.c
View File

@@ -761,6 +761,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 */
/**/
1266,
/**/ /**/
1265, 1265,
/**/ /**/