functests: Fix existing functional tests

2 files changed, 19 insertions, 14 deletions

diff --git a/test/functional/shada/merging_spec.lua b/test/functional/shada/merging_spec.lua
index 7a15c8908b..1a289a2de7 100644
--- a/test/functional/shada/merging_spec.lua
+++ b/test/functional/shada/merging_spec.lua
@@ -563,13 +563,14 @@ describe('ShaDa marks support code', function()
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
-    local found = 0
+    local found = {}
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 7 and v.value.f == '' .. mock_file_path .. '-' then
-        found = found + 1
+      if v.type == 7 and v.value.f == mock_file_path .. '-' then
+        local name = ('%c'):format(v.value.n)
+        found[name] = (found[name] or 0) + 1
       end
     end
-    eq(1, found)
+    eq({['0']=1, A=1}, found)
   end)
 
   it('uses last A mark with eq timestamp from instance when writing',
@@ -580,13 +581,14 @@ describe('ShaDa marks support code', function()
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
-    local found = 0
+    local found = {}
     for _, v in ipairs(read_shada_file(shada_fname)) do
       if v.type == 7 and v.value.f == mock_file_path .. '-' then
-        found = found + 1
+        local name = ('%c'):format(v.value.n)
+        found[name] = (found[name] or 0) + 1
       end
     end
-    eq(1, found)
+    eq({['0']=1, A=1}, found)
   end)
 
   it('uses last A mark with gt timestamp from file when writing',
@@ -597,13 +599,16 @@ describe('ShaDa marks support code', function()
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
-    local found = 0
+    local found = {}
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 7 and v.value.f == '' .. mock_file_path .. '?' then
-        found = found + 1
+      if v.type == 7 then
+        local name = ('%c'):format(v.value.n)
+        local t = found[name] or {}
+        t[v.value.f] = (t[v.value.f] or 0) + 1
+        found[name] = t
       end
     end
-    eq(1, found)
+    eq({['0']={['/a/b/-']=1}, A={['/a/b/?']=1}}, found)
   end)
 
   it('uses last a mark with gt timestamp from instance when reading',
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index ca44026852..720855860a 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -181,13 +181,13 @@ describe('ShaDa support code', function()
     nvim_command('set shada+=%')
     nvim_command('wshada! ' .. shada_fname)
     local readme_fname = funcs.resolve(paths.test_source_path) .. '/README.md'
-    eq({[7]=1, [8]=2, [9]=1, [10]=4, [11]=1}, find_file(readme_fname))
+    eq({[7]=2, [8]=2, [9]=1, [10]=4, [11]=1}, find_file(readme_fname))
     nvim_command('set shada+=r~')
     nvim_command('wshada! ' .. shada_fname)
     eq({}, find_file(readme_fname))
     nvim_command('set shada-=r~')
     nvim_command('wshada! ' .. shada_fname)
-    eq({[7]=1, [8]=2, [9]=1, [10]=4, [11]=1}, find_file(readme_fname))
+    eq({[7]=2, [8]=2, [9]=1, [10]=4, [11]=1}, find_file(readme_fname))
     nvim_command('set shada+=r' .. funcs.escape(
       funcs.escape(paths.test_source_path, '$~'), ' "\\,'))
     nvim_command('wshada! ' .. shada_fname)
@@ -206,7 +206,7 @@ describe('ShaDa support code', function()
     nvim_command('undo')
     nvim_command('set shada+=%')
     nvim_command('wshada! ' .. shada_fname)
-    eq({[7]=1, [8]=2, [9]=1, [10]=4, [11]=2}, find_file(fname))
+    eq({[7]=2, [8]=2, [9]=1, [10]=4, [11]=2}, find_file(fname))
     nvim_command('set shada+=r' .. pwd .. '/АБВ')
     nvim_command('wshada! ' .. shada_fname)
     eq({}, find_file(fname))