#3633 - Move linter tests into test/linter

2025-12-16 01:07:06 +08:00 · 2021-03-21 00:21:49 +00:00
parent 35caaecc9f
commit f7852dbd0a
256 changed files with 40 additions and 144 deletions
--- 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'

--- 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'
--- 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
  \ {
--- 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'

--- 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:
--- 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
--- 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
  \ {
--- 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

--- 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:
--- 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
--- 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
--- 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()

--- 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()

--- 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
--- 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'

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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:
--- 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'