1 files changed, 8 insertions, 22 deletions
diff --git a/test/command_callback/test_phpstan_command_callbacks.vader b/test/command_callback/test_phpstan_command_callbacks.vader
index 169c5bb7..c7db587a 100644
--- a/test/command_callback/test_phpstan_command_callbacks.vader
+++ b/test/command_callback/test_phpstan_command_callbacks.vader
@@ -1,38 +1,24 @@
 Before:
-  Save g:ale_php_phpstan_executable
-  Save g:ale_php_phpstan_level
-  Save g:ale_php_phpstan_configuration
-
-  unlet! g:ale_php_phpstan_executable
-  unlet! g:ale_php_phpstan_level
-  unlet! g:ale_php_phpstan_configuration
-
-  runtime ale_linters/php/phpstan.vim
+  call ale#assert#SetUpLinterTest('php', 'phpstan')
 
 After:
-  Restore
-
-  call ale#linter#Reset()
+  call ale#assert#TearDownLinterTest()
 
 Execute(Custom executables should be used for the executable and command):
   let g:ale_php_phpstan_executable = 'phpstan_test'
 
-  AssertEqual 'phpstan_test', ale_linters#php#phpstan#GetExecutable(bufnr(''))
-  AssertEqual
-  \ ale#Escape('phpstan_test') . ' analyze -l4 --errorFormat raw %s',
-  \ ale_linters#php#phpstan#GetCommand(bufnr(''))
+  AssertLinter 'phpstan_test',
+  \ ale#Escape('phpstan_test') . ' analyze -l4 --errorFormat raw %s'
 
 Execute(project with level set to 3):
   call ale#test#SetFilename('phpstan-test-files/foo/test.php')
   let g:ale_php_phpstan_level = 3
 
-  AssertEqual
-  \ ale#Escape('phpstan') . ' analyze -l3 --errorFormat raw %s',
-  \ ale_linters#php#phpstan#GetCommand(bufnr(''))
+  AssertLinter 'phpstan',
+  \ ale#Escape('phpstan') . ' analyze -l3 --errorFormat raw %s'
 
 Execute(Custom phpstan configuration file):
   let g:ale_php_phpstan_configuration = 'phpstan_config'
 
-  AssertEqual
-  \ ale#Escape('phpstan') . ' analyze -l4 --errorFormat raw -c phpstan_config %s',
-  \ ale_linters#php#phpstan#GetCommand(bufnr(''))
+  AssertLinter 'phpstan',
+  \ ale#Escape('phpstan') . ' analyze -l4 --errorFormat raw -c phpstan_config %s'