Mercurial > vim
changeset 12777:3272e1cde1eb v8.0.1266
patch 8.0.1266: Test_swap_directory was commented out
commit https://github.com/vim/vim/commit/ffe010fa0363d1a04b15cc6af119a4af63ba9363
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 4 22:30:40 2017 +0100
patch 8.0.1266: Test_swap_directory was commented out
Problem: Test_swap_directory was accidentally commented out.
Solution: Uncomment the test.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 04 Nov 2017 22:45:05 +0100 |
parents | c56100fde9e8 |
children | 77a183c386a5 |
files | src/testdir/test_swap.vim src/version.c |
diffstat | 2 files changed, 48 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -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")