Skip to content

Commit ffe010f

Browse files
committed
patch 8.0.1266: Test_swap_directory was commented out
Problem: Test_swap_directory was accidentally commented out. Solution: Uncomment the test.
1 parent ad7dac8 commit ffe010f

2 files changed

Lines changed: 48 additions & 46 deletions

File tree

src/testdir/test_swap.vim

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
" Tests for the swap feature
22

3-
"" Tests for 'directory' option.
4-
"func Test_swap_directory()
5-
" if !has("unix")
6-
" return
7-
" endif
8-
" let content = ['start of testfile',
9-
" \ 'line 2 Abcdefghij',
10-
" \ 'line 3 Abcdefghij',
11-
" \ 'end of testfile']
12-
" call writefile(content, 'Xtest1')
13-
"
14-
" " '.', swap file in the same directory as file
15-
" set dir=.,~
16-
"
17-
" " Verify that the swap file doesn't exist in the current directory
18-
" call assert_equal([], glob(".Xtest1*.swp", 1, 1, 1))
19-
" edit Xtest1
20-
" let swfname = split(execute("swapname"))[0]
21-
" call assert_equal([swfname], glob(swfname, 1, 1, 1))
22-
"
23-
" " './dir', swap file in a directory relative to the file
24-
" set dir=./Xtest2,.,~
25-
"
26-
" call mkdir("Xtest2")
27-
" edit Xtest1
28-
" call assert_equal([], glob(swfname, 1, 1, 1))
29-
" let swfname = "Xtest2/Xtest1.swp"
30-
" call assert_equal(swfname, split(execute("swapname"))[0])
31-
" call assert_equal([swfname], glob("Xtest2/*", 1, 1, 1))
32-
"
33-
" " 'dir', swap file in directory relative to the current dir
34-
" set dir=Xtest.je,~
35-
"
36-
" call mkdir("Xtest.je")
37-
" call writefile(content, 'Xtest2/Xtest3')
38-
" edit Xtest2/Xtest3
39-
" call assert_equal(["Xtest2/Xtest3"], glob("Xtest2/*", 1, 1, 1))
40-
" let swfname = "Xtest.je/Xtest3.swp"
41-
" call assert_equal(swfname, split(execute("swapname"))[0])
42-
" call assert_equal([swfname], glob("Xtest.je/*", 1, 1, 1))
43-
"
44-
" set dir&
45-
" call delete("Xtest1")
46-
" call delete("Xtest2", "rf")
47-
" call delete("Xtest.je", "rf")
48-
"endfunc
3+
" Tests for 'directory' option.
4+
func Test_swap_directory()
5+
if !has("unix")
6+
return
7+
endif
8+
let content = ['start of testfile',
9+
\ 'line 2 Abcdefghij',
10+
\ 'line 3 Abcdefghij',
11+
\ 'end of testfile']
12+
call writefile(content, 'Xtest1')
13+
14+
" '.', swap file in the same directory as file
15+
set dir=.,~
16+
17+
" Verify that the swap file doesn't exist in the current directory
18+
call assert_equal([], glob(".Xtest1*.swp", 1, 1, 1))
19+
edit Xtest1
20+
let swfname = split(execute("swapname"))[0]
21+
call assert_equal([swfname], glob(swfname, 1, 1, 1))
22+
23+
" './dir', swap file in a directory relative to the file
24+
set dir=./Xtest2,.,~
25+
26+
call mkdir("Xtest2")
27+
edit Xtest1
28+
call assert_equal([], glob(swfname, 1, 1, 1))
29+
let swfname = "Xtest2/Xtest1.swp"
30+
call assert_equal(swfname, split(execute("swapname"))[0])
31+
call assert_equal([swfname], glob("Xtest2/*", 1, 1, 1))
32+
33+
" 'dir', swap file in directory relative to the current dir
34+
set dir=Xtest.je,~
35+
36+
call mkdir("Xtest.je")
37+
call writefile(content, 'Xtest2/Xtest3')
38+
edit Xtest2/Xtest3
39+
call assert_equal(["Xtest2/Xtest3"], glob("Xtest2/*", 1, 1, 1))
40+
let swfname = "Xtest.je/Xtest3.swp"
41+
call assert_equal(swfname, split(execute("swapname"))[0])
42+
call assert_equal([swfname], glob("Xtest.je/*", 1, 1, 1))
43+
44+
set dir&
45+
call delete("Xtest1")
46+
call delete("Xtest2", "rf")
47+
call delete("Xtest.je", "rf")
48+
endfunc
4949

5050
func Test_swap_group()
5151
if !has("unix")

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1266,
764766
/**/
765767
1265,
766768
/**/

0 commit comments

Comments
 (0)