From ba7277cfb4e2556f246446d06b53f3427f28130f Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 26 Jul 2017 23:28:26 +0200
Subject: Adds nvim_get_hl_by_name/by_id

...in order to retrieve highlights.

Added test/functional/api/highlight_spec.lua
HL_NORMAL is not really a good name, since it's more like an empty attribute than the normal's one.
If one pays attention, syn_cterm_attr2entry is never called with attr=0 because it's always special cased before.
I suggest in subsequent PRs we remove the ATTR_OFF and just insert an EMPTY ATTR/RESET_ATTR/UNINITIALIZED for id 0.
---
 test/functional/api/highlight_spec.lua | 54 ++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 test/functional/api/highlight_spec.lua

(limited to 'test')

diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
new file mode 100644
index 0000000000..1aacfaed03
--- /dev/null
+++ b/test/functional/api/highlight_spec.lua
@@ -0,0 +1,54 @@
+
+local helpers = require('test.functional.helpers')(after_each)
+local clear, nvim = helpers.clear, helpers.nvim
+local Screen = require('test.functional.ui.screen')
+local eq, eval = helpers.eq, helpers.eval
+local command = helpers.command
+local ok = helpers.ok
+local meths = helpers.meths
+
+
+describe('highlight api', function()
+
+  before_each(function()
+    clear('--cmd', 'set termguicolors')
+  end)
+
+  it("nvim_get_hl_by_id", function()
+    local expected_hl = { background = Screen.colors.Yellow,
+                          foreground = Screen.colors.Red,
+                          special = Screen.colors.Blue
+                        }
+
+    command('hi NewHighlight guifg=red guibg=yellow guisp=blue')
+
+    local hl_id = eval("hlID('NewHighlight')")
+    eq(expected_hl, nvim("get_hl_by_id", hl_id))
+
+    -- assume there is no hl with 30000
+    local err, emsg = pcall(meths.get_hl_by_id, 30000)
+    eq(false, err)
+    ok(string.find(emsg, 'Invalid highlight id') ~= nil)
+  end)
+
+  it("nvim_get_hl_by_name", function()
+    local expected_hl = { background = Screen.colors.Yellow,
+                          foreground = Screen.colors.Red }
+
+    -- test "Normal" hl defaults
+    eq({}, nvim("get_hl_by_name", 'Normal'))
+
+    command('hi NewHighlight guifg=red guibg=yellow')
+    eq(expected_hl, nvim("get_hl_by_name", 'NewHighlight'))
+
+    command('hi Normal guifg=red guibg=yellow')
+    eq(expected_hl, nvim("get_hl_by_name", 'Normal'))
+    local err, emsg = pcall(meths.get_hl_by_name , 'unknown_highlight')
+    eq(false, err)
+    ok(string.find(emsg, 'Invalid highlight name') ~= nil)
+  end)
+
+
+
+end)
+
-- 
cgit 


From e3a2cca3878f44252eccdc1918cc8854145de860 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 27 Aug 2017 00:33:36 +0200
Subject: Increased test coverage for RGB and cterm

---
 test/functional/api/highlight_spec.lua | 42 +++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index 1aacfaed03..a5d3871d13 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -8,47 +8,53 @@ local ok = helpers.ok
 local meths = helpers.meths
 
 
