unittests: Add tv_dict_add* unit tests

Also fixes incorrect location of `tv_dict_add` function and three bugs in other 
functions:

1. `tv_dict_add_list` may free list it does not own (vim/vim#1555).
2. `tv_dict_add_dict` may free dictionary it does not own (vim/vim#1555).
3. `tv_dict_add_dict` ignores `key_len` argument.

1 files changed, 116 insertions, 0 deletions

diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index d91fd3e78d..c710171779 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -1770,6 +1770,122 @@ describe('typval.c', function()
              {tv_dict_get_callback(d, 'testt', 5)})
         end)
       end)
+      describe('dict_add()', function()
+        itp('works', function()
+          local di = lib.tv_dict_item_alloc_len('t-est', 5)
+          alloc_log:check({a.di(di, 't-est')})
+          di.di_tv.v_type = lib.VAR_NUMBER
+          di.di_tv.vval.v_number = 42
+          local d = dict({test=10})
+          local dis = dict_items(d)
+          alloc_log:check({
+            a.dict(d),
+            a.di(dis.test, 'test')
+          })
+          eq({test=10}, dct2tbl(d))
+          alloc_log:clear()
+          eq(OK, lib.tv_dict_add(d, di))
+          alloc_log:check({})
+          eq({test=10, ['t-est']=int(42)}, dct2tbl(d))
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add(d, di) end,
+                              'E685: Internal error: hash_add()'))
+        end)
+      end)
+      describe('dict_add_list()', function()
+        itp('works', function()
+          local l = list(1, 2, 3)
+          alloc_log:clear()
+          eq(1, l.lv_refcount)
+          local d = dict({test=10})
+          alloc_log:clear()
+          eq({test=10}, dct2tbl(d))
+          eq(OK, lib.tv_dict_add_list(d, 'testt', 3, l))
+          local dis = dict_items(d)
+          alloc_log:check({a.di(dis.tes, 'tes')})
+          eq({test=10, tes={1, 2, 3}}, dct2tbl(d))
+          eq(2, l.lv_refcount)
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_list(d, 'testt', 3, l) end,
+                              'E685: Internal error: hash_add()'))
+          eq(2, l.lv_refcount)
+          alloc_log:clear()
+          lib.emsg_skip = lib.emsg_skip + 1
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_list(d, 'testt', 3, l) end,
+                              nil))
+          eq(2, l.lv_refcount)
+          lib.emsg_skip = lib.emsg_skip - 1
+          alloc_log:clear_tmp_allocs()
+          alloc_log:check({})
+        end)
+      end)
+      describe('dict_add_dict()', function()
+        itp('works', function()
+          local d2 = dict({foo=42})
+          alloc_log:clear()
+          eq(1, d2.dv_refcount)
+          local d = dict({test=10})
+          alloc_log:clear()
+          eq({test=10}, dct2tbl(d))
+          eq(OK, lib.tv_dict_add_dict(d, 'testt', 3, d2))
+          local dis = dict_items(d)
+          alloc_log:check({a.di(dis.tes, 'tes')})
+          eq({test=10, tes={foo=42}}, dct2tbl(d))
+          eq(2, d2.dv_refcount)
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_dict(d, 'testt', 3, d2) end,
+                              'E685: Internal error: hash_add()'))
+          eq(2, d2.dv_refcount)
+          alloc_log:clear()
+          lib.emsg_skip = lib.emsg_skip + 1
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_dict(d, 'testt', 3, d2) end,
+                              nil))
+          eq(2, d2.dv_refcount)
+          lib.emsg_skip = lib.emsg_skip - 1
+          alloc_log:clear_tmp_allocs()
+          alloc_log:check({})
+        end)
+      end)
+      describe('dict_add_nr()', function()
+        itp('works', function()
+          local d = dict({test=10})
+          alloc_log:clear()
+          eq({test=10}, dct2tbl(d))
+          eq(OK, lib.tv_dict_add_nr(d, 'testt', 3, 2))
+          local dis = dict_items(d)
+          alloc_log:check({a.di(dis.tes, 'tes')})
+          eq({test=10, tes=int(2)}, dct2tbl(d))
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_nr(d, 'testt', 3, 2) end,
+                              'E685: Internal error: hash_add()'))
+          alloc_log:clear()
+          lib.emsg_skip = lib.emsg_skip + 1
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_nr(d, 'testt', 3, 2) end,
+                              nil))
+          lib.emsg_skip = lib.emsg_skip - 1
+          alloc_log:clear_tmp_allocs()
+          alloc_log:check({})
+        end)
+      end)
+      describe('dict_add_str()', function()
+        itp('works', function()
+          local d = dict({test=10})
+          alloc_log:clear()
+          eq({test=10}, dct2tbl(d))
+          eq(OK, lib.tv_dict_add_str(d, 'testt', 3, 'TEST'))
+          local dis = dict_items(d)
+          alloc_log:check({
+            a.di(dis.tes, 'tes'),
+            a.str(dis.tes.di_tv.vval.v_string, 'TEST')
+          })
+          eq({test=10, tes='TEST'}, dct2tbl(d))
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_str(d, 'testt', 3, 'TEST') end,
+                              'E685: Internal error: hash_add()'))
+          alloc_log:clear()
+          lib.emsg_skip = lib.emsg_skip + 1
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_str(d, 'testt', 3, 'TEST') end,
+                              nil))
+          lib.emsg_skip = lib.emsg_skip - 1
+          alloc_log:clear_tmp_allocs()
+          alloc_log:check({})
+        end)
+      end)
     end)
   end)
 end)