1 files changed, 7 insertions, 14 deletions
diff --git a/test/command_callback/test_gfortran_command_callback.vader b/test/command_callback/test_gfortran_command_callback.vader
index 501e92fd..a6ab50cd 100644
--- a/test/command_callback/test_gfortran_command_callback.vader
+++ b/test/command_callback/test_gfortran_command_callback.vader
@@ -1,31 +1,24 @@
 Before:
-  runtime ale_linters/fortran/gcc.vim
+  call ale#assert#SetUpLinterTest('fortran', 'gcc')
 
 After:
-  call ale#linter#Reset()
-  let g:ale_fortran_gcc_options = '-Wall'
-  let g:ale_fortran_gcc_use_free_form = 1
-  let g:ale_fortran_gcc_executable = 'gcc'
+  call ale#assert#TearDownLinterTest()
 
 Execute(The fortran gcc command callback should return the correct default string):
-  AssertEqual 'gcc -S -x f95 -fsyntax-only -ffree-form -Wall -',
-  \ join(split(ale_linters#fortran#gcc#GetCommand(1)))
+  AssertLinter 'gcc', 'gcc -S -x f95 -fsyntax-only -ffree-form -Wall -'
 
 Execute(The fortran gcc command callback should let you set options):
   let g:ale_fortran_gcc_options = '-Wotherthings'
 
-  AssertEqual 'gcc -S -x f95 -fsyntax-only -ffree-form -Wotherthings -',
-  \ join(split(ale_linters#fortran#gcc#GetCommand(1)))
+  AssertLinter 'gcc', 'gcc -S -x f95 -fsyntax-only -ffree-form -Wotherthings -'
 
 Execute(The fortran gcc command callback should let you use -ffixed-form):
   let g:ale_fortran_gcc_use_free_form = 0
 
-  AssertEqual 'gcc -S -x f95 -fsyntax-only -ffixed-form -Wall -',
-  \ join(split(ale_linters#fortran#gcc#GetCommand(1)))
+  AssertLinter 'gcc', 'gcc -S -x f95 -fsyntax-only -ffixed-form -Wall -'
 
 Execute(The fortran executable should be configurable):
   let g:ale_fortran_gcc_executable = 'gfortran'
 
-  AssertEqual 'gfortran', ale_linters#fortran#gcc#GetExecutable(1)
-  AssertEqual 'gfortran -S -x f95 -fsyntax-only -ffree-form -Wall -',
-  \ join(split(ale_linters#fortran#gcc#GetCommand(1)))
+  AssertLinter 'gfortran',
+  \ 'gfortran -S -x f95 -fsyntax-only -ffree-form -Wall -'