1 files changed, 66 insertions, 6 deletions
diff --git a/test/functional/api/tabpage_spec.lua b/test/functional/api/tabpage_spec.lua
index 65b030fc60..36955c4ace 100644
--- a/test/functional/api/tabpage_spec.lua
+++ b/test/functional/api/tabpage_spec.lua
@@ -12,15 +12,19 @@ describe('api/tabpage', function()
 
   describe('list_wins and get_win', function()
     it('works', function()
-      helpers.command('tabnew')
-      helpers.command('vsplit')
+      command('tabnew')
+      command('vsplit')
       local tab1, tab2 = unpack(api.nvim_list_tabpages())
       local win1, win2, win3 = unpack(api.nvim_list_wins())
       eq({ win1 }, api.nvim_tabpage_list_wins(tab1))
+      eq(win1, api.nvim_tabpage_get_win(tab1))
       eq({ win2, win3 }, api.nvim_tabpage_list_wins(tab2))
       eq(win2, api.nvim_tabpage_get_win(tab2))
       api.nvim_set_current_win(win3)
       eq(win3, api.nvim_tabpage_get_win(tab2))
+      command('tabprev')
+      eq(win1, api.nvim_tabpage_get_win(tab1))
+      eq(win3, api.nvim_tabpage_get_win(tab2))
     end)
 
     it('validates args', function()
@@ -28,6 +32,62 @@ describe('api/tabpage', function()
     end)
   end)
 
+  describe('set_win', function()
+    it('works', function()
+      command('tabnew')
+      command('vsplit')
+      local tab1, tab2 = unpack(api.nvim_list_tabpages())
+      local win1, win2, win3 = unpack(api.nvim_list_wins())
+      eq({ win1 }, api.nvim_tabpage_list_wins(tab1))
+      eq({ win2, win3 }, api.nvim_tabpage_list_wins(tab2))
+      eq(win2, api.nvim_tabpage_get_win(tab2))
+      api.nvim_tabpage_set_win(tab2, win3)
+      eq(win3, api.nvim_tabpage_get_win(tab2))
+    end)
+
+    it('works in non-current tabpages', function()
+      command('tabnew')
+      command('vsplit')
+      local tab1, tab2 = unpack(api.nvim_list_tabpages())
+      local win1, win2, win3 = unpack(api.nvim_list_wins())
+      eq({ win1 }, api.nvim_tabpage_list_wins(tab1))
+      eq({ win2, win3 }, api.nvim_tabpage_list_wins(tab2))
+      eq(win2, api.nvim_tabpage_get_win(tab2))
+      eq(win2, api.nvim_get_current_win())
+
+      command('tabprev')
+
+      eq(tab1, api.nvim_get_current_tabpage())
+
+      eq(win2, api.nvim_tabpage_get_win(tab2))
+      api.nvim_tabpage_set_win(tab2, win3)
+      eq(win3, api.nvim_tabpage_get_win(tab2))
+
+      command('tabnext')
+      eq(win3, api.nvim_get_current_win())
+    end)
+
+    it('throws an error when the window does not belong to the tabpage', function()
+      command('tabnew')
+      command('vsplit')
+      local tab1, tab2 = unpack(api.nvim_list_tabpages())
+      local win1, win2, win3 = unpack(api.nvim_list_wins())
+      eq({ win1 }, api.nvim_tabpage_list_wins(tab1))
+      eq({ win2, win3 }, api.nvim_tabpage_list_wins(tab2))
+      eq(win2, api.nvim_get_current_win())
+
+      eq(
+        string.format('Window does not belong to tabpage %d', tab2),
+        pcall_err(api.nvim_tabpage_set_win, tab2, win1)
+      )
+
+      eq(
+        string.format('Window does not belong to tabpage %d', tab1),
+        pcall_err(api.nvim_tabpage_set_win, tab1, win3)
+      )
+    end)
+  end)
+
   describe('{get,set,del}_var', function()
     it('works', function()
       api.nvim_tabpage_set_var(0, 'lua', { 1, 2, { ['3'] = 1 } })
@@ -64,12 +124,12 @@ describe('api/tabpage', function()
       local tabs = api.nvim_list_tabpages()
       eq(1, api.nvim_tabpage_get_number(tabs[1]))
 
-      helpers.command('tabnew')
+      command('tabnew')
       local tab1, tab2 = unpack(api.nvim_list_tabpages())
       eq(1, api.nvim_tabpage_get_number(tab1))
       eq(2, api.nvim_tabpage_get_number(tab2))
 
-      helpers.command('-tabmove')
+      command('-tabmove')
       eq(2, api.nvim_tabpage_get_number(tab1))
       eq(1, api.nvim_tabpage_get_number(tab2))
     end)
@@ -77,11 +137,11 @@ describe('api/tabpage', function()
 
   describe('is_valid', function()
     it('works', function()
-      helpers.command('tabnew')
+      command('tabnew')
       local tab = api.nvim_list_tabpages()[2]
       api.nvim_set_current_tabpage(tab)
       ok(api.nvim_tabpage_is_valid(tab))
-      helpers.command('tabclose')
+      command('tabclose')
       ok(not api.nvim_tabpage_is_valid(tab))
     end)
   end)