summaryrefslogtreecommitdiff
path: root/src/testdir
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-04 22:30:40 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-04 22:30:40 +0100
commitffe010fa0363d1a04b15cc6af119a4af63ba9363 (patch)
treee8d3fe9c968cec90fbe8fe59304fc7bb27decb97 /src/testdir
parentad7dac85c3c90893e78e5463ca44b874082b482f (diff)
downloadvim-git-ffe010fa0363d1a04b15cc6af119a4af63ba9363.tar.gz
patch 8.0.1266: Test_swap_directory was commented outv8.0.1266
Problem: Test_swap_directory was accidentally commented out. Solution: Uncomment the test.
Diffstat (limited to 'src/testdir')
-rw-r--r--src/testdir/test_swap.vim92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index 457edf685..ee11a731b 100644
--- 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")