From 65fb622000af8e3dbb65480e1581758ecf4ba3e2 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 9 Apr 2017 00:12:26 +0300
Subject: functests: Replace execute with either command or feed_command

Hope this will make people using feed_command less likely: this hides bugs.
Already found at least two:

1. msgpackparse() will show internal error: hash_add() in case of duplicate
   keys, though it will still work correctly. Currently silenced.
2. ttimeoutlen was spelled incorrectly, resulting in option not being set when
   expected. Test was still functioning somehow though. Currently fixed.
---
 test/functional/legacy/delete_spec.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'test/functional/legacy/delete_spec.lua')

diff --git a/test/functional/legacy/delete_spec.lua b/test/functional/legacy/delete_spec.lua
index cd19e31a79..aeaab335e8 100644
--- a/test/functional/legacy/delete_spec.lua
+++ b/test/functional/legacy/delete_spec.lua
@@ -1,6 +1,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, source = helpers.clear, helpers.source
-local eq, eval, execute = helpers.eq, helpers.eval, helpers.execute
+local eq, eval, command = helpers.eq, helpers.eval, helpers.command
 
 if helpers.pending_win32(pending) then return end
 
@@ -8,30 +8,30 @@ describe('Test for delete()', function()
   before_each(clear)
 
   it('file delete', function()
-    execute('split Xfile')
-    execute("call setline(1, ['a', 'b'])")
-    execute('wq')
+    command('split Xfile')
+    command("call setline(1, ['a', 'b'])")
+    command('wq')
     eq(eval("['a', 'b']"), eval("readfile('Xfile')"))
     eq(0, eval("delete('Xfile')"))
     eq(-1, eval("delete('Xfile')"))
   end)
 
   it('directory delete', function()
-    execute("call mkdir('Xdir1')")
+    command("call mkdir('Xdir1')")
     eq(1, eval("isdirectory('Xdir1')"))
     eq(0, eval("delete('Xdir1', 'd')"))
     eq(0, eval("isdirectory('Xdir1')"))
     eq(-1, eval("delete('Xdir1', 'd')"))
   end)
   it('recursive delete', function()
-    execute("call mkdir('Xdir1')")
-    execute("call mkdir('Xdir1/subdir')")
-    execute("call mkdir('Xdir1/empty')")
-    execute('split Xdir1/Xfile')
-    execute("call setline(1, ['a', 'b'])")
-    execute('w')
-    execute('w Xdir1/subdir/Xfile')
-    execute('close')
+    command("call mkdir('Xdir1')")
+    command("call mkdir('Xdir1/subdir')")
+    command("call mkdir('Xdir1/empty')")
+    command('split Xdir1/Xfile')
+    command("call setline(1, ['a', 'b'])")
+    command('w')
+    command('w Xdir1/subdir/Xfile')
+    command('close')
 
     eq(1, eval("isdirectory('Xdir1')"))
     eq(eval("['a', 'b']"), eval("readfile('Xdir1/Xfile')"))
@@ -57,8 +57,8 @@ describe('Test for delete()', function()
   end)
 
   it('symlink directory delete', function()
-    execute("call mkdir('Xdir1')")
-    execute("silent !ln -s Xdir1 Xlink")
+    command("call mkdir('Xdir1')")
+    command("silent !ln -s Xdir1 Xlink")
     eq(1, eval("isdirectory('Xdir1')"))
     eq(1, eval("isdirectory('Xlink')"))
     -- Delete the link, not the directory
-- 
cgit