test: buffer_spec: fix set_line invocation

- pcall result was always false because of wrong arity
- also re-arrange tests into it() blocks

1 files changed, 35 insertions, 15 deletions

diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua
index 99b6c68f6d..c924988d06 100644
--- a/test/functional/api/buffer_spec.lua
+++ b/test/functional/api/buffer_spec.lua
@@ -29,18 +29,26 @@ describe('buffer_* functions', function()
       eq('', curbuf('get_line', 0))
       curbuf('set_line', 0, 'line1')
       eq('line1', curbuf('get_line', 0))
-      eq('', curbuf('get_line', 1))
-      eq('', curbuf('get_line', -2))
-      eq(false, pcall(function() curbuf('set_line', 1) end))
-      eq(false, pcall(function() curbuf('set_line', -2) end))
       curbuf('set_line', 0, 'line2')
       eq('line2', curbuf('get_line', 0))
-      eq(false, pcall(function() curbuf('del_line', 2) end))
-      eq(false, pcall(function() curbuf('del_line', -3) end))
       curbuf('del_line', 0)
       eq('', curbuf('get_line', 0))
     end)
 
+    it('get_line: out-of-bounds returns empty string', function()
+      curbuf('set_line', 0, 'line1.a')
+      eq('', curbuf('get_line', 1))
+      eq('', curbuf('get_line', -2))
+    end)
+
+    it('set_line, del_line: out-of-bounds is an error', function()
+      curbuf('set_line', 0, 'line1.a')
+      eq(false, pcall(curbuf, 'set_line', 1, 'line1.b'))
+      eq(false, pcall(curbuf, 'set_line', -2, 'line1.b'))
+      eq(false, pcall(curbuf, 'del_line', 2))
+      eq(false, pcall(curbuf, 'del_line', -3))
+    end)
+
     it('can handle NULs', function()
       curbuf('set_line', 0, 'ab\0cd')
       eq('ab\0cd', curbuf('get_line', 0))
@@ -49,6 +57,27 @@ describe('buffer_* functions', function()
 
 
   describe('{get,set}_line_slice', function()
+    it('get_line_slice: out-of-bounds returns empty array', function()
+      curbuf('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
+      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 2, true, true)) --sanity
+
+      eq({}, curbuf('get_line_slice', 2, 3, false, true))
+      eq({}, curbuf('get_line_slice', 3, 9, true, true))
+      eq({}, curbuf('get_line_slice', 3, -1, true, true))
+      eq({}, curbuf('get_line_slice', -3, -4, false, true))
+      eq({}, curbuf('get_line_slice', -4, -5, true, true))
+    end)
+
+    it('set_line_slice: out-of-bounds is an error', function()
+      curbuf('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
+      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 2, true, true)) --sanity
+
+      eq({'c'}, curbuf('get_line_slice', -1, 4, true, true))
+      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 5, true, true))
+      eq(false, pcall(curbuf, 'set_line_slice', 4, 5, true, true, {'d'}))
+      eq(false, pcall(curbuf, 'set_line_slice', -4, -5, true, true, {'d'}))
+    end)
+
     it('works', function()
       eq({''}, curbuf('get_line_slice', 0, -1, true, true))
       -- Replace buffer
@@ -60,15 +89,6 @@ describe('buffer_* functions', function()
       eq({'a', 'b'}, curbuf('get_line_slice', 0, -1, true, false))
       eq({'b'}, curbuf('get_line_slice', 1, -1, true, false))
       eq({'b', 'c'}, curbuf('get_line_slice', -2, -1, true, true))
-      eq({}, curbuf('get_line_slice', 2, 3, false, true))
-      eq({}, curbuf('get_line_slice', 3, 9, true, true))
-      eq({}, curbuf('get_line_slice', 3, -1, true, true))
-      eq({}, curbuf('get_line_slice', -3, -4, false, true))
-      eq({}, curbuf('get_line_slice', -4, -5, true, true))
-      eq({'c'}, curbuf('get_line_slice', -1, 4, true, true))
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 5, true, true))
-      eq(false, pcall(function() curbuf('set_line_slice', 4, 5, true, true, {'d'}) end))
-      eq(false, pcall(function() curbuf('set_line_slice', -4, -5, true, true, {'d'}) end))
       curbuf('set_line_slice', 1, 2, true, false, {'a', 'b', 'c'})
       eq({'a', 'a', 'b', 'c', 'c'}, curbuf('get_line_slice', 0, -1, true, true))
       curbuf('set_line_slice', -1, -1, true, true, {'a', 'b', 'c'})