From a42999a639b2916b769a85f37d037be314d9d61b Mon Sep 17 00:00:00 2001 From: w0rp Date: Sun, 15 Jul 2018 18:24:53 +0100 Subject: Massively reduce the amount of code needed for linter tests --- .../test_cpp_cppcheck_command_callbacks.vader | 39 ++++------------------ 1 file changed, 6 insertions(+), 33 deletions(-) (limited to 'test/command_callback/test_cpp_cppcheck_command_callbacks.vader') diff --git a/test/command_callback/test_cpp_cppcheck_command_callbacks.vader b/test/command_callback/test_cpp_cppcheck_command_callbacks.vader index 2c9d7298..3a7ada2c 100644 --- a/test/command_callback/test_cpp_cppcheck_command_callbacks.vader +++ b/test/command_callback/test_cpp_cppcheck_command_callbacks.vader @@ -1,49 +1,22 @@ Before: - Save g:ale_cpp_cppcheck_executable - Save g:ale_cpp_cppcheck_options - - unlet! g:ale_cpp_cppcheck_executable - unlet! b:ale_cpp_cppcheck_executable - unlet! g:ale_cpp_cppcheck_options - unlet! b:ale_cpp_cppcheck_options - - runtime ale_linters/cpp/cppcheck.vim - + call ale#assert#SetUpLinterTest('cpp', 'cppcheck') let b:command_tail = ' -q --language=c++ --enable=style %t' - call ale#test#SetDirectory('/testplugin/test/command_callback') - After: - Restore unlet! b:command_tail - unlet! b:ale_cpp_cppcheck_executable - unlet! b:ale_cpp_cppcheck_options - call ale#linter#Reset() - call ale#test#RestoreDirectory() + call ale#assert#TearDownLinterTest() Execute(The executable should be configurable): - AssertEqual 'cppcheck', ale_linters#cpp#cppcheck#GetExecutable(bufnr('')) - - let b:ale_cpp_cppcheck_executable = 'foobar' - - AssertEqual 'foobar', ale_linters#cpp#cppcheck#GetExecutable(bufnr('')) - -Execute(The executable should be used in the command): - AssertEqual - \ ale#Escape('cppcheck') . b:command_tail, - \ ale_linters#cpp#cppcheck#GetCommand(bufnr('')) + AssertLinter 'cppcheck', ale#Escape('cppcheck') . b:command_tail let b:ale_cpp_cppcheck_executable = 'foobar' - AssertEqual - \ ale#Escape('foobar') . b:command_tail, - \ ale_linters#cpp#cppcheck#GetCommand(bufnr('')) + AssertLinter 'foobar', ale#Escape('foobar') . b:command_tail Execute(cppcheck for C++ should detect compile_commands.json files): call ale#test#SetFilename('cppcheck_paths/one/foo.cpp') - AssertEqual + AssertLinter 'cppcheck', \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths/one')) . ' && ' \ . ale#Escape('cppcheck') - \ . ' -q --language=c++ --project=compile_commands.json --enable=style %t', - \ ale_linters#cpp#cppcheck#GetCommand(bufnr('')) + \ . ' -q --language=c++ --project=compile_commands.json --enable=style %t' -- cgit v1.2.3