Permalink
Browse files

patch 8.0.1266: Test_swap_directory was commented out

Problem:    Test_swap_directory was accidentally commented out.
Solution:   Uncomment the test.
  • Loading branch information...
brammool committed Nov 4, 2017
1 parent ad7dac8 commit ffe010fa0363d1a04b15cc6af119a4af63ba9363
Showing with 48 additions and 46 deletions.
  1. +46 −46 src/testdir/test_swap.vim
  2. +2 −0 src/version.c
View
@@ -1,51 +1,51 @@
" Tests for the swap feature
"" Tests for 'directory' option.
"func Test_swap_directory()
" if !has("unix")
" return
" endif
" let content = ['start of testfile',
" \ 'line 2 Abcdefghij',
" \ 'line 3 Abcdefghij',
" \ 'end of testfile']
" call writefile(content, 'Xtest1')
"
" " '.', swap file in the same directory as file
" set dir=.,~
"
" " Verify that the swap file doesn't exist in the current directory
" call assert_equal([], glob(".Xtest1*.swp", 1, 1, 1))
" edit Xtest1
" let swfname = split(execute("swapname"))[0]
" call assert_equal([swfname], glob(swfname, 1, 1, 1))
"
" " './dir', swap file in a directory relative to the file
" set dir=./Xtest2,.,~
"
" call mkdir("Xtest2")
" edit Xtest1
" call assert_equal([], glob(swfname, 1, 1, 1))
" let swfname = "Xtest2/Xtest1.swp"
" call assert_equal(swfname, split(execute("swapname"))[0])
" call assert_equal([swfname], glob("Xtest2/*", 1, 1, 1))
"
" " 'dir', swap file in directory relative to the current dir
" set dir=Xtest.je,~
"
" call mkdir("Xtest.je")
" call writefile(content, 'Xtest2/Xtest3')
" edit Xtest2/Xtest3
" call assert_equal(["Xtest2/Xtest3"], glob("Xtest2/*", 1, 1, 1))
" let swfname = "Xtest.je/Xtest3.swp"
" call assert_equal(swfname, split(execute("swapname"))[0])
" call assert_equal([swfname], glob("Xtest.je/*", 1, 1, 1))
"
" set dir&
" call delete("Xtest1")
" call delete("Xtest2", "rf")
" call delete("Xtest.je", "rf")
"endfunc
" Tests for 'directory' option.
func Test_swap_directory()
if !has("unix")
return
endif
let content = ['start of testfile',
\ 'line 2 Abcdefghij',
\ 'line 3 Abcdefghij',
\ 'end of testfile']
call writefile(content, 'Xtest1')
" '.', swap file in the same directory as file
set dir=.,~
" Verify that the swap file doesn't exist in the current directory
call assert_equal([], glob(".Xtest1*.swp", 1, 1, 1))
edit Xtest1
let swfname = split(execute("swapname"))[0]
call assert_equal([swfname], glob(swfname, 1, 1, 1))
" './dir', swap file in a directory relative to the file
set dir=./Xtest2,.,~
call mkdir("Xtest2")
edit Xtest1
call assert_equal([], glob(swfname, 1, 1, 1))
let swfname = "Xtest2/Xtest1.swp"
call assert_equal(swfname, split(execute("swapname"))[0])
call assert_equal([swfname], glob("Xtest2/*", 1, 1, 1))
" 'dir', swap file in directory relative to the current dir
set dir=Xtest.je,~
call mkdir("Xtest.je")
call writefile(content, 'Xtest2/Xtest3')
edit Xtest2/Xtest3
call assert_equal(["Xtest2/Xtest3"], glob("Xtest2/*", 1, 1, 1))
let swfname = "Xtest.je/Xtest3.swp"
call assert_equal(swfname, split(execute("swapname"))[0])
call assert_equal([swfname], glob("Xtest.je/*", 1, 1, 1))
set dir&
call delete("Xtest1")
call delete("Xtest2", "rf")
call delete("Xtest.je", "rf")
endfunc
func Test_swap_group()
if !has("unix")
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1266,
/**/
1265,
/**/

0 comments on commit ffe010f

Please sign in to comment.