From a15ba262e4592cdfb270afad4471b023284cb215 Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Thu, 11 Jun 2015 01:01:22 +0200
Subject: tests: Migrate legacy test argument_0count.

---
 src/nvim/testdir/Makefile                       |  1 -
 src/nvim/testdir/test_argument_0count.in        | 28 ------------------
 src/nvim/testdir/test_argument_0count.ok        |  5 ----
 test/functional/legacy/argument_0count_spec.lua | 38 +++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 34 deletions(-)
 delete mode 100644 src/nvim/testdir/test_argument_0count.in
 delete mode 100644 src/nvim/testdir/test_argument_0count.ok
 create mode 100644 test/functional/legacy/argument_0count_spec.lua

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 0359e15488..023a8bf234 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -30,7 +30,6 @@ SCRIPTS := test_eval.out                                               \
            test_argument_count.out                                     \
            test_close_count.out                                        \
            test_command_count.out                                      \
-           test_argument_0count.out
 
 SCRIPTS_GUI := test16.out
 
diff --git a/src/nvim/testdir/test_argument_0count.in b/src/nvim/testdir/test_argument_0count.in
deleted file mode 100644
index 88317fa1fc..0000000000
--- a/src/nvim/testdir/test_argument_0count.in
+++ /dev/null
@@ -1,28 +0,0 @@
-Tests for :0argadd and :0argedit     vim: set ft=vim :
-
-STARTTEST
-:so small.vim
-:let arglists = []
-:%argd
-:arga a b c d
-:2argu
-:0arga added
-:call add(arglists, argv())
-:2argu
-:arga third
-:call add(arglists, argv())
-:%argd
-:arga a b c d
-:2argu
-:0arge edited
-:call add(arglists, argv())
-:2argu
-:arga third
-:call add(arglists, argv())
-:e! test.out
-:call append(0, map(copy(arglists), 'join(v:val, " ")'))
-:w
-:qa!
-ENDTEST
-
-
diff --git a/src/nvim/testdir/test_argument_0count.ok b/src/nvim/testdir/test_argument_0count.ok
deleted file mode 100644
index ee5daea812..0000000000
--- a/src/nvim/testdir/test_argument_0count.ok
+++ /dev/null
@@ -1,5 +0,0 @@
-added a b c d
-added a third b c d
-edited a b c d
-edited a third b c d
-
diff --git a/test/functional/legacy/argument_0count_spec.lua b/test/functional/legacy/argument_0count_spec.lua
new file mode 100644
index 0000000000..d27809c8d8
--- /dev/null
+++ b/test/functional/legacy/argument_0count_spec.lua
@@ -0,0 +1,38 @@
+-- Tests for :0argadd and :0argedit
+
+local helpers = require('test.functional.helpers')
+local source, clear, expect = helpers.source, helpers.clear, helpers.expect
+
+describe('argument_0count', function()
+  setup(clear)
+
+  it('is working', function()
+    source([[
+      let arglists = []
+      arga a b c d
+      2argu
+      0arga added
+      call add(arglists, argv())
+      2argu
+      arga third
+      call add(arglists, argv())
+      %argd
+      arga a b c d
+      2argu
+      0arge edited
+      call add(arglists, argv())
+      2argu
+      arga third
+      call add(arglists, argv())
+      call append(0, map(copy(arglists), 'join(v:val, " ")'))
+    ]])
+
+    -- Assert buffer contents.
+    expect([=[
+      added a b c d
+      added a third b c d
+      edited a b c d
+      edited a third b c d
+      ]=])
+  end)
+end)
-- 
cgit 


From 88b76ec146613797dbf3e4df76f52cd94ae1480e Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Thu, 11 Jun 2015 01:18:35 +0200
Subject: tests: Modernize migrated legacy test argument_0count.

---
 test/functional/legacy/argument_0count_spec.lua | 46 ++++++++++---------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/test/functional/legacy/argument_0count_spec.lua b/test/functional/legacy/argument_0count_spec.lua
index d27809c8d8..6e8b60547b 100644
--- a/test/functional/legacy/argument_0count_spec.lua
+++ b/test/functional/legacy/argument_0count_spec.lua
@@ -1,38 +1,28 @@
 -- Tests for :0argadd and :0argedit
 
 local helpers = require('test.functional.helpers')
-local source, clear, expect = helpers.source, helpers.clear, helpers.expect
+local eq, eval, clear, execute =
+  helpers.eq, helpers.eval, helpers.clear, helpers.execute
 
 describe('argument_0count', function()
   setup(clear)
 
   it('is working', function()
-    source([[
-      let arglists = []
-      arga a b c d
-      2argu
-      0arga added
-      call add(arglists, argv())
-      2argu
-      arga third
-      call add(arglists, argv())
-      %argd
-      arga a b c d
-      2argu
-      0arge edited
-      call add(arglists, argv())
-      2argu
-      arga third
-      call add(arglists, argv())
-      call append(0, map(copy(arglists), 'join(v:val, " ")'))
-    ]])
-
-    -- Assert buffer contents.
-    expect([=[
-      added a b c d
-      added a third b c d
-      edited a b c d
-      edited a third b c d
-      ]=])
+    execute('arga a b c d')
+    eq({'a', 'b', 'c', 'd'}, eval('argv()'))
+    execute('2argu')
+    execute('0arga added')
+    eq({'added', 'a', 'b', 'c', 'd'}, eval('argv()'))
+    execute('2argu')
+    execute('arga third')
+    eq({'added', 'a', 'third', 'b', 'c', 'd'}, eval('argv()'))
+    execute('%argd')
+    execute('arga a b c d')
+    execute('2argu')
+    execute('0arge edited')
+    eq({'edited', 'a', 'b', 'c', 'd'}, eval('argv()'))
+    execute('2argu')
+    execute('arga third')
+    eq({'edited', 'a', 'third', 'b', 'c', 'd'}, eval('argv()'))
   end)
 end)
-- 
cgit