dense-analysis#3633 - Move linter tests into test/linter

Author: w0rp

ale_linters/json/jq.vim

@@ -1,32 +1,24 @@
 " Author: jD91mZM2 <[email protected]>
+call ale#Set('json_jq_executable', 'jq')
+call ale#Set('json_jq_options', '')
+call ale#Set('json_jq_filters', '.')
 
-function! ale_linters#json#jq#GetCommand(buffer) abort
-    let l:executable = ale#fixers#jq#GetExecutable(a:buffer)
-
-    return ale#Escape(l:executable)
-endfunction
+" Matches patterns like the following:
+" parse error: Expected another key-value pair at line 4, column 3
+let s:pattern = '^parse error: \(.\+\) at line \(\d\+\), column \(\d\+\)$'
 
 function! ale_linters#json#jq#Handle(buffer, lines) abort
-    " Matches patterns like the following:
-    " parse error: Expected another key-value pair at line 4, column 3
-    let l:pattern = '^parse error: \(.\+\) at line \(\d\+\), column \(\d\+\)$'
-    let l:output = []
-
-    for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        call add(l:output, {
-        \   'text': l:match[1],
-        \   'lnum': l:match[2] + 0,
-        \   'col': l:match[3] + 0,
-        \})
-    endfor
-
-    return l:output
+    return ale#util#MapMatches(a:lines, s:pattern, {match -> {
+    \   'text': match[1],
+    \   'lnum': match[2] + 0,
+    \   'col': match[3] + 0,
+    \}})
 endfunction
 
 call ale#linter#Define('json', {
 \   'name': 'jq',
-\   'executable': function('ale#fixers#jq#GetExecutable'),
+\   'executable': {b -> ale#Var(b, 'json_jq_executable')},
 \   'output_stream': 'stderr',
-\   'command': function('ale_linters#json#jq#GetCommand'),
+\   'command': '%e',
 \   'callback': 'ale_linters#json#jq#Handle',
 \})

autoload/ale/assert.vim

@@ -293,7 +293,7 @@ function! ale#assert#SetUpLinterTest(filetype, name) abort
     execute 'runtime ale_linters/' . a:filetype . '/' . a:name . '.vim'
 
     if !exists('g:dir')
-        call ale#test#SetDirectory('/testplugin/test/command_callback')
+        call ale#test#SetDirectory('/testplugin/test/linter')
     endif
 
     call ale#assert#SetUpLinterTestCommands()

doc/ale-development.txt

@@ -181,7 +181,7 @@ Generally write tests for any changes you make. The following types of tests
 are recommended for the following types of code.
 
 * New/edited error handler callbacks -> Write tests in `test/handler`
-* New/edited command callbacks       -> Write tests in `test/command_callback`
+* New/edited linter definition       -> Write tests in `test/linter`
 * New/edited fixer functions         -> Write tests in `test/fixers`
 
 Look at existing tests in the codebase for examples of how to write tests.
@@ -278,8 +278,8 @@ be written like so. >
   \ '1:Something went wrong',
   \ ]
 <
-Tests for what ALE runs should go in the `test/command_callback` directory,
-and should be written like so. >
+Tests for what ALE runs should go in the `test/linter` directory, and should
+be written like so. >
 
   Before:
     " Load the linter and set up a series of commands, reset linter variables,

test/completion/test_completion_events.vader

@@ -11,6 +11,10 @@ Before:
   let g:feedkeys_calls = []
   let g:fake_mode = 'i'
 
+  let b:ale_linters = {
+  \ 'typescript': ['tsserver'],
+  \}
+
   let &l:completeopt = 'menu,menuone,preview,noselect,noinsert'
 
   runtime autoload/ale/util.vim
@@ -69,6 +73,7 @@ After:
   unlet! b:ale_completion_info
   unlet! b:ale_completion_result
   unlet! b:ale_complete_done_time
+  unlet! b:ale_linters
 
   delfunction CheckCompletionCalled
   delfunction ale#code_action#HandleCodeAction

test/fixers/test_autoimport_fixer_callback.vader

@@ -7,9 +7,6 @@ Before:
   let g:ale_python_autoimport_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 

test/fixers/test_autopep8_fixer_callback.vader

@@ -7,8 +7,6 @@ Before:
   let g:ale_python_autopep8_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
   let g:dir = getcwd()
 
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'

test/fixers/test_bibclean_fixer_callback.vader

@@ -12,15 +12,15 @@ After:
   call ale#test#RestoreDirectory()
 
 Execute(The bibclean callback should return the correct default values):
-  call ale#test#SetFilename('../command_callback/../test-files/bib/dummy.bib')
+  call ale#test#SetFilename('../test-files/bib/dummy.bib')
 
   AssertEqual
   \ {'command': ale#Escape(g:ale_bib_bibclean_executable) . ' -align-equals'},
   \ ale#fixers#bibclean#Fix(bufnr(''))
 
 Execute(The bibclean callback should include custom bibclean options):
   let g:ale_bib_bibclean_options = '-author -check-values'
-  call ale#test#SetFilename('../command_callback/../test-files/bib/dummy.bib')
+  call ale#test#SetFilename('../test-files/bib/dummy.bib')
 
   AssertEqual
   \ {

test/fixers/test_black_fixer_callback.vader

@@ -1,8 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('python', 'black')
 
-  silent cd ..
-  silent cd command_callback
   let g:dir = getcwd()
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 

test/fixers/test_clangformat_fixer_callback.vader

@@ -7,8 +7,6 @@ Before:
   let g:ale_c_clangformat_executable = 'xxxinvalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
   let g:dir = getcwd()
 
 After:

test/fixers/test_clangtidy_fixer_callback.vader

@@ -17,8 +17,6 @@ Before:
   let g:ale_c_build_dir = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ../command_callback
-  let g:dir = getcwd()
 
 After:
   Restore