2 files changed, 54 insertions, 45 deletions

diff --git a/test/unit/api/helpers.lua b/test/unit/api/helpers.lua
index 166456d2a1..4fb1cee4b3 100644
--- a/test/unit/api/helpers.lua
+++ b/test/unit/api/helpers.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.unit.helpers')
+local helpers = require('test.unit.helpers')(nil)
 local eval_helpers = require('test.unit.eval.helpers')
 
 local cimport = helpers.cimport
@@ -19,47 +19,55 @@ local api = cimport('./src/nvim/api/private/defs.h',
 
 local obj2lua
 
-local obj2lua_tab = {
-  [tonumber(api.kObjectTypeArray)] = function(obj)
-    local ret = {[type_key]=list_type}
-    for i = 1,tonumber(obj.data.array.size) do
-      ret[i] = obj2lua(obj.data.array.items[i - 1])
-    end
-    if ret[1] then
-      ret[type_key] = nil
-    end
-    return ret
-  end,
-  [tonumber(api.kObjectTypeDictionary)] = function(obj)
-    local ret = {}
-    for i = 1,tonumber(obj.data.dictionary.size) do
-      local kv_pair = obj.data.dictionary.items[i - 1]
-      ret[ffi.string(kv_pair.key.data, kv_pair.key.size)] = obj2lua(kv_pair.value)
-    end
-    return ret
-  end,
-  [tonumber(api.kObjectTypeBoolean)] = function(obj)
-    if obj.data.boolean == false then
-      return false
-    else
-      return true
-    end
-  end,
-  [tonumber(api.kObjectTypeNil)] = function(_)
-    return nil_value
-  end,
-  [tonumber(api.kObjectTypeFloat)] = function(obj)
-    return tonumber(obj.data.floating)
-  end,
-  [tonumber(api.kObjectTypeInteger)] = function(obj)
-    return {[type_key]=int_type, value=tonumber(obj.data.integer)}
-  end,
-  [tonumber(api.kObjectTypeString)] = function(obj)
-    return ffi.string(obj.data.string.data, obj.data.string.size)
-  end,
-}
+local obj2lua_tab = nil
+
+local function init_obj2lua_tab()
+  if obj2lua_tab then
+    return
+  end
+  obj2lua_tab = {
+    [tonumber(api.kObjectTypeArray)] = function(obj)
+      local ret = {[type_key]=list_type}
+      for i = 1,tonumber(obj.data.array.size) do
+        ret[i] = obj2lua(obj.data.array.items[i - 1])
+      end
+      if ret[1] then
+        ret[type_key] = nil
+      end
+      return ret
+    end,
+    [tonumber(api.kObjectTypeDictionary)] = function(obj)
+      local ret = {}
+      for i = 1,tonumber(obj.data.dictionary.size) do
+        local kv_pair = obj.data.dictionary.items[i - 1]
+        ret[ffi.string(kv_pair.key.data, kv_pair.key.size)] = obj2lua(kv_pair.value)
+      end
+      return ret
+    end,
+    [tonumber(api.kObjectTypeBoolean)] = function(obj)
+      if obj.data.boolean == false then
+        return false
+      else
+        return true
+      end
+    end,
+    [tonumber(api.kObjectTypeNil)] = function(_)
+      return nil_value
+    end,
+    [tonumber(api.kObjectTypeFloat)] = function(obj)
+      return tonumber(obj.data.floating)
+    end,
+    [tonumber(api.kObjectTypeInteger)] = function(obj)
+      return {[type_key]=int_type, value=tonumber(obj.data.integer)}
+    end,
+    [tonumber(api.kObjectTypeString)] = function(obj)
+      return ffi.string(obj.data.string.data, obj.data.string.size)
+    end,
+  }
+end
 
 obj2lua = function(obj)
+  init_obj2lua_tab()
   return ((obj2lua_tab[tonumber(obj['type'])] or function(obj_inner)
     assert(false, 'Converting ' .. tostring(tonumber(obj_inner['type'])) .. ' is not implementing yet')
   end)(obj))
diff --git a/test/unit/api/private_helpers_spec.lua b/test/unit/api/private_helpers_spec.lua
index 8c54ea6a2a..a534d83165 100644
--- a/test/unit/api/private_helpers_spec.lua
+++ b/test/unit/api/private_helpers_spec.lua
@@ -1,4 +1,5 @@
-local helpers = require('test.unit.helpers')
+local helpers = require('test.unit.helpers')(after_each)
+local itp = helpers.gen_itp(it)
 local eval_helpers = require('test.unit.eval.helpers')
 local api_helpers = require('test.unit.api.helpers')
 
@@ -25,7 +26,7 @@ describe('vim_to_object', function()
   end
 
   local different_output_test = function(name, input, output)
-    it(name, function()
+    itp(name, function()
       eq(output, vim_to_object(input))
     end)
   end
@@ -76,19 +77,19 @@ describe('vim_to_object', function()
   different_output_test('outputs nil for nested lists (2 level, in dict)',
                         lst3, {{lst=nil_value}, true, false, 'ttest'})
 
-  it('outputs empty list for NULL list', function()
+  itp('outputs empty list for NULL list', function()
     local tt = typvalt('VAR_LIST', {v_list=NULL})
     eq(nil, tt.vval.v_list)
     eq({[type_key]=list_type}, obj2lua(api.vim_to_object(tt)))
   end)
 
-  it('outputs empty dict for NULL dict', function()
+  itp('outputs empty dict for NULL dict', function()
     local tt = typvalt('VAR_DICT', {v_dict=NULL})
     eq(nil, tt.vval.v_dict)
     eq({}, obj2lua(api.vim_to_object(tt)))
   end)
 
-  it('regression: partials in a list', function()
+  itp('regression: partials in a list', function()
     local llist = {
       {
         [type_key]=func_type,