1 files changed, 24 insertions, 24 deletions
diff --git a/test/functional/vimscript/printf_spec.lua b/test/functional/vimscript/printf_spec.lua
index 27e24c4118..4fa4ea7f4c 100644
--- a/test/functional/vimscript/printf_spec.lua
+++ b/test/functional/vimscript/printf_spec.lua
@@ -3,56 +3,56 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
-local funcs = helpers.funcs
-local meths = helpers.meths
+local fn = helpers.fn
+local api = helpers.api
 local exc_exec = helpers.exc_exec
 
 describe('printf()', function()
   before_each(clear)
 
   it('works with zero and %b', function()
-    eq('0', funcs.printf('%lb', 0))
-    eq('0', funcs.printf('%llb', 0))
-    eq('0', funcs.printf('%zb', 0))
+    eq('0', fn.printf('%lb', 0))
+    eq('0', fn.printf('%llb', 0))
+    eq('0', fn.printf('%zb', 0))
   end)
   it('works with one and %b', function()
-    eq('1', funcs.printf('%b', 1))
-    eq('1', funcs.printf('%lb', 1))
-    eq('1', funcs.printf('%llb', 1))
-    eq('1', funcs.printf('%zb', 1))
+    eq('1', fn.printf('%b', 1))
+    eq('1', fn.printf('%lb', 1))
+    eq('1', fn.printf('%llb', 1))
+    eq('1', fn.printf('%zb', 1))
   end)
   it('works with 0xff and %b', function()
-    eq('11111111', funcs.printf('%b', 0xff))
-    eq('11111111', funcs.printf('%lb', 0xff))
-    eq('11111111', funcs.printf('%llb', 0xff))
-    eq('11111111', funcs.printf('%zb', 0xff))
+    eq('11111111', fn.printf('%b', 0xff))
+    eq('11111111', fn.printf('%lb', 0xff))
+    eq('11111111', fn.printf('%llb', 0xff))
+    eq('11111111', fn.printf('%zb', 0xff))
   end)
   it('accepts width modifier with %b', function()
-    eq('  1', funcs.printf('%3b', 1))
+    eq('  1', fn.printf('%3b', 1))
   end)
   it('accepts prefix modifier with %b', function()
-    eq('0b1', funcs.printf('%#b', 1))
+    eq('0b1', fn.printf('%#b', 1))
   end)
   it('writes capital B with %B', function()
-    eq('0B1', funcs.printf('%#B', 1))
+    eq('0B1', fn.printf('%#B', 1))
   end)
   it('accepts prefix, zero-fill and width modifiers with %b', function()
-    eq('0b001', funcs.printf('%#05b', 1))
+    eq('0b001', fn.printf('%#05b', 1))
   end)
   it('accepts prefix and width modifiers with %b', function()
-    eq('  0b1', funcs.printf('%#5b', 1))
+    eq('  0b1', fn.printf('%#5b', 1))
   end)
   it('does not write prefix for zero with prefix and width modifier used with %b', function()
-    eq('    0', funcs.printf('%#5b', 0))
+    eq('    0', fn.printf('%#5b', 0))
   end)
   it('accepts precision modifier with %b', function()
-    eq('00000', funcs.printf('%.5b', 0))
+    eq('00000', fn.printf('%.5b', 0))
   end)
   it('accepts all modifiers with %b at once', function()
     -- zero-fill modifier is ignored when used with left-align
     -- force-sign and add-blank are ignored
     -- use-grouping-characters modifier is ignored always
-    eq('0b00011   ', funcs.printf('% \'+#0-10.5b', 3))
+    eq('0b00011   ', fn.printf("% '+#0-10.5b", 3))
   end)
   it('errors out when %b modifier is used for a list', function()
     eq('Vim(call):E745: Using a List as a Number', exc_exec('call printf("%b", [])'))
@@ -65,12 +65,12 @@ describe('printf()', function()
     local seen_rets = {}
     -- Collect all args in an array to avoid possible allocation of the same
     -- address after freeing unreferenced values.
-    meths.set_var('__args', {})
+    api.nvim_set_var('__args', {})
     local function check_printf(expr, is_null)
       eq(0, exc_exec('call add(__args, ' .. expr .. ')'))
       eq(0, exc_exec('let __result = printf("%p", __args[-1])'))
       local id_ret = eval('id(__args[-1])')
-      eq(id_ret, meths.get_var('__result'))
+      eq(id_ret, api.nvim_get_var('__result'))
       if is_null then
         if null_ret then
           eq(null_ret, id_ret)
@@ -81,7 +81,7 @@ describe('printf()', function()
         eq(nil, seen_rets[id_ret])
         seen_rets[id_ret] = expr
       end
-      meths.del_var('__result')
+      api.nvim_del_var('__result')
     end
     check_printf('v:_null_list', true)
     check_printf('v:_null_dict', true)