unittests: Test tv_copy()

2 files changed, 47 insertions, 8 deletions

diff --git a/test/unit/eval/helpers.lua b/test/unit/eval/helpers.lua
index a3cb062b7b..fa76113756 100644
--- a/test/unit/eval/helpers.lua
+++ b/test/unit/eval/helpers.lua
@@ -132,10 +132,10 @@ local function typvalt2lua_tab_init()
   typvalt2lua_tab = {
     [tonumber(eval.VAR_SPECIAL)] = function(t)
       return ({
-        [eval.kSpecialVarFalse] = false,
-        [eval.kSpecialVarNull] = nil_value,
-        [eval.kSpecialVarTrue] = true,
-      })[t.vval.v_special]
+        [tonumber(eval.kSpecialVarFalse)] = false,
+        [tonumber(eval.kSpecialVarNull)] = nil_value,
+        [tonumber(eval.kSpecialVarTrue)] = true,
+      })[tonumber(t.vval.v_special)]
     end,
     [tonumber(eval.VAR_NUMBER)] = function(t)
       return {[type_key]=int_type, value=tonumber(t.vval.v_number)}
diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index 8b0470d3b7..9745a432c3 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -25,6 +25,7 @@ local typvalt = eval_helpers.typvalt
 local type_key = eval_helpers.type_key
 local li_alloc = eval_helpers.li_alloc
 local first_di = eval_helpers.first_di
+local nil_value = eval_helpers.nil_value
 local func_type = eval_helpers.func_type
 local null_list = eval_helpers.null_list
 local null_dict = eval_helpers.null_dict
@@ -2223,6 +2224,9 @@ describe('typval.c', function()
         end)
       end)
     end)
+    local function defalloc()
+      return {}
+    end
     describe('clear()', function()
       itp('works', function()
         local function deffrees(alloc_rets)
@@ -2232,9 +2236,6 @@ describe('typval.c', function()
           end
           return ret
         end
-        local function defalloc()
-          return {}
-        end
         alloc_log:check({})
         lib.tv_clear(nil)
         alloc_log:check({})
@@ -2244,12 +2245,13 @@ describe('typval.c', function()
         local dd = {}
         dd.dd = dd
         for _, v in ipairs({
-          {nil},
+          {nil_value},
           {null_string, nil, function() return {a.freed(alloc_log.null)} end},
           {0},
           {int(0)},
           {true},
           {false},
+          {'true', function(tv) return {a.str(tv.vval.v_string)} end},
           {{}, function(tv) return {a.dict(tv.vval.v_dict)} end},
           {empty_list, function(tv) return {a.list(tv.vval.v_list)} end},
           {ll, function(tv)
@@ -2271,5 +2273,42 @@ describe('typval.c', function()
         eq(1, dd_d.dv_refcount)
       end)
     end)
+    describe('copy()', function()
+      itp('works', function()
+        local function strallocs(tv)
+          return {a.str(tv.vval.v_string)}
+        end
+        for _, v in ipairs({
+          {nil_value},
+          {null_string},
+          {0},
+          {int(0)},
+          {true},
+          {false},
+          {{}, function(tv) return {a.dict(tv.vval.v_dict)} end, nil, function(from, to)
+            eq(2, to.vval.v_dict.dv_refcount)
+            eq(to.vval.v_dict, from.vval.v_dict)
+          end},
+          {empty_list, function(tv) return {a.list(tv.vval.v_list)} end, nil, function(from, to)
+            eq(2, to.vval.v_list.lv_refcount)
+            eq(to.vval.v_list, from.vval.v_list)
+          end},
+          {'test', strallocs, strallocs, function(from, to)
+            neq(to.vval.v_string, from.vval.v_string)
+          end},
+        }) do
+          local from = lua2typvalt(v[1])
+          alloc_log:check((v[2] or defalloc)(from))
+          local to = typvalt(lib.VAR_UNKNOWN)
+          lib.tv_copy(from, to)
+          local res = v[1]
+          eq(res, typvalt2lua(to))
+          alloc_log:check((v[3] or defalloc)(to))
+          if v[4] then
+            v[4](from, to)
+          end
+        end
+      end)
+    end)
   end)
 end)