1 files changed, 22 insertions, 23 deletions

diff --git a/test/functional/vimscript/changedtick_spec.lua b/test/functional/vimscript/changedtick_spec.lua
index 1ff580e570..85928921c5 100644
--- a/test/functional/vimscript/changedtick_spec.lua
+++ b/test/functional/vimscript/changedtick_spec.lua
@@ -4,25 +4,24 @@ local eq = helpers.eq
 local eval = helpers.eval
 local feed = helpers.feed
 local clear = helpers.clear
-local funcs = helpers.funcs
-local meths = helpers.meths
+local fn = helpers.fn
+local api = helpers.api
 local command = helpers.command
 local exc_exec = helpers.exc_exec
 local pcall_err = helpers.pcall_err
 local exec_capture = helpers.exec_capture
-local curbufmeths = helpers.curbufmeths
 
 before_each(clear)
 
 local function changedtick()
-  local ct = curbufmeths.get_changedtick()
-  eq(ct, curbufmeths.get_var('changedtick'))
-  eq(ct, curbufmeths.get_var('changedtick'))
+  local ct = api.nvim_buf_get_changedtick(0)
+  eq(ct, api.nvim_buf_get_var(0, 'changedtick'))
+  eq(ct, api.nvim_buf_get_var(0, 'changedtick'))
   eq(ct, eval('b:changedtick'))
   eq(ct, eval('b:["changedtick"]'))
   eq(ct, eval('b:.changedtick'))
-  eq(ct, funcs.getbufvar('%', 'changedtick'))
-  eq(ct, funcs.getbufvar('%', '').changedtick)
+  eq(ct, fn.getbufvar('%', 'changedtick'))
+  eq(ct, fn.getbufvar('%', '').changedtick)
   eq(ct, eval('b:').changedtick)
   return ct
 end
@@ -32,7 +31,7 @@ describe('b:changedtick', function()
   it('increments', function() -- Test_changedtick_increments
     -- New buffer has an empty line, tick starts at 2
     eq(2, changedtick())
-    funcs.setline(1, 'hello')
+    fn.setline(1, 'hello')
     eq(3, changedtick())
     eq(0, exc_exec('undo'))
     -- Somehow undo counts as two changes
@@ -41,16 +40,16 @@ describe('b:changedtick', function()
   it('is present in b: dictionary', function()
     eq(2, changedtick())
     command('let d = b:')
-    eq(2, meths.get_var('d').changedtick)
+    eq(2, api.nvim_get_var('d').changedtick)
   end)
   it('increments at bdel', function()
     command('new')
     eq(2, changedtick())
-    local bnr = curbufmeths.get_number()
+    local bnr = api.nvim_buf_get_number(0)
     eq(2, bnr)
     command('bdel')
-    eq(3, funcs.getbufvar(bnr, 'changedtick'))
-    eq(1, curbufmeths.get_number())
+    eq(3, fn.getbufvar(bnr, 'changedtick'))
+    eq(1, api.nvim_buf_get_number(0))
   end)
   it('fails to be changed by user', function()
     local ct = changedtick()
@@ -72,7 +71,7 @@ describe('b:changedtick', function()
       'Vim(let):E46: Cannot change read-only variable "d.changedtick"',
       pcall_err(command, 'let d.changedtick = ' .. ctn)
     )
-    eq('Key is read-only: changedtick', pcall_err(curbufmeths.set_var, 'changedtick', ctn))
+    eq('Key is read-only: changedtick', pcall_err(api.nvim_buf_set_var, 0, 'changedtick', ctn))
 
     eq(
       'Vim(unlet):E795: Cannot delete variable b:changedtick',
@@ -90,7 +89,7 @@ describe('b:changedtick', function()
       'Vim(unlet):E46: Cannot change read-only variable "d.changedtick"',
       pcall_err(command, 'unlet d.changedtick')
     )
-    eq('Key is read-only: changedtick', pcall_err(curbufmeths.del_var, 'changedtick'))
+    eq('Key is read-only: changedtick', pcall_err(api.nvim_buf_del_var, 0, 'changedtick'))
     eq(ct, changedtick())
 
     eq(
@@ -108,7 +107,7 @@ describe('b:changedtick', function()
 
     eq(ct, changedtick())
 
-    funcs.setline(1, 'hello')
+    fn.setline(1, 'hello')
 
     eq(ct + 1, changedtick())
   end)
@@ -117,8 +116,8 @@ describe('b:changedtick', function()
   end)
   it('fails to unlock b:changedtick', function()
     eq(0, exc_exec('let d = b:'))
-    eq(0, funcs.islocked('b:changedtick'))
-    eq(0, funcs.islocked('d.changedtick'))
+    eq(0, fn.islocked('b:changedtick'))
+    eq(0, fn.islocked('d.changedtick'))
     eq(
       'Vim(unlockvar):E940: Cannot lock or unlock variable b:changedtick',
       pcall_err(command, 'unlockvar b:changedtick')
@@ -127,8 +126,8 @@ describe('b:changedtick', function()
       'Vim(unlockvar):E46: Cannot change read-only variable "d.changedtick"',
       pcall_err(command, 'unlockvar d.changedtick')
     )
-    eq(0, funcs.islocked('b:changedtick'))
-    eq(0, funcs.islocked('d.changedtick'))
+    eq(0, fn.islocked('b:changedtick'))
+    eq(0, fn.islocked('d.changedtick'))
     eq(
       'Vim(lockvar):E940: Cannot lock or unlock variable b:changedtick',
       pcall_err(command, 'lockvar b:changedtick')
@@ -137,12 +136,12 @@ describe('b:changedtick', function()
       'Vim(lockvar):E46: Cannot change read-only variable "d.changedtick"',
       pcall_err(command, 'lockvar d.changedtick')
     )
-    eq(0, funcs.islocked('b:changedtick'))
-    eq(0, funcs.islocked('d.changedtick'))
+    eq(0, fn.islocked('b:changedtick'))
+    eq(0, fn.islocked('d.changedtick'))
   end)
   it('is being completed', function()
     feed(':echo b:<Tab><Home>let cmdline="<End>"<CR>')
-    eq('echo b:changedtick', meths.get_var('cmdline'))
+    eq('echo b:changedtick', api.nvim_get_var('cmdline'))
   end)
   it('cannot be changed by filter() or map()', function()
     eq(2, changedtick())