1 files changed, 5 insertions, 30 deletions
diff --git a/test/command_callback/test_tslint_command_callback.vader b/test/command_callback/test_tslint_command_callback.vader
index 0c2f3abf..bd8a12ec 100644
--- a/test/command_callback/test_tslint_command_callback.vader
+++ b/test/command_callback/test_tslint_command_callback.vader
@@ -1,43 +1,19 @@
 Before:
-  call ale#assert#Init()
-
-  Save g:ale_typescript_tslint_executable
-  Save g:ale_typescript_tslint_config_path
-  Save g:ale_typescript_tslint_rules_dir
-  Save g:ale_typescript_tslint_use_global
-
-  unlet! g:ale_typescript_tslint_executable
-  unlet! g:ale_typescript_tslint_config_path
-  unlet! g:ale_typescript_tslint_rules_dir
-  unlet! g:ale_typescript_tslint_use_global
-
-  runtime ale_linters/typescript/tslint.vim
-
-  call ale#test#SetDirectory('/testplugin/test/command_callback')
+  call ale#assert#SetUpLinterTest('typescript', 'tslint')
   call ale#test#SetFilename('test.ts')
 
 After:
-  Restore
-
-  unlet! b:ale_typescript_tslint_executable
-  unlet! b:ale_typescript_tslint_config_path
-  unlet! b:ale_typescript_tslint_rules_dir
-  unlet! b:ale_typescript_tslint_use_global
-
-  call ale#test#RestoreDirectory()
-  call ale#linter#Reset()
+  call ale#assert#TearDownLinterTest()
 
 Execute(The default tslint command should be correct):
-  AssertLinter
-  \ 'tslint',
+  AssertLinter 'tslint',
   \ 'cd ' . ale#Escape(expand('%:p:h')) . ' && '
   \   . ale#Escape('tslint') . ' --format json %t'
 
 Execute(The rules directory option should be included if set):
   let b:ale_typescript_tslint_rules_dir = '/foo/bar'
 
-  AssertLinter
-  \ 'tslint',
+  AssertLinter 'tslint',
   \ 'cd ' . ale#Escape(expand('%:p:h')) . ' && '
   \   . ale#Escape('tslint') . ' --format json'
   \   . ' -r ' . ale#Escape('/foo/bar')
@@ -46,7 +22,6 @@ Execute(The rules directory option should be included if set):
 Execute(The executable should be configurable and escaped):
   let b:ale_typescript_tslint_executable = 'foo bar'
 
-  AssertLinter
-  \ 'foo bar',
+  AssertLinter 'foo bar',
   \ 'cd ' . ale#Escape(expand('%:p:h')) . ' && '
   \   . ale#Escape('foo bar') . ' --format json %t'