-describe('highlight api', function()
+describe('highlight api',function()
+  local expected_rgb = { background = Screen.colors.Yellow,
+                          foreground = Screen.colors.Red,
+                          special = Screen.colors.Blue,
+                          bold = true,
+                        }
+
+  local expected_cterm = { background = 10,
+                          underline = true,
+                        }
 
   before_each(function()
-    clear('--cmd', 'set termguicolors')
+    clear()
+    command("hi NewHighlight cterm=underline ctermbg=green guifg=red guibg=yellow guisp=blue gui=bold")
   end)
 
   it("nvim_get_hl_by_id", function()
-    local expected_hl = { background = Screen.colors.Yellow,
-                          foreground = Screen.colors.Red,
-                          special = Screen.colors.Blue
-                        }
+    local hl_id = eval("hlID('NewHighlight')")
 
-    command('hi NewHighlight guifg=red guibg=yellow guisp=blue')
+    eq(expected_cterm, nvim("get_hl_by_id", hl_id))
 
-    local hl_id = eval("hlID('NewHighlight')")
-    eq(expected_hl, nvim("get_hl_by_id", hl_id))
+    command('set termguicolors')
+    hl_id = eval("hlID('NewHighlight')")
+    eq(expected_rgb, nvim("get_hl_by_id", hl_id))
 
-    -- assume there is no hl with 30000
+    -- assume there is no hl with id 30000
     local err, emsg = pcall(meths.get_hl_by_id, 30000)
     eq(false, err)
     ok(string.find(emsg, 'Invalid highlight id') ~= nil)
   end)
 
   it("nvim_get_hl_by_name", function()
-    local expected_hl = { background = Screen.colors.Yellow,
+    local expected_normal = { background = Screen.colors.Yellow,
                           foreground = Screen.colors.Red }
 
     -- test "Normal" hl defaults
     eq({}, nvim("get_hl_by_name", 'Normal'))
 
-    command('hi NewHighlight guifg=red guibg=yellow')
-    eq(expected_hl, nvim("get_hl_by_name", 'NewHighlight'))
+    eq(expected_cterm, nvim("get_hl_by_name", 'NewHighlight'))
+    command('set termguicolors')
+    eq(expected_rgb, nvim("get_hl_by_name", 'NewHighlight'))
 
     command('hi Normal guifg=red guibg=yellow')
-    eq(expected_hl, nvim("get_hl_by_name", 'Normal'))
+    eq(expected_normal, nvim("get_hl_by_name", 'Normal'))
+
     local err, emsg = pcall(meths.get_hl_by_name , 'unknown_highlight')
     eq(false, err)
     ok(string.find(emsg, 'Invalid highlight name') ~= nil)
   end)
-
-
-
 end)
-
-- 
cgit 


From 3a006486397d611234abd9b429bce0b44d6b7747 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 3 Sep 2017 05:25:57 +0200
Subject: Changed prototypes to accept a boolean "rgb"

---
 test/functional/api/highlight_spec.lua | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index a5d3871d13..4082b0daf9 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -27,14 +27,13 @@ describe('highlight api',function()
   it("nvim_get_hl_by_id", function()
     local hl_id = eval("hlID('NewHighlight')")
 
-    eq(expected_cterm, nvim("get_hl_by_id", hl_id))
+    eq(expected_cterm, nvim("get_hl_by_id", hl_id, false))
 
-    command('set termguicolors')
     hl_id = eval("hlID('NewHighlight')")
-    eq(expected_rgb, nvim("get_hl_by_id", hl_id))
+    eq(expected_rgb, nvim("get_hl_by_id", hl_id, true))
 
-    -- assume there is no hl with id 30000
-    local err, emsg = pcall(meths.get_hl_by_id, 30000)
+    -- assume there is no hl with id = 30000
+    local err, emsg = pcall(meths.get_hl_by_id, 30000, false)
     eq(false, err)
     ok(string.find(emsg, 'Invalid highlight id') ~= nil)
   end)
@@ -44,16 +43,15 @@ describe('highlight api',function()
                           foreground = Screen.colors.Red }
 
     -- test "Normal" hl defaults
-    eq({}, nvim("get_hl_by_name", 'Normal'))
+    eq({}, nvim("get_hl_by_name", 'Normal', true))
 
-    eq(expected_cterm, nvim("get_hl_by_name", 'NewHighlight'))
-    command('set termguicolors')
-    eq(expected_rgb, nvim("get_hl_by_name", 'NewHighlight'))
+    eq(expected_cterm, nvim("get_hl_by_name", 'NewHighlight', false))
+    eq(expected_rgb, nvim("get_hl_by_name", 'NewHighlight', true))
 
     command('hi Normal guifg=red guibg=yellow')
-    eq(expected_normal, nvim("get_hl_by_name", 'Normal'))
+    eq(expected_normal, nvim("get_hl_by_name", 'Normal', true))
 
-    local err, emsg = pcall(meths.get_hl_by_name , 'unknown_highlight')
+    local err, emsg = pcall(meths.get_hl_by_name , 'unknown_highlight', false)
     eq(false, err)
     ok(string.find(emsg, 'Invalid highlight name') ~= nil)
   end)
-- 
cgit 


From 2b133101cf67b523c2503ef715dfb9ebfa732da2 Mon Sep 17 00:00:00 2001
From: Ignas Anikevicius <anikevicius@gmail.com>
Date: Mon, 18 Sep 2017 21:06:55 +0300
Subject: win: vim_FullName(): force backslashes #7287

- Replace obvious cases of '/' literal with PATHSEP. (There are still
  some remaining cases that need closer inspection.)
- Fixup tests: ui/screen_basic

closes #7117
ref https://github.com/neovim/neovim/issues/2471#issuecomment-271193714
---
 test/functional/core/path_spec.lua       | 61 ++++++++++++++++++++++++++++++++
 test/functional/ui/screen_basic_spec.lua | 10 +++++-
 test/unit/path_spec.lua                  | 14 ++++++++
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 test/functional/core/path_spec.lua

(limited to 'test')

diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua
new file mode 100644
index 0000000000..44e69fff7b
--- /dev/null
+++ b/test/functional/core/path_spec.lua
@@ -0,0 +1,61 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear = helpers.clear
+local eq = helpers.eq
+local eval = helpers.eval
+local get_pathsep = helpers.get_pathsep
+local command = helpers.command
+
+describe("'%:p' expanding", function()
+  local pathsep
+  local targetdir
+  local expected_path
+
+  local function get_full_path()
+    return eval('expand("%:p")')
+  end
+
+  local function join_path(...)
+    return table.concat({...}, pathsep)
+  end
+
+  before_each(function()
+    clear()
+    pathsep = get_pathsep()
+    targetdir = join_path('test', 'functional', 'fixtures')
+    clear(join_path(targetdir, 'tty-test.c'))
+    expected_path = get_full_path()
+  end)
+
+  it('given a relative path with current directory in the middle #7117', function()
+    clear(join_path(targetdir, '.', 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a relative path with current directory #7117', function()
+    clear(join_path('.', targetdir, 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a relative path with current directory to a file when changing directory #7117', function()
+    clear(join_path('.', targetdir, 'tty-test.c'))
+    command('cd test')
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a relative path with directory up the tree to a file #7117', function()
+    clear(join_path(targetdir, '..', 'fixtures', 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a different starting directory and a relative path with directory up the tree #7117', function()
+    command('cd test')
+    command('e ' .. join_path('..', targetdir, 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a different starting directory and a relative path with current directory and up the tree #7117', function()
+    command('cd test')
+    command('e ' .. join_path('.', '..', targetdir, 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+end)
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index bfcdc7f652..9032239b31 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -5,6 +5,7 @@ local feed, command = helpers.feed, helpers.command
 local insert = helpers.insert
 local eq = helpers.eq
 local eval = helpers.eval
+local iswin = helpers.iswin
 
 describe('screen', function()
   local screen
@@ -120,8 +121,15 @@ describe('Screen', function()
 
     it('has correct default title with named file', function()
       local expected = 'myfile (/mydir) - NVIM'
+      if iswin() then
+        expected = 'myfile (C:\\mydir) - NVIM'
+      end
       command('set title')
-      command('file /mydir/myfile')
+      if iswin() then
+        command('file C:\\mydir\\myfile')
+      else
+        command('file /mydir/myfile')
+      end
       screen:expect(function()
         eq(expected, screen.title)
       end)
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index a9cba7df84..0400747e72 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -481,6 +481,20 @@ describe('path.c', function()
       eq('/tmp', ffi.string(buffer))
       eq(OK, result)
     end)
+
+    itp('works with a relative path with the current directory prefix #7117', function()
+      local force_expansion = 1
+      local result = vim_FullName('./unit-test-directory/test.file', buffer, length, force_expansion)
+      eq(OK, result)
+      eq(lfs.currentdir() .. '/unit-test-directory/test.file', (ffi.string(buffer)))
+    end)
+
+    itp('works with a relative path with the directory name mentioned twice #7117', function()
+      local force_expansion = 1
+      local result = vim_FullName('unit-test-directory/../unit-test-directory/test.file', buffer, length, force_expansion)
+      eq(OK, result)
+      eq(lfs.currentdir() .. '/unit-test-directory/test.file', (ffi.string(buffer)))
+    end)
   end)
 
   describe('path_fix_case', function()
-- 
cgit 


From e9dba214eada40a2d64b89616f1799b87cab1e5e Mon Sep 17 00:00:00 2001
From: Ignas Anikevicius <anikevicius@gmail.com>
Date: Thu, 21 Sep 2017 16:50:56 +0300
Subject: test/shada: fixup for Windows backslashes #7287

---
 test/functional/shada/compatibility_spec.lua |  29 +++--
 test/functional/shada/merging_spec.lua       | 187 ++++++++++++++-------------
 2 files changed, 115 insertions(+), 101 deletions(-)

(limited to 'test')

diff --git a/test/functional/shada/compatibility_spec.lua b/test/functional/shada/compatibility_spec.lua
index 1287ac010c..a5ef60d91f 100644
--- a/test/functional/shada/compatibility_spec.lua
+++ b/test/functional/shada/compatibility_spec.lua
@@ -10,6 +10,13 @@ local read_shada_file = shada_helpers.read_shada_file
 
 local wshada, sdrcmd, shada_fname = get_shada_rw('Xtest-functional-shada-compatibility.shada')
 
+local mock_file_path = '/a/b/'
+local mock_file_path2 = '/d/e/'
+if helpers.iswin() then
+  mock_file_path = 'C:/a/'
+  mock_file_path2 = 'C:/d/'
+end
+
 describe('ShaDa forward compatibility support code', function()
   before_each(reset)
   after_each(function()
@@ -114,14 +121,14 @@ describe('ShaDa forward compatibility support code', function()
     funcs.garbagecollect(1)
   end)
 
-  for _, v in ipairs({{name='global mark', mpack='\007\001\018\131\162mX\195\161f\196\006/a/b/c\161nA'},
-                      {name='jump', mpack='\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'},
-                      {name='local mark', mpack='\010\001\018\131\162mX\195\161f\196\006/a/b/c\161na'},
-                      {name='change', mpack='\011\001\015\130\162mX\195\161f\196\006/a/b/c'},
+  for _, v in ipairs({{name='global mark', mpack='\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161nA'},
+                      {name='jump', mpack='\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'},
+                      {name='local mark', mpack='\010\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161na'},
+                      {name='change', mpack='\011\001\015\130\162mX\195\161f\196\006' .. mock_file_path .. 'c'},
                      }) do
     it('works with ' .. v.name .. ' item with BOOL unknown (mX) key value', function()
-      nvim_command('silent noautocmd edit /a/b/c')
-      eq('/a/b/c', funcs.bufname('%'))
+      nvim_command('silent noautocmd edit ' .. mock_file_path .. 'c')
+      eq('' .. mock_file_path .. 'c', funcs.bufname('%'))
       funcs.setline('.', {'1', '2', '3'})
       wshada(v.mpack)
       eq(0, exc_exec(sdrcmd(true)))
@@ -159,12 +166,12 @@ describe('ShaDa forward compatibility support code', function()
 
     if v.name == 'global mark' or v.name == 'local mark' then
       it('works with ' .. v.name .. ' item with <C-a> name', function()
-        nvim_command('silent noautocmd edit /a/b/c')
-        eq('/a/b/c', funcs.bufname('%'))
+        nvim_command('silent noautocmd edit ' .. mock_file_path .. 'c')
+        eq('' .. mock_file_path .. 'c', funcs.bufname('%'))
         funcs.setline('.', {'1', '2', '3'})
         wshada(v.mpack:gsub('n.$', 'n\001')
                .. v.mpack:gsub('n.$', 'n\002')
-               .. v.mpack:gsub('n.$', 'n\003'):gsub('/a/b/c', '/d/e/f'))
+               .. v.mpack:gsub('n.$', 'n\003'):gsub('' .. mock_file_path .. 'c', '' .. mock_file_path2 .. 'f'))
         eq(0, exc_exec(sdrcmd(true)))
         nvim_command('wshada ' .. shada_fname)
         local found = 0
@@ -307,10 +314,10 @@ describe('ShaDa forward compatibility support code', function()
 
   it('works with buffer list item with BOOL unknown (bX) key', function()
     nvim_command('set shada+=%')
-    wshada('\009\000\016\145\130\161f\196\006/a/b/c\162bX\195')
+    wshada('\009\000\016\145\130\161f\196\006' .. mock_file_path .. 'c\162bX\195')
     eq(0, exc_exec(sdrcmd()))
     eq(2, funcs.bufnr('$'))
-    eq('/a/b/c', funcs.bufname(2))
+    eq('' .. mock_file_path .. 'c', funcs.bufname(2))
     os.remove(shada_fname)
     nvim_command('wshada ' .. shada_fname)
     local found = false
diff --git a/test/functional/shada/merging_spec.lua b/test/functional/shada/merging_spec.lua
index 25c73b99eb..7a15c8908b 100644
--- a/test/functional/shada/merging_spec.lua
+++ b/test/functional/shada/merging_spec.lua
@@ -13,6 +13,11 @@ local read_shada_file = shada_helpers.read_shada_file
 local wshada, sdrcmd, shada_fname =
   get_shada_rw('Xtest-functional-shada-merging.shada')
 
+local mock_file_path = '/a/b/'
+if helpers.iswin() then
+  mock_file_path = 'C:/a/'
+end
+
 describe('ShaDa history merging code', function()
   before_each(reset)
   after_each(function()
@@ -512,9 +517,9 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from instance when reading',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\000\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\000\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
@@ -522,9 +527,9 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from file when reading with !',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\000\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\000\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     eq(0, exc_exec(sdrcmd(true)))
     nvim_command('normal! `A')
     eq('?', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
@@ -532,9 +537,9 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with eq timestamp from instance when reading',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
@@ -542,9 +547,9 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from file when reading',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\002\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\002\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `A')
     eq('?', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
@@ -552,15 +557,15 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from instance when writing',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\000\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\000\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 7 and v.value.f == '/a/b/-' then
+      if v.type == 7 and v.value.f == '' .. mock_file_path .. '-' then
         found = found + 1
       end
     end
@@ -569,15 +574,15 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with eq timestamp from instance when writing',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 7 and v.value.f == '/a/b/-' then
+      if v.type == 7 and v.value.f == mock_file_path .. '-' then
         found = found + 1
       end
     end
@@ -586,15 +591,15 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from file when writing',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\002\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\002\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 7 and v.value.f == '/a/b/?' then
+      if v.type == 7 and v.value.f == '' .. mock_file_path .. '?' then
         found = found + 1
       end
     end
@@ -603,11 +608,11 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from instance when reading',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\000\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\000\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `a')
     eq('-', funcs.getline('.'))
@@ -615,11 +620,11 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from file when reading with !',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\000\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\000\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd(true)))
     nvim_command('normal! `a')
     eq('?', funcs.getline('.'))
@@ -627,11 +632,11 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with eq timestamp from instance when reading',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\001\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `a')
     eq('-', funcs.getline('.'))
@@ -639,11 +644,11 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from file when reading',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\002\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\002\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `a')
     eq('?', funcs.getline('.'))
@@ -651,17 +656,17 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from instance when writing',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\000\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\000\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     nvim_command('normal! `a')
     eq('-', funcs.getline('.'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 10 and v.value.f == '/a/b/-' and v.value.n == ('a'):byte() then
+      if v.type == 10 and v.value.f == '' .. mock_file_path .. '-' and v.value.n == ('a'):byte() then
         eq(true, v.value.l == 1 or v.value.l == nil)
         found = found + 1
       end
@@ -671,17 +676,17 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with eq timestamp from instance when writing',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\001\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     nvim_command('normal! `a')
     eq('-', funcs.getline('.'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 10 and v.value.f == '/a/b/-' and v.value.n == ('a'):byte() then
+      if v.type == 10 and v.value.f == '' .. mock_file_path .. '-' and v.value.n == ('a'):byte() then
         eq(true, v.value.l == 1 or v.value.l == nil)
         found = found + 1
       end
@@ -691,17 +696,17 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from file when writing',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\002\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\002\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     nvim_command('normal! `a')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 10 and v.value.f == '/a/b/-' and v.value.n == ('a'):byte() then
+      if v.type == 10 and v.value.f == '' .. mock_file_path .. '-' and v.value.n == ('a'):byte() then
         eq(2, v.value.l)
         found = found + 1
       end
@@ -813,41 +818,41 @@ describe('ShaDa jumps support code', function()
   end)
 
   it('merges jumps when reading', function()
-    wshada('\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\008\004\018\131\162mX\195\161f\196\006/a/b/d\161l\002'
-           .. '\008\007\018\131\162mX\195\161f\196\006/a/b/e\161l\002')
+    wshada('\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\008\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'd\161l\002'
+           .. '\008\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'e\161l\002')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\008\004\018\131\162mX\195\161f\196\006/a/b/d\161l\003'
-           .. '\008\007\018\131\162mX\195\161f\196\006/a/b/f\161l\002')
+    wshada('\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\008\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'd\161l\003'
+           .. '\008\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'f\161l\002')
     eq(0, exc_exec(sdrcmd()))
     eq('', curbufmeths.get_name())
     eq('\n'
        .. ' jump line  col file/text\n'
-       .. '   6     2    0 /a/b/c\n'
-       .. '   5     2    0 /a/b/d\n'
-       .. '   4     3    0 /a/b/d\n'
-       .. '   3     2    0 /a/b/e\n'
-       .. '   2     2    0 /a/b/f\n'
+       .. '   6     2    0 ' .. mock_file_path .. 'c\n'
+       .. '   5     2    0 ' .. mock_file_path .. 'd\n'
+       .. '   4     3    0 ' .. mock_file_path .. 'd\n'
+       .. '   3     2    0 ' .. mock_file_path .. 'e\n'
+       .. '   2     2    0 ' .. mock_file_path .. 'f\n'
        .. '   1     1    0 \n'
        .. '>', redir_exec('jumps'))
   end)
 
   it('merges jumps when writing', function()
-    wshada('\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\008\004\018\131\162mX\195\161f\196\006/a/b/d\161l\002'
-           .. '\008\007\018\131\162mX\195\161f\196\006/a/b/e\161l\002')
+    wshada('\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\008\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'd\161l\002'
+           .. '\008\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'e\161l\002')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\008\004\018\131\162mX\195\161f\196\006/a/b/d\161l\003'
-           .. '\008\007\018\131\162mX\195\161f\196\006/a/b/f\161l\002')
+    wshada('\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\008\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'd\161l\003'
+           .. '\008\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'f\161l\002')
     eq(0, exc_exec('wshada ' .. shada_fname))
     local jumps = {
-      {file='/a/b/c', line=2},
-      {file='/a/b/d', line=2},
-      {file='/a/b/d', line=3},
-      {file='/a/b/e', line=2},
-      {file='/a/b/f', line=2},
+      {file='' .. mock_file_path .. 'c', line=2},
+      {file='' .. mock_file_path .. 'd', line=2},
+      {file='' .. mock_file_path .. 'd', line=3},
+      {file='' .. mock_file_path .. 'e', line=2},
+      {file='' .. mock_file_path .. 'f', line=2},
     }
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
@@ -864,9 +869,9 @@ describe('ShaDa jumps support code', function()
     local jumps = {}
     local shada = ''
     for i = 1,100 do
-      shada = shada .. ('\008%c\018\131\162mX\195\161f\196\006/a/b/c\161l%c'
+      shada = shada .. ('\008%c\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l%c'
                        ):format(i, i)
-      jumps[i] = {file='/a/b/c', line=i}
+      jumps[i] = {file='' .. mock_file_path .. 'c', line=i}
     end
     wshada(shada)
     eq(0, exc_exec(sdrcmd()))
@@ -874,9 +879,9 @@ describe('ShaDa jumps support code', function()
     for i = 1,101 do
       local t = i * 2
       shada = shada .. (
-          '\008\204%c\019\131\162mX\195\161f\196\006/a/b/c\161l\204%c'
+          '\008\204%c\019\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\204%c'
           ):format(t, t)
-      jumps[(t > #jumps + 1) and (#jumps + 1) or t] = {file='/a/b/c', line=t}
+      jumps[(t > #jumps + 1) and (#jumps + 1) or t] = {file='' .. mock_file_path .. 'c', line=t}
     end
     wshada(shada)
     eq(0, exc_exec('wshada ' .. shada_fname))
@@ -904,15 +909,15 @@ describe('ShaDa changes support code', function()
   end)
 
   it('merges changes when reading', function()
-    nvim_command('edit /a/b/c')
+    nvim_command('edit ' .. mock_file_path .. 'c')
     nvim_command('keepjumps call setline(1, range(7))')
-    wshada('\011\001\018\131\162mX\195\161f\196\006/a/b/c\161l\001'
-           .. '\011\004\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\011\007\018\131\162mX\195\161f\196\006/a/b/c\161l\003')
+    wshada('\011\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\001'
+           .. '\011\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\011\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\003')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\011\001\018\131\162mX\194\161f\196\006/a/b/c\161l\001'
-           .. '\011\004\018\131\162mX\195\161f\196\006/a/b/c\161l\005'
-           .. '\011\008\018\131\162mX\195\161f\196\006/a/b/c\161l\004')
+    wshada('\011\001\018\131\162mX\194\161f\196\006' .. mock_file_path .. 'c\161l\001'
+           .. '\011\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\005'
+           .. '\011\008\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\004')
     eq(0, exc_exec(sdrcmd()))
     eq('\n'
        .. 'change line  col text\n'
@@ -925,15 +930,15 @@ describe('ShaDa changes support code', function()
   end)
 
   it('merges changes when writing', function()
-    nvim_command('edit /a/b/c')
+    nvim_command('edit ' .. mock_file_path .. 'c')
     nvim_command('keepjumps call setline(1, range(7))')
-    wshada('\011\001\018\131\162mX\195\161f\196\006/a/b/c\161l\001'
-           .. '\011\004\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\011\007\018\131\162mX\195\161f\196\006/a/b/c\161l\003')
+    wshada('\011\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\001'
+           .. '\011\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\011\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\003')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\011\001\018\131\162mX\194\161f\196\006/a/b/c\161l\001'
-           .. '\011\004\018\131\162mX\195\161f\196\006/a/b/c\161l\005'
-           .. '\011\008\018\131\162mX\195\161f\196\006/a/b/c\161l\004')
+    wshada('\011\001\018\131\162mX\194\161f\196\006' .. mock_file_path .. 'c\161l\001'
+           .. '\011\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\005'
+           .. '\011\008\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\004')
     eq(0, exc_exec('wshada ' .. shada_fname))
     local changes = {
       {line=1},
@@ -944,7 +949,7 @@ describe('ShaDa changes support code', function()
     }
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 11 and v.value.f == '/a/b/c' then
+      if v.type == 11 and v.value.f == '' .. mock_file_path .. 'c' then
         found = found + 1
         eq(changes[found].line, v.value.l or 1)
       end
@@ -953,12 +958,12 @@ describe('ShaDa changes support code', function()
   end)
 
   it('merges JUMPLISTSIZE changes when writing', function()
-    nvim_command('edit /a/b/c')
+    nvim_command('edit ' .. mock_file_path .. 'c')
     nvim_command('keepjumps call setline(1, range(202))')
     local changes = {}
     local shada = ''
     for i = 1,100 do
-      shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006/a/b/c\161l%c'
+      shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l%c'
                        ):format(i, i)
       changes[i] = {line=i}
     end
@@ -968,7 +973,7 @@ describe('ShaDa changes support code', function()
     for i = 1,101 do
       local t = i * 2
       shada = shada .. (
-          '\011\204%c\019\131\162mX\195\161f\196\006/a/b/c\161l\204%c'
+          '\011\204%c\019\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\204%c'
           ):format(t, t)
       changes[(t > #changes + 1) and (#changes + 1) or t] = {line=t}
     end
@@ -980,7 +985,7 @@ describe('ShaDa changes support code', function()
     end
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 11 and v.value.f == '/a/b/c' then
+      if v.type == 11 and v.value.f == '' .. mock_file_path .. 'c' then
         found = found + 1
         eq(changes[found].line, v.value.l)
       end
@@ -990,20 +995,20 @@ describe('ShaDa changes support code', function()
 
   it('merges JUMPLISTSIZE changes when writing, with new items between old',
   function()
-    nvim_command('edit /a/b/c')
+    nvim_command('edit ' .. mock_file_path .. 'c')
     nvim_command('keepjumps call setline(1, range(202))')
     local shada = ''
     for i = 1,101 do
       local t = i * 2
       shada = shada .. (
-          '\011\204%c\019\131\162mX\195\161f\196\006/a/b/c\161l\204%c'
+          '\011\204%c\019\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\204%c'
           ):format(t, t)
     end
     wshada(shada)
     eq(0, exc_exec(sdrcmd()))
     shada = ''
     for i = 1,100 do
-      shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006/a/b/c\161l%c'
+      shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l%c'
                        ):format(i, i)
     end
     local changes = {}
@@ -1022,7 +1027,7 @@ describe('ShaDa changes support code', function()
     end
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 11 and v.value.f == '/a/b/c' then
+      if v.type == 11 and v.value.f == '' .. mock_file_path .. 'c' then
         found = found + 1
         eq(changes[found].line, v.value.l)
       end
@@ -1030,3 +1035,5 @@ describe('ShaDa changes support code', function()
     eq(found, 100)
   end)
 end)
+
+-- vim: ts=2 sw=2
-- 
cgit 


From 6f7754dfa0c6a9ec2a1e7db3685ffd41b207b882 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 2 Oct 2017 00:24:19 +0200
Subject: test: avoid extra clear() calls

also: various other cleanup
---
 test/functional/core/path_spec.lua       | 53 +++++++++++++++-----------------
 test/functional/ui/screen_basic_spec.lua | 12 ++------
 test/unit/path_spec.lua                  |  4 +--
 3 files changed, 29 insertions(+), 40 deletions(-)

(limited to 'test')

diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua
index 44e69fff7b..669bc99136 100644
--- a/test/functional/core/path_spec.lua
+++ b/test/functional/core/path_spec.lua
@@ -2,60 +2,55 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
-local get_pathsep = helpers.get_pathsep
 local command = helpers.command
+local iswin = helpers.iswin
 
-describe("'%:p' expanding", function()
-  local pathsep
+describe('path collapse', function()
   local targetdir
   local expected_path
 
-  local function get_full_path()
-    return eval('expand("%:p")')
-  end
-
   local function join_path(...)
+    local pathsep = (iswin() and '\\' or '/')
     return table.concat({...}, pathsep)
   end
 
   before_each(function()
-    clear()
-    pathsep = get_pathsep()
     targetdir = join_path('test', 'functional', 'fixtures')
-    clear(join_path(targetdir, 'tty-test.c'))
-    expected_path = get_full_path()
+    clear()
+    command('edit '..join_path(targetdir, 'tty-test.c'))
+    expected_path = eval('expand("%:p")')
   end)
 
-  it('given a relative path with current directory in the middle #7117', function()
-    clear(join_path(targetdir, '.', 'tty-test.c'))
-    eq(expected_path, get_full_path())
+  it('with /./ segment #7117', function()
+    command('edit '..join_path(targetdir, '.', 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a relative path with current directory #7117', function()
-    clear(join_path('.', targetdir, 'tty-test.c'))
-    eq(expected_path, get_full_path())
+  it('with ./ prefix #7117', function()
+    command('edit '..join_path('.', targetdir, 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a relative path with current directory to a file when changing directory #7117', function()
-    clear(join_path('.', targetdir, 'tty-test.c'))
+  it('with ./ prefix, after directory change #7117', function()
+    command('edit '..join_path('.', targetdir, 'tty-test.c'))
     command('cd test')
-    eq(expected_path, get_full_path())
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a relative path with directory up the tree to a file #7117', function()
-    clear(join_path(targetdir, '..', 'fixtures', 'tty-test.c'))
-    eq(expected_path, get_full_path())
+  it('with /../ segment #7117', function()
+    command('edit '..join_path(targetdir, '..', 'fixtures', 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a different starting directory and a relative path with directory up the tree #7117', function()
+  it('with ../ and different starting directory #7117', function()
     command('cd test')
-    command('e ' .. join_path('..', targetdir, 'tty-test.c'))
-    eq(expected_path, get_full_path())
+    command('edit '..join_path('..', targetdir, 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a different starting directory and a relative path with current directory and up the tree #7117', function()
+  it('with ./../ and different starting directory #7117', function()
     command('cd test')
-    command('e ' .. join_path('.', '..', targetdir, 'tty-test.c'))
-    eq(expected_path, get_full_path())
+    command('edit '..join_path('.', '..', targetdir, 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 end)
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index 9032239b31..b31d9cb32f 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -120,16 +120,10 @@ describe('Screen', function()
     end)
 
     it('has correct default title with named file', function()
-      local expected = 'myfile (/mydir) - NVIM'
-      if iswin() then
-        expected = 'myfile (C:\\mydir) - NVIM'
-      end
+      local expected = (iswin() and 'myfile (C:\\mydir) - NVIM'
+                                 or 'myfile (/mydir) - NVIM')
       command('set title')
-      if iswin() then
-        command('file C:\\mydir\\myfile')
-      else
-        command('file /mydir/myfile')
-      end
+      command(iswin() and 'file C:\\mydir\\myfile' or 'file /mydir/myfile')
       screen:expect(function()
         eq(expected, screen.title)
       end)
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index 0400747e72..befb204d0a 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -482,14 +482,14 @@ describe('path.c', function()
       eq(OK, result)
     end)
 
-    itp('works with a relative path with the current directory prefix #7117', function()
+    itp('expands "./" to the current directory #7117', function()
       local force_expansion = 1
       local result = vim_FullName('./unit-test-directory/test.file', buffer, length, force_expansion)
       eq(OK, result)
       eq(lfs.currentdir() .. '/unit-test-directory/test.file', (ffi.string(buffer)))
     end)
 
-    itp('works with a relative path with the directory name mentioned twice #7117', function()
+    itp('collapses "foo/../foo" to "foo" #7117', function()
       local force_expansion = 1
       local result = vim_FullName('unit-test-directory/../unit-test-directory/test.file', buffer, length, force_expansion)
       eq(OK, result)
-- 
cgit 


From d1874ab2821d076397290cc154d87ec2dc352c79 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 7 Oct 2017 16:06:46 +0200
Subject: syntax: 'cursorline': low priority #6380

---
 test/functional/ui/highlight_spec.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index d1357ea525..077b0ec14c 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -518,7 +518,7 @@ describe("'listchars' highlight", function()
     ]])
     feed_command('set cursorline')
     screen:expect([[
-      {2:^>-------.}{1:abcd}{2:.}{1:Lorem}{4:>}|
+      {2:^>-------.}{1:abcd}{2:.}{1:Lorem}{3:>}|
       {5:>-------.}abcd{5:*}{4:¬}     |
       {4:¬}                   |
       {4:~                   }|
@@ -526,7 +526,7 @@ describe("'listchars' highlight", function()
     ]])
     feed('$')
     screen:expect([[
-      {4:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
+      {3:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
       {4:<}                   |
       {4:<}                   |
       {4:~                   }|
@@ -607,7 +607,7 @@ describe("'listchars' highlight", function()
     feed('<esc>$')
     screen:expect([[
       {4:<}                   |
-      {4:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
+      {3:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
       {4:<}                   |
       {4:~                   }|
                           |
-- 
cgit 


From c0e45d97b0cbc700cd6f2b9733c15875339262df Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sat, 30 Sep 2017 21:43:03 +0800
Subject: vim-patch:8.0.0148 #7344

Problem:    When a C preprocessor statement has two line continuations the
            following line does not have the right indent. (Ken Takata)
Solution:   Add the indent of the previous continuation line. (Hirohito
            Higashi)

https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
---
 test/functional/legacy/003_cindent_spec.lua | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'test')

diff --git a/test/functional/legacy/003_cindent_spec.lua b/test/functional/legacy/003_cindent_spec.lua
index 202baadd4c..58e87354fb 100644
--- a/test/functional/legacy/003_cindent_spec.lua
+++ b/test/functional/legacy/003_cindent_spec.lua
@@ -4718,4 +4718,38 @@ describe('cindent', function()
       JSEND
       ]=])
   end)
+
+  it('line continuations in macros / vim-patch 8.0.0148', function()
+    insert_([=[
+      /* start of define */
+      {
+      }
+      #define AAA \
+      BBB\
+      CCC
+
+      #define CNT \
+      1 + \
+      2 + \
+      4
+      /* end of define */]=])
+
+    feed_command('set cino&')
+    feed_command('/start of define')
+    feed('=/end of define<cr>')
+
+    expect([=[
+      /* start of define */
+      {
+      }
+      #define AAA \
+      	BBB\
+      	CCC
+
+      #define CNT \
+      	1 + \
+      	2 + \
+      	4
+      /* end of define */]=])
+  end)
 end)
-- 
cgit 


From 52517321d1859c31fef14aa75d784615693fcecb Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 8 Oct 2017 20:23:11 +0200
Subject: test: nvim_get_hl_by_name/by_id #7082

- test all properties
- test failure modes
---
 test/functional/api/highlight_spec.lua | 77 +++++++++++++++++++++++++++-------
 1 file changed, 62 insertions(+), 15 deletions(-)

(limited to 'test')

diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index c482128a31..2297a0760f 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -6,15 +6,26 @@ local command = helpers.command
 local meths = helpers.meths
 
 describe('highlight api',function()
-  local expected_rgb = { background = Screen.colors.Yellow,
-                         foreground = Screen.colors.Red,
-                         special = Screen.colors.Blue,
-                         bold = true,
-                       }
-
-  local expected_cterm = { background = 10,
-                           underline = true,
-                         }
+  local expected_rgb = {
+    background = Screen.colors.Yellow,
+    foreground = Screen.colors.Red,
+    special = Screen.colors.Blue,
+    bold = true,
+  }
+  local expected_cterm = {
+    background = 10,
+    underline = true,
+  }
+  local expected_rgb2 = {
+    background = Screen.colors.Yellow,
+    foreground = Screen.colors.Red,
+    special = Screen.colors.Blue,
+    bold = true,
+    italic = true,
+    reverse = true,
+    undercurl = true,
+    underline = true,
+  }
 
   before_each(function()
     clear()
@@ -26,31 +37,67 @@ describe('highlight api',function()
     eq(expected_cterm, nvim("get_hl_by_id", hl_id, false))
 
     hl_id = eval("hlID('NewHighlight')")
+    -- Test valid id.
     eq(expected_rgb, nvim("get_hl_by_id", hl_id, true))
 
-    local expected_error = 'Invalid highlight id'
-    -- Assume there is no hl id 30000.
+    -- Test invalid id.
     local err, emsg = pcall(meths.get_hl_by_id, 30000, false)
     eq(false, err)
-    eq(expected_error, string.match(emsg, expected_error))
+    eq('Invalid highlight id: 30000', string.match(emsg, 'Invalid.*'))
+
+    -- Test all highlight properties.
+    command('hi NewHighlight gui=underline,bold,undercurl,italic,reverse')
+    eq(expected_rgb2, nvim("get_hl_by_id", hl_id, true))
+
+    -- Test nil argument.
+    err, emsg = pcall(meths.get_hl_by_id, { nil }, false)
+    eq(false, err)
+    eq('Wrong type for argument 1, expecting Integer',
+       string.match(emsg, 'Wrong.*'))
+
+    -- Test 0 argument.
+    err, emsg = pcall(meths.get_hl_by_id, 0, false)
+    eq(false, err)
+    eq('Invalid highlight id: 0',
+       string.match(emsg, 'Invalid.*'))
+
+    -- Test -1 argument.
+    err, emsg = pcall(meths.get_hl_by_id, -1, false)
+    eq(false, err)
+    eq('Invalid highlight id: -1',
+       string.match(emsg, 'Invalid.*'))
   end)
 
   it("nvim_get_hl_by_name", function()
     local expected_normal = { background = Screen.colors.Yellow,
                               foreground = Screen.colors.Red }
 
-    -- Test "Normal" hl defaults.
+    -- Test `Normal` default values.
     eq({}, nvim("get_hl_by_name", 'Normal', true))
 
     eq(expected_cterm, nvim("get_hl_by_name", 'NewHighlight', false))
     eq(expected_rgb, nvim("get_hl_by_name", 'NewHighlight', true))
 
+    -- Test `Normal` modified values.
     command('hi Normal guifg=red guibg=yellow')
     eq(expected_normal, nvim("get_hl_by_name", 'Normal', true))
 
-    local expected_error = 'Invalid highlight name'
+    -- Test invalid name.
     local err, emsg = pcall(meths.get_hl_by_name , 'unknown_highlight', false)
     eq(false, err)
-    eq(expected_error, string.match(emsg, expected_error))
+    eq('Invalid highlight name: unknown_highlight',
+       string.match(emsg, 'Invalid.*'))
+
+    -- Test nil argument.
+    err, emsg = pcall(meths.get_hl_by_name , { nil }, false)
+    eq(false, err)
+    eq('Wrong type for argument 1, expecting String',
+       string.match(emsg, 'Wrong.*'))
+
+    -- Test empty string argument.
+    err, emsg = pcall(meths.get_hl_by_name , '', false)
+    eq(false, err)
+    eq('Invalid highlight name: ',
+       string.match(emsg, 'Invalid.*'))
   end)
 end)
-- 
cgit