1 files changed, 6 insertions, 29 deletions
diff --git a/test/command_callback/test_nagelfar_command_callbacks.vader b/test/command_callback/test_nagelfar_command_callbacks.vader
index 5c6be7f1..94bb1d53 100644
--- a/test/command_callback/test_nagelfar_command_callbacks.vader
+++ b/test/command_callback/test_nagelfar_command_callbacks.vader
@@ -1,42 +1,19 @@
 Before:
-  Save g:ale_tcl_nagelfar_executable
-  Save g:ale_tcl_nagelfar_options
-
-  unlet! g:ale_tcl_nagelfar_executable
-  unlet! b:ale_tcl_nagelfar_executable
-  unlet! g:ale_tcl_nagelfar_options
-  unlet! b:ale_tcl_nagelfar_options
-
-  runtime ale_linters/tcl/nagelfar.vim
+  call ale#assert#SetUpLinterTest('tcl', 'nagelfar')
 
 After:
-  Restore
   unlet! b:command_tail
-  unlet! b:ale_tcl_nagelfar_executable
-  unlet! b:ale_tcl_nagelfar_options
-  call ale#linter#Reset()
 
-Execute(The executable should be configurable):
-  AssertEqual 'nagelfar.tcl', ale_linters#tcl#nagelfar#GetExecutable(bufnr(''))
+  call ale#assert#TearDownLinterTest()
 
-  let b:ale_tcl_nagelfar_executable = 'foobar'
-
-  AssertEqual 'foobar', ale_linters#tcl#nagelfar#GetExecutable(bufnr(''))
-
-Execute(The executable should be used in the command):
-  AssertEqual
-  \ ale#Escape('nagelfar.tcl') . ' %s',
-  \ ale_linters#tcl#nagelfar#GetCommand(bufnr(''))
+Execute(The executable should be configurable):
+  AssertLinter 'nagelfar.tcl', ale#Escape('nagelfar.tcl') . ' %s'
 
   let b:ale_tcl_nagelfar_executable = 'foobar'
 
-  AssertEqual
-  \ ale#Escape('foobar') . ' %s',
-  \ ale_linters#tcl#nagelfar#GetCommand(bufnr(''))
+  AssertLinter 'foobar', ale#Escape('foobar') . ' %s'
 
 Execute(The options should be configurable):
   let b:ale_tcl_nagelfar_options = '--something'
 
-  AssertEqual
-  \ ale#Escape('nagelfar.tcl') . ' --something %s',
-  \ ale_linters#tcl#nagelfar#GetCommand(bufnr(''))
+  AssertLinter 'nagelfar.tcl', ale#Escape('nagelfar.tcl') . ' --something %s'