#3633 - Move linter tests into test/linter

26 files changed, 4 insertions, 81 deletions

diff --git a/test/fixers/test_autoimport_fixer_callback.vader b/test/fixers/test_autoimport_fixer_callback.vader
index 67dc46e9..edca5c38 100644
--- a/test/fixers/test_autoimport_fixer_callback.vader
+++ b/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'
 
diff --git a/test/fixers/test_autopep8_fixer_callback.vader b/test/fixers/test_autopep8_fixer_callback.vader
index 9ca90c41..46671eda 100644
--- a/test/fixers/test_autopep8_fixer_callback.vader
+++ b/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'
diff --git a/test/fixers/test_bibclean_fixer_callback.vader b/test/fixers/test_bibclean_fixer_callback.vader
index dd1313d2..88412eca 100644
--- a/test/fixers/test_bibclean_fixer_callback.vader
+++ b/test/fixers/test_bibclean_fixer_callback.vader
@@ -12,7 +12,7 @@ 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'},
@@ -20,7 +20,7 @@ Execute(The bibclean callback should return the correct default values):
 
 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
   \ {
diff --git a/test/fixers/test_black_fixer_callback.vader b/test/fixers/test_black_fixer_callback.vader
index 6e9f3de7..665ba78b 100644
--- a/test/fixers/test_black_fixer_callback.vader
+++ b/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'
 
diff --git a/test/fixers/test_clangformat_fixer_callback.vader b/test/fixers/test_clangformat_fixer_callback.vader
index 3e4546d1..130ca7f7 100644
--- a/test/fixers/test_clangformat_fixer_callback.vader
+++ b/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:
diff --git a/test/fixers/test_clangtidy_fixer_callback.vader b/test/fixers/test_clangtidy_fixer_callback.vader
index 7a04e801..d6678bd9 100644
--- a/test/fixers/test_clangtidy_fixer_callback.vader
+++ b/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
diff --git a/test/fixers/test_fecs_fixer_callback.vader b/test/fixers/test_fecs_fixer_callback.vader
index b218e550..146c0a87 100644
--- a/test/fixers/test_fecs_fixer_callback.vader
+++ b/test/fixers/test_fecs_fixer_callback.vader
@@ -8,8 +8,6 @@ After:
 Execute(The fecs fixer should respect to g:ale_javascript_fecs_executable):
   let g:ale_javascript_fecs_executable = '../test-files/fecs/fecs'
   let g:ale_javascript_fecs_use_global = 1
-  silent cd ../command_callback
-  let g:dir = getcwd()
 
   AssertEqual
   \ {
diff --git a/test/fixers/test_html_beautify_fixer_callback.vader b/test/fixers/test_html_beautify_fixer_callback.vader
index 372572e4..3012c7f1 100644
--- a/test/fixers/test_html_beautify_fixer_callback.vader
+++ b/test/fixers/test_html_beautify_fixer_callback.vader
@@ -1,10 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('html', 'html-beautify', 'beautify')
 
-  call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-
 After:
   Restore
 
diff --git a/test/fixers/test_isort_fixer_callback.vader b/test/fixers/test_isort_fixer_callback.vader
index 5f3cc447..9e112c03 100644
--- a/test/fixers/test_isort_fixer_callback.vader
+++ b/test/fixers/test_isort_fixer_callback.vader
@@ -1,9 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('python', 'isort')
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
 After:
diff --git a/test/fixers/test_php_cs_fixer.vader b/test/fixers/test_php_cs_fixer.vader
index 550f453c..eb4d78f8 100644
--- a/test/fixers/test_php_cs_fixer.vader
+++ b/test/fixers/test_php_cs_fixer.vader
@@ -5,9 +5,6 @@ Before:
   let g:ale_php_cs_fixer_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_phpcbf_fixer_callback.vader b/test/fixers/test_phpcbf_fixer_callback.vader
index 2d44a44d..45229a1b 100644
--- a/test/fixers/test_phpcbf_fixer_callback.vader
+++ b/test/fixers/test_phpcbf_fixer_callback.vader
@@ -9,9 +9,6 @@ Before:
   let g:ale_php_phpcbf_use_global = 0
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
@@ -75,9 +72,6 @@ Before:
   let g:ale_php_phpcbf_use_global = 0
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_prettier_fixer_callback.vader b/test/fixers/test_prettier_fixer_callback.vader
index 7e7b661d..8da13fcd 100644
--- a/test/fixers/test_prettier_fixer_callback.vader
+++ b/test/fixers/test_prettier_fixer_callback.vader
@@ -4,10 +4,6 @@ Before:
 
   let g:ale_command_wrapper = ''
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
-
 After:
   call ale#assert#TearDownFixerTest()
 
diff --git a/test/fixers/test_prettier_standard_callback.vader b/test/fixers/test_prettier_standard_callback.vader
index d0cf4ecf..f5037ed6 100644
--- a/test/fixers/test_prettier_standard_callback.vader
+++ b/test/fixers/test_prettier_standard_callback.vader
@@ -1,10 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('javascript', 'prettier_standard')
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
-
 After:
   call ale#assert#TearDownFixerTest()
 
diff --git a/test/fixers/test_puppetlint_fixer_callback.vader b/test/fixers/test_puppetlint_fixer_callback.vader
index 5ccb0137..1a5a6cea 100644
--- a/test/fixers/test_puppetlint_fixer_callback.vader
+++ b/test/fixers/test_puppetlint_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_puppet_puppetlint_options = '--invalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_reorder_python_imports_fixer_callback.vader b/test/fixers/test_reorder_python_imports_fixer_callback.vader
index 74f3715d..ead2da77 100644
--- a/test/fixers/test_reorder_python_imports_fixer_callback.vader
+++ b/test/fixers/test_reorder_python_imports_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_python_reorder_python_imports_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'
 
diff --git a/test/fixers/test_rubocop_fixer_callback.vader b/test/fixers/test_rubocop_fixer_callback.vader
index 2029df23..5b5375ae 100644
--- a/test/fixers/test_rubocop_fixer_callback.vader
+++ b/test/fixers/test_rubocop_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_ruby_rubocop_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_rufo_fixer_callback.vader b/test/fixers/test_rufo_fixer_callback.vader
index 54361784..3d539f7a 100644
--- a/test/fixers/test_rufo_fixer_callback.vader
+++ b/test/fixers/test_rufo_fixer_callback.vader
@@ -4,8 +4,7 @@ Before:
   " Use an invalid global executable, so we don't match it.
   let g:ale_ruby_rufo_executable = 'xxxinvalid'
 
-  call ale#test#SetDirectory('/testplugin/test/command_callback')
-  let g:dir = getcwd()
+  call ale#test#SetDirectory('/testplugin/test/fixers')
 
 After:
   Restore
diff --git a/test/fixers/test_scalafmt_fixer_callback.vader b/test/fixers/test_scalafmt_fixer_callback.vader
index 94f544a1..2b8dc3eb 100644
--- a/test/fixers/test_scalafmt_fixer_callback.vader
+++ b/test/fixers/test_scalafmt_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_scala_scalafmt_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_sorbet_fixer_callback.vader b/test/fixers/test_sorbet_fixer_callback.vader
index deb2b4e0..2694a3dc 100644
--- a/test/fixers/test_sorbet_fixer_callback.vader
+++ b/test/fixers/test_sorbet_fixer_callback.vader
@@ -1,4 +1,3 @@
-
 Before:
   Save g:ale_ruby_sorbet_executable
   Save g:ale_ruby_sorbet_options
@@ -8,9 +7,6 @@ Before:
   let g:ale_ruby_sorbet_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_standardrb_fixer_callback.vader b/test/fixers/test_standardrb_fixer_callback.vader
index 31684c29..ff82b8f1 100644
--- a/test/fixers/test_standardrb_fixer_callback.vader
+++ b/test/fixers/test_standardrb_fixer_callback.vader
@@ -7,9 +7,6 @@ Before:
   let g:ale_ruby_standardrb_options = ''
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_swiftformat_fixer_callback.vader b/test/fixers/test_swiftformat_fixer_callback.vader
index d307c2b1..755c30f6 100644
--- a/test/fixers/test_swiftformat_fixer_callback.vader
+++ b/test/fixers/test_swiftformat_fixer_callback.vader
@@ -5,9 +5,6 @@ Before:
   let g:ale_swift_swiftformat_executable = 'xxxinvalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_tidy_fixer_callback.vader b/test/fixers/test_tidy_fixer_callback.vader
index a588d75e..25d3d6c3 100644
--- a/test/fixers/test_tidy_fixer_callback.vader
+++ b/test/fixers/test_tidy_fixer_callback.vader
@@ -5,10 +5,6 @@ Before:
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
-
 After:
   Restore
 
diff --git a/test/fixers/test_tslint_fixer_callback.vader b/test/fixers/test_tslint_fixer_callback.vader
index 2bcbddf7..43fcc5a4 100644
--- a/test/fixers/test_tslint_fixer_callback.vader
+++ b/test/fixers/test_tslint_fixer_callback.vader
@@ -8,10 +8,7 @@ Before:
   unlet! b:ale_typescript_tslint_config_path
 
   call ale#handlers#tslint#InitVariables()
-
-  call ale#test#SetDirectory('/testplugin/test/command_callback')
-  silent cd ..
-  silent cd command_callback
+  call ale#test#SetDirectory('/testplugin/test/fixers')
 
 After:
   Restore
diff --git a/test/fixers/test_uncrustify_fixer_callback.vader b/test/fixers/test_uncrustify_fixer_callback.vader
index 6c7f6b5d..26b5f892 100644
--- a/test/fixers/test_uncrustify_fixer_callback.vader
+++ b/test/fixers/test_uncrustify_fixer_callback.vader
@@ -5,9 +5,6 @@ Before:
   let g:ale_c_uncrustify_executable = 'xxxinvalid'
 
   call ale#test#SetDirectory('/testplugin/test/fixers')
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
 
 After:
   Restore
diff --git a/test/fixers/test_yamlfix_fixer_callback.vader b/test/fixers/test_yamlfix_fixer_callback.vader
index 4038de16..1ae5e335 100644
--- a/test/fixers/test_yamlfix_fixer_callback.vader
+++ b/test/fixers/test_yamlfix_fixer_callback.vader
@@ -1,10 +1,6 @@
 Before:
   call ale#assert#SetUpFixerTest('yaml', 'yamlfix')
 
-  silent cd ..
-  silent cd command_callback
-  let g:dir = getcwd()
-
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
 After:
diff --git a/test/fixers/test_yapf_fixer_callback.vader b/test/fixers/test_yapf_fixer_callback.vader
index 2f7a12b7..a7fcc07b 100644
--- a/test/fixers/test_yapf_fixer_callback.vader
+++ b/test/fixers/test_yapf_fixer_callback.vader
@@ -5,9 +5,6 @@ Before:
   let g:ale_python_yapf_executable = 'xxxinvalid'
 
   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'