From 549fc9548deaa737ff101806b60cedd7d4970c28 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Wed, 1 Oct 2014 09:05:28 -0300 Subject: test: Move 'test/legacy' to 'test/functional' Busted can only discover tests from a single directory. In order to allow tests under 'legacy' to run as a functional test, it needed to be moved to 'test/functional'. --- .../legacy/002_filename_recognition_spec.lua | 42 ++++++++++++++++++++++ test/legacy/002_filename_recognition_spec.lua | 42 ---------------------- 2 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 test/functional/legacy/002_filename_recognition_spec.lua delete mode 100644 test/legacy/002_filename_recognition_spec.lua (limited to 'test') diff --git a/test/functional/legacy/002_filename_recognition_spec.lua b/test/functional/legacy/002_filename_recognition_spec.lua new file mode 100644 index 0000000000..569e748631 --- /dev/null +++ b/test/functional/legacy/002_filename_recognition_spec.lua @@ -0,0 +1,42 @@ +-- Test if URLs are recognized as filenames by commands such as "gf". Here +-- we'll use `expand("")` since "gf" would need to open the file. + +local helpers = require('test.functional.helpers') +local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert +local execute, expect = helpers.execute, helpers.expect + +describe('filename recognition', function() + setup(clear) + + it('is working', function() + -- insert some lines containing URLs + insert([[ + first test for URL://machine.name/tmp/vimtest2a and other text + second test for URL://machine.name/tmp/vimtest2b. And other text + third test for URL:\\machine.name\vimtest2c and other text + fourth test for URL:\\machine.name\tmp\vimtest2d, and other text]]) + + -- Go to the first URL and append it to the beginning + execute('/^first', '/tmp', 'call append(0, expand(""))') + + -- Repeat for the second URL + -- this time, navigate to the word "URL" instead of "tmp" + execute('/^second', '/URL', 'call append(1, expand(""))') + + -- Repeat for the remaining URLs. This time, the 'isfname' option must be + -- set to allow '\' in filenames + execute('set isf=@,48-57,/,.,-,_,+,,,$,:,~,\\') + execute('/^third', '/name', 'call append(2, expand(""))') + execute('/^fourth', '/URL', 'call append(3, expand(""))') + + -- Delete the initial text, which now starts at line 5 + feed('5GdG') + + -- The buffer should now contain: + expect([[ + URL://machine.name/tmp/vimtest2a + URL://machine.name/tmp/vimtest2b + URL:\\machine.name\vimtest2c + URL:\\machine.name\tmp\vimtest2d]]) + end) +end) diff --git a/test/legacy/002_filename_recognition_spec.lua b/test/legacy/002_filename_recognition_spec.lua deleted file mode 100644 index 569e748631..0000000000 --- a/test/legacy/002_filename_recognition_spec.lua +++ /dev/null @@ -1,42 +0,0 @@ --- Test if URLs are recognized as filenames by commands such as "gf". Here --- we'll use `expand("")` since "gf" would need to open the file. - -local helpers = require('test.functional.helpers') -local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert -local execute, expect = helpers.execute, helpers.expect - -describe('filename recognition', function() - setup(clear) - - it('is working', function() - -- insert some lines containing URLs - insert([[ - first test for URL://machine.name/tmp/vimtest2a and other text - second test for URL://machine.name/tmp/vimtest2b. And other text - third test for URL:\\machine.name\vimtest2c and other text - fourth test for URL:\\machine.name\tmp\vimtest2d, and other text]]) - - -- Go to the first URL and append it to the beginning - execute('/^first', '/tmp', 'call append(0, expand(""))') - - -- Repeat for the second URL - -- this time, navigate to the word "URL" instead of "tmp" - execute('/^second', '/URL', 'call append(1, expand(""))') - - -- Repeat for the remaining URLs. This time, the 'isfname' option must be - -- set to allow '\' in filenames - execute('set isf=@,48-57,/,.,-,_,+,,,$,:,~,\\') - execute('/^third', '/name', 'call append(2, expand(""))') - execute('/^fourth', '/URL', 'call append(3, expand(""))') - - -- Delete the initial text, which now starts at line 5 - feed('5GdG') - - -- The buffer should now contain: - expect([[ - URL://machine.name/tmp/vimtest2a - URL://machine.name/tmp/vimtest2b - URL:\\machine.name\vimtest2c - URL:\\machine.name\tmp\vimtest2d]]) - end) -end) -- cgit From f6a008a1824938038bb0801881302ea5b42e1087 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Wed, 1 Oct 2014 09:31:57 -0300 Subject: test: Add 'eval' functional helper The eval helper transforms vimL expressions into lua tables, it's useful for verifying function output. --- test/functional/helpers.lua | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index 2b9ddfbe3c..671e34e592 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -31,9 +31,24 @@ local function execute(...) end end +local function eval(expr) + local status, result = pcall(function() return nvim_eval(expr) end) + if not status then + error('Failed to evaluate expression "' .. expr .. '"') + end + return result +end + +local function eq(expected, actual) + return assert.are.same(expected, actual) +end + +local function neq(expected, actual) + return assert.are_not.same(expected, actual) +end + local function expect(contents, first, last, buffer_index) - return assert.are.same(dedent(contents), - buffer_slice(first, last, buffer_idx)) + return eq(dedent(contents), buffer_slice(first, last, buffer_idx)) end rawfeed([[:function BeforeEachTest() @@ -80,5 +95,8 @@ return { insert = insert, feed = feed, execute = execute, + eval = eval, + eq = eq, + neq = neq, expect = expect } -- cgit From 35d7815eb2c89bd88c94e32b2e6afecc906d7e7d Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Wed, 1 Oct 2014 09:32:56 -0300 Subject: test: Add some specs for the viml function `system()` These new specs replace src/nvim/testdir/test_system --- test/functional/shell/viml_system_spec.lua | 125 +++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 test/functional/shell/viml_system_spec.lua (limited to 'test') diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua new file mode 100644 index 0000000000..effabe715c --- /dev/null +++ b/test/functional/shell/viml_system_spec.lua @@ -0,0 +1,125 @@ +-- Specs for +-- - `system()` +-- - `systemlist()` + +local helpers = require('test.functional.helpers') +local eq, clear, eval, feed = + helpers.eq, helpers.clear, helpers.eval, helpers.feed + + +local function create_file_with_nuls(name) + return function() + feed('ipart1000part2000part3:w '..name..'') + end +end + +local function delete_file(name) + return function() + eval("delete('"..name.."')") + end +end + + +describe('system()', function() + before_each(clear) + + describe('passing no input', function() + it('returns the program output', function() + eq("echoed", eval('system("echo -n echoed")')) + end) + end) + + describe('passing input', function() + it('returns the program output', function() + eq("input", eval('system("cat -", "input")')) + end) + end) + + describe('passing number as input', function() + it('stringifies the input', function() + eq('1', eval('system("cat", 1)')) + end) + end) + + describe('with output containing NULs', function() + local fname = 'Xtest' + + setup(create_file_with_nuls(fname)) + teardown(delete_file(fname)) + + it('replaces NULs by SOH characters', function() + eq('part1\001part2\001part3\n', eval('system("cat '..fname..'")')) + end) + end) + + describe('passing list as input', function() + it('joins list items with linefeed characters', function() + eq('line1\nline2\nline3', + eval("system('cat -', ['line1', 'line2', 'line3'])")) + end) + + -- Notice that NULs are converted to SOH when the data is read back. This + -- is inconsistent and is a good reason for the existence of the + -- `systemlist()` function, where input and output map to the same + -- characters(see the following tests with `systemlist()` below) + describe('with linefeed characters inside list items', function() + it('converts linefeed characters to NULs', function() + eq('l1\001p2\nline2\001a\001b\nl3', + eval([[system('cat -', ["l1\np2", "line2\na\nb", 'l3'])]])) + end) + end) + + describe('with leading/trailing whitespace characters on items', function() + it('preserves whitespace, replacing linefeeds by NULs', function() + eq('line \nline2\001\n\001line3', + eval([[system('cat -', ['line ', "line2\n", "\nline3"])]])) + end) + end) + end) +end) + +describe('systemlist()', function() + -- behavior is similar to `system()` but it returns a list instead of a + -- string. + before_each(clear) + + describe('passing string with linefeed characters as input', function() + it('splits the output on linefeed characters', function() + eq({'abc', 'def', 'ghi'}, eval([[systemlist("cat -", "abc\ndef\nghi")]])) + end) + end) + + describe('with output containing NULs', function() + local fname = 'Xtest' + + setup(create_file_with_nuls(fname)) + teardown(delete_file(fname)) + + it('replaces NULs by newline characters', function() + eq({'part1\npart2\npart3'}, eval('systemlist("cat '..fname..'")')) + end) + end) + + describe('passing list as input', function() + it('joins list items with linefeed characters', function() + eq({'line1', 'line2', 'line3'}, + eval("systemlist('cat -', ['line1', 'line2', 'line3'])")) + end) + + -- Unlike `system()` which uses SOH to represent NULs, with `systemlist()` + -- input and ouput are the same + describe('with linefeed characters inside list items', function() + it('converts linefeed characters to NULs', function() + eq({'l1\np2', 'line2\na\nb', 'l3'}, + eval([[systemlist('cat -', ["l1\np2", "line2\na\nb", 'l3'])]])) + end) + end) + + describe('with leading/trailing whitespace characters on items', function() + it('preserves whitespace, replacing linefeeds by NULs', function() + eq({'line ', 'line2\n', '\nline3'}, + eval([[systemlist('cat -', ['line ', "line2\n", "\nline3"])]])) + end) + end) + end) +end) -- cgit