1 files changed, 50 insertions, 11 deletions
diff --git a/test/functional/api/tabpage_spec.lua b/test/functional/api/tabpage_spec.lua
index 7b97c7f067..c49091db02 100644
--- a/test/functional/api/tabpage_spec.lua
+++ b/test/functional/api/tabpage_spec.lua
@@ -1,25 +1,28 @@
--- Sanity checks for tabpage_* API calls via msgpack-rpc
 local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, tabpage, curtab, eq, ok =
   helpers.clear, helpers.nvim, helpers.tabpage, helpers.curtab, helpers.eq,
   helpers.ok
 local curtabmeths = helpers.curtabmeths
 local funcs = helpers.funcs
+local request = helpers.request
+local NIL = helpers.NIL
+local meth_pcall = helpers.meth_pcall
+local command = helpers.command
 
-describe('tabpage_* functions', function()
+describe('api/tabpage', function()
   before_each(clear)
 
-  describe('get_windows and get_window', function()
+  describe('list_wins and get_win', function()
     it('works', function()
       nvim('command', 'tabnew')
       nvim('command', 'vsplit')
-      local tab1, tab2 = unpack(nvim('get_tabpages'))
-      local win1, win2, win3 = unpack(nvim('get_windows'))
-      eq({win1},  tabpage('get_windows', tab1))
-      eq({win2, win3},  tabpage('get_windows', tab2))
-      eq(win2, tabpage('get_window', tab2))
-      nvim('set_current_window', win3)
-      eq(win3, tabpage('get_window', tab2))
+      local tab1, tab2 = unpack(nvim('list_tabpages'))
+      local win1, win2, win3 = unpack(nvim('list_wins'))
+      eq({win1},  tabpage('list_wins', tab1))
+      eq({win2, win3},  tabpage('list_wins', tab2))
+      eq(win2, tabpage('get_win', tab2))
+      nvim('set_current_win', win3)
+      eq(win3, tabpage('get_win', tab2))
     end)
   end)
 
@@ -31,13 +34,49 @@ describe('tabpage_* functions', function()
       eq(1, funcs.exists('t:lua'))
       curtabmeths.del_var('lua')
       eq(0, funcs.exists('t:lua'))
+      eq({false, 'Key not found: lua'}, meth_pcall(curtabmeths.del_var, 'lua'))
+      curtabmeths.set_var('lua', 1)
+      command('lockvar t:lua')
+      eq({false, 'Key is locked: lua'}, meth_pcall(curtabmeths.del_var, 'lua'))
+      eq({false, 'Key is locked: lua'}, meth_pcall(curtabmeths.set_var, 'lua', 1))
+    end)
+
+    it('tabpage_set_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL, request('tabpage_set_var', 0, 'lua', val1))
+      eq(val1, request('tabpage_set_var', 0, 'lua', val2))
+    end)
+
+    it('tabpage_del_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL,  request('tabpage_set_var', 0, 'lua', val1))
+      eq(val1, request('tabpage_set_var', 0, 'lua', val2))
+      eq(val2, request('tabpage_del_var', 0, 'lua'))
+    end)
+  end)
+
+  describe('get_number', function()
+    it('works', function()
+      local tabs = nvim('list_tabpages')
+      eq(1, tabpage('get_number', tabs[1]))
+
+      nvim('command', 'tabnew')
+      local tab1, tab2 = unpack(nvim('list_tabpages'))
+      eq(1, tabpage('get_number', tab1))
+      eq(2, tabpage('get_number', tab2))
+
+      nvim('command', '-tabmove')
+      eq(2, tabpage('get_number', tab1))
+      eq(1, tabpage('get_number', tab2))
     end)
   end)
 
   describe('is_valid', function()
     it('works', function()
       nvim('command', 'tabnew')
-      local tab = nvim('get_tabpages')[2]
+      local tab = nvim('list_tabpages')[2]
       nvim('set_current_tabpage', tab)
       ok(tabpage('is_valid', tab))
       nvim('command', 'tabclose')