From 937138dad4910e2746abcf34c9d0dc4ffb5454f3 Mon Sep 17 00:00:00 2001 From: w0rp Date: Mon, 20 May 2019 20:06:44 +0100 Subject: [PATCH] Try to fix the tests --- test/command_callback/test_c_ccls_command_callbacks.vader | 6 ++++++ test/command_callback/test_c_clangd_command_callbacks.vader | 2 ++ test/command_callback/test_c_cquery_command_callbacks.vader | 4 ++++ test/command_callback/test_cpp_ccls_command_callbacks.vader | 6 ++++++ .../test_cpp_cquery_command_callbacks.vader | 4 ++++ .../command_callback/test_objc_ccls_command_callbacks.vader | 6 ++++++ test/lsp/test_lsp_root_detection.vader | 4 ++-- 7 files changed, 30 insertions(+), 2 deletions(-) diff --git a/test/command_callback/test_c_ccls_command_callbacks.vader b/test/command_callback/test_c_ccls_command_callbacks.vader index b8f3ab5b..43fdb366 100644 --- a/test/command_callback/test_c_ccls_command_callbacks.vader +++ b/test/command_callback/test_c_ccls_command_callbacks.vader @@ -8,6 +8,8 @@ After: call ale#assert#TearDownLinterTest() Execute(The project root should be detected correctly using compile_commands.json file): + call ale#test#SetFilename(tempname() . '/dummy.c') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.c') @@ -15,6 +17,8 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') Execute(The project root should be detected correctly using .ccls file): + call ale#test#SetFilename(tempname() . '/dummy.c') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_ccls/dummy.c') @@ -22,6 +26,8 @@ Execute(The project root should be detected correctly using .ccls file): AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls') Execute(The project root should be detected correctly using .ccls-root file): + call ale#test#SetFilename(tempname() . '/dummy.c') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_ccls-root/dummy.c') diff --git a/test/command_callback/test_c_clangd_command_callbacks.vader b/test/command_callback/test_c_clangd_command_callbacks.vader index c8c10b67..dc52097d 100644 --- a/test/command_callback/test_c_clangd_command_callbacks.vader +++ b/test/command_callback/test_c_clangd_command_callbacks.vader @@ -14,6 +14,8 @@ Execute(The default executable should be correct): AssertLinter 'clangd', ale#Escape('clangd') Execute(The project root should be detected correctly): + call ale#test#SetFilename(tempname() . '/dummy.c') + AssertLSPProject '' call ale#test#SetFilename('clangd_paths/dummy.c') diff --git a/test/command_callback/test_c_cquery_command_callbacks.vader b/test/command_callback/test_c_cquery_command_callbacks.vader index a2e03889..01356bdf 100644 --- a/test/command_callback/test_c_cquery_command_callbacks.vader +++ b/test/command_callback/test_c_cquery_command_callbacks.vader @@ -5,6 +5,8 @@ After: call ale#assert#TearDownLinterTest() Execute(The project root should be detected correctly using compile_commands.json file): + call ale#test#SetFilename(tempname() . '/dummy.c') + AssertLSPProject '' call ale#test#SetFilename('cquery_paths/dummy.c') @@ -12,6 +14,8 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths') Execute(The project root should be detected correctly using .cquery file): + call ale#test#SetFilename(tempname() . '/dummy.c') + AssertLSPProject '' call ale#test#SetFilename('cquery_paths/with_cquery/dummy.c') diff --git a/test/command_callback/test_cpp_ccls_command_callbacks.vader b/test/command_callback/test_cpp_ccls_command_callbacks.vader index 38947acf..eece42bc 100644 --- a/test/command_callback/test_cpp_ccls_command_callbacks.vader +++ b/test/command_callback/test_cpp_ccls_command_callbacks.vader @@ -8,6 +8,8 @@ After: call ale#assert#TearDownLinterTest() Execute(The project root should be detected correctly using compile_commands.json file): + call ale#test#SetFilename(tempname() . '/dummy.cpp') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.cpp') @@ -15,6 +17,8 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') Execute(The project root should be detected correctly using .ccls file): + call ale#test#SetFilename(tempname() . '/dummy.cpp') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_ccls/dummy.cpp') @@ -22,6 +26,8 @@ Execute(The project root should be detected correctly using .ccls file): AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls') Execute(The project root should be detected correctly using .ccls-root file): + call ale#test#SetFilename(tempname() . '/dummy.cpp') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_ccls-root/dummy.cpp') diff --git a/test/command_callback/test_cpp_cquery_command_callbacks.vader b/test/command_callback/test_cpp_cquery_command_callbacks.vader index 7eb2a284..842f123e 100644 --- a/test/command_callback/test_cpp_cquery_command_callbacks.vader +++ b/test/command_callback/test_cpp_cquery_command_callbacks.vader @@ -8,6 +8,8 @@ After: call ale#assert#TearDownLinterTest() Execute(The project root should be detected correctly using compile_commands.json file): + call ale#test#SetFilename(tempname() . '/dummy.cpp') + AssertLSPProject '' call ale#test#SetFilename('cquery_paths/dummy.cpp') @@ -15,6 +17,8 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths') Execute(The project root should be detected correctly using .cquery file): + call ale#test#SetFilename(tempname() . '/dummy.cpp') + AssertLSPProject '' call ale#test#SetFilename('cquery_paths/with_cquery/dummy.cpp') diff --git a/test/command_callback/test_objc_ccls_command_callbacks.vader b/test/command_callback/test_objc_ccls_command_callbacks.vader index 9d0c7690..5aa69d6a 100644 --- a/test/command_callback/test_objc_ccls_command_callbacks.vader +++ b/test/command_callback/test_objc_ccls_command_callbacks.vader @@ -5,6 +5,8 @@ After: call ale#assert#TearDownLinterTest() Execute(The project root should be detected correctly using compile_commands.json file): + call ale#test#SetFilename(tempname() . '/dummy.m') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.m') @@ -12,6 +14,8 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') Execute(The project root should be detected correctly using .ccls file): + call ale#test#SetFilename(tempname() . '/dummy.m') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_ccls/dummy.m') @@ -19,6 +23,8 @@ Execute(The project root should be detected correctly using .ccls file): AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls') Execute(The project root should be detected correctly using .ccls-root file): + call ale#test#SetFilename(tempname() . '/dummy.m') + AssertLSPProject '' call ale#test#SetFilename('ccls_paths/with_ccls-root/dummy.m') diff --git a/test/lsp/test_lsp_root_detection.vader b/test/lsp/test_lsp_root_detection.vader index b7827248..3de4d825 100644 --- a/test/lsp/test_lsp_root_detection.vader +++ b/test/lsp/test_lsp_root_detection.vader @@ -56,7 +56,7 @@ Execute(The global variable is queried if the buffer-specific has no value): AssertLSPProject '/some/path' -Execute(The default hook value is acceptable): - call ale#test#SetFilename('other-file.c') +Execute(No path should be returned by default): + call ale#test#SetFilename(tempname() . '/other-file.c') AssertLSPProject ''