From b1d833417bcb57e265e0d01df07b28f463529d4b Mon Sep 17 00:00:00 2001 From: w0rp Date: Sat, 20 Mar 2021 22:11:22 +0000 Subject: [PATCH] #3633 - Put all dummy test files in test/test-files --- doc/ale-development.txt | 4 + .../test_alex_command_callback.vader | 14 +- .../test_angular_command_callback.vader | 18 +-- ..._asciidoc_textlint_command_callbacks.vader | 16 +-- .../test_bandit_command_callback.vader | 8 +- .../test_bingo_command_callback.vader | 10 +- .../test_brakeman_command_callback.vader | 14 +- .../test_c_ccls_command_callbacks.vader | 22 ++-- .../test_c_clangd_command_callbacks.vader | 8 +- .../test_c_cppcheck_command_callbacks.vader | 18 +-- .../test_c_cquery_command_callbacks.vader | 8 +- .../test_c_import_paths.vader | 44 +++---- .../test_cargo_command_callbacks.vader | 10 +- .../test_checkstyle_command_callback.vader | 14 +- .../test_cpp_ccls_command_callbacks.vader | 22 ++-- .../test_cpp_cppcheck_command_callbacks.vader | 18 +-- .../test_cpp_cquery_command_callbacks.vader | 8 +- .../test_cucumber_command_callback.vader | 4 +- .../test_dartanalyzer_command_callback.vader | 4 +- .../test_dialyxir_command_callback.vader | 8 +- .../test_dogma_command_callback.vader | 8 +- .../test_elixir_credo_command_callback.vader | 8 +- .../test_elixir_ls_command_callbacks.vader | 4 +- .../test_elixir_mix_command_callbacks.vader | 8 +- .../test_elm_ls_command_callbacks.vader | 8 +- .../test_elm_make_command_callback.vader | 34 ++--- .../test_erb_command_callback.vader | 4 +- .../test_erubi_command_callback.vader | 4 +- .../test_erubis_command_callback.vader | 4 +- .../test_eslint_command_callback.vader | 38 +++--- .../test_flake8_command_callback.vader | 32 ++--- .../test_flow_command_callback.vader} | 12 +- .../test_fortran_fortls_callback.vader | 4 +- .../test_gitlint_command_callback.vader | 8 +- .../test_gofmt_command_callback.vader | 2 +- .../test_golangserver_command_callback.vader | 16 +-- .../test_gopls_command_callback.vader | 8 +- .../test_gosimple_command_callback.vader | 2 +- .../test_gotype_command_callback.vader | 2 +- .../test_haml_hamllint_command_callback.vader | 14 +- ...haskell_stack_build_command_callback.vader | 2 +- ...t_haskell_stack_ghc_command_callback.vader | 2 +- ...test_html_stylelint_command_callback.vader | 6 +- .../test_htmlhint_command_callback.vader | 10 +- .../test_ink_ls_command_callbacks.vader | 4 +- .../test_inko_inko_callbacks.vader | 6 +- .../test_javac_command_callback.vader | 68 +++++----- ...javascript_tsserver_command_callback.vader | 8 +- .../test_julia_languageserver_callbacks.vader | 4 +- ...tlin_languageserver_command_callback.vader | 15 +++ ...test_less_stylelint_command_callback.vader | 6 +- .../test_lessc_command_callback.vader | 10 +- .../test_mypy_command_callback.vader | 20 +-- .../test_objc_ccls_command_callbacks.vader | 22 ++-- .../test_ocaml_ocamllsp_callbacks.vader | 8 +- .../test_ocaml_ols_callbacks.vader | 12 +- ...st_php_intelephense_command_callback.vader | 14 +- .../test_php_langserver_callbacks.vader | 16 +-- .../test_phpcs_command_callback.vader | 8 +- .../test_prospector_command_callback.vader | 2 +- .../test_psalm_command_callbacks.vader | 28 +--- .../test_puglint_command_callback.vader | 36 +++--- ...test_purescript_ls_command_callbacks.vader | 12 +- .../test_pycodestyle_command_callback.vader | 2 +- .../test_pydocstyle_command_callback.vader | 2 +- .../test_pyflakes_command_callback.vader | 8 +- .../test_pylama_command_callback.vader | 20 +-- .../test_pylint_command_callback.vader | 16 +-- .../test_pyls_command_callback.vader | 8 +- .../test_pyre_command_callback.vader | 8 +- .../test_pyright_command_callback.vader | 20 +-- .../test_r_languageserver_callbacks.vader | 4 +- ...ails_best_practices_command_callback.vader | 6 +- .../test_reason_ls_command_callback.vader | 4 +- .../test_reason_ols_callbacks.vader | 12 +- .../test_remark_lint_command_callbacks.vader | 8 +- .../test_rnix_command_callback.vader} | 2 - .../test_rst_textlint_command_callbacks.vader | 16 +-- .../test_ruby_solargraph.vader | 16 +-- .../test_rust_analyzer_callbacks.vader | 4 +- .../test_rust_rls_callbacks.vader | 4 +- .../test_rustc_command_callback.vader | 6 +- .../test_sass_sasslint_command_callback.vader | 8 +- test/command_callback/test_scala_metals.vader | 6 +- .../test_scala_sbtserver.vader | 6 +- .../test_scss_sasslint_command_callback.vader | 8 +- ...test_scss_stylelint_command_callback.vader | 6 +- .../test_slimlint_command_callback.vader | 4 +- .../test_spectral_command_callback.vader | 6 +- .../test_standard_command_callback.vader | 8 +- .../test_standardts_command_callback.vader | 8 +- ...t_sugarss_stylelint_command_callback.vader | 6 +- .../test_swaglint_command_callback.vader | 6 +- ...swift_sourcekitlsp_command_callbacks.vader | 4 +- ..._swift_swiftformat_command_callbacks.vader | 6 +- .../test_swiftlint_command_callback.vader | 43 ++++++ .../test_terraform_ls_command_callback.vader | 2 +- .../test_terraform_lsp_command_callback.vader | 2 +- ...st_terraform_tflint_command_callback.vader | 4 +- .../test_tex_textlint_command_callbacks.vader | 16 +-- .../test_texlab_command_callbacks.vader | 6 +- .../test_textlint_command_callbacks.vader | 16 +-- .../test_typescript_deno_lsp.vader | 33 ++--- test/command_callback/test_vim_vimls.vader | 26 ++-- .../test_vulture_command_callback.vader | 12 +- .../test_write_good_command_callback.vader | 14 +- .../test_zig_zls_callbacks.vader | 4 +- test/compile_database_perf/test.sh | 29 ----- test/fixers/test_astyle_fixer_callback.vader | 4 +- .../test_autoimport_fixer_callback.vader | 8 +- .../fixers/test_autopep8_fixer_callback.vader | 8 +- .../fixers/test_bibclean_fixer_callback.vader | 4 +- test/fixers/test_black_fixer_callback.vader | 14 +- ...est_break_up_long_lines_python_fixer.vader | 2 +- .../test_buildifier_fixer_callback.vader | 8 +- .../test_clangformat_fixer_callback.vader | 8 +- .../test_clangtidy_fixer_callback.vader | 4 +- test/fixers/test_dartfmt_fixer_callback.vader | 4 +- test/fixers/test_dfmt_fixer_callback.vader | 4 +- .../test_elm_format_fixer_callback.vader | 16 +-- test/fixers/test_eslint_fixer_callback.vader | 76 +++++------ test/fixers/test_fecs_fixer_callback.vader | 2 +- .../test_fish_indent_fixer_callback.vader | 4 +- test/fixers/test_fixjson_fixer_callback.vader | 2 +- test/fixers/test_gnatpp_fixer_callback.vader | 4 +- test/fixers/test_gofmt_fixer_callback.vader | 6 +- .../test_goimports_fixer_callback.vader | 2 +- test/fixers/test_gomod_fixer_callback.vader | 4 +- .../fixers/test_importjs_fixer_callback.vader | 2 +- test/fixers/test_isort_fixer_callback.vader | 10 +- test/fixers/test_ktlint_fixer_callback.vader | 4 +- .../test_latexindent_fixer_callback.vader | 4 +- test/fixers/test_luafmt_fixer_callback.vader | 4 +- .../test_mix_format_fixer_callback.vader | 4 +- .../test_ocamlformat_fixer_callback.vader | 4 +- .../test_ocp_indent_fixer_callback.vader | 4 +- test/fixers/test_php_cs_fixer.vader | 12 +- test/fixers/test_phpcbf_fixer_callback.vader | 36 +++--- .../test_prettier_eslint_fixer.callback.vader | 10 +- .../fixers/test_prettier_fixer_callback.vader | 46 +++---- .../test_prettier_standard_callback.vader | 2 +- .../test_puppetlint_fixer_callback.vader | 2 +- test/fixers/test_refmt_fixer_callback.vader | 4 +- ...eorder_python_imports_fixer_callback.vader | 8 +- test/fixers/test_rubocop_fixer_callback.vader | 14 +- test/fixers/test_rufo_fixer_callback.vader | 4 +- test/fixers/test_rustfmt_fixer_callback.vader | 30 +---- .../fixers/test_scalafmt_fixer_callback.vader | 8 +- test/fixers/test_sorbet_fixer_callback.vader | 4 +- .../fixers/test_standard_fixer_callback.vader | 4 +- .../test_standardrb_fixer_callback.vader | 10 +- .../test_stylelint_fixer_callback.vader | 8 +- .../test_swiftformat_fixer_callback.vader | 4 +- .../fixers/test_textlint_fixer_callback.vader | 4 +- test/fixers/test_tidy_fixer_callback.vader | 4 +- test/fixers/test_tslint_fixer_callback.vader | 4 +- .../test_uncrustify_fixer_callback.vader | 4 +- test/fixers/test_xo_fixer_callback.vader | 12 +- test/fixers/test_xots_fixer_callback.vader | 12 +- test/fixers/test_yamlfix_fixer_callback.vader | 8 +- test/fixers/test_yapf_fixer_callback.vader | 10 +- test/handler/test_brakeman_handler.vader | 2 +- test/handler/test_lacheck_handler.vader | 2 +- .../test_rails_best_practices_handler.vader | 2 +- test/handler/test_terraform_handler.vader | 2 +- test/{ => script}/dumb_named_pipe_server.py | 0 test/{ => script}/dumb_tcp_client.py | 0 test/{ => script}/dumb_tcp_server.py | 0 test/test-files/.gitignore | 2 + .../ada}/testfile.adb | 0 .../node-modules-2}/node_modules/alex/cli.js | 0 .../alex/node-modules}/node_modules/.bin/alex | 0 .../@angular/language-server/bin/ngserver} | 0 .../@angular/language-service}/dummy | 0 .../ant/ant-project/build.xml} | 0 .../bin/ant.exe => test-files/ant/bin/ant} | 0 .../BUILD => test-files/ant/bin/ant.exe} | 0 .../WORKSPACE => test-files/bazel/BUILD} | 0 .../defs.bzl => test-files/bazel/WORKSPACE} | 0 .../dummy.bib => test-files/bazel/defs.bzl} | 0 .../dummy.c => test-files/bib/dummy.bib} | 0 .../build/bad_folder_to_test_priority} | 0 .../build}/compile_commands.json | 0 .../c/configure_project/Makefile} | 0 .../c/configure_project/configure} | 0 .../c/configure_project/include/test.h} | 0 .../c/configure_project/subdir/Makefile} | 0 .../c/dummy.c} | 0 .../git_and_nested_makefiles/include/test.h} | 0 .../c/git_and_nested_makefiles/src/Makefile} | 0 .../c/gnumakefile_project/GNUmakefile} | 0 .../c/gnumakefile_project}/file.c | 0 .../c/h_file_project/Makefile} | 0 .../c/h_file_project/subdir}/dummy | 0 .../c/h_file_project/test.h} | 0 .../c/hpp_file_project/Makefile} | 0 .../c/hpp_file_project/subdir}/dummy | 0 .../c/hpp_file_project/test.hpp} | 0 .../json_project}/build/compile_commands.json | 0 .../c/json_project/include/test.h} | 0 .../c/json_project/subdir}/dummy | 0 .../c/makefile_project/Makefile} | 0 .../c/makefile_project/_astylerc} | 0 .../c}/makefile_project/args | 0 .../c/makefile_project/include/test.h} | 0 .../c}/makefile_project/subdir/args | 0 .../c/makefile_project/subdir}/dummy | 0 .../c/makefile_project/subdir/file.c} | 0 .../app.ex => test-files/cargo/Cargo.toml} | 0 .../cargo/workspace_paths/Cargo.toml} | 0 .../cargo/workspace_paths/subpath/Cargo.toml} | 0 .../compile_commands.json} | 0 .../ccls/with_ccls-root/.ccls-root} | 0 .../ccls/with_ccls/.ccls} | 0 .../compile_commands.json} | 0 .../checkstyle/other_config.xml} | 0 .../compile_commands.json} | 0 .../compile_commands.json} | 0 .../with_clangformat/.clang-format} | 0 .../cpp/.astylerc} | 0 .../test.html => test-files/cpp/dummy.cpp} | 0 .../cppcheck/one/compile_commands.json} | 0 .../cppcheck/one/two/three/file.c} | 0 .../cppcheck/one/two/three/file.cpp} | 0 .../build/compile_commands.json} | 0 .../cquery/build/compile_commands.json} | 0 .../cquery/with_cquery/.cquery} | 0 .../csslint/other-app/testfile.css} | 0 .../csslint/some-app/.csslintrc} | 0 .../csslint/some-app/subdir/testfile.css} | 0 .../cucumber/features/cuke.feature} | 0 .../features/step_definitions/base_steps.rb} | 0 .../ols_paths/.merlin => test-files/d/test.d} | 0 .../dart/.packages} | 0 .../dart/testfile.dart} | 0 .../elixir/mix_project/lib/app.ex} | 0 .../elixir}/mix_project/mix.exs | 0 .../elixir/testfile.ex} | 0 .../umbrella_project/apps/app1/lib/app.ex} | 0 .../umbrella_project/apps/app1/mix.exs} | 0 .../umbrella_project/apps/app2/lib/app.ex} | 0 .../umbrella_project/apps/app2/mix.exs} | 0 .../elixir/umbrella_project/mix.exs} | 0 .../elm/newapp-notests/elm.json} | 0 .../elm/newapp-notests/node_modules/.bin/elm} | 0 .../elm/newapp-notests/tests/TestMain.elm} | 0 .../psalm => test-files/elm/newapp/elm.json} | 0 .../elm/newapp/node_modules/.bin/elm} | 0 .../elm/newapp/node_modules/.bin/elm-test} | 0 .../elm/newapp/src/Main.elm} | 0 .../elm/newapp/tests/TestSuite.elm} | 0 .../elm/node_modules/.bin/elm-format} | 0 .../elm/oldapp/elm-package.json} | 0 .../elm/oldapp/node_modules/.bin/elm} | 0 .../elm/oldapp/node_modules/.bin/elm-test} | 0 .../elm/oldapp/src/Main.elm} | 0 .../elm/oldapp/tests/TestSuite.elm} | 0 .../elm/src/subdir/testfile.elm} | 0 .../node_modules/.bin/eslint_d} | 0 .../eslint/node_modules/.bin/eslint} | 0 .../eslint/other-app/subdir/testfile.js} | 0 .../eslint/package.json} | 0 .../eslint/react-app/.eslintrc.js} | 0 .../node_modules/eslint/bin/eslint.js} | 0 .../node_modules/standard/bin/cmd.js | 0 .../node_modules/stylelint/bin/stylelint.js} | 0 .../eslint/react-app/node_modules/xo/cli.js} | 0 .../react-app/subdir-with-config/.eslintrc} | 0 .../node_modules/.gitkeep} | 0 .../subdir-with-package-json/package.json} | 0 .../eslint/react-app/subdir}/testfile.css | 0 .../eslint/react-app/subdir/testfile.js} | 0 .../eslint/react-app/subdir/testfile.ts} | 0 .../foo/__init__.py => test-files/fecs/fecs} | 0 .../foo/bar.py => test-files/fecs/fecs.exe} | 0 .../fish/testfile.fish} | 0 .../flow/a/.flowconfig} | 0 .../flow/a/sub/dummy} | 0 .../flow/b/sub/dummy} | 0 .../fortls-project}/.fortls | 0 test/{go_files => test-files/go}/go.mod | 0 .../go/go1/prj1/file.go} | 0 .../go/go2/prj2/file.go} | 0 .../go/testfile.go} | 0 .../black.exe => test-files/go/testfile2.go} | 0 .../gradle/build-gradle-project/build.gradle} | 0 .../src/main/kotlin/dummy.kt} | 0 .../isort.exe => test-files/gradle/gradle} | 0 .../src/main/kotlin/dummy.kt} | 0 .../settings-gradle-project/settings.gradle} | 0 .../src/main/kotlin/dummy.kt} | 0 .../gradle/unwrapped-project/build.gradle} | 0 .../gradle/unwrapped-project/settings.gradle} | 0 .../src/main/kotlin/dummy.kt} | 0 .../gradle/wrapped-project/build.gradle} | 0 .../gradle/wrapped-project/gradlew} | 0 .../gradle/wrapped-project/settings.gradle} | 0 .../wrapped-project/src/main/kotlin/dummy.kt} | 0 .../haml-lint-and-rubocop/.haml-lint.yml} | 0 .../haml-lint-and-rubocop}/.rubocop.yml | 0 .../haml-lint-and-rubocop/subdir/file.haml} | 0 .../hamllint/haml-lint-yml/.haml-lint.yml} | 0 .../hamllint/haml-lint-yml/subdir/file.haml} | 0 .../hamllint/rubocop-yml/.rubocop.yml} | 0 .../hamllint/rubocop-yml/subdir/file.haml} | 0 .../isort => test-files/hdl_server/foo.vhd} | 0 .../with_config_file/.hdl_checker.config} | 0 .../with_config_file/_hdl_checker.config} | 0 .../hdl_server/with_config_file/foo.vhd} | 0 .../hdl_server/with_git/files/foo.vhd | 0 .../html_beautify/html-beautify} | 0 .../html_beautify}/test.html | 0 .../htmlhint/node_modules/.bin/htmlhint} | 0 .../htmlhint/with_config/.htmlhintrc} | 0 .../ink/story/main.ink} | 0 .../bin/vulture => test-files/inko/test.inko} | 0 .../inko/tests/test/test_foo.inko} | 0 .../src/test/java/com/something}/dummy | 0 .../src/main/java/com/something}/dummy | 0 .../src/main/jaxb/com/something/dummy} | 0 .../build/gen/main/java/com/something/dummy} | 0 .../build/gen2/main/java/com/something/dummy} | 0 .../src/main/java/com/something/dummy} | 0 .../src/test/java/com/something/dummy} | 0 .../javascript/test.js} | 0 .../json}/testfile.json | 0 .../app-without-jsonlint/src/app.json} | 0 .../jsonlint/app/node_modules/.bin/jsonlint} | 0 .../jsonlint/app/src/app.json} | 0 .../node_modules/jsonlint/lib}/cli.js | 0 .../julia/REQUIRE} | 0 .../Cargo.toml => test-files/julia/test.jl} | 0 .../kotlin/testfile.kt} | 0 .../lessc/node_modules/.bin/lessc} | 0 .../long-line}/setup.cfg | 0 .../lua/testfile.lua} | 0 .../markdown/testfile.md} | 0 .../maven/maven-java-project/module1/mvnw} | 0 .../maven-java-project/module1/mvnw.cmd} | 0 .../maven}/maven-java-project/module1/pom.xml | 0 .../module1/src/main/java/dummy1.java} | 0 .../maven}/maven-java-project/module2/pom.xml | 0 .../module2/src/main/java/dummy2.java} | 0 .../maven}/maven-kotlin-project/pom.xml | 0 .../src/main/kotlin/dummy.kt | 0 .../.bin/stylelint => test-files/maven/mvn} | 0 .../src/main/java/dummy.java} | 0 .../nim/with-git/src/source.nim} | 0 .../ocaml/testfile.ml} | 0 .../ocamllsp/dune-project} | 0 .../sample2.tex => test-files/ols/.merlin} | 0 .../node_modules/.bin/ocaml-language-server} | 0 .../php/project-with-php-cs-fixer/test.php} | 0 .../vendor/bin/php-cs-fixer} | 0 .../php/project-with-phpcbf/foo/test.php} | 0 .../project-with-phpcbf/vendor/bin/phpcbf} | 0 .../project-without-php-cs-fixer/test.php} | 0 .../php/project-without-phpcbf/foo/test.php} | 0 .../php/vendor/bin/php-language-server.php} | 0 .../php/with-composer/composer.json} | 0 .../vendor/bin/php-language-server.php} | 0 .../vendor/bin/php-language-server.php} | 0 .../phpcs}/project-with-phpcs/foo/test.php | 0 .../project-with-phpcs/vendor/bin/phpcs | 0 .../phpcs}/project-without-phpcs/foo/test.php | 0 .../prettier}/testfile | 0 .../prettier}/testfile.css | 0 .../prettier}/testfile.js | 0 .../prettier}/testfile.json | 0 .../prettier}/testfile.scss | 0 .../prettier}/testfile.ts | 0 .../prettier}/with_config/.prettierrc | 0 .../prettier/with_config}/testfile.js | 0 .../with_prettierignore/.prettierignore | 0 .../with_prettierignore/src}/testfile.js | 0 .../psalm/vendor/bin/psalm} | 0 .../puglint/node_modules/.bin/pug-lint} | 0 .../puglint}/package.json | 0 .../puglint/puglint_rc_dir/.pug-lintrc} | 0 .../puglint/puglint_rc_js_dir/.pug-lintrc.js} | 0 .../puglint_rc_json_dir/.pug-lintrc.json} | 0 .../test.vim => test-files/puppet/dummy.pp} | 0 .../lib/puppet/types/exampletype.rb | 0 .../puppet}/new-style-module/metadata.json | 0 .../new-style-module/template/template.epp | 0 .../old-style-module/manifests/init.pp | 0 .../old-style-module/templates/template.epp | 0 .../purescript/bower/Foo.purs} | 0 .../purescript/bower/bower.json} | 0 .../purescript/psc-package/Foo.purs} | 0 .../purescript/psc-package/psc-package.json} | 0 .../purescript/spago/Foo.purs} | 0 .../purescript/spago/spago.dhall} | 0 .../namespace_package_manifest/MANIFEST.in | 0 .../namespace/foo/__init__.py} | 0 .../namespace/foo/bar.py} | 0 .../namespace/foo/__init__.py} | 0 .../namespace/foo/bar.py} | 0 .../namespace_package_pytest/pytest.ini | 0 .../namespace/foo/__init__.py} | 0 .../namespace/foo/bar.py} | 0 .../python}/namespace_package_setup/setup.cfg | 0 .../namespace/foo/__init__.py} | 0 .../namespace/foo/bar.py} | 0 .../python}/namespace_package_tox/tox.ini | 0 .../no_virtualenv/subdir/foo/COMMIT_EDITMSG} | 0 .../no_virtualenv/subdir/foo/__init__.py} | 0 .../python/no_virtualenv/subdir/foo/bar.py} | 0 .../python}/pipenv/Pipfile.lock | 0 .../python}/python-package-project/.flake8 | 0 .../package-name/module.py | 0 .../python/with_bandit/.bandit} | 0 .../with_bandit/namespace/foo/__init__.py} | 0 .../python/with_bandit/namespace/foo/bar.py} | 0 .../with_mypy_ini_and_pytest_ini/mypy.ini} | 0 .../tests/pytest.ini} | 0 .../tests/testsubfolder/my_tests.py} | 0 .../dir_with_yapf_config/.style.yapf} | 0 .../with_virtualenv/env/Scripts/activate} | 0 .../env/Scripts/autoimport.exe} | 0 .../with_virtualenv/env/Scripts/autopep8.exe} | 0 .../with_virtualenv/env/Scripts/black.exe} | 0 .../with_virtualenv/env/Scripts/flake8.exe} | 0 .../with_virtualenv/env/Scripts/gitlint.exe} | 0 .../with_virtualenv/env/Scripts/isort.exe} | 0 .../with_virtualenv/env/Scripts/mypy.exe} | 0 .../with_virtualenv/env/Scripts/pyflakes.exe} | 0 .../with_virtualenv/env/Scripts/pylama.exe} | 0 .../with_virtualenv/env/Scripts/pylint.exe} | 0 .../with_virtualenv/env/Scripts/pyls.exe} | 0 .../with_virtualenv/env/Scripts/pyre.exe} | 0 .../env/Scripts/reorder-python-imports.exe} | 0 .../with_virtualenv/env/Scripts/vulture.exe} | 0 .../with_virtualenv/env/Scripts/yamlfix.exe} | 0 .../with_virtualenv/env/Scripts/yapf.exe} | 0 .../python/with_virtualenv/env/bin/activate} | 0 .../with_virtualenv/env/bin/autoimport} | 0 .../python/with_virtualenv/env/bin/autopep8} | 0 .../python/with_virtualenv/env/bin/black} | 0 .../python/with_virtualenv/env/bin/flake8} | 0 .../python/with_virtualenv/env/bin/gitlint} | 0 .../python/with_virtualenv/env/bin/isort} | 0 .../python/with_virtualenv/env/bin/mypy} | 0 .../python/with_virtualenv/env/bin/pyflakes} | 0 .../python/with_virtualenv/env/bin/pylama} | 0 .../python/with_virtualenv/env/bin/pylint} | 0 .../python/with_virtualenv/env/bin/pyls} | 0 .../python/with_virtualenv/env/bin/pyre} | 0 .../env/bin/reorder-python-imports} | 0 .../python/with_virtualenv/env/bin/vulture} | 0 .../python/with_virtualenv/env/bin/yamlfix} | 0 .../python/with_virtualenv/env/bin/yapf} | 0 .../subdir/foo/COMMIT_EDITMSG} | 0 .../with_virtualenv/subdir/foo/__init__.py} | 0 .../python/with_virtualenv/subdir/foo/bar.py} | 0 .../with_virtualenv/subdir/foo/bar.pyi} | 0 .../.haml-lint.yml => test-files/r/.Rprofile} | 0 .../reasonml/bsconfig.json} | 0 .../reasonml}/testfile.re | 0 .../with_bin_path/node_modules/.bin/remark} | 0 .../app => test-files/ruby}/dummy.rb | 0 .../ruby}/not_a_rails_app/file.rb | 0 .../ruby/valid_rails_app/app}/dummy.rb | 0 .../ruby}/valid_rails_app/app/models/thing.rb | 0 .../app/views/my_great_view.html.erb | 0 .../ruby/valid_rails_app/config}/dummy.rb | 0 .../ruby/valid_rails_app/db/dummy.rb} | 0 .../ruby}/valid_ruby_app1/Rakefile | 0 .../ruby}/valid_ruby_app1/lib/file.rb | 0 .../ruby}/valid_ruby_app2/Gemfile | 0 .../ruby}/valid_ruby_app2/lib/file.rb | 0 .../ruby}/valid_ruby_app3/.solargraph.yml | 0 .../ruby}/valid_ruby_app3/lib/file.rb | 0 .../ruby/with_config}/.rubocop.yml | 0 .../ruby/with_config/.standard.yml} | 0 .../file.haml => test-files/rust/Cargo.toml} | 0 .../rust}/testfile.rs | 0 .../with-bin/node_modules/.bin/sass-lint} | 0 .../node_modules/sass-lint/bin/sass-lint.js} | 0 .../jsonlint => test-files/scala/dummy.scala} | 0 .../scala}/invalid_sbt_project/Main.scala | 0 .../scala}/valid_sbt_project/Main.scala | 0 .../scala}/valid_sbt_project/build.sbt | 0 .../slimlint}/.rubocop.yml | 0 .../slimlint}/subdir/file.slim | 0 test/{ => test-files}/smlnj/cm/foo.sml | 0 .../{ => test-files}/smlnj/cm/path/to/bar.sml | 0 test/{ => test-files}/smlnj/cm/sources.cm | 0 test/{ => test-files}/smlnj/file/qux.sml | 0 .../spectral/node_modules/.bin/spectral} | 0 .../spectral/openapi.yaml} | 0 .../stack/stack.yaml} | 0 .../with-bin/node_modules/.bin/standard} | 0 .../node_modules/standard/bin/cmd.js} | 0 .../stylelint/node_modules/.bin/stylelint} | 0 .../swaglint/docs/swagger.yaml} | 0 .../swaglint/node_modules/.bin/swaglint} | 0 .../folder => test-files/swift}/dummy.swift | 0 .../src/folder/dummy.swift | 0 .../swift-package-project/Package.swift | 0 .../src/folder/dummy.swift} | 0 .../Pods/SwiftLint/swiftlint | 0 .../ios/Pods/SwiftLint/swiftlint | 0 .../cocoapods/Pods/SwiftLint/swiftlint | 0 .../react-native/ios/Pods/SwiftLint/swiftlint | 0 .../terraform}/main.tf | 0 .../mvn => test-files/tex/sample1.tex} | 0 .../dummy.java => test-files/tex/sample2.tex} | 0 .../tex}/testfile.tex | 0 .../with_bin_path/node_modules/.bin/textlint} | 0 .../node_modules/textlint/bin/textlint.js} | 0 .../tflint}/foo/.tflint.hcl | 0 .../tflint}/foo/bar.tf | 0 .../testfile.ml => test-files/tidy/.tidyrc} | 0 .../tidy/test.html} | 0 .../testfile.js => test-files/tidy/tidy} | 0 .../testfile.ts => test-files/tidy/tidy.exe} | 0 .../empty-file | 0 test/{ => test-files}/top/example.ini | 0 .../top/middle/bottom/dummy.txt | 0 .../tsserver/src/file1.ts} | 0 .../tsserver/src/level-1/file2.ts} | 0 .../tsserver/src/level-1/level-2/file3.ts} | 0 .../tsserver/src/level-1}/tsconfig.json | 0 .../tsserver/tsconfig.json} | 0 test/{ => test-files}/typescript/test.ts | 0 .../typescript/tsconfig.json} | 0 .../vim/invalid_vim_project/test.vim} | 0 .../node_modules/.bin/vim-language-server} | 0 .../vim/path_with_autoload/autoload/test.vim} | 0 .../vim/path_with_autoload/test.vim} | 0 .../vim/path_with_initvim/init.vim} | 0 .../vim/path_with_plugin/plugin/test.vim} | 0 .../vim/path_with_plugin/test.vim} | 0 .../vim/path_with_vimrc/.vimrc} | 0 .../write-good/bin/write-good.js} | 0 .../node_modules/.bin/write-good} | 0 .../xo}/monorepo/node_modules/xo/cli.js | 0 .../xo}/monorepo/package.json | 0 .../xo}/monorepo/packages/a/index.js | 0 .../xo}/monorepo/packages/a/index.ts | 0 .../xo}/monorepo/packages/a/package.json | 0 .../subdir/dummy => test-files/zig/build.zig} | 0 test/test_ant_build_classpath_command.vader | 8 +- test/test_ant_find_project_root.vader | 12 +- test/test_c_flag_parsing.vader | 122 +++++++++--------- test/test_c_projects/h_file_project/test.h | 0 .../test_c_projects/hpp_file_project/Makefile | 0 .../hpp_file_project/subdir/dummy | 0 .../test_c_projects/hpp_file_project/test.hpp | 0 .../json_project/build/compile_commands.json | 0 .../json_project/include/test.h | 0 .../test_c_projects/json_project/subdir/dummy | 0 .../test_c_projects/makefile_project/Makefile | 0 .../makefile_project/_astylerc | 0 .../makefile_project/include/test.h | 0 .../makefile_project/subdir/dummy | 0 .../makefile_project/subdir/file.c | 0 test/test_cpp_project/.astylerc | 0 test/test_cpp_project/dummy.cpp | 0 test/test_csslint_config_detection.vader | 6 +- test/test_find_nearest_directory.vader | 4 +- .../test_gradle_build_classpath_command.vader | 14 +- test/test_gradle_find_executable.vader | 10 +- test/test_gradle_find_project_root.vader | 14 +- test/test_hdl_checker_options.vader | 14 +- test/test_jsonlint_executable_detection.vader | 12 +- ...kotlin_languageserver_path_detection.vader | 25 ---- test/test_maven_build_classpath_command.vader | 14 +- test/test_maven_find_executable.vader | 8 +- test/test_maven_find_project_root.vader | 10 +- test/test_nearest_file_search.vader | 4 +- test/test_nimlsp_project_root.vader | 2 +- test/test_puppet_path_detection.vader | 8 +- test/test_python_find_project_root.vader | 4 +- test/test_python_pipenv.vader | 10 +- test/test_resolve_local_path.vader | 4 +- test/test_sml_command.vader | 18 +-- test/test_socket_connections.vader | 12 +- test/test_swift_find_project_root.vader | 6 +- .../test_swiftlint_executable_detection.vader | 49 ------- 581 files changed, 1027 insertions(+), 1123 deletions(-) rename test/{test_flow_command.vader => command_callback/test_flow_command_callback.vader} (77%) rename test/{nix/test_rnix_lsp.vader => command_callback/test_rnix_command_callback.vader} (87%) create mode 100644 test/command_callback/test_swiftlint_command_callback.vader delete mode 100755 test/compile_database_perf/test.sh rename test/{ => script}/dumb_named_pipe_server.py (100%) rename test/{ => script}/dumb_tcp_client.py (100%) rename test/{ => script}/dumb_tcp_server.py (100%) create mode 100644 test/test-files/.gitignore rename test/{ada_files => test-files/ada}/testfile.adb (100%) rename test/{command_callback/alex-node-modules-2 => test-files/alex/node-modules-2}/node_modules/alex/cli.js (100%) rename test/{command_callback/alex-node-modules => test-files/alex/node-modules}/node_modules/.bin/alex (100%) rename test/{ant-test-files/ant-project/build.xml => test-files/angular/node_modules/@angular/language-server/bin/ngserver} (100%) rename test/{command_callback/java_paths/build/gen/main/java/com/something => test-files/angular/node_modules/@angular/language-service}/dummy (100%) rename test/{ant-test-files/bin/ant => test-files/ant/ant-project/build.xml} (100%) mode change 100755 => 100644 rename test/{ant-test-files/bin/ant.exe => test-files/ant/bin/ant} (100%) rename test/{command_callback/bazel_paths/BUILD => test-files/ant/bin/ant.exe} (100%) mode change 100644 => 100755 rename test/{command_callback/bazel_paths/WORKSPACE => test-files/bazel/BUILD} (100%) rename test/{command_callback/bazel_paths/defs.bzl => test-files/bazel/WORKSPACE} (100%) rename test/{command_callback/bib_paths/dummy.bib => test-files/bazel/defs.bzl} (100%) rename test/{command_callback/c_paths/dummy.c => test-files/bib/dummy.bib} (100%) rename test/{command_callback/cargo_paths/Cargo.toml => test-files/c/build_compile_commands_project/build/bad_folder_to_test_priority} (100%) rename test/{command_callback/ccls_paths/with_build_dir/unusual_build_dir_name => test-files/c/build_compile_commands_project/build}/compile_commands.json (100%) rename test/{command_callback/cargo_workspace_paths/Cargo.toml => test-files/c/configure_project/Makefile} (100%) rename test/{command_callback/cargo_workspace_paths/subpath/Cargo.toml => test-files/c/configure_project/configure} (100%) rename test/{command_callback/ccls_paths/with_ccls-root/.ccls-root => test-files/c/configure_project/include/test.h} (100%) rename test/{command_callback/ccls_paths/with_ccls/.ccls => test-files/c/configure_project/subdir/Makefile} (100%) rename test/{command_callback/ccls_paths/with_compile_commands_json/compile_commands.json => test-files/c/dummy.c} (100%) rename test/{command_callback/checkstyle_paths/other_config.xml => test-files/c/git_and_nested_makefiles/include/test.h} (100%) rename test/{command_callback/clangd_paths/with_build_dir/unusual_build_dir_name/compile_commands.json => test-files/c/git_and_nested_makefiles/src/Makefile} (100%) rename test/{command_callback/clangd_paths/with_compile_commands/compile_commands.json => test-files/c/gnumakefile_project/GNUmakefile} (100%) rename test/{command_callback/cppcheck_paths/one/two/three => test-files/c/gnumakefile_project}/file.c (100%) rename test/{command_callback/clangformat_paths/with_clangformat/.clang-format => test-files/c/h_file_project/Makefile} (100%) rename test/{command_callback/java_paths/build/gen2/main/java/com/something => test-files/c/h_file_project/subdir}/dummy (100%) rename test/{command_callback/cppcheck_paths/one/compile_commands.json => test-files/c/h_file_project/test.h} (100%) rename test/{command_callback/cppcheck_paths/one/two/three/file.cpp => test-files/c/hpp_file_project/Makefile} (100%) rename test/{command_callback/java_paths/src/main/java/com/something => test-files/c/hpp_file_project/subdir}/dummy (100%) rename test/{command_callback/cppcheck_paths/with_build_dir/build/compile_commands.json => test-files/c/hpp_file_project/test.hpp} (100%) rename test/{command_callback/cquery_paths => test-files/c/json_project}/build/compile_commands.json (100%) rename test/{command_callback/cquery_paths/with_cquery/.cquery => test-files/c/json_project/include/test.h} (100%) rename test/{command_callback/java_paths/src/test/java/com/something => test-files/c/json_project/subdir}/dummy (100%) rename test/{command_callback/dart_paths/.packages => test-files/c/makefile_project/Makefile} (100%) rename test/{command_callback/elixir_paths/mix_project/lib/app.ex => test-files/c/makefile_project/_astylerc} (100%) rename test/{test_c_projects => test-files/c}/makefile_project/args (100%) rename test/{command_callback/elixir_paths/umbrella_project/apps/app1/lib/app.ex => test-files/c/makefile_project/include/test.h} (100%) rename test/{test_c_projects => test-files/c}/makefile_project/subdir/args (100%) rename test/{command_callback/java_paths_no_main/src/test/java/com/something => test-files/c/makefile_project/subdir}/dummy (100%) rename test/{command_callback/elixir_paths/umbrella_project/apps/app1/mix.exs => test-files/c/makefile_project/subdir/file.c} (100%) rename test/{command_callback/elixir_paths/umbrella_project/apps/app2/lib/app.ex => test-files/cargo/Cargo.toml} (100%) rename test/{command_callback/elixir_paths/umbrella_project/apps/app2/mix.exs => test-files/cargo/workspace_paths/Cargo.toml} (100%) rename test/{command_callback/elixir_paths/umbrella_project/mix.exs => test-files/cargo/workspace_paths/subpath/Cargo.toml} (100%) rename test/{command_callback/fecs_paths/fecs => test-files/ccls/with_build_dir/unusual_build_dir_name/compile_commands.json} (100%) mode change 100755 => 100644 rename test/{command_callback/fecs_paths/fecs.exe => test-files/ccls/with_ccls-root/.ccls-root} (100%) mode change 100755 => 100644 rename test/{command_callback/go_paths/go1/prj1/file.go => test-files/ccls/with_ccls/.ccls} (100%) rename test/{command_callback/go_paths/go2/prj2/file.go => test-files/ccls/with_compile_commands_json/compile_commands.json} (100%) rename test/{command_callback/hdl_server/foo.vhd => test-files/checkstyle/other_config.xml} (100%) rename test/{command_callback/hdl_server/with_config_file/.hdl_checker.config => test-files/clangd/with_build_dir/unusual_build_dir_name/compile_commands.json} (100%) rename test/{command_callback/hdl_server/with_config_file/_hdl_checker.config => test-files/clangd/with_compile_commands/compile_commands.json} (100%) rename test/{command_callback/hdl_server/with_config_file/foo.vhd => test-files/clangformat/with_clangformat/.clang-format} (100%) rename test/{command_callback/html_beautify_paths/html-beautify => test-files/cpp/.astylerc} (100%) mode change 100755 => 100644 rename test/{command_callback/html_beautify_paths/test.html => test-files/cpp/dummy.cpp} (100%) rename test/{command_callback/htmlhint_paths/node_modules/.bin/htmlhint => test-files/cppcheck/one/compile_commands.json} (100%) mode change 100755 => 100644 rename test/{command_callback/htmlhint_paths/with_config/.htmlhintrc => test-files/cppcheck/one/two/three/file.c} (100%) rename test/{command_callback/ink_paths/story/main.ink => test-files/cppcheck/one/two/three/file.cpp} (100%) rename test/{command_callback/inko_paths/test.inko => test-files/cppcheck/with_build_dir/build/compile_commands.json} (100%) rename test/{command_callback/inko_paths/tests/test/test_foo.inko => test-files/cquery/build/compile_commands.json} (100%) rename test/{command_callback/java_paths_with_jaxb/src/main/java/com/something/dummy => test-files/cquery/with_cquery/.cquery} (100%) rename test/{command_callback/java_paths_with_jaxb/src/main/jaxb/com/something/dummy => test-files/csslint/other-app/testfile.css} (100%) rename test/{command_callback/julia-languageserver-project/REQUIRE => test-files/csslint/some-app/.csslintrc} (100%) rename test/{command_callback/julia-languageserver-project/test.jl => test-files/csslint/some-app/subdir/testfile.css} (100%) rename test/{command_callback/lessc_paths/node_modules/.bin/lessc => test-files/cucumber/features/cuke.feature} (100%) mode change 100755 => 100644 rename test/{command_callback/ocamllsp_paths/dune-project => test-files/cucumber/features/step_definitions/base_steps.rb} (100%) rename test/{command_callback/ols_paths/.merlin => test-files/d/test.d} (100%) rename test/{command_callback/ols_paths/node_modules/.bin/ocaml-language-server => test-files/dart/.packages} (100%) rename test/{command_callback/php-intelephense-project/with-composer/composer.json => test-files/dart/testfile.dart} (100%) rename test/{command_callback/php-langserver-project/vendor/bin/php-language-server.php => test-files/elixir/mix_project/lib/app.ex} (100%) mode change 100755 => 100644 rename test/{command_callback/elixir_paths => test-files/elixir}/mix_project/mix.exs (100%) rename test/{command_callback/php-langserver-project/with-composer/composer.json => test-files/elixir/testfile.ex} (100%) rename test/{command_callback/php-langserver-project/with-composer/vendor/bin/php-language-server.php => test-files/elixir/umbrella_project/apps/app1/lib/app.ex} (100%) mode change 100755 => 100644 rename test/{command_callback/php-langserver-project/with-git/vendor/bin/php-language-server.php => test-files/elixir/umbrella_project/apps/app1/mix.exs} (100%) mode change 100755 => 100644 rename test/{command_callback/php_paths/project-with-php-cs-fixer/test.php => test-files/elixir/umbrella_project/apps/app2/lib/app.ex} (100%) rename test/{command_callback/php_paths/project-with-php-cs-fixer/vendor/bin/php-cs-fixer => test-files/elixir/umbrella_project/apps/app2/mix.exs} (100%) rename test/{command_callback/php_paths/project-with-phpcbf/foo/test.php => test-files/elixir/umbrella_project/mix.exs} (100%) rename test/{command_callback/php_paths/project-with-phpcbf/vendor/bin/phpcbf => test-files/elm/newapp-notests/elm.json} (100%) rename test/{command_callback/php_paths/project-without-php-cs-fixer/test.php => test-files/elm/newapp-notests/node_modules/.bin/elm} (100%) rename test/{command_callback/php_paths/project-without-phpcbf/foo/test.php => test-files/elm/newapp-notests/tests/TestMain.elm} (100%) rename test/{command_callback/psalm-project/vendor/bin/psalm => test-files/elm/newapp/elm.json} (100%) mode change 100755 => 100644 rename test/{command_callback/puglint_project/node_modules/.bin/pug-lint => test-files/elm/newapp/node_modules/.bin/elm} (100%) rename test/{command_callback/puglint_project/package.json => test-files/elm/newapp/node_modules/.bin/elm-test} (100%) rename test/{command_callback/puglint_project/puglint_rc_dir/.pug-lintrc => test-files/elm/newapp/src/Main.elm} (100%) rename test/{command_callback/puglint_project/puglint_rc_js_dir/.pug-lintrc.js => test-files/elm/newapp/tests/TestSuite.elm} (100%) rename test/{command_callback/puglint_project/puglint_rc_json_dir/.pug-lintrc.json => test-files/elm/node_modules/.bin/elm-format} (100%) rename test/{command_callback/puppet_paths/dummy.pp => test-files/elm/oldapp/elm-package.json} (100%) rename test/{command_callback/purescript_paths/bower/Foo.purs => test-files/elm/oldapp/node_modules/.bin/elm} (100%) rename test/{command_callback/purescript_paths/bower/bower.json => test-files/elm/oldapp/node_modules/.bin/elm-test} (100%) rename test/{command_callback/purescript_paths/psc-package/Foo.purs => test-files/elm/oldapp/src/Main.elm} (100%) rename test/{command_callback/purescript_paths/psc-package/psc-package.json => test-files/elm/oldapp/tests/TestSuite.elm} (100%) rename test/{command_callback/purescript_paths/spago/Foo.purs => test-files/elm/src/subdir/testfile.elm} (100%) rename test/{command_callback/purescript_paths/spago/spago.dhall => test-files/eslint/app-with-eslint-d/node_modules/.bin/eslint_d} (100%) rename test/{command_callback/python_paths/namespace_package_manifest/namespace/foo/__init__.py => test-files/eslint/node_modules/.bin/eslint} (100%) rename test/{command_callback/python_paths/namespace_package_manifest/namespace/foo/bar.py => test-files/eslint/other-app/subdir/testfile.js} (100%) rename test/{command_callback/python_paths/namespace_package_pytest/namespace/foo/__init__.py => test-files/eslint/package.json} (100%) rename test/{command_callback/python_paths/namespace_package_pytest/namespace/foo/bar.py => test-files/eslint/react-app/.eslintrc.js} (100%) rename test/{command_callback/python_paths/namespace_package_setup/namespace/foo/__init__.py => test-files/eslint/react-app/node_modules/eslint/bin/eslint.js} (100%) rename test/{command_callback/standard-test-files/with-cmd => test-files/eslint/react-app}/node_modules/standard/bin/cmd.js (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/namespace_package_setup/namespace/foo/bar.py => test-files/eslint/react-app/node_modules/stylelint/bin/stylelint.js} (100%) rename test/{command_callback/python_paths/namespace_package_tox/namespace/foo/__init__.py => test-files/eslint/react-app/node_modules/xo/cli.js} (100%) rename test/{command_callback/python_paths/namespace_package_tox/namespace/foo/bar.py => test-files/eslint/react-app/subdir-with-config/.eslintrc} (100%) rename test/{command_callback/python_paths/no_virtualenv/subdir/foo/COMMIT_EDITMSG => test-files/eslint/react-app/subdir-with-package-json/node_modules/.gitkeep} (100%) rename test/{command_callback/python_paths/no_virtualenv/subdir/foo/__init__.py => test-files/eslint/react-app/subdir-with-package-json/package.json} (100%) rename test/{csslint-test-files/other-app => test-files/eslint/react-app/subdir}/testfile.css (100%) rename test/{command_callback/python_paths/no_virtualenv/subdir/foo/bar.py => test-files/eslint/react-app/subdir/testfile.js} (100%) rename test/{command_callback/python_paths/with_bandit/.bandit => test-files/eslint/react-app/subdir/testfile.ts} (100%) rename test/{command_callback/python_paths/with_bandit/namespace/foo/__init__.py => test-files/fecs/fecs} (100%) mode change 100644 => 100755 rename test/{command_callback/python_paths/with_bandit/namespace/foo/bar.py => test-files/fecs/fecs.exe} (100%) mode change 100644 => 100755 rename test/{command_callback/python_paths/with_mypy_ini_and_pytest_ini/mypy.ini => test-files/fish/testfile.fish} (100%) rename test/{command_callback/python_paths/with_mypy_ini_and_pytest_ini/tests/pytest.ini => test-files/flow/a/.flowconfig} (100%) rename test/{command_callback/python_paths/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py => test-files/flow/a/sub/dummy} (100%) rename test/{command_callback/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf => test-files/flow/b/sub/dummy} (100%) rename test/{command_callback/fortran-fortls-project => test-files/fortls-project}/.fortls (100%) rename test/{go_files => test-files/go}/go.mod (100%) rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/activate => test-files/go/go1/prj1/file.go} (100%) rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/autoimport.exe => test-files/go/go2/prj2/file.go} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/autopep8.exe => test-files/go/testfile.go} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/black.exe => test-files/go/testfile2.go} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/flake8.exe => test-files/gradle/build-gradle-project/build.gradle} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/gitlint.exe => test-files/gradle/build-gradle-project/src/main/kotlin/dummy.kt} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/isort.exe => test-files/gradle/gradle} (100%) rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/mypy.exe => test-files/gradle/non-gradle-project/src/main/kotlin/dummy.kt} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/pyflakes.exe => test-files/gradle/settings-gradle-project/settings.gradle} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/pylama.exe => test-files/gradle/settings-gradle-project/src/main/kotlin/dummy.kt} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/pylint.exe => test-files/gradle/unwrapped-project/build.gradle} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/pyls.exe => test-files/gradle/unwrapped-project/settings.gradle} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/pyre.exe => test-files/gradle/unwrapped-project/src/main/kotlin/dummy.kt} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/reorder-python-imports.exe => test-files/gradle/wrapped-project/build.gradle} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/vulture.exe => test-files/gradle/wrapped-project/gradlew} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/yamlfix.exe => test-files/gradle/wrapped-project/settings.gradle} (100%) rename test/{command_callback/python_paths/with_virtualenv/env/Scripts/yapf.exe => test-files/gradle/wrapped-project/src/main/kotlin/dummy.kt} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/activate => test-files/hamllint/haml-lint-and-rubocop/.haml-lint.yml} (100%) rename test/{command_callback/ruby_paths/with_config => test-files/hamllint/haml-lint-and-rubocop}/.rubocop.yml (100%) rename test/{command_callback/python_paths/with_virtualenv/env/bin/autoimport => test-files/hamllint/haml-lint-and-rubocop/subdir/file.haml} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/autopep8 => test-files/hamllint/haml-lint-yml/.haml-lint.yml} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/black => test-files/hamllint/haml-lint-yml/subdir/file.haml} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/flake8 => test-files/hamllint/rubocop-yml/.rubocop.yml} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/gitlint => test-files/hamllint/rubocop-yml/subdir/file.haml} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/isort => test-files/hdl_server/foo.vhd} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/mypy => test-files/hdl_server/with_config_file/.hdl_checker.config} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/pyflakes => test-files/hdl_server/with_config_file/_hdl_checker.config} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/pylama => test-files/hdl_server/with_config_file/foo.vhd} (100%) mode change 100755 => 100644 rename test/{command_callback => test-files}/hdl_server/with_git/files/foo.vhd (100%) rename test/{command_callback/python_paths/with_virtualenv/env/bin/pylint => test-files/html_beautify/html-beautify} (100%) rename test/{command_callback/tidy_paths => test-files/html_beautify}/test.html (100%) rename test/{command_callback/python_paths/with_virtualenv/env/bin/pyls => test-files/htmlhint/node_modules/.bin/htmlhint} (100%) rename test/{command_callback/python_paths/with_virtualenv/env/bin/pyre => test-files/htmlhint/with_config/.htmlhintrc} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/reorder-python-imports => test-files/ink/story/main.ink} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/vulture => test-files/inko/test.inko} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/env/bin/yamlfix => test-files/inko/tests/test/test_foo.inko} (100%) mode change 100755 => 100644 rename test/{flow/a/sub => test-files/java/no_main/src/test/java/com/something}/dummy (100%) rename test/{flow/b/sub => test-files/java/with_jaxb/src/main/java/com/something}/dummy (100%) rename test/{command_callback/python_paths/with_virtualenv/env/bin/yapf => test-files/java/with_jaxb/src/main/jaxb/com/something/dummy} (100%) mode change 100755 => 100644 rename test/{command_callback/python_paths/with_virtualenv/subdir/foo/COMMIT_EDITMSG => test-files/java/with_main/build/gen/main/java/com/something/dummy} (100%) rename test/{command_callback/python_paths/with_virtualenv/subdir/foo/__init__.py => test-files/java/with_main/build/gen2/main/java/com/something/dummy} (100%) rename test/{command_callback/python_paths/with_virtualenv/subdir/foo/bar.py => test-files/java/with_main/src/main/java/com/something/dummy} (100%) rename test/{command_callback/python_paths/with_virtualenv/subdir/foo/bar.pyi => test-files/java/with_main/src/test/java/com/something/dummy} (100%) rename test/{command_callback/r_paths/.Rprofile => test-files/javascript/test.js} (100%) rename test/{json_files => test-files/json}/testfile.json (100%) rename test/{command_callback/reason_ls_paths/bsconfig.json => test-files/jsonlint/app-without-jsonlint/src/app.json} (100%) rename test/{command_callback/remark_lint_paths/with_bin_path/node_modules/.bin/remark => test-files/jsonlint/app/node_modules/.bin/jsonlint} (100%) mode change 100755 => 100644 rename test/{command_callback/ruby_paths/dummy.rb => test-files/jsonlint/app/src/app.json} (100%) rename test/{eslint-test-files/react-app/node_modules/xo => test-files/jsonlint/node_modules/jsonlint/lib}/cli.js (100%) rename test/{command_callback/ruby_paths/with_config/.standard.yml => test-files/julia/REQUIRE} (100%) rename test/{command_callback/rust-rls-project/Cargo.toml => test-files/julia/test.jl} (100%) rename test/{command_callback/sasslint-test-files/with-bin/node_modules/.bin/sass-lint => test-files/kotlin/testfile.kt} (100%) mode change 100755 => 100644 rename test/{command_callback/sasslint-test-files/with-source/node_modules/sass-lint/bin/sass-lint.js => test-files/lessc/node_modules/.bin/lessc} (100%) rename test/{fixers/long-line-project => test-files/long-line}/setup.cfg (100%) rename test/{command_callback/scala_paths/dummy.scala => test-files/lua/testfile.lua} (100%) rename test/{command_callback/spectral_paths/node_modules/.bin/spectral => test-files/markdown/testfile.md} (100%) rename test/{command_callback/spectral_paths/openapi.yaml => test-files/maven/maven-java-project/module1/mvnw} (100%) mode change 100644 => 100755 rename test/{command_callback/stack_build_paths/stack.yaml => test-files/maven/maven-java-project/module1/mvnw.cmd} (100%) mode change 100644 => 100755 rename test/{maven-test-files => test-files/maven}/maven-java-project/module1/pom.xml (100%) rename test/{command_callback/stack_ghc_paths/stack.yaml => test-files/maven/maven-java-project/module1/src/main/java/dummy1.java} (100%) rename test/{maven-test-files => test-files/maven}/maven-java-project/module2/pom.xml (100%) rename test/{command_callback/standard-test-files/with-bin/node_modules/.bin/standard => test-files/maven/maven-java-project/module2/src/main/java/dummy2.java} (100%) mode change 100755 => 100644 rename test/{maven-test-files => test-files/maven}/maven-kotlin-project/pom.xml (100%) rename test/{maven-test-files => test-files/maven}/maven-kotlin-project/src/main/kotlin/dummy.kt (100%) rename test/{command_callback/stylelint_paths/node_modules/.bin/stylelint => test-files/maven/mvn} (100%) rename test/{command_callback/swaglint_paths/docs/swagger.yaml => test-files/maven/non-maven-project/src/main/java/dummy.java} (100%) rename test/{command_callback/swaglint_paths/node_modules/.bin/swaglint => test-files/nim/with-git/src/source.nim} (100%) rename test/{command_callback/swift_paths/dummy.swift => test-files/ocaml/testfile.ml} (100%) rename test/{command_callback/tex_paths/sample1.tex => test-files/ocamllsp/dune-project} (100%) rename test/{command_callback/tex_paths/sample2.tex => test-files/ols/.merlin} (100%) rename test/{command_callback/textlint_paths/with_bin_path/node_modules/.bin/textlint => test-files/ols/node_modules/.bin/ocaml-language-server} (100%) mode change 100755 => 100644 rename test/{command_callback/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js => test-files/php/project-with-php-cs-fixer/test.php} (100%) mode change 100755 => 100644 rename test/{command_callback/tidy_paths/.tidyrc => test-files/php/project-with-php-cs-fixer/vendor/bin/php-cs-fixer} (100%) rename test/{command_callback/tidy_paths/tidy => test-files/php/project-with-phpcbf/foo/test.php} (100%) mode change 100755 => 100644 rename test/{command_callback/tidy_paths/tidy.exe => test-files/php/project-with-phpcbf/vendor/bin/phpcbf} (100%) mode change 100755 => 100644 rename test/{command_callback/tsserver_paths/src/file1.ts => test-files/php/project-without-php-cs-fixer/test.php} (100%) rename test/{command_callback/tsserver_paths/src/level-1/file2.ts => test-files/php/project-without-phpcbf/foo/test.php} (100%) rename test/{command_callback/tsserver_paths/src/level-1/level-2/file3.ts => test-files/php/vendor/bin/php-language-server.php} (100%) mode change 100644 => 100755 rename test/{command_callback/tsserver_paths/src/level-1/tsconfig.json => test-files/php/with-composer/composer.json} (100%) rename test/{command_callback/tsserver_paths/tsconfig.json => test-files/php/with-composer/vendor/bin/php-language-server.php} (100%) mode change 100644 => 100755 rename test/{command_callback/vim_fixtures/invalid_vim_project/test.vim => test-files/php/with-git/vendor/bin/php-language-server.php} (100%) mode change 100644 => 100755 rename test/{phpcs-test-files => test-files/phpcs}/project-with-phpcs/foo/test.php (100%) rename test/{phpcs-test-files => test-files/phpcs}/project-with-phpcs/vendor/bin/phpcs (100%) rename test/{phpcs-test-files => test-files/phpcs}/project-without-phpcs/foo/test.php (100%) rename test/{prettier-test-files => test-files/prettier}/testfile (100%) rename test/{csslint-test-files/some-app/subdir => test-files/prettier}/testfile.css (100%) rename test/{eslint-test-files/other-app/subdir => test-files/prettier}/testfile.js (100%) rename test/{prettier-test-files => test-files/prettier}/testfile.json (100%) rename test/{prettier-test-files => test-files/prettier}/testfile.scss (100%) rename test/{eslint-test-files/react-app/subdir => test-files/prettier}/testfile.ts (100%) rename test/{prettier-test-files => test-files/prettier}/with_config/.prettierrc (100%) rename test/{eslint-test-files/react-app/subdir => test-files/prettier/with_config}/testfile.js (100%) rename test/{prettier-test-files => test-files/prettier}/with_prettierignore/.prettierignore (100%) rename test/{fixers/eslint-test-files/other-app/subdir => test-files/prettier/with_prettierignore/src}/testfile.js (100%) rename test/{command_callback/vim_fixtures/node_modules/.bin/vim-language-server => test-files/psalm/vendor/bin/psalm} (100%) mode change 100644 => 100755 rename test/{command_callback/vim_fixtures/path_with_autoload/autoload/test.vim => test-files/puglint/node_modules/.bin/pug-lint} (100%) rename test/{ember-template-lint-test-files => test-files/puglint}/package.json (100%) rename test/{command_callback/vim_fixtures/path_with_autoload/test.vim => test-files/puglint/puglint_rc_dir/.pug-lintrc} (100%) rename test/{command_callback/vim_fixtures/path_with_initvim/init.vim => test-files/puglint/puglint_rc_js_dir/.pug-lintrc.js} (100%) rename test/{command_callback/vim_fixtures/path_with_plugin/plugin/test.vim => test-files/puglint/puglint_rc_json_dir/.pug-lintrc.json} (100%) rename test/{command_callback/vim_fixtures/path_with_plugin/test.vim => test-files/puppet/dummy.pp} (100%) rename test/{puppet-test-files => test-files/puppet}/new-style-module/lib/puppet/types/exampletype.rb (100%) rename test/{puppet-test-files => test-files/puppet}/new-style-module/metadata.json (100%) rename test/{puppet-test-files => test-files/puppet}/new-style-module/template/template.epp (100%) rename test/{puppet-test-files => test-files/puppet}/old-style-module/manifests/init.pp (100%) rename test/{puppet-test-files => test-files/puppet}/old-style-module/templates/template.epp (100%) rename test/{command_callback/vim_fixtures/path_with_vimrc/.vimrc => test-files/purescript/bower/Foo.purs} (100%) rename test/{command_callback/write-good-node-modules-2/node_modules/write-good/bin/write-good.js => test-files/purescript/bower/bower.json} (100%) rename test/{command_callback/write-good-node-modules/node_modules/.bin/write-good => test-files/purescript/psc-package/Foo.purs} (100%) rename test/{command_callback/zig-zls-project/build.zig => test-files/purescript/psc-package/psc-package.json} (100%) rename test/{csslint-test-files/some-app/.csslintrc => test-files/purescript/spago/Foo.purs} (100%) rename test/{cucumber_fixtures/features/cuke.feature => test-files/purescript/spago/spago.dhall} (100%) rename test/{command_callback/python_paths => test-files/python}/namespace_package_manifest/MANIFEST.in (100%) rename test/{cucumber_fixtures/features/step_definitions/base_steps.rb => test-files/python/namespace_package_manifest/namespace/foo/__init__.py} (100%) rename test/{d_files/test.d => test-files/python/namespace_package_manifest/namespace/foo/bar.py} (100%) rename test/{dart_files/testfile.dart => test-files/python/namespace_package_pytest/namespace/foo/__init__.py} (100%) rename test/{elixir-test-files/testfile.ex => test-files/python/namespace_package_pytest/namespace/foo/bar.py} (100%) rename test/{command_callback/python_paths => test-files/python}/namespace_package_pytest/pytest.ini (100%) rename test/{elm-test-files/newapp-notests/elm.json => test-files/python/namespace_package_setup/namespace/foo/__init__.py} (100%) rename test/{elm-test-files/newapp-notests/node_modules/.bin/elm => test-files/python/namespace_package_setup/namespace/foo/bar.py} (100%) rename test/{command_callback/python_paths => test-files/python}/namespace_package_setup/setup.cfg (100%) rename test/{elm-test-files/newapp-notests/tests/TestMain.elm => test-files/python/namespace_package_tox/namespace/foo/__init__.py} (100%) rename test/{elm-test-files/newapp/elm.json => test-files/python/namespace_package_tox/namespace/foo/bar.py} (100%) rename test/{command_callback/python_paths => test-files/python}/namespace_package_tox/tox.ini (100%) rename test/{elm-test-files/newapp/node_modules/.bin/elm => test-files/python/no_virtualenv/subdir/foo/COMMIT_EDITMSG} (100%) rename test/{elm-test-files/newapp/node_modules/.bin/elm-test => test-files/python/no_virtualenv/subdir/foo/__init__.py} (100%) rename test/{elm-test-files/newapp/src/Main.elm => test-files/python/no_virtualenv/subdir/foo/bar.py} (100%) rename test/{python_fixtures => test-files/python}/pipenv/Pipfile.lock (100%) rename test/{python-test-files => test-files/python}/python-package-project/.flake8 (100%) rename test/{python-test-files => test-files/python}/python-package-project/package-name/module.py (100%) rename test/{elm-test-files/newapp/tests/TestSuite.elm => test-files/python/with_bandit/.bandit} (100%) rename test/{elm-test-files/node_modules/.bin/elm-format => test-files/python/with_bandit/namespace/foo/__init__.py} (100%) rename test/{elm-test-files/oldapp/elm-package.json => test-files/python/with_bandit/namespace/foo/bar.py} (100%) rename test/{elm-test-files/oldapp/node_modules/.bin/elm => test-files/python/with_mypy_ini_and_pytest_ini/mypy.ini} (100%) rename test/{elm-test-files/oldapp/node_modules/.bin/elm-test => test-files/python/with_mypy_ini_and_pytest_ini/tests/pytest.ini} (100%) rename test/{elm-test-files/oldapp/src/Main.elm => test-files/python/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py} (100%) rename test/{elm-test-files/oldapp/tests/TestSuite.elm => test-files/python/with_virtualenv/dir_with_yapf_config/.style.yapf} (100%) rename test/{elm-test-files/src/subdir/testfile.elm => test-files/python/with_virtualenv/env/Scripts/activate} (100%) rename test/{ember-template-lint-test-files/app/template.hbs => test-files/python/with_virtualenv/env/Scripts/autoimport.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d => test-files/python/with_virtualenv/env/Scripts/autopep8.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/node_modules/.bin/eslint => test-files/python/with_virtualenv/env/Scripts/black.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/package.json => test-files/python/with_virtualenv/env/Scripts/flake8.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/react-app/.eslintrc.js => test-files/python/with_virtualenv/env/Scripts/gitlint.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/react-app/node_modules/eslint/bin/eslint.js => test-files/python/with_virtualenv/env/Scripts/isort.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/react-app/node_modules/standard/bin/cmd.js => test-files/python/with_virtualenv/env/Scripts/mypy.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/react-app/node_modules/stylelint/bin/stylelint.js => test-files/python/with_virtualenv/env/Scripts/pyflakes.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/react-app/subdir-with-config/.eslintrc => test-files/python/with_virtualenv/env/Scripts/pylama.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/react-app/subdir-with-package-json/node_modules/.gitkeep => test-files/python/with_virtualenv/env/Scripts/pylint.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/react-app/subdir-with-package-json/package.json => test-files/python/with_virtualenv/env/Scripts/pyls.exe} (100%) mode change 100644 => 100755 rename test/{eslint-test-files/react-app/subdir/testfile.css => test-files/python/with_virtualenv/env/Scripts/pyre.exe} (100%) mode change 100644 => 100755 rename test/{fish_files/testfile.fish => test-files/python/with_virtualenv/env/Scripts/reorder-python-imports.exe} (100%) mode change 100644 => 100755 rename test/{fixers/eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d => test-files/python/with_virtualenv/env/Scripts/vulture.exe} (100%) mode change 100644 => 100755 rename test/{fixers/eslint-test-files/node_modules/.bin/eslint => test-files/python/with_virtualenv/env/Scripts/yamlfix.exe} (100%) rename test/{fixers/eslint-test-files/react-app/.eslintrc.js => test-files/python/with_virtualenv/env/Scripts/yapf.exe} (100%) mode change 100644 => 100755 rename test/{fixers/eslint-test-files/react-app/node_modules/eslint/bin/eslint.js => test-files/python/with_virtualenv/env/bin/activate} (100%) rename test/{fixers/eslint-test-files/react-app/node_modules/standard/bin/cmd.js => test-files/python/with_virtualenv/env/bin/autoimport} (100%) mode change 100644 => 100755 rename test/{fixers/eslint-test-files/react-app/node_modules/stylelint/bin/stylelint.js => test-files/python/with_virtualenv/env/bin/autopep8} (100%) mode change 100644 => 100755 rename test/{fixers/eslint-test-files/react-app/subdir/testfile.css => test-files/python/with_virtualenv/env/bin/black} (100%) mode change 100644 => 100755 rename test/{fixers/eslint-test-files/react-app/subdir/testfile.js => test-files/python/with_virtualenv/env/bin/flake8} (100%) mode change 100644 => 100755 rename test/{flow/a/.flowconfig => test-files/python/with_virtualenv/env/bin/gitlint} (100%) mode change 100644 => 100755 rename test/{go_files/testfile.go => test-files/python/with_virtualenv/env/bin/isort} (100%) mode change 100644 => 100755 rename test/{go_files/testfile2.go => test-files/python/with_virtualenv/env/bin/mypy} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/build-gradle-project/build.gradle => test-files/python/with_virtualenv/env/bin/pyflakes} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/build-gradle-project/src/main/kotlin/dummy.kt => test-files/python/with_virtualenv/env/bin/pylama} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/gradle => test-files/python/with_virtualenv/env/bin/pylint} (100%) rename test/{gradle-test-files/non-gradle-project/src/main/kotlin/dummy.kt => test-files/python/with_virtualenv/env/bin/pyls} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/settings-gradle-project/settings.gradle => test-files/python/with_virtualenv/env/bin/pyre} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/settings-gradle-project/src/main/kotlin/dummy.kt => test-files/python/with_virtualenv/env/bin/reorder-python-imports} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/unwrapped-project/build.gradle => test-files/python/with_virtualenv/env/bin/vulture} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/unwrapped-project/settings.gradle => test-files/python/with_virtualenv/env/bin/yamlfix} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/unwrapped-project/src/main/kotlin/dummy.kt => test-files/python/with_virtualenv/env/bin/yapf} (100%) mode change 100644 => 100755 rename test/{gradle-test-files/wrapped-project/build.gradle => test-files/python/with_virtualenv/subdir/foo/COMMIT_EDITMSG} (100%) rename test/{gradle-test-files/wrapped-project/gradlew => test-files/python/with_virtualenv/subdir/foo/__init__.py} (100%) rename test/{gradle-test-files/wrapped-project/settings.gradle => test-files/python/with_virtualenv/subdir/foo/bar.py} (100%) rename test/{gradle-test-files/wrapped-project/src/main/kotlin/dummy.kt => test-files/python/with_virtualenv/subdir/foo/bar.pyi} (100%) rename test/{hamllint-test-files/haml-lint-and-rubocop/.haml-lint.yml => test-files/r/.Rprofile} (100%) rename test/{hamllint-test-files/haml-lint-and-rubocop/.rubocop.yml => test-files/reasonml/bsconfig.json} (100%) rename test/{reasonml_files => test-files/reasonml}/testfile.re (100%) rename test/{hamllint-test-files/haml-lint-and-rubocop/subdir/file.haml => test-files/remark_lint/with_bin_path/node_modules/.bin/remark} (100%) mode change 100644 => 100755 rename test/{ruby_fixtures/valid_rails_app/app => test-files/ruby}/dummy.rb (100%) rename test/{ruby_fixtures => test-files/ruby}/not_a_rails_app/file.rb (100%) rename test/{ruby_fixtures/valid_rails_app/config => test-files/ruby/valid_rails_app/app}/dummy.rb (100%) rename test/{ruby_fixtures => test-files/ruby}/valid_rails_app/app/models/thing.rb (100%) rename test/{ruby_fixtures => test-files/ruby}/valid_rails_app/app/views/my_great_view.html.erb (100%) rename test/{ruby_fixtures/valid_rails_app/db => test-files/ruby/valid_rails_app/config}/dummy.rb (100%) rename test/{hamllint-test-files/haml-lint-yml/.haml-lint.yml => test-files/ruby/valid_rails_app/db/dummy.rb} (100%) rename test/{ruby_fixtures => test-files/ruby}/valid_ruby_app1/Rakefile (100%) rename test/{ruby_fixtures => test-files/ruby}/valid_ruby_app1/lib/file.rb (100%) rename test/{ruby_fixtures => test-files/ruby}/valid_ruby_app2/Gemfile (100%) rename test/{ruby_fixtures => test-files/ruby}/valid_ruby_app2/lib/file.rb (100%) rename test/{ruby_fixtures => test-files/ruby}/valid_ruby_app3/.solargraph.yml (100%) rename test/{ruby_fixtures => test-files/ruby}/valid_ruby_app3/lib/file.rb (100%) rename test/{hamllint-test-files/rubocop-yml => test-files/ruby/with_config}/.rubocop.yml (100%) rename test/{hamllint-test-files/haml-lint-yml/subdir/file.haml => test-files/ruby/with_config/.standard.yml} (100%) rename test/{hamllint-test-files/rubocop-yml/subdir/file.haml => test-files/rust/Cargo.toml} (100%) rename test/{rust_files => test-files/rust}/testfile.rs (100%) rename test/{javascript_files/test.js => test-files/sasslint/with-bin/node_modules/.bin/sass-lint} (100%) mode change 100644 => 100755 rename test/{jsonlint-test-files/app-without-jsonlint/src/app.json => test-files/sasslint/with-source/node_modules/sass-lint/bin/sass-lint.js} (100%) mode change 100644 => 100755 rename test/{jsonlint-test-files/app/node_modules/.bin/jsonlint => test-files/scala/dummy.scala} (100%) rename test/{scala_fixtures => test-files/scala}/invalid_sbt_project/Main.scala (100%) rename test/{scala_fixtures => test-files/scala}/valid_sbt_project/Main.scala (100%) rename test/{scala_fixtures => test-files/scala}/valid_sbt_project/build.sbt (100%) rename test/{slimlint-test-files => test-files/slimlint}/.rubocop.yml (100%) rename test/{slimlint-test-files => test-files/slimlint}/subdir/file.slim (100%) rename test/{ => test-files}/smlnj/cm/foo.sml (100%) rename test/{ => test-files}/smlnj/cm/path/to/bar.sml (100%) rename test/{ => test-files}/smlnj/cm/sources.cm (100%) rename test/{ => test-files}/smlnj/file/qux.sml (100%) rename test/{jsonlint-test-files/app/src/app.json => test-files/spectral/node_modules/.bin/spectral} (100%) rename test/{jsonlint-test-files/node_modules/jsonlint/lib/cli.js => test-files/spectral/openapi.yaml} (100%) rename test/{kotlin_files/testfile.kt => test-files/stack/stack.yaml} (100%) rename test/{lua_files/testfile.lua => test-files/standard/with-bin/node_modules/.bin/standard} (100%) mode change 100644 => 100755 rename test/{markdown_files/testfile.md => test-files/standard/with-cmd/node_modules/standard/bin/cmd.js} (100%) mode change 100644 => 100755 rename test/{maven-test-files/maven-java-project/module1/mvnw => test-files/stylelint/node_modules/.bin/stylelint} (100%) rename test/{maven-test-files/maven-java-project/module1/mvnw.cmd => test-files/swaglint/docs/swagger.yaml} (100%) mode change 100755 => 100644 rename test/{maven-test-files/maven-java-project/module1/src/main/java/dummy1.java => test-files/swaglint/node_modules/.bin/swaglint} (100%) rename test/{swift-test-files/non-swift-package-project/src/folder => test-files/swift}/dummy.swift (100%) rename test/{swift-test-files/swift-package-project => test-files/swift/non-swift-package-project}/src/folder/dummy.swift (100%) rename test/{swift-test-files => test-files/swift}/swift-package-project/Package.swift (100%) rename test/{maven-test-files/maven-java-project/module2/src/main/java/dummy2.java => test-files/swift/swift-package-project/src/folder/dummy.swift} (100%) rename test/{swiftlint-test-files => test-files/swiftlint}/cocoapods-and-react-native/Pods/SwiftLint/swiftlint (100%) rename test/{swiftlint-test-files => test-files/swiftlint}/cocoapods-and-react-native/ios/Pods/SwiftLint/swiftlint (100%) rename test/{swiftlint-test-files => test-files/swiftlint}/cocoapods/Pods/SwiftLint/swiftlint (100%) rename test/{swiftlint-test-files => test-files/swiftlint}/react-native/ios/Pods/SwiftLint/swiftlint (100%) rename test/{terraform_files => test-files/terraform}/main.tf (100%) rename test/{maven-test-files/mvn => test-files/tex/sample1.tex} (100%) mode change 100755 => 100644 rename test/{maven-test-files/non-maven-project/src/main/java/dummy.java => test-files/tex/sample2.tex} (100%) rename test/{tex_files => test-files/tex}/testfile.tex (100%) rename test/{nim-test-files/with-git/src/source.nim => test-files/textlint/with_bin_path/node_modules/.bin/textlint} (100%) mode change 100644 => 100755 rename test/{nix/test.nix => test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js} (100%) mode change 100644 => 100755 rename test/{tflint-test-files => test-files/tflint}/foo/.tflint.hcl (100%) rename test/{tflint-test-files => test-files/tflint}/foo/bar.tf (100%) rename test/{ocaml-test-files/testfile.ml => test-files/tidy/.tidyrc} (100%) rename test/{prettier-test-files/testfile.css => test-files/tidy/test.html} (100%) rename test/{prettier-test-files/testfile.js => test-files/tidy/tidy} (100%) mode change 100644 => 100755 rename test/{prettier-test-files/testfile.ts => test-files/tidy/tidy.exe} (100%) mode change 100644 => 100755 rename test/{ => test-files}/top/ale-special-directory-name-dont-use-this-please/empty-file (100%) rename test/{ => test-files}/top/example.ini (100%) rename test/{ => test-files}/top/middle/bottom/dummy.txt (100%) rename test/{prettier-test-files/with_config/testfile.js => test-files/tsserver/src/file1.ts} (100%) rename test/{prettier-test-files/with_prettierignore/src/testfile.js => test-files/tsserver/src/level-1/file2.ts} (100%) rename test/{test-projects/angular/node_modules/@angular/language-server/bin/ngserver => test-files/tsserver/src/level-1/level-2/file3.ts} (100%) rename test/{typescript => test-files/tsserver/src/level-1}/tsconfig.json (100%) rename test/{test-projects/angular/node_modules/@angular/language-service/dummy => test-files/tsserver/tsconfig.json} (100%) rename test/{ => test-files}/typescript/test.ts (100%) rename test/{test_c_projects/build_compile_commands_project/build/bad_folder_to_test_priority => test-files/typescript/tsconfig.json} (100%) rename test/{test_c_projects/build_compile_commands_project/build/compile_commands.json => test-files/vim/invalid_vim_project/test.vim} (100%) rename test/{test_c_projects/configure_project/Makefile => test-files/vim/node_modules/.bin/vim-language-server} (100%) rename test/{test_c_projects/configure_project/configure => test-files/vim/path_with_autoload/autoload/test.vim} (100%) rename test/{test_c_projects/configure_project/include/test.h => test-files/vim/path_with_autoload/test.vim} (100%) rename test/{test_c_projects/configure_project/subdir/Makefile => test-files/vim/path_with_initvim/init.vim} (100%) rename test/{test_c_projects/git_and_nested_makefiles/include/test.h => test-files/vim/path_with_plugin/plugin/test.vim} (100%) rename test/{test_c_projects/git_and_nested_makefiles/src/Makefile => test-files/vim/path_with_plugin/test.vim} (100%) rename test/{test_c_projects/gnumakefile_project/GNUmakefile => test-files/vim/path_with_vimrc/.vimrc} (100%) rename test/{test_c_projects/gnumakefile_project/file.c => test-files/write-good/node-modules-2/node_modules/write-good/bin/write-good.js} (100%) rename test/{test_c_projects/h_file_project/Makefile => test-files/write-good/node-modules/node_modules/.bin/write-good} (100%) rename test/{xo-test-files => test-files/xo}/monorepo/node_modules/xo/cli.js (100%) rename test/{xo-test-files => test-files/xo}/monorepo/package.json (100%) rename test/{xo-test-files => test-files/xo}/monorepo/packages/a/index.js (100%) rename test/{xo-test-files => test-files/xo}/monorepo/packages/a/index.ts (100%) rename test/{xo-test-files => test-files/xo}/monorepo/packages/a/package.json (100%) rename test/{test_c_projects/h_file_project/subdir/dummy => test-files/zig/build.zig} (100%) delete mode 100644 test/test_c_projects/h_file_project/test.h delete mode 100644 test/test_c_projects/hpp_file_project/Makefile delete mode 100644 test/test_c_projects/hpp_file_project/subdir/dummy delete mode 100644 test/test_c_projects/hpp_file_project/test.hpp delete mode 100644 test/test_c_projects/json_project/build/compile_commands.json delete mode 100644 test/test_c_projects/json_project/include/test.h delete mode 100644 test/test_c_projects/json_project/subdir/dummy delete mode 100644 test/test_c_projects/makefile_project/Makefile delete mode 100644 test/test_c_projects/makefile_project/_astylerc delete mode 100644 test/test_c_projects/makefile_project/include/test.h delete mode 100644 test/test_c_projects/makefile_project/subdir/dummy delete mode 100644 test/test_c_projects/makefile_project/subdir/file.c delete mode 100644 test/test_cpp_project/.astylerc delete mode 100644 test/test_cpp_project/dummy.cpp delete mode 100644 test/test_kotlin_languageserver_path_detection.vader delete mode 100644 test/test_swiftlint_executable_detection.vader diff --git a/doc/ale-development.txt b/doc/ale-development.txt index 0ebce87b..3436b531 100644 --- a/doc/ale-development.txt +++ b/doc/ale-development.txt @@ -188,6 +188,10 @@ Look at existing tests in the codebase for examples of how to write tests. Refer to the Vader documentation for general information on how to write Vader tests: https://github.com/junegunn/vader.vim +If you need to add any supporting files for tests, such as empty files present +to test searching upwards through paths for configuration files, they can be +added to the `test/test-files` directory. + See |ale-development-linter-tests| for more information on how to write linter tests. diff --git a/test/command_callback/test_alex_command_callback.vader b/test/command_callback/test_alex_command_callback.vader index 98769e0b..20e20301 100644 --- a/test/command_callback/test_alex_command_callback.vader +++ b/test/command_callback/test_alex_command_callback.vader @@ -10,22 +10,22 @@ Execute(The global executable should be used when the local one cannot be found) \ ale#Escape('alex') . ' %s --text', Execute(Should use the node_modules/.bin executable, if available): - call ale#test#SetFilename('alex-node-modules/test_file.tex') + call ale#test#SetFilename('../test-files/alex/node-modules/test_file.tex') - AssertLinter ale#path#Simplify(g:dir . '/alex-node-modules/node_modules/.bin/alex'), - \ ale#Escape(ale#path#Simplify(g:dir . '/alex-node-modules/node_modules/.bin/alex')) + AssertLinter ale#path#Simplify(g:dir . '/../test-files/alex/node-modules/node_modules/.bin/alex'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/alex/node-modules/node_modules/.bin/alex')) \ . ' %s --text', Execute(Should use the node_modules/alex executable, if available): - call ale#test#SetFilename('alex-node-modules-2/test_file.tex') + call ale#test#SetFilename('../test-files/alex/node-modules-2/test_file.tex') - AssertLinter ale#path#Simplify(g:dir . '/alex-node-modules-2/node_modules/alex/cli.js'), + AssertLinter ale#path#Simplify(g:dir . '/../test-files/alex/node-modules-2/node_modules/alex/cli.js'), \ (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/alex-node-modules-2/node_modules/alex/cli.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/alex/node-modules-2/node_modules/alex/cli.js')) \ . ' %s --text', Execute(Should let users configure a global executable and override local paths): - call ale#test#SetFilename('write-good-node-modules-2/test_file.tex') + call ale#test#SetFilename('../test-files/write-good/node-modules-2/test_file.tex') let g:ale_alex_executable = '/path/to/custom/alex' let g:ale_alex_use_global = 1 diff --git a/test/command_callback/test_angular_command_callback.vader b/test/command_callback/test_angular_command_callback.vader index c5de3d87..fe0749a1 100644 --- a/test/command_callback/test_angular_command_callback.vader +++ b/test/command_callback/test_angular_command_callback.vader @@ -13,15 +13,15 @@ Execute(The Angular LSP connection shouldn't be created outside of Angular proje AssertLinterNotExecuted Execute(The default command for Angular should be correct): - call ale#test#SetFilename('../test-projects/angular/test.html') + call ale#test#SetFilename('../test-files/angular/test.html') let g:paths = { - \ 'ngserver': ale#test#GetFilename('../test-projects/angular/node_modules/@angular/language-server/bin/ngserver'), - \ 'service': ale#test#GetFilename('../test-projects/angular/node_modules/@angular/language-service'), - \ 'typescript': ale#test#GetFilename('../test-projects/angular/node_modules/typescript'), + \ 'ngserver': ale#test#GetFilename('../test-files/angular/node_modules/@angular/language-server/bin/ngserver'), + \ 'service': ale#test#GetFilename('../test-files/angular/node_modules/@angular/language-service'), + \ 'typescript': ale#test#GetFilename('../test-files/angular/node_modules/typescript'), \} AssertLSPLanguage 'html' - AssertLSPProject ale#test#GetFilename('../test-projects/angular') + AssertLSPProject ale#test#GetFilename('../test-files/angular') AssertLinter g:paths.ngserver, ale#Escape(g:paths.ngserver) \ . ' --ngProbeLocations ' . ale#Escape(g:paths.service) \ . ' --tsProbeLocations ' . ale#Escape(g:paths.typescript) @@ -30,14 +30,14 @@ Execute(The default command for Angular should be correct): Execute(It should be possible to use the global ngserver): let b:ale_html_angular_use_global = 1 - call ale#test#SetFilename('../test-projects/angular/test.html') + call ale#test#SetFilename('../test-files/angular/test.html') let g:paths = { - \ 'service': ale#test#GetFilename('../test-projects/angular/node_modules/@angular/language-service'), - \ 'typescript': ale#test#GetFilename('../test-projects/angular/node_modules/typescript'), + \ 'service': ale#test#GetFilename('../test-files/angular/node_modules/@angular/language-service'), + \ 'typescript': ale#test#GetFilename('../test-files/angular/node_modules/typescript'), \} AssertLSPLanguage 'html' - AssertLSPProject ale#test#GetFilename('../test-projects/angular') + AssertLSPProject ale#test#GetFilename('../test-files/angular') AssertLinter 'ngserver', ale#Escape('ngserver') \ . ' --ngProbeLocations ' . ale#Escape(g:paths.service) \ . ' --tsProbeLocations ' . ale#Escape(g:paths.typescript) diff --git a/test/command_callback/test_asciidoc_textlint_command_callbacks.vader b/test/command_callback/test_asciidoc_textlint_command_callbacks.vader index 623833b2..a79a0ae3 100644 --- a/test/command_callback/test_asciidoc_textlint_command_callbacks.vader +++ b/test/command_callback/test_asciidoc_textlint_command_callbacks.vader @@ -42,24 +42,24 @@ Execute(The options should be configurable): \ ale#Escape('textlint') . ' --something -f json --stdin --stdin-filename %s' Execute(The local executable from .bin should be used if available): - call ale#test#SetFilename('textlint_paths/with_bin_path/foo.txt') + call ale#test#SetFilename('../test-files/textlint/with_bin_path/foo.txt') AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_bin_path/node_modules/.bin/textlint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_bin_path/node_modules/.bin/textlint')) \ . ' -f json --stdin --stdin-filename %s' Execute(The local executable from textlint/bin should be used if available): - call ale#test#SetFilename('textlint_paths/with_textlint_bin_path/foo.txt') + call ale#test#SetFilename('../test-files/textlint/with_textlint_bin_path/foo.txt') if has('win32') AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), - \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), + \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) \ . ' -f json --stdin --stdin-filename %s' else AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), - \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) \ . ' -f json --stdin --stdin-filename %s' endif diff --git a/test/command_callback/test_bandit_command_callback.vader b/test/command_callback/test_bandit_command_callback.vader index 274ce901..3d3a60a3 100644 --- a/test/command_callback/test_bandit_command_callback.vader +++ b/test/command_callback/test_bandit_command_callback.vader @@ -40,7 +40,7 @@ Execute(Setting executable to 'pipenv' appends 'run bandit'): Execute(Pipenv is detected when python_bandit_auto_pipenv is set): let g:ale_python_bandit_auto_pipenv = 1 - call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinter 'pipenv', \ ale#Escape('pipenv') @@ -49,10 +49,10 @@ Execute(Pipenv is detected when python_bandit_auto_pipenv is set): \ . ' -' Execute(The bandit command callback should add .bandit by default): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_bandit/namespace/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_bandit/namespace/foo/bar.py') let b:config_path = ale#path#Simplify( - \ g:dir . '/python_paths/with_bandit/.bandit' + \ g:dir . '/../test-files/python/with_bandit/.bandit' \) AssertLinter 'bandit', @@ -62,7 +62,7 @@ Execute(The bandit command callback should add .bandit by default): \ . ' -' Execute(The bandit command callback should support not using .bandit): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_bandit/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_bandit/subdir/foo/bar.py') let g:ale_python_bandit_use_config = 0 AssertLinter 'bandit', diff --git a/test/command_callback/test_bingo_command_callback.vader b/test/command_callback/test_bingo_command_callback.vader index 5544effa..d8328414 100644 --- a/test/command_callback/test_bingo_command_callback.vader +++ b/test/command_callback/test_bingo_command_callback.vader @@ -25,7 +25,7 @@ Execute(should configure bingo callback executable): AssertLinter 'boo', ale#Escape('boo') Execute(should set bingo options): - call ale#test#SetFilename('go_paths/go1/prj1/file.go') + call ale#test#SetFilename('../test-files/go/go1/prj1/file.go') " let b:ale_completion_enabled = 1 let b:ale_go_bingo_options = '' @@ -38,7 +38,7 @@ Execute(should set bingo options): \ ale#Escape('bingo') . ' --mode stdio --trace' Execute(should support Go environment variables): - call ale#test#SetFilename('go_paths/go1/prj1/file.go') + call ale#test#SetFilename('../test-files/go/go1/prj1/file.go') let b:ale_go_go111module = 'on' AssertLinter 'bingo', @@ -46,9 +46,9 @@ Execute(should support Go environment variables): Execute(Should return directory for 'go.mod' if found in parent directory): - call ale#test#SetFilename('../go_files/test.go') + call ale#test#SetFilename('../test-files/go/test.go') - AssertLSPProject ale#path#Simplify(g:dir . '/../go_files') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/go') Execute(Should return nearest directory with '.git' if found in parent directory): call ale#test#SetFilename('test.go') @@ -57,7 +57,7 @@ Execute(Should return nearest directory with '.git' if found in parent directory AssertLSPProject g:dir Execute(Should ignore 'go.mod' and return '.git' dir if modules off): - call ale#test#SetFilename('../go_files/test.go') + call ale#test#SetFilename('../test-files/go/test.go') let b:ale_go_go111module = 'off' let b:parent_dir = ale#path#Simplify(g:dir . '/..') diff --git a/test/command_callback/test_brakeman_command_callback.vader b/test/command_callback/test_brakeman_command_callback.vader index 15dbbe1c..d3bf1920 100644 --- a/test/command_callback/test_brakeman_command_callback.vader +++ b/test/command_callback/test_brakeman_command_callback.vader @@ -5,28 +5,28 @@ After: call ale#assert#TearDownLinterTest() Execute(The brakeman command callback should detect absence of a valid Rails app): - call ale#test#SetFilename('../ruby_fixtures/not_a_rails_app/test.rb') + call ale#test#SetFilename('../test-files/ruby/not_a_rails_app/test.rb') AssertLinter 'brakeman', '' Execute(The brakeman command callback should find a valid Rails app root): - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/db/test.rb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/db/test.rb') AssertLinter 'brakeman', ale#Escape('brakeman') \ . ' -f json -q -p ' - \ . ale#Escape(ale#path#Simplify(g:dir . '/../ruby_fixtures/valid_rails_app')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/valid_rails_app')) Execute(The brakeman command callback should include configured options): - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/db/test.rb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/db/test.rb') let g:ale_ruby_brakeman_options = '--combobulate' AssertLinter 'brakeman', ale#Escape('brakeman') \ . ' -f json -q --combobulate -p ' - \ . ale#Escape(ale#path#Simplify(g:dir . '/../ruby_fixtures/valid_rails_app')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/valid_rails_app')) Execute(Setting bundle appends 'exec brakeman'): - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/db/test.rb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/db/test.rb') let g:ale_ruby_brakeman_executable = 'bundle' let g:ale_ruby_brakeman_options = '--combobulate' @@ -34,4 +34,4 @@ Execute(Setting bundle appends 'exec brakeman'): AssertLinter 'bundle', ale#Escape('bundle') \ . ' exec brakeman' \ . ' -f json -q --combobulate -p ' - \ . ale#Escape(ale#path#Simplify(g:dir . '/../ruby_fixtures/valid_rails_app')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/valid_rails_app')) diff --git a/test/command_callback/test_c_ccls_command_callbacks.vader b/test/command_callback/test_c_ccls_command_callbacks.vader index 04643d02..a4f575c6 100644 --- a/test/command_callback/test_c_ccls_command_callbacks.vader +++ b/test/command_callback/test_c_ccls_command_callbacks.vader @@ -16,27 +16,27 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_compile_commands_json/dummy.c') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_compile_commands_json') Execute(The project root should be detected correctly using .ccls file): call ale#test#SetFilename(tempname() . '/dummy.c') AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_ccls/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_ccls/dummy.c') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_ccls') Execute(The project root should be detected correctly using .ccls-root file): call ale#test#SetFilename(tempname() . '/dummy.c') AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_ccls-root/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_ccls-root/dummy.c') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls-root') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_ccls-root') Execute(The executable should be configurable): AssertLinter 'ccls', ale#Escape('ccls') @@ -53,17 +53,17 @@ Execute(The initialization options should be configurable): AssertLSPOptions { 'cacheDirectory': '/tmp/ccls' } Execute(The compile command database should be detected correctly): - call ale#test#SetFilename('ccls_paths/with_ccls/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_ccls/dummy.c') AssertLSPOptions {} - call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_compile_commands_json/dummy.c') AssertLSPOptions { 'compilationDatabaseDirectory': - \ ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') } + \ ale#path#Simplify(g:dir . '/../test-files/ccls/with_compile_commands_json') } - call ale#test#SetFilename('ccls_paths/with_build_dir/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_build_dir/dummy.c') let b:ale_c_build_dir_names = ['unusual_build_dir_name'] AssertLSPOptions { 'compilationDatabaseDirectory': - \ ale#path#Simplify(g:dir . '/ccls_paths/with_build_dir/unusual_build_dir_name') } + \ ale#path#Simplify(g:dir . '/../test-files/ccls/with_build_dir/unusual_build_dir_name') } diff --git a/test/command_callback/test_c_clangd_command_callbacks.vader b/test/command_callback/test_c_clangd_command_callbacks.vader index 753dc9a8..438bc80e 100644 --- a/test/command_callback/test_c_clangd_command_callbacks.vader +++ b/test/command_callback/test_c_clangd_command_callbacks.vader @@ -23,9 +23,9 @@ Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('clangd_paths/with_compile_commands/dummy.c') + call ale#test#SetFilename('../test-files/clangd/with_compile_commands/dummy.c') - AssertLSPProject ale#path#Simplify(g:dir . '/clangd_paths/with_compile_commands') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/clangd/with_compile_commands') Execute(The executable should be configurable): let g:ale_c_clangd_executable = 'foobar' @@ -38,7 +38,7 @@ Execute(The options should be configurable): AssertLinter 'clangd', ale#Escape('clangd') . ' ' . b:ale_c_clangd_options Execute(The compile command database should be detected correctly): - call ale#test#SetFilename('clangd_paths/with_build_dir/dummy_src/dummy.c') + call ale#test#SetFilename('../test-files/clangd/with_build_dir/dummy_src/dummy.c') let b:ale_c_clangd_options = '' let b:ale_c_build_dir = '' @@ -47,5 +47,5 @@ Execute(The compile command database should be detected correctly): AssertLinter 'clangd', ale#Escape('clangd') \ . ' -compile-commands-dir=' - \ . ale#Escape(ale#path#Simplify(g:dir . '/clangd_paths/with_build_dir/unusual_build_dir_name')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/clangd/with_build_dir/unusual_build_dir_name')) diff --git a/test/command_callback/test_c_cppcheck_command_callbacks.vader b/test/command_callback/test_c_cppcheck_command_callbacks.vader index d9b9c62c..40685dab 100644 --- a/test/command_callback/test_c_cppcheck_command_callbacks.vader +++ b/test/command_callback/test_c_cppcheck_command_callbacks.vader @@ -21,9 +21,9 @@ Execute(The executable should be configurable): AssertLinter 'foobar', ale#Escape('foobar') . b:command_tail Execute(cppcheck for C should detect compile_commands.json files): - call ale#test#SetFilename('cppcheck_paths/one/foo.c') + call ale#test#SetFilename('../test-files/cppcheck/one/foo.c') - AssertLinterCwd ale#path#Simplify(g:dir . '/cppcheck_paths/one') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/cppcheck/one') AssertLinter 'cppcheck', ale#Escape('cppcheck') \ . ' -q --language=c' \ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') @@ -31,9 +31,9 @@ Execute(cppcheck for C should detect compile_commands.json files): \ . ' --enable=style %t' Execute(cppcheck for C should detect compile_commands.json files in build directories): - call ale#test#SetFilename('cppcheck_paths/with_build_dir/foo.cpp') + call ale#test#SetFilename('../test-files/cppcheck/with_build_dir/foo.cpp') - AssertLinterCwd ale#path#Simplify(g:dir . '/cppcheck_paths/with_build_dir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/cppcheck/with_build_dir') AssertLinter 'cppcheck', ale#Escape('cppcheck') \ . ' -q --language=c' \ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') @@ -41,26 +41,26 @@ Execute(cppcheck for C should detect compile_commands.json files in build direct \ . ' --enable=style %t' Execute(cppcheck for C should include file dir if compile_commands.json file is not found): - call ale#test#SetFilename('cppcheck_paths/foo.cpp') + call ale#test#SetFilename('../test-files/cppcheck/foo.cpp') AssertLinter 'cppcheck', \ ale#Escape('cppcheck') \ . ' -q --language=c' \ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') \ . ' --enable=style' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/cppcheck')) \ . ' %t' Execute(cppcheck for C should ignore compile_commands.json file if buffer is modified): - call ale#test#SetFilename('cppcheck_paths/one/foo.c') + call ale#test#SetFilename('../test-files/cppcheck/one/foo.c') set buftype= set modified - AssertLinterCwd ale#path#Simplify(g:dir . '/cppcheck_paths/one') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/cppcheck/one') AssertLinter 'cppcheck', ale#Escape('cppcheck') \ . ' -q --language=c' \ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') \ . ' --enable=style' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths/one')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/cppcheck/one')) \ . ' %t' diff --git a/test/command_callback/test_c_cquery_command_callbacks.vader b/test/command_callback/test_c_cquery_command_callbacks.vader index 01356bdf..bca0dbbc 100644 --- a/test/command_callback/test_c_cquery_command_callbacks.vader +++ b/test/command_callback/test_c_cquery_command_callbacks.vader @@ -9,18 +9,18 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject '' - call ale#test#SetFilename('cquery_paths/dummy.c') + call ale#test#SetFilename('../test-files/cquery/dummy.c') - AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/cquery') Execute(The project root should be detected correctly using .cquery file): call ale#test#SetFilename(tempname() . '/dummy.c') AssertLSPProject '' - call ale#test#SetFilename('cquery_paths/with_cquery/dummy.c') + call ale#test#SetFilename('../test-files/cquery/with_cquery/dummy.c') - AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths/with_cquery') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/cquery/with_cquery') Execute(The executable should be configurable): AssertLinter 'cquery', ale#Escape('cquery') diff --git a/test/command_callback/test_c_import_paths.vader b/test/command_callback/test_c_import_paths.vader index 3c2bd79b..19e39915 100644 --- a/test/command_callback/test_c_import_paths.vader +++ b/test/command_callback/test_c_import_paths.vader @@ -37,126 +37,126 @@ After: Execute(The C cc linter should include 'include' directories for projects with a Makefile): call ale#assert#SetUpLinterTest('c', 'cc') - call ale#test#SetFilename('../test_c_projects/makefile_project/subdir/file.c') + call ale#test#SetFilename('../test-files/c/makefile_project/subdir/file.c') let g:ale_c_cc_options = '' AssertLinter 'gcc', \ ale#Escape('gcc') \ . ' -S -x c -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote %s:h' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/makefile_project/include')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/makefile_project/include')) \ . ' -' Execute(The C cc linter should include 'include' directories for projects with a configure file): call ale#assert#SetUpLinterTest('c', 'cc') - call ale#test#SetFilename('../test_c_projects/configure_project/subdir/file.c') + call ale#test#SetFilename('../test-files/c/configure_project/subdir/file.c') let g:ale_c_cc_options = '' AssertLinter 'gcc', \ ale#Escape('gcc') \ . ' -S -x c -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote %s:h' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/configure_project/include')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/configure_project/include')) \ . ' -' Execute(The C cc linter should include root directories for projects with .h files in them): call ale#assert#SetUpLinterTest('c', 'cc') - call ale#test#SetFilename('../test_c_projects/h_file_project/subdir/file.c') + call ale#test#SetFilename('../test-files/c/h_file_project/subdir/file.c') let g:ale_c_cc_options = '' AssertLinter 'gcc', \ ale#Escape('gcc') \ . ' -S -x c -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote %s:h' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/h_file_project')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/h_file_project')) \ . ' -' Execute(The C cc linter should include root directories for projects with .hpp files in them): call ale#assert#SetUpLinterTest('c', 'cc') - call ale#test#SetFilename('../test_c_projects/hpp_file_project/subdir/file.c') + call ale#test#SetFilename('../test-files/c/hpp_file_project/subdir/file.c') let g:ale_c_cc_options = '' AssertLinter 'gcc', \ ale#Escape('gcc') \ . ' -S -x c -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote %s:h' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/hpp_file_project')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/hpp_file_project')) \ . ' -' Execute(The C ClangTidy handler should include 'include' directories for projects with a Makefile): call ale#assert#SetUpLinterTest('c', 'clangtidy') - call ale#test#SetFilename('../test_c_projects/makefile_project/subdir/file.cpp') + call ale#test#SetFilename('../test-files/c/makefile_project/subdir/file.cpp') let g:ale_c_clangtidy_options = '' AssertLinter 'clang-tidy', \ ale#Escape('clang-tidy') \ . ' %s ' - \ . '-- -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/makefile_project/include')) + \ . '-- -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/makefile_project/include')) Execute(The C++ cc linter should include 'include' directories for projects with a Makefile): call ale#assert#SetUpLinterTest('cpp', 'cc') - call ale#test#SetFilename('../test_c_projects/makefile_project/subdir/file.cpp') + call ale#test#SetFilename('../test-files/c/makefile_project/subdir/file.cpp') let g:ale_cpp_cc_options = '' AssertLinter 'gcc', \ ale#Escape('gcc') \ . ' -S -x c++ -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote %s:h' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/makefile_project/include')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/makefile_project/include')) \ . ' -' Execute(The C++ cc linter should include 'include' directories for projects with a configure file): call ale#assert#SetUpLinterTest('cpp', 'cc') - call ale#test#SetFilename('../test_c_projects/configure_project/subdir/file.cpp') + call ale#test#SetFilename('../test-files/c/configure_project/subdir/file.cpp') let g:ale_cpp_cc_options = '' AssertLinter 'gcc', \ ale#Escape('gcc') \ . ' -S -x c++ -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote %s:h' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/configure_project/include')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/configure_project/include')) \ . ' -' Execute(The C++ cc linter should include root directories for projects with .h files in them): call ale#assert#SetUpLinterTest('cpp', 'cc') - call ale#test#SetFilename('../test_c_projects/h_file_project/subdir/file.cpp') + call ale#test#SetFilename('../test-files/c/h_file_project/subdir/file.cpp') let g:ale_cpp_cc_options = '' AssertLinter 'gcc', \ ale#Escape('gcc') \ . ' -S -x c++ -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote %s:h' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/h_file_project')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/h_file_project')) \ . ' -' Execute(The C++ cc linter should include root directories for projects with .hpp files in them): call ale#assert#SetUpLinterTest('cpp', 'cc') - call ale#test#SetFilename('../test_c_projects/hpp_file_project/subdir/file.cpp') + call ale#test#SetFilename('../test-files/c/hpp_file_project/subdir/file.cpp') let g:ale_cpp_cc_options = '' AssertLinter 'gcc', \ ale#Escape('gcc') \ . ' -S -x c++ -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote %s:h' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/hpp_file_project')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/hpp_file_project')) \ . ' -' Execute(The C++ ClangTidy handler should include json folders for projects with suitable build directory in them): call ale#assert#SetUpLinterTest('cpp', 'clangtidy') - call ale#test#SetFilename('../test_c_projects/json_project/subdir/file.cpp') + call ale#test#SetFilename('../test-files/c/json_project/subdir/file.cpp') AssertLinter 'clang-tidy', \ ale#Escape('clang-tidy') \ . ' %s ' - \ . '-p ' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/json_project/build')) + \ . '-p ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/json_project/build')) Execute(The C++ ClangTidy handler should include 'include' directories for projects with a Makefile): call ale#assert#SetUpLinterTest('cpp', 'clangtidy') - call ale#test#SetFilename('../test_c_projects/makefile_project/subdir/file.cpp') + call ale#test#SetFilename('../test-files/c/makefile_project/subdir/file.cpp') let g:ale_cpp_clangtidy_options = '' AssertLinter 'clang-tidy', \ ale#Escape('clang-tidy') \ . ' %s ' - \ . '-- -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test_c_projects/makefile_project/include')) + \ . '-- -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/c/makefile_project/include')) diff --git a/test/command_callback/test_cargo_command_callbacks.vader b/test/command_callback/test_cargo_command_callbacks.vader index ee942c28..25dd0253 100644 --- a/test/command_callback/test_cargo_command_callbacks.vader +++ b/test/command_callback/test_cargo_command_callbacks.vader @@ -1,8 +1,8 @@ Before: call ale#assert#SetUpLinterTest('rust', 'cargo') - call ale#test#SetFilename('cargo_paths/test.rs') + call ale#test#SetFilename('../test-files/cargo/test.rs') - let g:cd = 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/cargo_paths')) . ' && ' + let g:cd = 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/cargo')) . ' && ' let g:suffix = ' --frozen --message-format=json -q' let g:ale_rust_cargo_avoid_whole_workspace = 0 @@ -120,9 +120,9 @@ Execute(--all-features should be used when g:ale_rust_cargo_default_feature_beha Execute(Cargo should run from the crate directory when set to avoid the workspace): let g:ale_rust_cargo_avoid_whole_workspace = 1 - call ale#test#SetFilename('cargo_workspace_paths/subpath/test.rs') + call ale#test#SetFilename('../test-files/cargo/workspace_paths/subpath/test.rs') - AssertLinterCwd ale#path#Simplify(g:dir . '/cargo_workspace_paths/subpath') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/cargo/workspace_paths/subpath') call ale#semver#ResetVersionCache() AssertLinter 'cargo', [ \ ale#Escape('cargo') . ' --version', @@ -131,7 +131,7 @@ Execute(Cargo should run from the crate directory when set to avoid the workspac Execute(Cargo should not run from the crate directory when not set to avoid the workspace): let g:ale_rust_cargo_avoid_whole_workspace = 0 - call ale#test#SetFilename('cargo_workspace_paths/subpath/test.rs') + call ale#test#SetFilename('../test-files/cargo/workspace_paths/subpath/test.rs') AssertLinterCwd '' call ale#semver#ResetVersionCache() diff --git a/test/command_callback/test_checkstyle_command_callback.vader b/test/command_callback/test_checkstyle_command_callback.vader index 5824df87..8197e6b5 100644 --- a/test/command_callback/test_checkstyle_command_callback.vader +++ b/test/command_callback/test_checkstyle_command_callback.vader @@ -29,11 +29,11 @@ Execute(Custom options should be supported): \ . ' %s' Execute(configuration files set in _config should be supported): - let b:ale_java_checkstyle_config = ale#path#Simplify(g:dir . '/checkstyle_paths/other_config.xml') + let b:ale_java_checkstyle_config = ale#path#Simplify(g:dir . '/../test-files/checkstyle/other_config.xml') AssertLinter 'checkstyle', \ ale#Escape('checkstyle') - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/checkstyle_paths/other_config.xml')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/checkstyle/other_config.xml')) \ . ' %s' Execute(configuration files set in _options should be preferred over _config): @@ -47,7 +47,7 @@ Execute(configuration files set in _options should be preferred over _config): AssertLinter 'checkstyle', ale#Escape('checkstyle') . ' -x -c /bar.xml %s' Execute(google_checks.xml should be used by default): - call ale#test#SetFilename('checkstyle_paths/test.java') + call ale#test#SetFilename('../test-files/checkstyle/test.java') AssertLinter 'checkstyle', \ ale#Escape('checkstyle') @@ -55,18 +55,18 @@ Execute(google_checks.xml should be used by default): \ . ' %s' Execute(Other relative paths should be supported): - let b:ale_java_checkstyle_config = 'checkstyle_paths/other_config.xml' + let b:ale_java_checkstyle_config = '../test-files/checkstyle/other_config.xml' AssertLinter 'checkstyle', \ ale#Escape('checkstyle') - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/checkstyle_paths/other_config.xml')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/checkstyle/other_config.xml')) \ . ' %s' - call ale#test#SetFilename('checkstyle_paths/test.java') + call ale#test#SetFilename('../test-files/checkstyle/test.java') let b:ale_java_checkstyle_config = 'other_config.xml' AssertLinter 'checkstyle', \ ale#Escape('checkstyle') - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/checkstyle_paths/other_config.xml')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/checkstyle/other_config.xml')) \ . ' %s' diff --git a/test/command_callback/test_cpp_ccls_command_callbacks.vader b/test/command_callback/test_cpp_ccls_command_callbacks.vader index f603ac07..12aa30e3 100644 --- a/test/command_callback/test_cpp_ccls_command_callbacks.vader +++ b/test/command_callback/test_cpp_ccls_command_callbacks.vader @@ -16,27 +16,27 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.cpp') + call ale#test#SetFilename('../test-files/ccls/with_compile_commands_json/dummy.cpp') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_compile_commands_json') Execute(The project root should be detected correctly using .ccls file): call ale#test#SetFilename(tempname() . '/dummy.cpp') AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_ccls/dummy.cpp') + call ale#test#SetFilename('../test-files/ccls/with_ccls/dummy.cpp') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_ccls') Execute(The project root should be detected correctly using .ccls-root file): call ale#test#SetFilename(tempname() . '/dummy.cpp') AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_ccls-root/dummy.cpp') + call ale#test#SetFilename('../test-files/ccls/with_ccls-root/dummy.cpp') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls-root') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_ccls-root') Execute(The executable should be configurable): AssertLinter 'ccls', ale#Escape('ccls') @@ -53,17 +53,17 @@ Execute(The initialization options should be configurable): AssertLSPOptions { 'cacheDirectory': '/tmp/ccls' } Execute(The compile command database should be detected correctly): - call ale#test#SetFilename('ccls_paths/with_ccls/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_ccls/dummy.c') AssertLSPOptions {} - call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_compile_commands_json/dummy.c') AssertLSPOptions { 'compilationDatabaseDirectory': - \ ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') } + \ ale#path#Simplify(g:dir . '/../test-files/ccls/with_compile_commands_json') } - call ale#test#SetFilename('ccls_paths/with_build_dir/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_build_dir/dummy.c') let b:ale_c_build_dir_names = ['unusual_build_dir_name'] AssertLSPOptions { 'compilationDatabaseDirectory': - \ ale#path#Simplify(g:dir . '/ccls_paths/with_build_dir/unusual_build_dir_name') } + \ ale#path#Simplify(g:dir . '/../test-files/ccls/with_build_dir/unusual_build_dir_name') } diff --git a/test/command_callback/test_cpp_cppcheck_command_callbacks.vader b/test/command_callback/test_cpp_cppcheck_command_callbacks.vader index 01e4f776..62195803 100644 --- a/test/command_callback/test_cpp_cppcheck_command_callbacks.vader +++ b/test/command_callback/test_cpp_cppcheck_command_callbacks.vader @@ -21,9 +21,9 @@ Execute(The executable should be configurable): AssertLinter 'foobar', ale#Escape('foobar') . b:command_tail Execute(cppcheck for C++ should detect compile_commands.json files): - call ale#test#SetFilename('cppcheck_paths/one/foo.cpp') + call ale#test#SetFilename('../test-files/cppcheck/one/foo.cpp') - AssertLinterCwd ale#path#Simplify(g:dir . '/cppcheck_paths/one') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/cppcheck/one') AssertLinter 'cppcheck', ale#Escape('cppcheck') \ . ' -q --language=c++' \ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') @@ -31,9 +31,9 @@ Execute(cppcheck for C++ should detect compile_commands.json files): \ . ' --enable=style %t' Execute(cppcheck for C++ should detect compile_commands.json files in build directories): - call ale#test#SetFilename('cppcheck_paths/with_build_dir/foo.cpp') + call ale#test#SetFilename('../test-files/cppcheck/with_build_dir/foo.cpp') - AssertLinterCwd ale#path#Simplify(g:dir . '/cppcheck_paths/with_build_dir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/cppcheck/with_build_dir') AssertLinter 'cppcheck', ale#Escape('cppcheck') \ . ' -q --language=c++' \ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') @@ -41,26 +41,26 @@ Execute(cppcheck for C++ should detect compile_commands.json files in build dire \ . ' --enable=style %t' Execute(cppcheck for C++ should include file dir if compile_commands.json file is not found): - call ale#test#SetFilename('cppcheck_paths/foo.cpp') + call ale#test#SetFilename('../test-files/cppcheck/foo.cpp') AssertLinter 'cppcheck', \ ale#Escape('cppcheck') \ . ' -q --language=c++' \ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') \ . ' --enable=style' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/cppcheck')) \ . ' %t' Execute(cppcheck for C++ should ignore compile_commands.json file if buffer is modified): - call ale#test#SetFilename('cppcheck_paths/one/foo.cpp') + call ale#test#SetFilename('../test-files/cppcheck/one/foo.cpp') set buftype= set modified - AssertLinterCwd ale#path#Simplify(g:dir . '/cppcheck_paths/one') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/cppcheck/one') AssertLinter 'cppcheck', ale#Escape('cppcheck') \ . ' -q --language=c++' \ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') \ . ' --enable=style' - \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths/one')) + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/cppcheck/one')) \ . ' %t' diff --git a/test/command_callback/test_cpp_cquery_command_callbacks.vader b/test/command_callback/test_cpp_cquery_command_callbacks.vader index 842f123e..f638e401 100644 --- a/test/command_callback/test_cpp_cquery_command_callbacks.vader +++ b/test/command_callback/test_cpp_cquery_command_callbacks.vader @@ -12,18 +12,18 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject '' - call ale#test#SetFilename('cquery_paths/dummy.cpp') + call ale#test#SetFilename('../test-files/cquery/dummy.cpp') - AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/cquery') Execute(The project root should be detected correctly using .cquery file): call ale#test#SetFilename(tempname() . '/dummy.cpp') AssertLSPProject '' - call ale#test#SetFilename('cquery_paths/with_cquery/dummy.cpp') + call ale#test#SetFilename('../test-files/cquery/with_cquery/dummy.cpp') - AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths/with_cquery') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/cquery/with_cquery') Execute(The executable should be configurable): AssertLinter 'cquery', ale#Escape('cquery') diff --git a/test/command_callback/test_cucumber_command_callback.vader b/test/command_callback/test_cucumber_command_callback.vader index 7a8457fc..6a7851ef 100644 --- a/test/command_callback/test_cucumber_command_callback.vader +++ b/test/command_callback/test_cucumber_command_callback.vader @@ -5,11 +5,11 @@ After: call ale#assert#TearDownLinterTest() Execute(Should require the nearest features dir, if one is found): - call ale#test#SetFilename('../cucumber_fixtures/features/cuke.feature') + call ale#test#SetFilename('../test-files/cucumber/features/cuke.feature') AssertLinter 'cucumber', \ 'cucumber --dry-run --quiet --strict --format=json ' - \ . '-r ' . ale#Escape(ale#path#Simplify(g:dir . '/../cucumber_fixtures/features/')) . ' %t' + \ . '-r ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/cucumber/features/')) . ' %t' Execute(Should require nothing if no features dir is found): call ale#test#SetFilename('something/without/a/features/dir') diff --git a/test/command_callback/test_dartanalyzer_command_callback.vader b/test/command_callback/test_dartanalyzer_command_callback.vader index 62b1d636..7275b187 100644 --- a/test/command_callback/test_dartanalyzer_command_callback.vader +++ b/test/command_callback/test_dartanalyzer_command_callback.vader @@ -13,8 +13,8 @@ Execute(The executable should be configurable): AssertLinter 'foobar', ale#Escape('foobar') . ' %s' Execute(The .packages file should be set if detected): - call ale#test#SetFilename('dart_paths/foo') + call ale#test#SetFilename('../test-files/dart/foo') AssertLinter 'dartanalyzer', ale#Escape('dartanalyzer') - \ . ' --packages ' . ale#Escape(ale#path#Simplify(g:dir . '/dart_paths/.packages')) + \ . ' --packages ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/dart/.packages')) \ . ' %s' diff --git a/test/command_callback/test_dialyxir_command_callback.vader b/test/command_callback/test_dialyxir_command_callback.vader index 9fe27dfb..250ffefd 100644 --- a/test/command_callback/test_dialyxir_command_callback.vader +++ b/test/command_callback/test_dialyxir_command_callback.vader @@ -1,16 +1,16 @@ Before: call ale#assert#SetUpLinterTest('elixir', 'dialyxir') - call ale#test#SetFilename('elixir_paths/mix_project/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/mix_project/lib/app.ex') After: call ale#assert#TearDownLinterTest() Execute(Builds dialyxir command with a normal project): - AssertLinterCwd ale#path#Simplify(g:dir . '/elixir_paths/mix_project') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elixir/mix_project') AssertLinter 'mix', 'mix help dialyzer && mix dialyzer' Execute(Builds dialyxir command with an umbrella project): - call ale#test#SetFilename('elixir_paths/umbrella_project/apps/mix_project/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/umbrella_project/apps/mix_project/lib/app.ex') - AssertLinterCwd ale#path#Simplify(g:dir . '/elixir_paths/umbrella_project') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elixir/umbrella_project') AssertLinter 'mix', 'mix help dialyzer && mix dialyzer' diff --git a/test/command_callback/test_dogma_command_callback.vader b/test/command_callback/test_dogma_command_callback.vader index 99267505..c8b599af 100644 --- a/test/command_callback/test_dogma_command_callback.vader +++ b/test/command_callback/test_dogma_command_callback.vader @@ -1,16 +1,16 @@ Before: call ale#assert#SetUpLinterTest('elixir', 'dogma') - call ale#test#SetFilename('elixir_paths/mix_project/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/mix_project/lib/app.ex') After: call ale#assert#TearDownLinterTest() Execute(Builds dogma command with a normal project): - AssertLinterCwd ale#path#Simplify(g:dir . '/elixir_paths/mix_project') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elixir/mix_project') AssertLinter 'mix', 'mix help dogma && mix dogma %s --format=flycheck' Execute(Builds dogma command with an umbrella project): - call ale#test#SetFilename('elixir_paths/umbrella_project/apps/mix_project/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/umbrella_project/apps/mix_project/lib/app.ex') - AssertLinterCwd ale#path#Simplify(g:dir . '/elixir_paths/umbrella_project') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elixir/umbrella_project') AssertLinter 'mix', 'mix help dogma && mix dogma %s --format=flycheck' diff --git a/test/command_callback/test_elixir_credo_command_callback.vader b/test/command_callback/test_elixir_credo_command_callback.vader index e3c57c61..9c639c57 100644 --- a/test/command_callback/test_elixir_credo_command_callback.vader +++ b/test/command_callback/test_elixir_credo_command_callback.vader @@ -1,6 +1,6 @@ Before: call ale#assert#SetUpLinterTest('elixir', 'credo') - call ale#test#SetFilename('elixir_paths/mix_project/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/mix_project/lib/app.ex') After: @@ -9,14 +9,14 @@ After: call ale#assert#TearDownLinterTest() Execute(Builds credo command with normal project): - AssertLinterCwd ale#path#Simplify(g:dir . '/elixir_paths/mix_project') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elixir/mix_project') AssertLinter 'mix', \ 'mix help credo && mix credo suggest --format=flycheck --read-from-stdin %s' Execute(Builds credo command with umbrella project): - call ale#test#SetFilename('elixir_paths/umbrella_project/apps/mix_project/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/umbrella_project/apps/mix_project/lib/app.ex') - AssertLinterCwd ale#path#Simplify(g:dir . '/elixir_paths/umbrella_project') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elixir/umbrella_project') AssertLinter 'mix', \ 'mix help credo && mix credo suggest --format=flycheck --read-from-stdin %s' diff --git a/test/command_callback/test_elixir_ls_command_callbacks.vader b/test/command_callback/test_elixir_ls_command_callbacks.vader index 41a5bc34..84e805ba 100644 --- a/test/command_callback/test_elixir_ls_command_callbacks.vader +++ b/test/command_callback/test_elixir_ls_command_callbacks.vader @@ -21,12 +21,12 @@ Execute(should configure elixir-ls release location): endif Execute(should set correct LSP values): - call ale#test#SetFilename('elixir_paths/umbrella_project/apps/app1/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/umbrella_project/apps/app1/lib/app.ex') AssertLSPLanguage 'elixir' AssertLSPOptions {} AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/elixir_paths/umbrella_project') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/elixir/umbrella_project') Execute(should accept configuration settings): AssertLSPConfig {} diff --git a/test/command_callback/test_elixir_mix_command_callbacks.vader b/test/command_callback/test_elixir_mix_command_callbacks.vader index 8dfba231..a04bee55 100644 --- a/test/command_callback/test_elixir_mix_command_callbacks.vader +++ b/test/command_callback/test_elixir_mix_command_callbacks.vader @@ -1,6 +1,6 @@ Before: call ale#assert#SetUpLinterTest('elixir', 'mix') - call ale#test#SetFilename('elixir_paths/mix_project/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/mix_project/lib/app.ex') let g:env_prefix = ale#Env('MIX_BUILD_PATH', 'TEMP_DIR') After: @@ -9,11 +9,11 @@ After: call ale#assert#TearDownLinterTest() Execute(The default mix command should be correct): - AssertLinterCwd ale#path#Simplify(g:dir . '/elixir_paths/mix_project') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elixir/mix_project') AssertLinter 'mix', g:env_prefix . 'mix compile %s' Execute(Build mix commands with an umbrella root): - call ale#test#SetFilename('elixir_paths/umbrella_project/apps/mix_project/lib/app.ex') + call ale#test#SetFilename('../test-files/elixir/umbrella_project/apps/mix_project/lib/app.ex') - AssertLinterCwd ale#path#Simplify(g:dir . '/elixir_paths/umbrella_project') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elixir/umbrella_project') AssertLinter 'mix', g:env_prefix . 'mix compile %s' diff --git a/test/command_callback/test_elm_ls_command_callbacks.vader b/test/command_callback/test_elm_ls_command_callbacks.vader index 3e1d5fbf..98b01c96 100644 --- a/test/command_callback/test_elm_ls_command_callbacks.vader +++ b/test/command_callback/test_elm_ls_command_callbacks.vader @@ -5,19 +5,19 @@ After: call ale#assert#TearDownLinterTest() Execute(The default executable path should be correct): - call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm') + call ale#test#SetFilename('../test-files/elm/newapp/src/Main.elm') AssertLinter 'elm-language-server', ale#Escape('elm-language-server') . ' --stdio' Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm') + call ale#test#SetFilename('../test-files/elm/newapp/src/Main.elm') - AssertLSPProject ale#path#Simplify(g:dir . '/../elm-test-files/newapp') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/elm/newapp') Execute(Should let users configure a global executable and override local paths): - call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm') + call ale#test#SetFilename('../test-files/elm/newapp/src/Main.elm') let g:ale_elm_ls_executable = '/path/to/custom/elm-language-server' let g:ale_elm_ls_use_global = 1 diff --git a/test/command_callback/test_elm_make_command_callback.vader b/test/command_callback/test_elm_make_command_callback.vader index 97a9e91d..90e0c920 100644 --- a/test/command_callback/test_elm_make_command_callback.vader +++ b/test/command_callback/test_elm_make_command_callback.vader @@ -7,48 +7,48 @@ After: call ale#assert#TearDownLinterTest() Execute(should get valid executable with default params): - call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm') + call ale#test#SetFilename('../test-files/elm/newapp/src/Main.elm') - let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/newapp/node_modules/.bin/elm') + let g:executable = ale#path#Simplify(g:dir . '/../test-files/elm/newapp/node_modules/.bin/elm') - AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elm/newapp') AssertLinter g:executable, \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t' Execute(should get elm-test executable for test code with elm >= 0.19): - call ale#test#SetFilename('../elm-test-files/newapp/tests/TestSuite.elm') + call ale#test#SetFilename('../test-files/elm/newapp/tests/TestSuite.elm') - let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/newapp/node_modules/.bin/elm-test') + let g:executable = ale#path#Simplify(g:dir . '/../test-files/elm/newapp/node_modules/.bin/elm-test') - AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elm/newapp') AssertLinter g:executable, \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null --compiler ' - \ . ale#path#Simplify(g:dir . '/../elm-test-files/newapp/node_modules/.bin/elm') . ' %t' + \ . ale#path#Simplify(g:dir . '/../test-files/elm/newapp/node_modules/.bin/elm') . ' %t' Execute(should fallback to elm executable with elm >= 0.19): - call ale#test#SetFilename('../elm-test-files/newapp-notests/tests/TestMain.elm') + call ale#test#SetFilename('../test-files/elm/newapp-notests/tests/TestMain.elm') - let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/newapp-notests/node_modules/.bin/elm') + let g:executable = ale#path#Simplify(g:dir . '/../test-files/elm/newapp-notests/node_modules/.bin/elm') - AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp-notests') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elm/newapp-notests') AssertLinter g:executable, \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t' Execute(should get plain elm executable for test code with elm < 0.19): - call ale#test#SetFilename('../elm-test-files/oldapp/tests/TestSuite.elm') + call ale#test#SetFilename('../test-files/elm/oldapp/tests/TestSuite.elm') - let g:executable = ale#path#Simplify(g:dir . '/../elm-test-files/oldapp/node_modules/.bin/elm') + let g:executable = ale#path#Simplify(g:dir . '/../test-files/elm/oldapp/node_modules/.bin/elm') - AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/oldapp') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elm/oldapp') AssertLinter g:executable, \ ale#Escape(g:executable) . ' make --report=json --output=/dev/null %t' Execute(should get valid executable with 'use_global' params): let g:ale_elm_make_use_global = 1 - call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm') + call ale#test#SetFilename('../test-files/elm/newapp/src/Main.elm') - AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elm/newapp') AssertLinter 'elm', \ ale#Escape('elm') . ' make --report=json --output=/dev/null %t' @@ -56,8 +56,8 @@ Execute(should get valid executable with 'use_global' and 'executable' params): let g:ale_elm_make_executable = 'other-elm' let g:ale_elm_make_use_global = 1 - call ale#test#SetFilename('../elm-test-files/newapp/src/Main.elm') + call ale#test#SetFilename('../test-files/elm/newapp/src/Main.elm') - AssertLinterCwd ale#path#Simplify(g:dir . '/../elm-test-files/newapp') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/elm/newapp') AssertLinter 'other-elm', \ ale#Escape('other-elm') . ' make --report=json --output=/dev/null %t' diff --git a/test/command_callback/test_erb_command_callback.vader b/test/command_callback/test_erb_command_callback.vader index c29d9215..c64c7ba5 100644 --- a/test/command_callback/test_erb_command_callback.vader +++ b/test/command_callback/test_erb_command_callback.vader @@ -5,12 +5,12 @@ After: call ale#assert#TearDownLinterTest() Execute(Executable should not contain any filter code by default): - call ale#test#SetFilename('../ruby_fixtures/not_a_rails_app/file.rb') + call ale#test#SetFilename('../test-files/ruby/not_a_rails_app/file.rb') AssertLinter 'erb', 'erb -P -T - -x %t | ruby -c' Execute(Executable should filter invalid eRuby when inside a Rails project): - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/app/views/my_great_view.html.erb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/app/views/my_great_view.html.erb') AssertLinter 'erb', \ 'ruby -r erb -e ' . ale#Escape('puts ERB.new($stdin.read.gsub(%{<%=},%{<%}), nil, %{-}).src') . '< %t | ruby -c' diff --git a/test/command_callback/test_erubi_command_callback.vader b/test/command_callback/test_erubi_command_callback.vader index 0d88ff93..cd4a0b68 100644 --- a/test/command_callback/test_erubi_command_callback.vader +++ b/test/command_callback/test_erubi_command_callback.vader @@ -5,7 +5,7 @@ After: call ale#assert#TearDownLinterTest() Execute(Executable should not contain any filter code by default): - call ale#test#SetFilename('../ruby_fixtures/not_a_rails_app/file.rb') + call ale#test#SetFilename('../test-files/ruby/not_a_rails_app/file.rb') AssertLinter 'ruby', [ \ 'ruby -r erubi/capture_end -e ' . ale#Escape('""'), @@ -13,7 +13,7 @@ Execute(Executable should not contain any filter code by default): \] Execute(Executable should filter invalid eRuby when inside a Rails project): - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/app/views/my_great_view.html.erb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/app/views/my_great_view.html.erb') AssertLinter 'ruby', [ \ 'ruby -r erubi/capture_end -e ' . ale#Escape('""'), diff --git a/test/command_callback/test_erubis_command_callback.vader b/test/command_callback/test_erubis_command_callback.vader index c9cdb80f..cfca54a2 100644 --- a/test/command_callback/test_erubis_command_callback.vader +++ b/test/command_callback/test_erubis_command_callback.vader @@ -5,12 +5,12 @@ After: call ale#assert#TearDownLinterTest() Execute(Executable should not contain any filter code by default): - call ale#test#SetFilename('../ruby_fixtures/not_a_rails_app/file.rb') + call ale#test#SetFilename('../test-files/ruby/not_a_rails_app/file.rb') AssertLinter 'erubis', 'erubis -x %t | ruby -c' Execute(Executable should filter invalid eRuby when inside a Rails project): - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/app/views/my_great_view.html.erb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/app/views/my_great_view.html.erb') AssertLinter 'erubis', \ 'ruby -r erubis -e ' . ale#Escape('puts Erubis::Eruby.new($stdin.read.gsub(%{<%=},%{<%})).src') . '< %t | ruby -c' diff --git a/test/command_callback/test_eslint_command_callback.vader b/test/command_callback/test_eslint_command_callback.vader index 071ebdc6..81518af9 100644 --- a/test/command_callback/test_eslint_command_callback.vader +++ b/test/command_callback/test_eslint_command_callback.vader @@ -15,62 +15,62 @@ Execute(The default command should be correct): AssertLinter 'eslint', ale#Escape('eslint') . b:args Execute(create-react-app directories should be detected correctly): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir/testfile.js') - let b:executable = ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js') - AssertLinterCwd ale#path#Simplify(g:dir . '/../eslint-test-files/react-app') + let b:executable = ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/eslint/react-app') AssertLinter b:executable, \ (has('win32') ? ale#Escape('node.exe') . ' ' : '') \ . ale#Escape(b:executable) . b:args Execute(use-global should override create-react-app detection): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir/testfile.js') let g:ale_javascript_eslint_use_global = 1 let g:ale_javascript_eslint_executable = 'eslint_d' let b:executable = 'eslint_d' - AssertLinterCwd ale#path#Simplify(g:dir . '/../eslint-test-files/react-app') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/eslint/react-app') AssertLinter b:executable, ale#Escape(b:executable) . b:args Execute(other app directories should be detected correctly): - call ale#test#SetFilename('../eslint-test-files/other-app/subdir/testfile.js') + call ale#test#SetFilename('../test-files/eslint/other-app/subdir/testfile.js') - let b:executable = ale#path#Simplify(g:dir . '/../eslint-test-files/node_modules/.bin/eslint') - AssertLinterCwd ale#path#Simplify(g:dir . '/../eslint-test-files') + let b:executable = ale#path#Simplify(g:dir . '/../test-files/eslint/node_modules/.bin/eslint') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/eslint') AssertLinter b:executable, ale#Escape(b:executable) . b:args Execute(use-global should override other app directories): - call ale#test#SetFilename('../eslint-test-files/other-app/subdir/testfile.js') + call ale#test#SetFilename('../test-files/eslint/other-app/subdir/testfile.js') let g:ale_javascript_eslint_use_global = 1 let g:ale_javascript_eslint_executable = 'eslint_d' let b:executable = 'eslint_d' - AssertLinterCwd ale#path#Simplify(g:dir . '/../eslint-test-files') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/eslint') AssertLinter b:executable, ale#Escape(b:executable) . b:args Execute(eslint_d should be detected correctly): - call ale#test#SetFilename('../eslint-test-files/app-with-eslint-d/testfile.js') + call ale#test#SetFilename('../test-files/eslint/app-with-eslint-d/testfile.js') - let b:executable = ale#path#Simplify(g:dir . '/../eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d') - AssertLinterCwd ale#path#Simplify(g:dir . '/../eslint-test-files/app-with-eslint-d') + let b:executable = ale#path#Simplify(g:dir . '/../test-files/eslint/app-with-eslint-d/node_modules/.bin/eslint_d') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/eslint/app-with-eslint-d') AssertLinter b:executable, ale#Escape(b:executable) . b:args Execute(eslint.js executables should be run with node on Windows): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir/testfile.js') - let b:executable = ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js') - AssertLinterCwd ale#path#Simplify(g:dir . '/../eslint-test-files/react-app') + let b:executable = ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/eslint/react-app') AssertLinter b:executable, \ (has('win32') ? ale#Escape('node.exe') . ' ' : '') \ . ale#Escape(b:executable) . b:args Execute(eslint.js should be run from a containing project with eslint): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir-with-package-json/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir-with-package-json/testfile.js') - let b:executable = ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js') - AssertLinterCwd ale#path#Simplify(g:dir . '/../eslint-test-files/react-app') + let b:executable = ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/eslint/react-app') AssertLinter b:executable, \ (has('win32') ? ale#Escape('node.exe') . ' ' : '') \ . ale#Escape(b:executable) . b:args diff --git a/test/command_callback/test_flake8_command_callback.vader b/test/command_callback/test_flake8_command_callback.vader index 3cf1ed0c..81efe497 100644 --- a/test/command_callback/test_flake8_command_callback.vader +++ b/test/command_callback/test_flake8_command_callback.vader @@ -56,7 +56,7 @@ Execute(The option for disabling changing directories should work): \] Execute(The option for changing directory to project root should work): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_tox/namespace/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_tox/namespace/foo/bar.py') AssertLinterCwd ale#python#FindProjectRootIni(bufnr('')) call ale#semver#ResetVersionCache() @@ -67,7 +67,7 @@ Execute(The option for changing directory to project root should work): Execute(The option for changing directory to file dir should work): let g:ale_python_flake8_change_directory = 'file' - silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_tox/namespace/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_tox/namespace/foo/bar.py') AssertLinter 'flake8', [ \ ale#Escape('flake8') . ' --version', @@ -110,10 +110,10 @@ Execute(You should be able to set a custom executable and it should be escaped): \] Execute(The flake8 callbacks should detect virtualenv directories): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') let b:executable = ale#path#Simplify( - \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/flake8' + \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/flake8' \) AssertLinter b:executable, [ @@ -124,43 +124,43 @@ Execute(The flake8 callbacks should detect virtualenv directories): \] Execute(The FindProjectRoot should detect the project root directory for namespace package via Manifest.in): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_manifest/namespace/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_manifest/namespace/foo/bar.py') AssertEqual - \ ale#path#Simplify(g:dir . '/python_paths/namespace_package_manifest'), + \ ale#path#Simplify(g:dir . '/../test-files/python/namespace_package_manifest'), \ ale#python#FindProjectRoot(bufnr('')) Execute(The FindProjectRoot should detect the project root directory for namespace package via setup.cf): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_setup/namespace/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_setup/namespace/foo/bar.py') AssertEqual - \ ale#path#Simplify(g:dir . '/python_paths/namespace_package_setup'), + \ ale#path#Simplify(g:dir . '/../test-files/python/namespace_package_setup'), \ ale#python#FindProjectRoot(bufnr('')) Execute(The FindProjectRoot should detect the project root directory for namespace package via pytest.ini): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_pytest/namespace/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_pytest/namespace/foo/bar.py') AssertEqual - \ ale#path#Simplify(g:dir . '/python_paths/namespace_package_pytest'), + \ ale#path#Simplify(g:dir . '/../test-files/python/namespace_package_pytest'), \ ale#python#FindProjectRoot(bufnr('')) Execute(The FindProjectRoot should detect the project root directory for namespace package via tox.ini): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_tox/namespace/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_tox/namespace/foo/bar.py') AssertEqual - \ ale#path#Simplify(g:dir . '/python_paths/namespace_package_tox'), + \ ale#path#Simplify(g:dir . '/../test-files/python/namespace_package_tox'), \ ale#python#FindProjectRoot(bufnr('')) Execute(The FindProjectRoot should detect the project root directory for non-namespace package): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/no_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/no_virtualenv/subdir/foo/bar.py') AssertEqual - \ ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir'), + \ ale#path#Simplify(g:dir . '/../test-files/python/no_virtualenv/subdir'), \ ale#python#FindProjectRoot(bufnr('')) " Some users currently run flake8 this way, so we should support it. Execute(Using `python -m flake8` should be supported for running flake8): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') let g:ale_python_flake8_executable = 'python' let g:ale_python_flake8_options = '-m flake8 --some-option' @@ -194,7 +194,7 @@ Execute(Setting executable to 'pipenv' should append 'run flake8'): Execute(Pipenv is detected when python_flake8_auto_pipenv is set): let g:ale_python_flake8_auto_pipenv = 1 - call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinterCwd ale#python#FindProjectRootIni(bufnr('')) AssertLinter 'pipenv', diff --git a/test/test_flow_command.vader b/test/command_callback/test_flow_command_callback.vader similarity index 77% rename from test/test_flow_command.vader rename to test/command_callback/test_flow_command_callback.vader index 4805e121..8488a2e9 100644 --- a/test/test_flow_command.vader +++ b/test/command_callback/test_flow_command_callback.vader @@ -1,15 +1,11 @@ Before: - runtime ale_linters/javascript/flow.vim - call ale#assert#SetUpLinterTest('javascript', 'flow') - call ale#test#SetDirectory('/testplugin/test/') After: - unlet! b:ale_javascript_flow_use_respect_pragma call ale#assert#TearDownLinterTest() Execute(flow should return a command to run if a .flowconfig file exists): - call ale#test#SetFilename('flow/a/sub/dummy') + call ale#test#SetFilename('../test-files/flow/a/sub/dummy') AssertLinter 'flow', \ ale#Escape('flow') @@ -17,7 +13,7 @@ Execute(flow should return a command to run if a .flowconfig file exists): \ . (!has('win32') ? '; echo' : '') Execute(flow should not use the respect pragma argument if the option is off): - call ale#test#SetFilename('flow/a/sub/dummy') + call ale#test#SetFilename('../test-files/flow/a/sub/dummy') let b:ale_javascript_flow_use_respect_pragma = 0 @@ -27,7 +23,7 @@ Execute(flow should not use the respect pragma argument if the option is off): \ . (!has('win32') ? '; echo' : '') Execute(flow should should not use --respect-pragma for old versions): - call ale#test#SetFilename('flow/a/sub/dummy') + call ale#test#SetFilename('../test-files/flow/a/sub/dummy') GivenCommandOutput [ \ 'Warning: `flow --version` is deprecated in favor of `flow version`', @@ -41,6 +37,6 @@ Execute(flow should should not use --respect-pragma for old versions): \] Execute(flow should not return a command to run if no .flowconfig file exists): - call ale#test#SetFilename('flow/b/sub/dummy') + call ale#test#SetFilename('../test-files/flow/b/sub/dummy') AssertLinterNotExecuted diff --git a/test/command_callback/test_fortran_fortls_callback.vader b/test/command_callback/test_fortran_fortls_callback.vader index 3be7ff4f..581f94ba 100644 --- a/test/command_callback/test_fortran_fortls_callback.vader +++ b/test/command_callback/test_fortran_fortls_callback.vader @@ -10,9 +10,9 @@ Execute(The default executable path should be correct): Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('fortran-fortls-project/test.F90') + call ale#test#SetFilename('../test-files/fortls-project/test.F90') - AssertLSPProject ale#path#Simplify(g:dir . '/fortran-fortls-project') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/fortls-project') Execute(The language should be correct): AssertLSPLanguage 'fortran' diff --git a/test/command_callback/test_gitlint_command_callback.vader b/test/command_callback/test_gitlint_command_callback.vader index 7927b064..4df675f3 100644 --- a/test/command_callback/test_gitlint_command_callback.vader +++ b/test/command_callback/test_gitlint_command_callback.vader @@ -24,20 +24,20 @@ Execute(The gitlint command callback should let you set options): AssertLinter 'gitlint', ale#Escape('gitlint') . ' --some-option lint' Execute(The gitlint callbacks shouldn't detect virtualenv directories where they don't exist): - call ale#test#SetFilename('python_paths/no_virtualenv/subdir/foo/COMMIT_EDITMSG') + call ale#test#SetFilename('../test-files/python/no_virtualenv/subdir/foo/COMMIT_EDITMSG') AssertLinter 'gitlint', ale#Escape('gitlint') . ' lint' Execute(The gitlint callbacks should detect virtualenv directories): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/COMMIT_EDITMSG') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/COMMIT_EDITMSG') let b:executable = ale#path#Simplify( - \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/gitlint' + \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/gitlint' \) AssertLinter b:executable, ale#Escape(b:executable) . ' lint' Execute(You should able able to use the global gitlint instead): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/COMMIT_EDITMSG') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/COMMIT_EDITMSG') let g:ale_gitcommit_gitlint_use_global = 1 AssertLinter 'gitlint', ale#Escape('gitlint') . ' lint' diff --git a/test/command_callback/test_gofmt_command_callback.vader b/test/command_callback/test_gofmt_command_callback.vader index 88b2e6b0..b056a659 100644 --- a/test/command_callback/test_gofmt_command_callback.vader +++ b/test/command_callback/test_gofmt_command_callback.vader @@ -5,7 +5,7 @@ Before: let b:ale_go_go111module = '' call ale#assert#SetUpLinterTest('go', 'gofmt') - call ale#test#SetFilename('../go_files/testfile2.go') + call ale#test#SetFilename('../test-files/go/testfile2.go') After: Restore diff --git a/test/command_callback/test_golangserver_command_callback.vader b/test/command_callback/test_golangserver_command_callback.vader index 325adf63..b31d8dc8 100644 --- a/test/command_callback/test_golangserver_command_callback.vader +++ b/test/command_callback/test_golangserver_command_callback.vader @@ -7,9 +7,9 @@ Before: let g:sep = has('win32') ? ';' : ':' call ale#assert#SetUpLinterTest('go', 'langserver') - let $GOPATH = ale#path#Simplify(g:dir . '/go_paths/go1') + let $GOPATH = ale#path#Simplify(g:dir . '/../test-files/go/go1') \ . g:sep - \ . ale#path#Simplify(g:dir . '/go_paths/go2') + \ . ale#path#Simplify(g:dir . '/../test-files/go/go2') After: Restore @@ -29,7 +29,7 @@ Execute(should configure go-langserver callback executable): AssertLinter 'boo', ale#Escape('boo') Execute(should set go-langserver options): - call ale#test#SetFilename('go_paths/go1/prj1/file.go') + call ale#test#SetFilename('../test-files/go/go1/prj1/file.go') let b:ale_completion_enabled = 1 let b:ale_go_langserver_options = '' @@ -42,7 +42,7 @@ Execute(should set go-langserver options): \ ale#Escape('go-langserver') . ' -gocodecompletion -trace' Execute(should ignore go-langserver -gocodecompletion option): - call ale#test#SetFilename('go_paths/go1/prj1/file.go') + call ale#test#SetFilename('../test-files/go/go1/prj1/file.go') let b:ale_go_langserver_options = '-trace -gocodecompletion' let b:ale_completion_enabled = 1 @@ -61,16 +61,16 @@ Execute(should support Go environment variables): \ ale#Env('GO111MODULE', 'on') . ale#Escape('go-langserver') Execute(should set go-langserver for go app1): - call ale#test#SetFilename('go_paths/go1/prj1/file.go') + call ale#test#SetFilename('../test-files/go/go1/prj1/file.go') AssertLSPLanguage 'go' AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/go_paths/go1') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/go/go1') Execute(should set go-langserver for go app2): - call ale#test#SetFilename('go_paths/go2/prj1/file.go') + call ale#test#SetFilename('../test-files/go/go2/prj1/file.go') AssertLSPLanguage 'go' AssertLSPOptions {} AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/go_paths/go2') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/go/go2') diff --git a/test/command_callback/test_gopls_command_callback.vader b/test/command_callback/test_gopls_command_callback.vader index 590d8458..0f1558e9 100644 --- a/test/command_callback/test_gopls_command_callback.vader +++ b/test/command_callback/test_gopls_command_callback.vader @@ -24,7 +24,7 @@ Execute(should configure gopls callback executable): AssertLinter 'boo', ale#Escape('boo') Execute(should set gopls options): - call ale#test#SetFilename('go_paths/go1/prj1/file.go') + call ale#test#SetFilename('../test-files/go/go1/prj1/file.go') " let b:ale_completion_enabled = 1 let b:ale_go_gopls_options = '' @@ -46,9 +46,9 @@ Execute(should support go environment variables): \ ale#Env('GO111MODULE', 'off') . ale#Escape('gopls') . ' --mode stdio' Execute(Should return directory for 'go.mod' if found in parent directory): - call ale#test#SetFilename('../go_files/test.go') + call ale#test#SetFilename('../test-files/go/test.go') - AssertLSPProject ale#path#Simplify(g:dir . '/../go_files') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/go') Execute(Should return nearest directory with '.git' if found in parent directory): call ale#test#SetFilename('test.go') @@ -60,7 +60,7 @@ Execute(Should return nearest directory with '.git' if found in parent directory AssertLSPProject g:dir Execute(Should ignore 'go.mod' and return '.git' dir if modules off): - call ale#test#SetFilename('../go_files/test.go') + call ale#test#SetFilename('../test-files/go/test.go') let b:ale_go_go111module = 'off' let b:parent_dir = ale#path#Simplify(g:dir . '/..') diff --git a/test/command_callback/test_gosimple_command_callback.vader b/test/command_callback/test_gosimple_command_callback.vader index 7206722f..960f8ee9 100644 --- a/test/command_callback/test_gosimple_command_callback.vader +++ b/test/command_callback/test_gosimple_command_callback.vader @@ -2,7 +2,7 @@ Before: Save g:ale_go_go111module call ale#assert#SetUpLinterTest('go', 'gosimple') - call ale#test#SetFilename('../go_files/testfile2.go') + call ale#test#SetFilename('../test-files/go/testfile2.go') After: unlet! b:ale_go_go111module diff --git a/test/command_callback/test_gotype_command_callback.vader b/test/command_callback/test_gotype_command_callback.vader index 47845dd6..22829a17 100644 --- a/test/command_callback/test_gotype_command_callback.vader +++ b/test/command_callback/test_gotype_command_callback.vader @@ -2,7 +2,7 @@ Before: Save g:ale_go_go111module call ale#assert#SetUpLinterTest('go', 'gotype') - call ale#test#SetFilename('../go_files/testfile2.go') + call ale#test#SetFilename('../test-files/go/testfile2.go') After: unlet! b:ale_go_go111module diff --git a/test/command_callback/test_haml_hamllint_command_callback.vader b/test/command_callback/test_haml_hamllint_command_callback.vader index 694b21d3..9d81179b 100644 --- a/test/command_callback/test_haml_hamllint_command_callback.vader +++ b/test/command_callback/test_haml_hamllint_command_callback.vader @@ -14,23 +14,23 @@ Execute(The default command should be correct): AssertLinter 'haml-lint', 'haml-lint %t' Execute(The command should have the .rubocop.yml prepended as an env var if one exists): - call ale#test#SetFilename('../hamllint-test-files/rubocop-yml/subdir/file.haml') - let b:conf = ale#path#Simplify(g:dir . '/../hamllint-test-files/rubocop-yml/.rubocop.yml') + call ale#test#SetFilename('../test-files/hamllint/rubocop-yml/subdir/file.haml') + let b:conf = ale#path#Simplify(g:dir . '/../test-files/hamllint/rubocop-yml/.rubocop.yml') AssertLinter 'haml-lint', \ ale#Env('HAML_LINT_RUBOCOP_CONF', b:conf) . 'haml-lint %t' Execute(The command should have the nearest .haml-lint.yml set as --config if it exists): - call ale#test#SetFilename('../hamllint-test-files/haml-lint-yml/subdir/file.haml') - let b:conf = ale#path#Simplify(g:dir . '/../hamllint-test-files/haml-lint-yml/.haml-lint.yml') + call ale#test#SetFilename('../test-files/hamllint/haml-lint-yml/subdir/file.haml') + let b:conf = ale#path#Simplify(g:dir . '/../test-files/hamllint/haml-lint-yml/.haml-lint.yml') AssertLinter 'haml-lint', \ 'haml-lint --config ' . ale#Escape(b:conf) . ' %t', Execute(The command should include a .rubocop.yml and a .haml-lint if both are found): - call ale#test#SetFilename('../hamllint-test-files/haml-lint-and-rubocop/subdir/file.haml') - let b:conf_hamllint = ale#path#Simplify(g:dir . '/../hamllint-test-files/haml-lint-and-rubocop/.haml-lint.yml') - let b:conf_rubocop = ale#path#Simplify(g:dir . '/../hamllint-test-files/haml-lint-and-rubocop/.rubocop.yml') + call ale#test#SetFilename('../test-files/hamllint/haml-lint-and-rubocop/subdir/file.haml') + let b:conf_hamllint = ale#path#Simplify(g:dir . '/../test-files/hamllint/haml-lint-and-rubocop/.haml-lint.yml') + let b:conf_rubocop = ale#path#Simplify(g:dir . '/../test-files/hamllint/haml-lint-and-rubocop/.rubocop.yml') AssertLinter 'haml-lint', \ ale#Env('HAML_LINT_RUBOCOP_CONF', b:conf_rubocop) diff --git a/test/command_callback/test_haskell_stack_build_command_callback.vader b/test/command_callback/test_haskell_stack_build_command_callback.vader index f1e6f755..8b5b0971 100644 --- a/test/command_callback/test_haskell_stack_build_command_callback.vader +++ b/test/command_callback/test_haskell_stack_build_command_callback.vader @@ -8,6 +8,6 @@ Execute(The linter should not be executed when there's no stack.yaml file): AssertLinterNotExecuted Execute(The linter should be executed when there is a stack.yaml file): - call ale#test#SetFilename('stack_build_paths/test.hs') + call ale#test#SetFilename('../test-files/stack/test.hs') AssertLinter 'stack', 'stack build --fast' diff --git a/test/command_callback/test_haskell_stack_ghc_command_callback.vader b/test/command_callback/test_haskell_stack_ghc_command_callback.vader index 8b5e7485..04bd23f5 100644 --- a/test/command_callback/test_haskell_stack_ghc_command_callback.vader +++ b/test/command_callback/test_haskell_stack_ghc_command_callback.vader @@ -8,7 +8,7 @@ Execute(The linter should not be executed when there's no stack.yaml file): AssertLinterNotExecuted Execute(The linter should be executed when there is a stack.yaml file): - call ale#test#SetFilename('stack_ghc_paths/test.hs') + call ale#test#SetFilename('../test-files/stack/test.hs') AssertLinterCwd '%s:h' AssertLinter 'stack', 'stack ghc -- -fno-code -v0 %t' diff --git a/test/command_callback/test_html_stylelint_command_callback.vader b/test/command_callback/test_html_stylelint_command_callback.vader index 49d7d143..87440217 100644 --- a/test/command_callback/test_html_stylelint_command_callback.vader +++ b/test/command_callback/test_html_stylelint_command_callback.vader @@ -28,11 +28,11 @@ After: call ale#linter#Reset() Execute(node_modules directories should be discovered): - call ale#test#SetFilename('stylelint_paths/nested/testfile.html') + call ale#test#SetFilename('../test-files/stylelint/nested/testfile.html') let b:executable = ale#path#Simplify( \ g:dir - \ . '/stylelint_paths/node_modules/.bin/stylelint' + \ . '/../test-files/stylelint/node_modules/.bin/stylelint' \) AssertEqual b:executable, ale_linters#html#stylelint#GetExecutable(bufnr('')) @@ -44,7 +44,7 @@ Execute(The global override should work): let b:ale_html_stylelint_executable = 'foobar' let b:ale_html_stylelint_use_global = 1 - call ale#test#SetFilename('stylelint_paths/nested/testfile.html') + call ale#test#SetFilename('../test-files/stylelint/nested/testfile.html') AssertEqual 'foobar', ale_linters#html#stylelint#GetExecutable(bufnr('')) AssertEqual diff --git a/test/command_callback/test_htmlhint_command_callback.vader b/test/command_callback/test_htmlhint_command_callback.vader index d3f209f8..df5797af 100644 --- a/test/command_callback/test_htmlhint_command_callback.vader +++ b/test/command_callback/test_htmlhint_command_callback.vader @@ -1,12 +1,12 @@ Before: call ale#assert#SetUpLinterTest('html', 'htmlhint') - call ale#test#SetFilename('htmlhint_paths/test.html') + call ale#test#SetFilename('../test-files/htmlhint/test.html') let g:node_executable = ale#path#Simplify( - \ g:dir . '/htmlhint_paths/node_modules/.bin/htmlhint' + \ g:dir . '/../test-files/htmlhint/node_modules/.bin/htmlhint' \) let g:config_path = ale#path#Simplify( - \ g:dir . '/htmlhint_paths/with_config/.htmlhintrc' + \ g:dir . '/../test-files/htmlhint/with_config/.htmlhintrc' \) After: @@ -33,7 +33,7 @@ Execute(--format=unix should be removed from the options if added): \ ale#Escape(g:node_executable) . ' --format=unix %t' Execute(The configuration file should be automatically detected): - call ale#test#SetFilename('htmlhint_paths/with_config/test.html') + call ale#test#SetFilename('../test-files/htmlhint/with_config/test.html') AssertLinter g:node_executable, \ ale#Escape(g:node_executable) @@ -42,7 +42,7 @@ Execute(The configuration file should be automatically detected): " This is so old configurations which might include the config will work. Execute(The configuration file should be configurable through the options variable): - call ale#test#SetFilename('htmlhint_paths/with_config/test.html') + call ale#test#SetFilename('../test-files/htmlhint/with_config/test.html') let g:ale_html_htmlhint_options = '--config=/foo/bar/.htmlhintrc' AssertLinter g:node_executable, diff --git a/test/command_callback/test_ink_ls_command_callbacks.vader b/test/command_callback/test_ink_ls_command_callbacks.vader index 5074506c..a832a250 100644 --- a/test/command_callback/test_ink_ls_command_callbacks.vader +++ b/test/command_callback/test_ink_ls_command_callbacks.vader @@ -9,12 +9,12 @@ Execute(should set correct defaults): AssertLinter 'ink-language-server', ale#Escape('ink-language-server') . ' --stdio' Execute(should set correct LSP values): - call ale#test#SetFilename('ink_paths/story/main.ink') + call ale#test#SetFilename('../test-files/ink/story/main.ink') AssertLSPLanguage 'ink' AssertLSPOptions {} AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/ink_paths/story') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ink/story') Execute(should accept configuration settings): AssertLSPConfig {} diff --git a/test/command_callback/test_inko_inko_callbacks.vader b/test/command_callback/test_inko_inko_callbacks.vader index 93295c91..c08cbed4 100644 --- a/test/command_callback/test_inko_inko_callbacks.vader +++ b/test/command_callback/test_inko_inko_callbacks.vader @@ -1,6 +1,6 @@ Before: call ale#assert#SetUpLinterTest('inko', 'inko') - call ale#test#SetFilename('inko_paths/test.inko') + call ale#test#SetFilename('../test-files/inko/test.inko') After: call ale#assert#TearDownLinterTest() @@ -10,11 +10,11 @@ Execute(The default executable path should be correct): Execute(The inko callback should include tests/ for test paths): call ale#engine#Cleanup(bufnr('')) - noautocmd e! inko_paths/tests/test/test_foo.inko + noautocmd e! ../test-files/inko/tests/test/test_foo.inko call ale#engine#InitBufferInfo(bufnr('')) AssertLinter 'inko', \ ale#Escape('inko') \ . ' build --check --format=json --include ' - \ . ale#Escape(ale#path#Simplify(g:dir . '/inko_paths/tests/')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/inko/tests/')) \ . ' %s' diff --git a/test/command_callback/test_javac_command_callback.vader b/test/command_callback/test_javac_command_callback.vader index 29ed09b8..85a76e6a 100644 --- a/test/command_callback/test_javac_command_callback.vader +++ b/test/command_callback/test_javac_command_callback.vader @@ -161,27 +161,27 @@ Execute(The javac callback should combine discovered classpaths and manual ones) \ substitute(b:command, '%e', '\=ale#Escape(''javac'')', 'g') Execute(The javac callback should use string type g:ale_java_javac_sourcepath correctly): - let g:ale_java_javac_sourcepath = 'java_paths/build/gen/main' + let g:ale_java_javac_sourcepath = '../test-files/java/with_main/build/gen/main' AssertLinter 'javac', \ g:prefix \ . ' -sourcepath ' . ale#Escape( - \ ale#path#Simplify(g:dir . '/java_paths/build/gen/main/') + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/build/gen/main/') \ ) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t' Execute(The javac callback should use list type g:ale_java_javac_sourcepath correctly): - let g:ale_java_javac_sourcepath = ['java_paths/build/gen/main'] + let g:ale_java_javac_sourcepath = ['../test-files/java/with_main/build/gen/main'] AssertLinter 'javac', \ g:prefix \ . ' -sourcepath ' . ale#Escape( - \ ale#path#Simplify(g:dir . '/java_paths/build/gen/main/') + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/build/gen/main/') \ ) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t' Execute(The javac callback shouldn't add -sourcepath when g:ale_java_javac_sourcepath variable path doesn't exist): - let g:ale_java_javac_sourcepath = 'java_paths/build/gen3/main' + let g:ale_java_javac_sourcepath = '../test-files/java/with_main/build/gen3/main' AssertLinter 'javac', \ g:prefix @@ -189,78 +189,78 @@ Execute(The javac callback shouldn't add -sourcepath when g:ale_java_javac_sourc Execute(The javac callback should combine discovered sourcepath and manual ones): call ale#engine#Cleanup(bufnr('')) - call ale#test#SetFilename('java_paths/src/main/java/com/something/dummy.java') + call ale#test#SetFilename('../test-files/java/with_main/src/main/java/com/something/dummy.java') call ale#engine#InitBufferInfo(bufnr('')) - let g:ale_java_javac_sourcepath = 'java_paths/build/gen/main' + let g:ale_java_javac_sourcepath = '../test-files/java/with_main/build/gen/main' let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [], {}) AssertEqual \ ale#Escape('javac') . ' -Xlint' \ . ' -sourcepath ' . ale#Escape(join([ - \ ale#path#Simplify(g:dir . '/java_paths/src/main/java/'), - \ ale#path#Simplify(g:dir . '/java_paths/build/gen/main/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/src/main/java/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/build/gen/main/'), \ ], g:cp_sep)) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t', \ substitute(b:command, '%e', '\=ale#Escape(''javac'')', 'g') - let g:ale_java_javac_sourcepath = 'java_paths/build/gen/main' - \ . g:cp_sep . 'java_paths/build/gen2/main' + let g:ale_java_javac_sourcepath = '../test-files/java/with_main/build/gen/main' + \ . g:cp_sep . '../test-files/java/with_main/build/gen2/main' let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [], {}) AssertEqual \ ale#Escape('javac') . ' -Xlint' \ . ' -sourcepath ' . ale#Escape(join([ - \ ale#path#Simplify(g:dir . '/java_paths/src/main/java/'), - \ ale#path#Simplify(g:dir . '/java_paths/build/gen/main/'), - \ ale#path#Simplify(g:dir . '/java_paths/build/gen2/main/') + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/src/main/java/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/build/gen/main/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/build/gen2/main/') \ ], g:cp_sep)) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t', \ substitute(b:command, '%e', '\=ale#Escape(''javac'')', 'g') - let g:ale_java_javac_sourcepath = ['java_paths/build/gen/main'] + let g:ale_java_javac_sourcepath = ['../test-files/java/with_main/build/gen/main'] let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [], {}) AssertEqual \ ale#Escape('javac') . ' -Xlint' \ . ' -sourcepath ' . ale#Escape(join([ - \ ale#path#Simplify(g:dir . '/java_paths/src/main/java/'), - \ ale#path#Simplify(g:dir . '/java_paths/build/gen/main/') + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/src/main/java/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/build/gen/main/') \ ], g:cp_sep)) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t', \ substitute(b:command, '%e', '\=ale#Escape(''javac'')', 'g') let g:ale_java_javac_sourcepath = [ - \ 'java_paths/build/gen/main', - \ 'java_paths/build/gen2/main' + \ '../test-files/java/with_main/build/gen/main', + \ '../test-files/java/with_main/build/gen2/main' \ ] let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [], {}) AssertEqual \ ale#Escape('javac') . ' -Xlint' \ . ' -sourcepath ' . ale#Escape(join([ - \ ale#path#Simplify(g:dir . '/java_paths/src/main/java/'), - \ ale#path#Simplify(g:dir . '/java_paths/build/gen/main/'), - \ ale#path#Simplify(g:dir . '/java_paths/build/gen2/main/') + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/src/main/java/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/build/gen/main/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/build/gen2/main/') \ ], g:cp_sep)) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t', \ substitute(b:command, '%e', '\=ale#Escape(''javac'')', 'g') Execute(The javac callback should detect source directories): call ale#engine#Cleanup(bufnr('')) - noautocmd e! java_paths/src/main/java/com/something/dummy + noautocmd e! ../test-files/java/with_main/src/main/java/com/something/dummy call ale#engine#InitBufferInfo(bufnr('')) AssertLinter 'javac', \ ale#Escape('javac') . ' -Xlint' \ . ' -sourcepath ' . ale#Escape( - \ ale#path#Simplify(g:dir . '/java_paths/src/main/java/') + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/src/main/java/') \ ) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t' Execute(The javac callback should combine detected source directories and classpaths): call ale#engine#Cleanup(bufnr('')) - call ale#test#SetFilename('java_paths/src/main/java/com/something/dummy.java') + call ale#test#SetFilename('../test-files/java/with_main/src/main/java/com/something/dummy.java') call ale#engine#InitBufferInfo(bufnr('')) let b:command = ale_linters#java#javac#GetCommand(bufnr(''), [ @@ -274,7 +274,7 @@ Execute(The javac callback should combine detected source directories and classp \ ale#Escape('javac') . ' -Xlint' \ . ' -cp ' . ale#Escape(join(['/foo/bar.jar', '/xyz/abc.jar'], g:cp_sep)) \ . ' -sourcepath ' . ale#Escape( - \ ale#path#Simplify(g:dir . '/java_paths/src/main/java/') + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/src/main/java/') \ ) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t', \ substitute(b:command, '%e', '\=ale#Escape(''javac'')', 'g') @@ -289,38 +289,38 @@ Execute(The javac callback should include src/test/java for test paths): call ale#engine#Cleanup(bufnr('')) " The test path is only included for test files. " Regular Java files shouldn't import from tests. - noautocmd e! java_paths/src/test/java/com/something/dummy + noautocmd e! ../test-files/java/with_main/src/test/java/com/something/dummy call ale#engine#InitBufferInfo(bufnr('')) AssertLinter 'javac', \ ale#Escape('javac') . ' -Xlint' \ . ' -sourcepath ' . ale#Escape(join([ - \ ale#path#Simplify(g:dir . '/java_paths/src/main/java/'), - \ ale#path#Simplify(g:dir . '/java_paths/src/test/java/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/src/main/java/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_main/src/test/java/'), \ ], g:cp_sep)) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t' Execute(The javac callback should include src/main/jaxb when available): call ale#engine#Cleanup(bufnr('')) - noautocmd e! java_paths_with_jaxb/src/main/java/com/something/dummy + noautocmd e! ../test-files/java/with_jaxb/src/main/java/com/something/dummy call ale#engine#InitBufferInfo(bufnr('')) AssertLinter 'javac', \ ale#Escape('javac') . ' -Xlint' \ . ' -sourcepath ' . ale#Escape(join([ - \ ale#path#Simplify(g:dir . '/java_paths_with_jaxb/src/main/java/'), - \ ale#path#Simplify(g:dir . '/java_paths_with_jaxb/src/main/jaxb/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_jaxb/src/main/java/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/with_jaxb/src/main/jaxb/'), \ ], g:cp_sep)) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t' Execute(The javac callback should add -sourcepath even if src/java/main doesn't exist): call ale#engine#Cleanup(bufnr('')) - call ale#test#SetFilename('java_paths_no_main/src/test/java/com/something/dummy.java') + call ale#test#SetFilename('../test-files/java/no_main/src/test/java/com/something/dummy.java') call ale#engine#InitBufferInfo(bufnr('')) AssertLinter 'javac', \ ale#Escape('javac') . ' -Xlint' \ . ' -sourcepath ' . ale#Escape(join([ - \ ale#path#Simplify(g:dir . '/java_paths_no_main/src/test/java/'), + \ ale#path#Simplify(g:dir . '/../test-files/java/no_main/src/test/java/'), \ ], g:cp_sep)) \ . ' -d ' . ale#Escape('TEMP_DIR') . ' %t' diff --git a/test/command_callback/test_javascript_tsserver_command_callback.vader b/test/command_callback/test_javascript_tsserver_command_callback.vader index 04230238..1c29c8fd 100644 --- a/test/command_callback/test_javascript_tsserver_command_callback.vader +++ b/test/command_callback/test_javascript_tsserver_command_callback.vader @@ -8,9 +8,9 @@ Execute(The default command should be correct): AssertLinter 'tsserver', ale#Escape('tsserver') Execute(should resolve correct path when nested 1): - call ale#test#SetFilename('tsserver_paths/src/level-1/level-2/file3.ts') - AssertLSPProject ale#path#Simplify(g:dir . '/tsserver_paths/src/level-1') + call ale#test#SetFilename('../test-files/tsserver/src/level-1/level-2/file3.ts') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/tsserver/src/level-1') Execute(should resolve correct path when nested 2): - call ale#test#SetFilename('tsserver_paths/src/file1.ts') - AssertLSPProject ale#path#Simplify(g:dir . '/tsserver_paths') + call ale#test#SetFilename('../test-files/tsserver/src/file1.ts') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/tsserver') diff --git a/test/command_callback/test_julia_languageserver_callbacks.vader b/test/command_callback/test_julia_languageserver_callbacks.vader index 96df81f1..d75665a0 100644 --- a/test/command_callback/test_julia_languageserver_callbacks.vader +++ b/test/command_callback/test_julia_languageserver_callbacks.vader @@ -25,6 +25,6 @@ Execute(The executable should be configurable): Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('julia-languageserver-project/test.jl') + call ale#test#SetFilename('../test-files/julia/test.jl') - AssertLSPProject ale#path#Simplify(g:dir . '/julia-languageserver-project') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/julia') diff --git a/test/command_callback/test_kotlin_languageserver_command_callback.vader b/test/command_callback/test_kotlin_languageserver_command_callback.vader index e83a4f37..97b867ab 100644 --- a/test/command_callback/test_kotlin_languageserver_command_callback.vader +++ b/test/command_callback/test_kotlin_languageserver_command_callback.vader @@ -6,3 +6,18 @@ After: Execute(The default command should be correct): AssertLinter 'kotlin-language-server', ale#Escape('kotlin-language-server') + +Execute(Gradle project roots with build.gradle should be detected correctly): + call ale#test#SetFilename('../test-files/gradle/build-gradle-project/src/main/kotlin/dummy.kt') + + AssertLSPProject ale#test#GetFilename('../test-files/gradle/build-gradle-project') + +Execute(Maven project roots with pom.xml should be detected correctly): + call ale#test#SetFilename('../test-files/maven/maven-kotlin-project/src/main/kotlin/dummy.kt') + + AssertLSPProject ale#test#GetFilename('../test-files/maven/maven-kotlin-project') + +Execute(No root should be detected if configuration files can't be found): + call ale#test#SetFilename('../test-files/gradle/non-gradle-project/src/main/kotlin/dummy.kt') + + AssertLSPProject '' diff --git a/test/command_callback/test_less_stylelint_command_callback.vader b/test/command_callback/test_less_stylelint_command_callback.vader index 8d23deb6..cbe7d23c 100644 --- a/test/command_callback/test_less_stylelint_command_callback.vader +++ b/test/command_callback/test_less_stylelint_command_callback.vader @@ -7,11 +7,11 @@ After: call ale#assert#TearDownLinterTest() Execute(node_modules directories should be discovered): - call ale#test#SetFilename('stylelint_paths/nested/testfile.less') + call ale#test#SetFilename('../test-files/stylelint/nested/testfile.less') let b:executable = ale#path#Simplify( \ g:dir - \ . '/stylelint_paths/node_modules/.bin/stylelint' + \ . '/../test-files/stylelint/node_modules/.bin/stylelint' \) AssertLinter b:executable, ale#Escape(b:executable) . ' --stdin-filename %s' @@ -20,7 +20,7 @@ Execute(The global override should work): let b:ale_less_stylelint_executable = 'foobar' let b:ale_less_stylelint_use_global = 1 - call ale#test#SetFilename('stylelint_paths/nested/testfile.less') + call ale#test#SetFilename('../test-files/stylelint/nested/testfile.less') AssertLinter 'foobar', ale#Escape('foobar') . ' --stdin-filename %s' diff --git a/test/command_callback/test_lessc_command_callback.vader b/test/command_callback/test_lessc_command_callback.vader index 79f57d06..b7d664c6 100644 --- a/test/command_callback/test_lessc_command_callback.vader +++ b/test/command_callback/test_lessc_command_callback.vader @@ -10,29 +10,29 @@ After: call ale#assert#TearDownLinterTest() Execute(node_modules directories should be discovered): - call ale#test#SetFilename('lessc_paths/nested/testfile.less') + call ale#test#SetFilename('../test-files/lessc/nested/testfile.less') let b:executable = ale#path#Simplify( \ g:dir - \ . '/lessc_paths/node_modules/.bin/lessc' + \ . '/../test-files/lessc/node_modules/.bin/lessc' \) AssertLinter b:executable, ale#Escape(b:executable) \ . ' --no-color --lint' \ . ' --include-path=' - \ . ale#Escape(ale#path#Simplify(g:dir . '/lessc_paths/nested')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/lessc/nested')) \ . ' -' Execute(The global override should work): let b:ale_less_lessc_executable = 'foobar' let b:ale_less_lessc_use_global = 1 - call ale#test#SetFilename('lessc_paths/nested/testfile.less') + call ale#test#SetFilename('../test-files/lessc/nested/testfile.less') AssertLinter 'foobar', ale#Escape('foobar') \ . ' --no-color --lint' \ . ' --include-path=' - \ . ale#Escape(ale#path#Simplify(g:dir . '/lessc_paths/nested')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/lessc/nested')) \ . ' -' Execute(Extra options should be configurable): diff --git a/test/command_callback/test_mypy_command_callback.vader b/test/command_callback/test_mypy_command_callback.vader index 1a0f5301..8c1e5e9c 100644 --- a/test/command_callback/test_mypy_command_callback.vader +++ b/test/command_callback/test_mypy_command_callback.vader @@ -35,39 +35,39 @@ Execute(The mypy command callback should let you set options): \ . ' --shadow-file %s %t %s' Execute(The mypy command should switch directories to the detected project root): - call ale#test#SetFilename('python_paths/no_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/no_virtualenv/subdir/foo/bar.py') - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/no_virtualenv/subdir') AssertLinter 'mypy', \ ale#Escape('mypy') \ . ' --show-column-numbers' \ . ' --shadow-file %s %t %s' Execute(The mypy callbacks should detect virtualenv directories and switch to the project root): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') - let b:executable = ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/mypy') + let b:executable = ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/mypy') - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/subdir') AssertLinter b:executable, \ ale#Escape(b:executable) \ . ' --show-column-numbers' \ . ' --shadow-file %s %t %s' Execute(The mypy callbacks should cd to directory containing mypy.ini if found): - call ale#test#SetFilename('python_paths/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py') + call ale#test#SetFilename('../test-files/python/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py') - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_mypy_ini_and_pytest_ini') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/with_mypy_ini_and_pytest_ini') AssertLinter 'mypy', \ ale#Escape('mypy') \ . ' --show-column-numbers' \ . ' --shadow-file %s %t %s' Execute(You should able able to use the global mypy instead): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let g:ale_python_mypy_use_global = 1 - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/subdir') AssertLinter 'mypy', \ ale#Escape('mypy') \ . ' --show-column-numbers' @@ -82,7 +82,7 @@ Execute(Setting executable to 'pipenv' appends 'run mypy'): \ . ' --show-column-numbers --shadow-file %s %t %s' Execute(Pipenv is detected when python_mypy_auto_pipenv is set): - call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') let g:ale_python_mypy_auto_pipenv = 1 AssertLinterCwd expand('#' . bufnr('') . ':p:h') diff --git a/test/command_callback/test_objc_ccls_command_callbacks.vader b/test/command_callback/test_objc_ccls_command_callbacks.vader index 34b8539e..58d824c5 100644 --- a/test/command_callback/test_objc_ccls_command_callbacks.vader +++ b/test/command_callback/test_objc_ccls_command_callbacks.vader @@ -13,27 +13,27 @@ Execute(The project root should be detected correctly using compile_commands.jso AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.m') + call ale#test#SetFilename('../test-files/ccls/with_compile_commands_json/dummy.m') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_compile_commands_json') Execute(The project root should be detected correctly using .ccls file): call ale#test#SetFilename(tempname() . '/dummy.m') AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_ccls/dummy.m') + call ale#test#SetFilename('../test-files/ccls/with_ccls/dummy.m') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_ccls') Execute(The project root should be detected correctly using .ccls-root file): call ale#test#SetFilename(tempname() . '/dummy.m') AssertLSPProject '' - call ale#test#SetFilename('ccls_paths/with_ccls-root/dummy.m') + call ale#test#SetFilename('../test-files/ccls/with_ccls-root/dummy.m') - AssertLSPProject ale#path#Simplify(g:dir . '/ccls_paths/with_ccls-root') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ccls/with_ccls-root') Execute(The executable should be configurable): AssertLinter 'ccls', ale#Escape('ccls') @@ -50,17 +50,17 @@ Execute(The initialization options should be configurable): AssertLSPOptions { 'cacheDirectory': '/tmp/ccls' } Execute(The compile command database should be detected correctly): - call ale#test#SetFilename('ccls_paths/with_ccls/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_ccls/dummy.c') AssertLSPOptions {} - call ale#test#SetFilename('ccls_paths/with_compile_commands_json/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_compile_commands_json/dummy.c') AssertLSPOptions { 'compilationDatabaseDirectory': - \ ale#path#Simplify(g:dir . '/ccls_paths/with_compile_commands_json') } + \ ale#path#Simplify(g:dir . '/../test-files/ccls/with_compile_commands_json') } - call ale#test#SetFilename('ccls_paths/with_build_dir/dummy.c') + call ale#test#SetFilename('../test-files/ccls/with_build_dir/dummy.c') let b:ale_c_build_dir_names = ['unusual_build_dir_name'] AssertLSPOptions { 'compilationDatabaseDirectory': - \ ale#path#Simplify(g:dir . '/ccls_paths/with_build_dir/unusual_build_dir_name') } + \ ale#path#Simplify(g:dir . '/../test-files/ccls/with_build_dir/unusual_build_dir_name') } diff --git a/test/command_callback/test_ocaml_ocamllsp_callbacks.vader b/test/command_callback/test_ocaml_ocamllsp_callbacks.vader index 90a7e1a1..4f33af18 100644 --- a/test/command_callback/test_ocaml_ocamllsp_callbacks.vader +++ b/test/command_callback/test_ocaml_ocamllsp_callbacks.vader @@ -13,17 +13,17 @@ Execute(The language string should be correct): Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('ocamllsp_paths/file.ml') + call ale#test#SetFilename('../test-files/ocamllsp/file.ml') - AssertLSPProject ale#path#Simplify(g:dir . '/ocamllsp_paths') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ocamllsp') Execute(The executable should be run using opam exec by default): - call ale#test#SetFilename('ocamllsp_paths/file.ml') + call ale#test#SetFilename('../test-files/ocamllsp/file.ml') AssertLinter 'ocamllsp', 'opam config exec -- ocamllsp' Execute(The executable should be run directly if use_opam flag is disabled): let g:ale_ocaml_ocamllsp_use_opam = 0 - call ale#test#SetFilename('ocamllsp_paths/file.ml') + call ale#test#SetFilename('../test-files/ocamllsp/file.ml') AssertLinter 'ocamllsp', 'ocamllsp' diff --git a/test/command_callback/test_ocaml_ols_callbacks.vader b/test/command_callback/test_ocaml_ols_callbacks.vader index c77e2909..bf9ae65b 100644 --- a/test/command_callback/test_ocaml_ols_callbacks.vader +++ b/test/command_callback/test_ocaml_ols_callbacks.vader @@ -17,19 +17,19 @@ Execute(The default executable should be correct): Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('ols_paths/file.ml') + call ale#test#SetFilename('../test-files/ols/file.ml') - AssertLSPProject ale#path#Simplify(g:dir . '/ols_paths') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ols') Execute(The local executable should be used when available): - call ale#test#SetFilename('ols_paths/file.ml') + call ale#test#SetFilename('../test-files/ols/file.ml') - AssertLinter ale#path#Simplify(g:dir . '/ols_paths/node_modules/.bin/ocaml-language-server'), - \ ale#Escape(ale#path#Simplify(g:dir . '/ols_paths/node_modules/.bin/ocaml-language-server')) . ' --stdio' + AssertLinter ale#path#Simplify(g:dir . '/../test-files/ols/node_modules/.bin/ocaml-language-server'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ols/node_modules/.bin/ocaml-language-server')) . ' --stdio' Execute(The gloabl executable should always be used when use_global is set): let g:ale_ocaml_ols_use_global = 1 - call ale#test#SetFilename('ols_paths/file.ml') + call ale#test#SetFilename('../test-files/ols/file.ml') AssertLinter 'ocaml-language-server', \ ale#Escape('ocaml-language-server') . ' --stdio' diff --git a/test/command_callback/test_php_intelephense_command_callback.vader b/test/command_callback/test_php_intelephense_command_callback.vader index dd6adb3d..d6e2469d 100644 --- a/test/command_callback/test_php_intelephense_command_callback.vader +++ b/test/command_callback/test_php_intelephense_command_callback.vader @@ -9,18 +9,18 @@ Execute(The default executable path should be correct): \ ale#Escape('intelephense') . ' --stdio' Execute(The project path should be correct for .git directories): - call ale#test#SetFilename('php-intelephense-project/with-git/test.php') - silent! call mkdir('php-intelephense-project/with-git/.git', 'p') + call ale#test#SetFilename('../test-files/php/with-git/test.php') + silent! call mkdir('../test-files/php/with-git/.git', 'p') - AssertLSPProject ale#path#Simplify(g:dir . '/php-intelephense-project/with-git') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/php/with-git') Execute(The project path should be correct for composer.json file): - call ale#test#SetFilename('php-intelephense-project/with-composer/test.php') + call ale#test#SetFilename('../test-files/php/with-composer/test.php') - AssertLSPProject ale#path#Simplify(g:dir . '/php-intelephense-project/with-composer') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/php/with-composer') Execute(The project cache should be saved in a temp dir): - call ale#test#SetFilename('php-intelephense-project/with-composer/test.php') + call ale#test#SetFilename('../test-files/php/with-composer/test.php') let g:ale_php_intelephense_config = { 'storagePath': '/tmp/intelephense' } - AssertLSPProject ale#path#Simplify(g:dir . '/php-intelephense-project/with-composer') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/php/with-composer') diff --git a/test/command_callback/test_php_langserver_callbacks.vader b/test/command_callback/test_php_langserver_callbacks.vader index 59c3fe6c..7fe20b82 100644 --- a/test/command_callback/test_php_langserver_callbacks.vader +++ b/test/command_callback/test_php_langserver_callbacks.vader @@ -9,22 +9,22 @@ Execute(The default executable path should be correct): \ 'php ' . ale#Escape('php-language-server.php') Execute(Vendor executables should be detected): - call ale#test#SetFilename('php-langserver-project/test.php') + call ale#test#SetFilename('../test-files/php/test.php') AssertLinter - \ ale#path#Simplify(g:dir . '/php-langserver-project/vendor/bin/php-language-server.php'), + \ ale#path#Simplify(g:dir . '/../test-files/php/vendor/bin/php-language-server.php'), \ 'php ' . ale#Escape(ale#path#Simplify( \ g:dir - \ . '/php-langserver-project/vendor/bin/php-language-server.php' + \ . '/../test-files/php/vendor/bin/php-language-server.php' \ )) Execute(The project path should be correct for .git directories): - call ale#test#SetFilename('php-langserver-project/with-git/test.php') - silent! call mkdir('php-langserver-project/with-git/.git') + call ale#test#SetFilename('../test-files/php/with-git/test.php') + silent! call mkdir('../test-files/php/with-git/.git') - AssertLSPProject ale#path#Simplify(g:dir . '/php-langserver-project/with-git') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/php/with-git') Execute(The project path should be correct for composer.json file): - call ale#test#SetFilename('php-langserver-project/with-composer/test.php') + call ale#test#SetFilename('../test-files/php/with-composer/test.php') - AssertLSPProject ale#path#Simplify(g:dir . '/php-langserver-project/with-composer') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/php/with-composer') diff --git a/test/command_callback/test_phpcs_command_callback.vader b/test/command_callback/test_phpcs_command_callback.vader index 35d59777..afb88e32 100644 --- a/test/command_callback/test_phpcs_command_callback.vader +++ b/test/command_callback/test_phpcs_command_callback.vader @@ -7,9 +7,9 @@ After: call ale#assert#TearDownLinterTest() Execute(The local phpcs executable should be used): - call ale#test#SetFilename('../phpcs-test-files/project-with-phpcs/foo/test.php') + call ale#test#SetFilename('../test-files/phpcs/project-with-phpcs/foo/test.php') - let g:executable = ale#path#Simplify(g:dir . '/../phpcs-test-files/project-with-phpcs/vendor/bin/phpcs') + let g:executable = ale#path#Simplify(g:dir . '/../test-files/phpcs/project-with-phpcs/vendor/bin/phpcs') AssertLinterCwd '%s:h' AssertLinter g:executable, ale#Escape(g:executable) @@ -18,13 +18,13 @@ Execute(The local phpcs executable should be used): Execute(use_global should override local executable detection): let g:ale_php_phpcs_use_global = 1 - call ale#test#SetFilename('../phpcs-test-files/project-with-phpcs/foo/test.php') + call ale#test#SetFilename('../test-files/phpcs/project-with-phpcs/foo/test.php') AssertLinter 'phpcs', ale#Escape('phpcs') \ . ' -s --report=emacs --stdin-path=%s' Execute(Projects without local executables should use the global one): - call ale#test#SetFilename('../phpcs-test-files/project-without-phpcs/foo/test.php') + call ale#test#SetFilename('../test-files/phpcs/project-without-phpcs/foo/test.php') AssertLinter 'phpcs', ale#Escape('phpcs') \ . ' -s --report=emacs --stdin-path=%s' diff --git a/test/command_callback/test_prospector_command_callback.vader b/test/command_callback/test_prospector_command_callback.vader index 0d692bde..d6f84308 100644 --- a/test/command_callback/test_prospector_command_callback.vader +++ b/test/command_callback/test_prospector_command_callback.vader @@ -13,7 +13,7 @@ Execute(Setting executable to 'pipenv' appends 'run prospector'): Execute(Pipenv is detected when python_prospector_auto_pipenv is set): let g:ale_python_prospector_auto_pipenv = 1 - call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinter 'pipenv', \ ale#Escape('pipenv') . ' run prospector' diff --git a/test/command_callback/test_psalm_command_callbacks.vader b/test/command_callback/test_psalm_command_callbacks.vader index d32780e6..4edb95c8 100644 --- a/test/command_callback/test_psalm_command_callbacks.vader +++ b/test/command_callback/test_psalm_command_callbacks.vader @@ -16,13 +16,13 @@ Execute(The default executable path should be correct): \ ale#Escape('psalm') . ' --language-server' Execute(Vendor executables should be detected): - call ale#test#SetFilename('psalm-project/test.php') + call ale#test#SetFilename('../test-files/psalm/test.php') AssertLinter - \ ale#path#Simplify(g:dir . '/psalm-project/vendor/bin/psalm'), + \ ale#path#Simplify(g:dir . '/../test-files/psalm/vendor/bin/psalm'), \ ale#Escape(ale#path#Simplify( \ g:dir - \ . '/psalm-project/vendor/bin/psalm' + \ . '/../test-files/psalm/vendor/bin/psalm' \ )) . ' --language-server' let g:ale_php_psalm_use_global = 1 @@ -36,25 +36,3 @@ Execute(User provided options should be used): AssertLinter 'psalm', \ ale#Escape('psalm') \ . ' --language-server --my-user-provided-option my-value' - -Execute(The project path should be correct for .git directories): - call ale#test#SetFilename('psalm-project/test.php') - let g:matched = 0 - - for g:i in range(4) - if !isdirectory(g:dir . '/.git') - call mkdir(g:dir . '/.git') - endif - - try - AssertLSPProject g:dir - catch /.+/ - endtry - - let g:matched = 1 - break - endfor - - if !g:matched - AssertLSPProject g:dir - endif diff --git a/test/command_callback/test_puglint_command_callback.vader b/test/command_callback/test_puglint_command_callback.vader index 69c86b25..8a445408 100644 --- a/test/command_callback/test_puglint_command_callback.vader +++ b/test/command_callback/test_puglint_command_callback.vader @@ -5,44 +5,44 @@ After: call ale#assert#TearDownLinterTest() Execute(puglint should detect local executables and package.json): - call ale#test#SetFilename('puglint_project/test.pug') + call ale#test#SetFilename('../test-files/puglint/test.pug') AssertLinter - \ ale#path#Simplify(g:dir . '/puglint_project/node_modules/.bin/pug-lint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/node_modules/.bin/pug-lint')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/package.json')) + \ ale#path#Simplify(g:dir . '/../test-files/puglint/node_modules/.bin/pug-lint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/node_modules/.bin/pug-lint')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/package.json')) \ . ' -r inline %t' Execute(puglint should use global executables if configured): let g:ale_pug_puglint_use_global = 1 - call ale#test#SetFilename('puglint_project/test.pug') + call ale#test#SetFilename('../test-files/puglint/test.pug') AssertLinter 'pug-lint', \ ale#Escape('pug-lint') - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/package.json')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/package.json')) \ . ' -r inline %t' Execute(puglint should detect .pug-lintrc): - call ale#test#SetFilename('puglint_project/puglint_rc_dir/subdir/test.pug') + call ale#test#SetFilename('../test-files/puglint/puglint_rc_dir/subdir/test.pug') - AssertLinter ale#path#Simplify(g:dir . '/puglint_project/node_modules/.bin/pug-lint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/node_modules/.bin/pug-lint')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/puglint_rc_dir/.pug-lintrc')) + AssertLinter ale#path#Simplify(g:dir . '/../test-files/puglint/node_modules/.bin/pug-lint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/node_modules/.bin/pug-lint')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/puglint_rc_dir/.pug-lintrc')) \ . ' -r inline %t' Execute(puglint should detect .pug-lintrc.js): - call ale#test#SetFilename('puglint_project/puglint_rc_js_dir/subdir/test.pug') + call ale#test#SetFilename('../test-files/puglint/puglint_rc_js_dir/subdir/test.pug') - AssertLinter ale#path#Simplify(g:dir . '/puglint_project/node_modules/.bin/pug-lint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/node_modules/.bin/pug-lint')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/puglint_rc_js_dir/.pug-lintrc.js')) + AssertLinter ale#path#Simplify(g:dir . '/../test-files/puglint/node_modules/.bin/pug-lint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/node_modules/.bin/pug-lint')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/puglint_rc_js_dir/.pug-lintrc.js')) \ . ' -r inline %t' Execute(puglint should detect .pug-lintrc.json): - call ale#test#SetFilename('puglint_project/puglint_rc_json_dir/subdir/test.pug') + call ale#test#SetFilename('../test-files/puglint/puglint_rc_json_dir/subdir/test.pug') - AssertLinter ale#path#Simplify(g:dir . '/puglint_project/node_modules/.bin/pug-lint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/node_modules/.bin/pug-lint')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/puglint_project/puglint_rc_json_dir/.pug-lintrc.json')) + AssertLinter ale#path#Simplify(g:dir . '/../test-files/puglint/node_modules/.bin/pug-lint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/node_modules/.bin/pug-lint')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/puglint/puglint_rc_json_dir/.pug-lintrc.json')) \ . ' -r inline %t' diff --git a/test/command_callback/test_purescript_ls_command_callbacks.vader b/test/command_callback/test_purescript_ls_command_callbacks.vader index da63f7f1..3ef9707a 100644 --- a/test/command_callback/test_purescript_ls_command_callbacks.vader +++ b/test/command_callback/test_purescript_ls_command_callbacks.vader @@ -8,22 +8,22 @@ Execute(should set correct defaults): AssertLinter 'purescript-language-server', ale#Escape('purescript-language-server') . ' --stdio' Execute(should set correct LSP values): - call ale#test#SetFilename('purescript_paths/spago/Foo.purs') + call ale#test#SetFilename('../test-files/purescript/spago/Foo.purs') AssertLSPLanguage 'purescript' AssertLSPOptions {} AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/purescript_paths/spago') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/purescript/spago') Execute(should set correct project for bower): - call ale#test#SetFilename('purescript_paths/bower/Foo.purs') + call ale#test#SetFilename('../test-files/purescript/bower/Foo.purs') - AssertLSPProject ale#path#Simplify(g:dir . '/purescript_paths/bower') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/purescript/bower') Execute(should set correct project for psc-package): - call ale#test#SetFilename('purescript_paths/psc-package/Foo.purs') + call ale#test#SetFilename('../test-files/purescript/psc-package/Foo.purs') - AssertLSPProject ale#path#Simplify(g:dir . '/purescript_paths/psc-package') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/purescript/psc-package') Execute(should accept configuration settings): AssertLSPConfig {} diff --git a/test/command_callback/test_pycodestyle_command_callback.vader b/test/command_callback/test_pycodestyle_command_callback.vader index a3a338a9..9260913c 100644 --- a/test/command_callback/test_pycodestyle_command_callback.vader +++ b/test/command_callback/test_pycodestyle_command_callback.vader @@ -27,7 +27,7 @@ Execute(Setting executable to 'pipenv' appends 'run pycodestyle'): Execute(Pipenv is detected when python_pycodestyle_auto_pipenv is set): let g:ale_python_pycodestyle_auto_pipenv = 1 - call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinter 'pipenv', \ ale#Escape('pipenv') . ' run pycodestyle -' diff --git a/test/command_callback/test_pydocstyle_command_callback.vader b/test/command_callback/test_pydocstyle_command_callback.vader index 0a69c79a..b24cb0d9 100644 --- a/test/command_callback/test_pydocstyle_command_callback.vader +++ b/test/command_callback/test_pydocstyle_command_callback.vader @@ -28,6 +28,6 @@ Execute(Setting executable to 'pipenv' appends 'run pydocstyle'): Execute(Pipenv is detected when python_pydocstyle_auto_pipenv is set): let g:ale_python_pydocstyle_auto_pipenv = 1 - call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinter 'pipenv', ale#Escape('pipenv') . ' run pydocstyle %s:t' diff --git a/test/command_callback/test_pyflakes_command_callback.vader b/test/command_callback/test_pyflakes_command_callback.vader index 92f83820..bbb7b74c 100644 --- a/test/command_callback/test_pyflakes_command_callback.vader +++ b/test/command_callback/test_pyflakes_command_callback.vader @@ -17,16 +17,16 @@ Execute(The pyflakes executable should be configurable): \ ale#Escape('~/.local/bin/pyflakes') . ' %t' Execute(The pyflakes executable should be run from the virtualenv path): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let b:executable = ale#path#Simplify( - \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/pyflakes' + \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/pyflakes' \) AssertLinter b:executable, ale#Escape(b:executable) . ' %t' Execute(You should be able to override the pyflakes virtualenv lookup): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let g:ale_python_pyflakes_use_global = 1 @@ -40,7 +40,7 @@ Execute(Setting executable to 'pipenv' appends 'run pyflakes'): Execute(Pipenv is detected when python_pyflakes_auto_pipenv is set): let g:ale_python_pyflakes_auto_pipenv = 1 - call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinter 'pipenv', \ ale#Escape('pipenv') . ' run pyflakes %t' diff --git a/test/command_callback/test_pylama_command_callback.vader b/test/command_callback/test_pylama_command_callback.vader index 7f15bf4f..29fa971b 100644 --- a/test/command_callback/test_pylama_command_callback.vader +++ b/test/command_callback/test_pylama_command_callback.vader @@ -36,31 +36,31 @@ Execute(The pylama command callback should let you set options): AssertLinter 'pylama', ale#Escape('pylama') . ' --some-option' . b:command_tail Execute(The pylama command callback should switch directories to the detected project root): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/no_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/no_virtualenv/subdir/foo/bar.py') - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/no_virtualenv/subdir') AssertLinter 'pylama', ale#Escape('pylama') . b:command_tail Execute(The pylama command callback shouldn't detect virtualenv directories where they don't exist): - call ale#test#SetFilename('python_paths/no_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/no_virtualenv/subdir/foo/bar.py') - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/no_virtualenv/subdir') AssertLinter 'pylama', ale#Escape('pylama') . b:command_tail Execute(The pylama command callback should detect virtualenv directories and switch to the project root): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let b:executable = ale#path#Simplify( - \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/pylama' + \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/pylama' \) - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/subdir') AssertLinter b:executable, ale#Escape(b:executable) . b:command_tail Execute(You should able able to use the global pylama instead): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let g:ale_python_pylama_use_global = 1 - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/subdir') AssertLinter 'pylama', ale#Escape('pylama') . b:command_tail Execute(Setting executable to 'pipenv' appends 'run pylama'): @@ -71,6 +71,6 @@ Execute(Setting executable to 'pipenv' appends 'run pylama'): Execute(Pipenv is detected when python_pylama_auto_pipenv is set): let g:ale_python_pylama_auto_pipenv = 1 - call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinter 'pipenv', ale#Escape('pipenv') . ' run pylama' . b:command_tail diff --git a/test/command_callback/test_pylint_command_callback.vader b/test/command_callback/test_pylint_command_callback.vader index 4b9a14a5..e581915f 100644 --- a/test/command_callback/test_pylint_command_callback.vader +++ b/test/command_callback/test_pylint_command_callback.vader @@ -44,25 +44,25 @@ Execute(The pylint command callback should let you set options): AssertLinter 'pylint', ale#Escape('pylint') . ' --some-option' . b:command_tail Execute(The pylint callbacks shouldn't detect virtualenv directories where they don't exist): - call ale#test#SetFilename('python_paths/no_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/no_virtualenv/subdir/foo/bar.py') - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/no_virtualenv/subdir') AssertLinter 'pylint', ale#Escape('pylint') . b:command_tail Execute(The pylint callbacks should detect virtualenv directories): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let b:executable = ale#path#Simplify( - \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/pylint' + \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/pylint' \) - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/subdir') AssertLinter b:executable, ale#Escape(b:executable) . b:command_tail Execute(You should able able to use the global pylint instead): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let g:ale_python_pylint_use_global = 1 - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/subdir') AssertLinter 'pylint', ale#Escape('pylint') . b:command_tail Execute(Setting executable to 'pipenv' appends 'run pylint'): @@ -74,7 +74,7 @@ Execute(Setting executable to 'pipenv' appends 'run pylint'): Execute(Pipenv is detected when python_pylint_auto_pipenv is set): let g:ale_python_pylint_auto_pipenv = 1 - call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinterCwd expand('%:p:h') AssertLinter 'pipenv', ale#Escape('pipenv') . ' run pylint' diff --git a/test/command_callback/test_pyls_command_callback.vader b/test/command_callback/test_pyls_command_callback.vader index c03b8aeb..74a86ccb 100644 --- a/test/command_callback/test_pyls_command_callback.vader +++ b/test/command_callback/test_pyls_command_callback.vader @@ -23,17 +23,17 @@ Execute(The pyls command callback should let you set options): AssertLinter 'pyls', ale#Escape('pyls') . ' --some-option' Execute(The pyls executable should be run from the virtualenv path): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let b:executable = ale#path#Simplify( - \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/pyls' + \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/pyls' \) AssertEqual ale#Escape(b:executable), \ ale_linters#python#pyls#GetCommand(bufnr('')) Execute(You should be able to override the pyls virtualenv lookup): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let g:ale_python_pyls_use_global = 1 @@ -46,7 +46,7 @@ Execute(Setting executable to 'pipenv' appends 'run pyls'): Execute(Pipenv is detected when python_pyls_auto_pipenv is set): let g:ale_python_pyls_auto_pipenv = 1 - call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinter 'pipenv', \ ale#Escape('pipenv') . ' run pyls' diff --git a/test/command_callback/test_pyre_command_callback.vader b/test/command_callback/test_pyre_command_callback.vader index ba57c117..d3e5fe9d 100644 --- a/test/command_callback/test_pyre_command_callback.vader +++ b/test/command_callback/test_pyre_command_callback.vader @@ -17,16 +17,16 @@ Execute(The pyre executable should be configurable): \ ale#Escape('~/.local/bin/pyre') . ' persistent' Execute(The pyre executable should be run from the virtualenv path): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let b:executable = ale#path#Simplify( - \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/pyre' + \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/pyre' \) AssertLinter b:executable, ale#Escape(b:executable) . ' persistent' Execute(You should be able to override the pyre virtualenv lookup): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let g:ale_python_pyre_use_global = 1 @@ -40,7 +40,7 @@ Execute(Setting executable to 'pipenv' appends 'run pyre'): Execute(Pipenv is detected when python_pyre_auto_pipenv is set): let g:ale_python_pyre_auto_pipenv = 1 - call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertLinter 'pipenv', \ ale#Escape('pipenv') . ' run pyre persistent' diff --git a/test/command_callback/test_pyright_command_callback.vader b/test/command_callback/test_pyright_command_callback.vader index 3e421bd9..51510cf2 100644 --- a/test/command_callback/test_pyright_command_callback.vader +++ b/test/command_callback/test_pyright_command_callback.vader @@ -31,17 +31,17 @@ Execute(The default configuration should be mostly empty): AssertLSPConfig {'python': {}} Execute(virtualenv paths should be set in configuration by default): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertLSPConfig { \ 'python': { - \ 'pythonPath': ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/python'), - \ 'venvPath': ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env'), + \ 'pythonPath': ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/python'), + \ 'venvPath': ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env'), \ }, \} Execute(The pythonPath should be set based on whatever the ovveride for the venvPath is set to): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') " This overrides the default detection of the path. let b:ale_python_pyright_config = { @@ -58,7 +58,7 @@ Execute(The pythonPath should be set based on whatever the ovveride for the venv \} Execute(You should be able to override pythonPath when venvPath is detected): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') " This overrides the default detection of the path. let b:ale_python_pyright_config = { @@ -70,12 +70,12 @@ Execute(You should be able to override pythonPath when venvPath is detected): AssertLSPConfig { \ 'python': { \ 'pythonPath': '/bin/python', - \ 'venvPath': ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env'), + \ 'venvPath': ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env'), \ }, \} Execute(You should be able to override both pythonPath and venvPath): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') " This overrides the default detection of the path. let b:ale_python_pyright_config = { @@ -93,7 +93,7 @@ Execute(You should be able to override both pythonPath and venvPath): \} Execute(You should be able to define other settings): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let b:ale_python_pyright_config = { \ 'python': { @@ -107,8 +107,8 @@ Execute(You should be able to define other settings): AssertLSPConfig { \ 'python': { \ 'analysis': {'logLevel': 'warning'}, - \ 'pythonPath': ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/python'), - \ 'venvPath': ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env'), + \ 'pythonPath': ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/python'), + \ 'venvPath': ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env'), \ }, \ 'pyright': { \ 'disableLanguageServices': v:true, diff --git a/test/command_callback/test_r_languageserver_callbacks.vader b/test/command_callback/test_r_languageserver_callbacks.vader index 9a4a1f87..b5be0396 100644 --- a/test/command_callback/test_r_languageserver_callbacks.vader +++ b/test/command_callback/test_r_languageserver_callbacks.vader @@ -10,9 +10,9 @@ Execute(The default executable path should be correct): Execute(The project root should be detected correctly): AssertLSPProject '.' - call ale#test#SetFilename('r_paths/dummy/test.R') + call ale#test#SetFilename('../test-files/r/dummy/test.R') - AssertLSPProject ale#path#Simplify(g:dir . '/r_paths') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/r') Execute(Should accept configuration settings): AssertLSPConfig {} diff --git a/test/command_callback/test_rails_best_practices_command_callback.vader b/test/command_callback/test_rails_best_practices_command_callback.vader index bc7c8e85..6a6f7a53 100644 --- a/test/command_callback/test_rails_best_practices_command_callback.vader +++ b/test/command_callback/test_rails_best_practices_command_callback.vader @@ -1,10 +1,10 @@ Before: call ale#assert#SetUpLinterTest('ruby', 'rails_best_practices') - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/db/test.rb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/db/test.rb') let b:args = '--silent -f json' \ . ' --output-file ' . (has('win32') ? '%t' : '/dev/stdout') - let b:app_path = ale#path#Simplify(g:dir . '/../ruby_fixtures/valid_rails_app') + let b:app_path = ale#path#Simplify(g:dir . '/../test-files/ruby/valid_rails_app') let b:suffix = has('win32') ? '; type %t' : '' After: @@ -37,6 +37,6 @@ Execute(Setting bundle appends 'exec rails_best_practices'): \ . b:suffix Execute(Command callback should be empty when not in a valid Rails app): - call ale#test#SetFilename('../ruby_fixtures/not_a_rails_app/test.rb') + call ale#test#SetFilename('../test-files/ruby/not_a_rails_app/test.rb') AssertLinter 'rails_best_practices', '' diff --git a/test/command_callback/test_reason_ls_command_callback.vader b/test/command_callback/test_reason_ls_command_callback.vader index 64f672d7..57ea7302 100644 --- a/test/command_callback/test_reason_ls_command_callback.vader +++ b/test/command_callback/test_reason_ls_command_callback.vader @@ -16,6 +16,6 @@ Execute(There should be no default project root): AssertLSPProject '' Execute(The project root should be detected using bsconfig.json): - call ale#test#SetFilename('reason_ls_paths/test.ml') + call ale#test#SetFilename('../test-files/reasonml/test.ml') - AssertLSPProject ale#path#Simplify(g:dir . '/reason_ls_paths') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/reasonml') diff --git a/test/command_callback/test_reason_ols_callbacks.vader b/test/command_callback/test_reason_ols_callbacks.vader index 53ef7fab..752bd05b 100644 --- a/test/command_callback/test_reason_ols_callbacks.vader +++ b/test/command_callback/test_reason_ols_callbacks.vader @@ -17,20 +17,20 @@ Execute(The default executable should be correct): Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('ols_paths/file.re') + call ale#test#SetFilename('../test-files/ols/file.re') - AssertLSPProject ale#path#Simplify(g:dir . '/ols_paths') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/ols') Execute(The local executable should be used when available): - call ale#test#SetFilename('ols_paths/file.re') + call ale#test#SetFilename('../test-files/ols/file.re') AssertLinter - \ ale#path#Simplify(g:dir . '/ols_paths/node_modules/.bin/ocaml-language-server'), - \ ale#Escape(ale#path#Simplify(g:dir . '/ols_paths/node_modules/.bin/ocaml-language-server')) . ' --stdio' + \ ale#path#Simplify(g:dir . '/../test-files/ols/node_modules/.bin/ocaml-language-server'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ols/node_modules/.bin/ocaml-language-server')) . ' --stdio' Execute(The gloabl executable should always be used when use_global is set): let g:ale_reason_ols_use_global = 1 - call ale#test#SetFilename('ols_paths/file.re') + call ale#test#SetFilename('../test-files/ols/file.re') AssertLinter 'ocaml-language-server', \ ale#Escape('ocaml-language-server') . ' --stdio' diff --git a/test/command_callback/test_remark_lint_command_callbacks.vader b/test/command_callback/test_remark_lint_command_callbacks.vader index f3ab7550..a34f0a90 100644 --- a/test/command_callback/test_remark_lint_command_callbacks.vader +++ b/test/command_callback/test_remark_lint_command_callbacks.vader @@ -22,16 +22,16 @@ Execute(The options should be configurable): \ ale#Escape('remark') . ' --something --no-stdout --no-color' Execute(The local executable from .bin should be used if available): - call ale#test#SetFilename('remark_lint_paths/with_bin_path/foo.md') + call ale#test#SetFilename('../test-files/remark_lint/with_bin_path/foo.md') AssertLinter - \ ale#path#Simplify(g:dir . '/remark_lint_paths/with_bin_path/node_modules/.bin/remark'), - \ ale#Escape(ale#path#Simplify(g:dir . '/remark_lint_paths/with_bin_path/node_modules/.bin/remark')) + \ ale#path#Simplify(g:dir . '/../test-files/remark_lint/with_bin_path/node_modules/.bin/remark'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/remark_lint/with_bin_path/node_modules/.bin/remark')) \ . ' --no-stdout --no-color' Execute(The global executable should be uesd if the option is set): let b:ale_markdown_remark_lint_use_global = 1 - call ale#test#SetFilename('remark_lint_paths/with_bin_path/foo.md') + call ale#test#SetFilename('../test-files/remark_lint/with_bin_path/foo.md') AssertLinter 'remark', ale#Escape('remark') \ . ' --no-stdout --no-color' diff --git a/test/nix/test_rnix_lsp.vader b/test/command_callback/test_rnix_command_callback.vader similarity index 87% rename from test/nix/test_rnix_lsp.vader rename to test/command_callback/test_rnix_command_callback.vader index bf62616b..8970ee99 100644 --- a/test/nix/test_rnix_lsp.vader +++ b/test/command_callback/test_rnix_command_callback.vader @@ -1,6 +1,5 @@ " Author: jD91mZM2 " Description: Tests for rnix-lsp language client - Before: call ale#assert#SetUpLinterTest('nix', 'rnix_lsp') @@ -8,7 +7,6 @@ After: call ale#assert#TearDownLinterTest() Execute(should start rnix-lsp): - call ale#test#SetFilename('./test.nix') AssertLSPLanguage 'nix' AssertLSPOptions {} AssertLSPProject ale#path#Simplify('.') diff --git a/test/command_callback/test_rst_textlint_command_callbacks.vader b/test/command_callback/test_rst_textlint_command_callbacks.vader index 9bc4c5c2..b2d99636 100644 --- a/test/command_callback/test_rst_textlint_command_callbacks.vader +++ b/test/command_callback/test_rst_textlint_command_callbacks.vader @@ -42,24 +42,24 @@ Execute(The options should be configurable): \ ale#Escape('textlint') . ' --something -f json --stdin --stdin-filename %s' Execute(The local executable from .bin should be used if available): - call ale#test#SetFilename('textlint_paths/with_bin_path/foo.txt') + call ale#test#SetFilename('../test-files/textlint/with_bin_path/foo.txt') AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_bin_path/node_modules/.bin/textlint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_bin_path/node_modules/.bin/textlint')) \ . ' -f json --stdin --stdin-filename %s' Execute(The local executable from textlint/bin should be used if available): - call ale#test#SetFilename('textlint_paths/with_textlint_bin_path/foo.txt') + call ale#test#SetFilename('../test-files/textlint/with_textlint_bin_path/foo.txt') if has('win32') AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), - \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), + \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) \ . ' -f json --stdin --stdin-filename %s' else AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), - \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) \ . ' -f json --stdin --stdin-filename %s' endif diff --git a/test/command_callback/test_ruby_solargraph.vader b/test/command_callback/test_ruby_solargraph.vader index c6aee271..e909049b 100644 --- a/test/command_callback/test_ruby_solargraph.vader +++ b/test/command_callback/test_ruby_solargraph.vader @@ -15,28 +15,28 @@ Execute(command callback executable can be overridden): AssertLinter 'foobar', ale#Escape('foobar') . ' stdio' Execute(should set solargraph for rails app): - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/app/models/thing.rb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/app/models/thing.rb') AssertLSPLanguage 'ruby' AssertLSPOptions {} - AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../ruby_fixtures/valid_rails_app') + AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/ruby/valid_rails_app') Execute(should set solargraph for ruby app1): - call ale#test#SetFilename('../ruby_fixtures/valid_ruby_app1/lib/file.rb') + call ale#test#SetFilename('../test-files/ruby/valid_ruby_app1/lib/file.rb') AssertLSPLanguage 'ruby' AssertLSPOptions {} - AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../ruby_fixtures/valid_ruby_app1') + AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/ruby/valid_ruby_app1') Execute(should set solargraph for ruby app2): - call ale#test#SetFilename('../ruby_fixtures/valid_ruby_app2/lib/file.rb') + call ale#test#SetFilename('../test-files/ruby/valid_ruby_app2/lib/file.rb') AssertLSPLanguage 'ruby' AssertLSPOptions {} - AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../ruby_fixtures/valid_ruby_app2') + AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/ruby/valid_ruby_app2') Execute(should set solargraph for ruby app3): - call ale#test#SetFilename('../ruby_fixtures/valid_ruby_app3/lib/file.rb') + call ale#test#SetFilename('../test-files/ruby/valid_ruby_app3/lib/file.rb') AssertLSPLanguage 'ruby' AssertLSPOptions {} - AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../ruby_fixtures/valid_ruby_app3') + AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/ruby/valid_ruby_app3') Execute(should accept initialization options): AssertLSPOptions {} diff --git a/test/command_callback/test_rust_analyzer_callbacks.vader b/test/command_callback/test_rust_analyzer_callbacks.vader index efab1378..82a3adfb 100644 --- a/test/command_callback/test_rust_analyzer_callbacks.vader +++ b/test/command_callback/test_rust_analyzer_callbacks.vader @@ -10,9 +10,9 @@ Execute(The default executable path should be correct): Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('rust-rls-project/test.rs') + call ale#test#SetFilename('../test-files/rust/test.rs') - AssertLSPProject ale#path#Simplify(g:dir . '/rust-rls-project') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/rust') Execute(Should accept configuration settings): AssertLSPConfig {} diff --git a/test/command_callback/test_rust_rls_callbacks.vader b/test/command_callback/test_rust_rls_callbacks.vader index ec8c8811..9ca25619 100644 --- a/test/command_callback/test_rust_rls_callbacks.vader +++ b/test/command_callback/test_rust_rls_callbacks.vader @@ -20,9 +20,9 @@ Execute(The toolchain should be ommitted if not given): Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('rust-rls-project/test.rs') + call ale#test#SetFilename('../test-files/rust/test.rs') - AssertLSPProject ale#path#Simplify(g:dir . '/rust-rls-project') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/rust') Execute(Should accept configuration settings): AssertLSPConfig {} diff --git a/test/command_callback/test_rustc_command_callback.vader b/test/command_callback/test_rustc_command_callback.vader index f765e725..4bceb180 100644 --- a/test/command_callback/test_rustc_command_callback.vader +++ b/test/command_callback/test_rustc_command_callback.vader @@ -13,9 +13,9 @@ Execute(The options should be configurable): AssertLinter 'rustc', 'rustc --error-format=json --foo -' Execute(Some default paths should be included when the project is a Cargo project): - call ale#test#SetFilename('cargo_paths/test.rs') + call ale#test#SetFilename('../test-files/cargo/test.rs') AssertLinter 'rustc', 'rustc --error-format=json -Z no-codegen' - \ . ' -L ' . ale#Escape(ale#path#GetAbsPath(g:dir, 'cargo_paths/target/debug/deps')) - \ . ' -L ' . ale#Escape(ale#path#GetAbsPath(g:dir, 'cargo_paths/target/release/deps')) + \ . ' -L ' . ale#Escape(ale#path#GetAbsPath(g:dir, '../test-files/cargo/target/debug/deps')) + \ . ' -L ' . ale#Escape(ale#path#GetAbsPath(g:dir, '../test-files/cargo/target/release/deps')) \ . ' -' diff --git a/test/command_callback/test_sass_sasslint_command_callback.vader b/test/command_callback/test_sass_sasslint_command_callback.vader index 9b9bf906..87f0c8ad 100644 --- a/test/command_callback/test_sass_sasslint_command_callback.vader +++ b/test/command_callback/test_sass_sasslint_command_callback.vader @@ -7,11 +7,11 @@ After: call ale#assert#TearDownLinterTest() Execute(should default to source, bin/sass-lint.js): - call ale#test#SetFilename('sasslint-test-files/with-source/test.sass') + call ale#test#SetFilename('../test-files/sasslint/with-source/test.sass') let b:executable = ale#path#Simplify( \ g:dir - \ . '/sasslint-test-files/with-source/node_modules/sass-lint/bin/sass-lint.js' + \ . '/../test-files/sasslint/with-source/node_modules/sass-lint/bin/sass-lint.js' \) AssertLinter b:executable, @@ -20,11 +20,11 @@ Execute(should default to source, bin/sass-lint.js): \ . ' -v -q -f compact %t' Execute(should fallback to bin, .bin/sass-lint): - call ale#test#SetFilename('sasslint-test-files/with-bin/test.sass') + call ale#test#SetFilename('../test-files/sasslint/with-bin/test.sass') let b:executable = ale#path#Simplify( \ g:dir - \ . '/sasslint-test-files/with-bin/node_modules/.bin/sass-lint' + \ . '/../test-files/sasslint/with-bin/node_modules/.bin/sass-lint' \) AssertLinter b:executable, ale#Escape(b:executable) . ' -v -q -f compact %t' diff --git a/test/command_callback/test_scala_metals.vader b/test/command_callback/test_scala_metals.vader index 70e14c1a..f5733ddc 100644 --- a/test/command_callback/test_scala_metals.vader +++ b/test/command_callback/test_scala_metals.vader @@ -7,13 +7,13 @@ Before: After: call ale#assert#TearDownLinterTest() Execute(should set metals for sbt project with build.sbt): - call ale#test#SetFilename('../scala_fixtures/valid_sbt_project/Main.scala') + call ale#test#SetFilename('../test-files/scala/valid_sbt_project/Main.scala') AssertLSPLanguage 'scala' AssertLSPOptions {} AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../scala_fixtures/valid_sbt_project') + AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/scala/valid_sbt_project') Execute(should not set metals for sbt project without build.sbt): - call ale#test#SetFilename('../scala_fixtures/invalid_sbt_project/Main.scala') + call ale#test#SetFilename('../test-files/scala/invalid_sbt_project/Main.scala') AssertLSPLanguage 'scala' AssertLSPOptions {} AssertLSPConfig {} diff --git a/test/command_callback/test_scala_sbtserver.vader b/test/command_callback/test_scala_sbtserver.vader index 1c7d8472..a20c424e 100644 --- a/test/command_callback/test_scala_sbtserver.vader +++ b/test/command_callback/test_scala_sbtserver.vader @@ -6,14 +6,14 @@ Before: After: call ale#assert#TearDownLinterTest() Execute(should set sbtserver for sbt project with build.sbt): - call ale#test#SetFilename('../scala_fixtures/valid_sbt_project/Main.scala') + call ale#test#SetFilename('../test-files/scala/valid_sbt_project/Main.scala') AssertLSPLanguage 'scala' AssertLSPOptions {} AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../scala_fixtures/valid_sbt_project') + AssertLSPProject ale#path#Simplify(g:dir . 'command_callback/../test-files/scala/valid_sbt_project') AssertLSPAddress '127.0.0.1:4273' Execute(should not set sbtserver for sbt project without build.sbt): - call ale#test#SetFilename('../scala_fixtures/invalid_sbt_project/Main.scala') + call ale#test#SetFilename('../test-files/scala/invalid_sbt_project/Main.scala') AssertLSPLanguage 'scala' AssertLSPOptions {} AssertLSPConfig {} diff --git a/test/command_callback/test_scss_sasslint_command_callback.vader b/test/command_callback/test_scss_sasslint_command_callback.vader index 1695190a..839761c2 100644 --- a/test/command_callback/test_scss_sasslint_command_callback.vader +++ b/test/command_callback/test_scss_sasslint_command_callback.vader @@ -7,11 +7,11 @@ After: call ale#assert#TearDownLinterTest() Execute(should default to source, bin/sass-lint.js): - call ale#test#SetFilename('sasslint-test-files/with-source/test.scss') + call ale#test#SetFilename('../test-files/sasslint/with-source/test.scss') let b:executable = ale#path#Simplify( \ g:dir - \ . '/sasslint-test-files/with-source/node_modules/sass-lint/bin/sass-lint.js' + \ . '/../test-files/sasslint/with-source/node_modules/sass-lint/bin/sass-lint.js' \) AssertLinter b:executable, @@ -20,11 +20,11 @@ Execute(should default to source, bin/sass-lint.js): \ . ' -v -q -f compact %t' Execute(should fallback to bin, .bin/sass-lint): - call ale#test#SetFilename('sasslint-test-files/with-bin/test.scss') + call ale#test#SetFilename('../test-files/sasslint/with-bin/test.scss') let b:executable = ale#path#Simplify( \ g:dir - \ . '/sasslint-test-files/with-bin/node_modules/.bin/sass-lint' + \ . '/../test-files/sasslint/with-bin/node_modules/.bin/sass-lint' \) AssertLinter b:executable, ale#Escape(b:executable) . ' -v -q -f compact %t' diff --git a/test/command_callback/test_scss_stylelint_command_callback.vader b/test/command_callback/test_scss_stylelint_command_callback.vader index 9c3a02d8..5a1e71c6 100644 --- a/test/command_callback/test_scss_stylelint_command_callback.vader +++ b/test/command_callback/test_scss_stylelint_command_callback.vader @@ -7,11 +7,11 @@ After: call ale#assert#TearDownLinterTest() Execute(node_modules directories should be discovered): - call ale#test#SetFilename('stylelint_paths/nested/testfile.scss') + call ale#test#SetFilename('../test-files/stylelint/nested/testfile.scss') let b:executable = ale#path#Simplify( \ g:dir - \ . '/stylelint_paths/node_modules/.bin/stylelint' + \ . '/../test-files/stylelint/node_modules/.bin/stylelint' \) AssertLinter b:executable, ale#Escape(b:executable) . ' --stdin-filename %s' @@ -20,7 +20,7 @@ Execute(The global override should work): let b:ale_scss_stylelint_executable = 'foobar' let b:ale_scss_stylelint_use_global = 1 - call ale#test#SetFilename('stylelint_paths/nested/testfile.scss') + call ale#test#SetFilename('../test-files/stylelint/nested/testfile.scss') AssertLinter 'foobar', ale#Escape('foobar') . ' --stdin-filename %s' diff --git a/test/command_callback/test_slimlint_command_callback.vader b/test/command_callback/test_slimlint_command_callback.vader index 3522c2fa..33df9ac0 100644 --- a/test/command_callback/test_slimlint_command_callback.vader +++ b/test/command_callback/test_slimlint_command_callback.vader @@ -9,11 +9,11 @@ Execute(The default command should be correct): AssertLinter 'slim-lint', 'slim-lint %t' Execute(The command should have the .rubocop.yml prepended as an env var if one exists): - call ale#test#SetFilename('../slimlint-test-files/subdir/file.slim') + call ale#test#SetFilename('../test-files/slimlint/subdir/file.slim') AssertLinter 'slim-lint', \ ale#Env( \ 'SLIM_LINT_RUBOCOP_CONF', - \ ale#path#Simplify(g:dir . '/../slimlint-test-files/.rubocop.yml') + \ ale#path#Simplify(g:dir . '/../test-files/slimlint/.rubocop.yml') \ ) \ . 'slim-lint %t' diff --git a/test/command_callback/test_spectral_command_callback.vader b/test/command_callback/test_spectral_command_callback.vader index ed3795b9..cfcf0987 100644 --- a/test/command_callback/test_spectral_command_callback.vader +++ b/test/command_callback/test_spectral_command_callback.vader @@ -23,9 +23,9 @@ Execute(The yaml spectral command callback should allow a global installation to \ . ' lint --ignore-unknown-format -q -f text %t' Execute(The yaml spectral command callback should allow a local installation to be used): - call ale#test#SetFilename('spectral_paths/openapi.yaml') + call ale#test#SetFilename('../test-files/spectral/openapi.yaml') AssertLinter - \ ale#path#Simplify(g:dir . '/spectral_paths/node_modules/.bin/spectral'), - \ ale#Escape(ale#path#Simplify(g:dir . '/spectral_paths/node_modules/.bin/spectral')) + \ ale#path#Simplify(g:dir . '/../test-files/spectral/node_modules/.bin/spectral'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/spectral/node_modules/.bin/spectral')) \ . ' lint --ignore-unknown-format -q -f text %t' diff --git a/test/command_callback/test_standard_command_callback.vader b/test/command_callback/test_standard_command_callback.vader index a47e2ec9..4722cd4a 100644 --- a/test/command_callback/test_standard_command_callback.vader +++ b/test/command_callback/test_standard_command_callback.vader @@ -7,11 +7,11 @@ After: call ale#assert#TearDownLinterTest() Execute(bin/cmd.js paths should be preferred): - call ale#test#SetFilename('standard-test-files/with-cmd/testfile.js') + call ale#test#SetFilename('../test-files/standard/with-cmd/testfile.js') let b:executable = ale#path#Simplify( \ g:dir - \ . '/standard-test-files/with-cmd/node_modules/standard/bin/cmd.js' + \ . '/../test-files/standard/with-cmd/node_modules/standard/bin/cmd.js' \) AssertLinter b:executable, @@ -20,11 +20,11 @@ Execute(bin/cmd.js paths should be preferred): \ . ' --stdin %s' Execute(.bin directories should be used too): - call ale#test#SetFilename('standard-test-files/with-bin/testfile.js') + call ale#test#SetFilename('../test-files/standard/with-bin/testfile.js') let b:executable = ale#path#Simplify( \ g:dir - \ . '/standard-test-files/with-bin/node_modules/.bin/standard' + \ . '/../test-files/standard/with-bin/node_modules/.bin/standard' \) AssertLinter b:executable, ale#Escape(b:executable) . ' --stdin %s' diff --git a/test/command_callback/test_standardts_command_callback.vader b/test/command_callback/test_standardts_command_callback.vader index d769e712..33ca8b25 100644 --- a/test/command_callback/test_standardts_command_callback.vader +++ b/test/command_callback/test_standardts_command_callback.vader @@ -7,11 +7,11 @@ After: call ale#assert#TearDownLinterTest() Execute(bin/cmd.js paths should be preferred): - call ale#test#SetFilename('standard-test-files/with-cmd/testfile.js') + call ale#test#SetFilename('../test-files/standard/with-cmd/testfile.js') let b:executable = ale#path#Simplify( \ g:dir - \ . '/standard-test-files/with-cmd/node_modules/standard/bin/cmd.js' + \ . '/../test-files/standard/with-cmd/node_modules/standard/bin/cmd.js' \) AssertLinter b:executable, @@ -20,11 +20,11 @@ Execute(bin/cmd.js paths should be preferred): \ . ' --stdin %s' Execute(.bin directories should be used too): - call ale#test#SetFilename('standard-test-files/with-bin/testfile.js') + call ale#test#SetFilename('../test-files/standard/with-bin/testfile.js') let b:executable = ale#path#Simplify( \ g:dir - \ . '/standard-test-files/with-bin/node_modules/.bin/standard' + \ . '/../test-files/standard/with-bin/node_modules/.bin/standard' \) AssertLinter b:executable, ale#Escape(b:executable) . ' --stdin %s' diff --git a/test/command_callback/test_sugarss_stylelint_command_callback.vader b/test/command_callback/test_sugarss_stylelint_command_callback.vader index 448436fb..ba42eaf8 100644 --- a/test/command_callback/test_sugarss_stylelint_command_callback.vader +++ b/test/command_callback/test_sugarss_stylelint_command_callback.vader @@ -7,11 +7,11 @@ After: call ale#assert#TearDownLinterTest() Execute(node_modules directories should be discovered): - call ale#test#SetFilename('stylelint_paths/nested/testfile.sss') + call ale#test#SetFilename('../test-files/stylelint/nested/testfile.sss') let b:executable = ale#path#Simplify( \ g:dir - \ . '/stylelint_paths/node_modules/.bin/stylelint' + \ . '/../test-files/stylelint/node_modules/.bin/stylelint' \) AssertLinter b:executable, ale#Escape(b:executable) . ' --syntax=sugarss --stdin-filename %s' @@ -20,7 +20,7 @@ Execute(The global override should work): let b:ale_sugarss_stylelint_executable = 'foobar' let b:ale_sugarss_stylelint_use_global = 1 - call ale#test#SetFilename('stylelint_paths/nested/testfile.sss') + call ale#test#SetFilename('../test-files/stylelint/nested/testfile.sss') AssertLinter 'foobar', ale#Escape('foobar') . ' --syntax=sugarss --stdin-filename %s' diff --git a/test/command_callback/test_swaglint_command_callback.vader b/test/command_callback/test_swaglint_command_callback.vader index 68fb1406..98f0c594 100644 --- a/test/command_callback/test_swaglint_command_callback.vader +++ b/test/command_callback/test_swaglint_command_callback.vader @@ -21,9 +21,9 @@ Execute(The yaml swaglint command callback should allow a global installation to \ ale#Escape('/usr/local/bin/swaglint') . ' -r compact --stdin' Execute(The yaml swaglint command callback should allow a local installation to be used): - call ale#test#SetFilename('swaglint_paths/docs/swagger.yaml') + call ale#test#SetFilename('../test-files/swaglint/docs/swagger.yaml') AssertLinter - \ ale#path#Simplify(g:dir . '/swaglint_paths/node_modules/.bin/swaglint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/swaglint_paths/node_modules/.bin/swaglint')) + \ ale#path#Simplify(g:dir . '/../test-files/swaglint/node_modules/.bin/swaglint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/swaglint/node_modules/.bin/swaglint')) \ . ' -r compact --stdin' diff --git a/test/command_callback/test_swift_sourcekitlsp_command_callbacks.vader b/test/command_callback/test_swift_sourcekitlsp_command_callbacks.vader index 4611c6de..1040d590 100644 --- a/test/command_callback/test_swift_sourcekitlsp_command_callbacks.vader +++ b/test/command_callback/test_swift_sourcekitlsp_command_callbacks.vader @@ -5,12 +5,12 @@ After: call ale#assert#TearDownLinterTest() Execute(The default executable path should be correct): - call ale#test#SetFilename('../swift-test-files/swift-package-project/src/folder/dummy.swift') + call ale#test#SetFilename('../test-files/swift/swift-package-project/src/folder/dummy.swift') AssertLinter 'sourcekit-lsp', ale#Escape('sourcekit-lsp') Execute(Should let users configure a global executable and override local paths): - call ale#test#SetFilename('../swift-test-files/swift-package-project/src/folder/dummy.swift') + call ale#test#SetFilename('../test-files/swift/swift-package-project/src/folder/dummy.swift') let g:ale_sourcekit_lsp_executable = '/path/to/custom/sourcekitlsp' diff --git a/test/command_callback/test_swift_swiftformat_command_callbacks.vader b/test/command_callback/test_swift_swiftformat_command_callbacks.vader index 7be20bf7..9f6ee62e 100644 --- a/test/command_callback/test_swift_swiftformat_command_callbacks.vader +++ b/test/command_callback/test_swift_swiftformat_command_callbacks.vader @@ -5,19 +5,19 @@ After: call ale#assert#TearDownLinterTest() Execute(Should use default command when not in a swift package): - call ale#test#SetFilename('../swift-test-files/non-swift-package-project/src/folder/dummy.swift') + call ale#test#SetFilename('../test-files/swift/non-swift-package-project/src/folder/dummy.swift') AssertLinter 'swift-format', \ ale#Escape('swift-format') . ' --mode lint %t' Execute(Should use swift run when in a swift package): - call ale#test#SetFilename('../swift-test-files/swift-package-project/src/folder/dummy.swift') + call ale#test#SetFilename('../test-files/swift/swift-package-project/src/folder/dummy.swift') AssertLinter 'swift', \ ale#Escape('swift') . ' run swift-format --mode lint %t' Execute(Should let users configure a global executable and override local paths): - call ale#test#SetFilename('../swift-test-files/swift-package-project/src/folder/dummy.swift') + call ale#test#SetFilename('../test-files/swift/swift-package-project/src/folder/dummy.swift') let g:ale_swift_swiftformat_executable = '/path/to/custom/swift-format' diff --git a/test/command_callback/test_swiftlint_command_callback.vader b/test/command_callback/test_swiftlint_command_callback.vader new file mode 100644 index 00000000..d2442b0a --- /dev/null +++ b/test/command_callback/test_swiftlint_command_callback.vader @@ -0,0 +1,43 @@ +Before: + call ale#assert#SetUpLinterTest('swift', 'swiftlint') + +After: + call ale#assert#TearDownLinterTest() + +Execute(Global installation should be the default executable): + call ale#test#SetFilename('../test-files/swiftlint/global/testfile.swift') + + AssertEqual + \ 'swiftlint', + \ ale_linters#swift#swiftlint#GetExecutable(bufnr('')) + +Execute(React Native apps using CocoaPods should take precedence over the default executable): + call ale#test#SetFilename('../test-files/swiftlint/react-native/testfile.swift') + + AssertEqual + \ tolower(ale#test#GetFilename('../test-files/swiftlint/react-native/ios/Pods/SwiftLint/swiftlint')), + \ tolower(ale_linters#swift#swiftlint#GetExecutable(bufnr(''))) + +Execute(CocoaPods installation should take precedence over the default executable): + call ale#test#SetFilename('../test-files/swiftlint/cocoapods/testfile.swift') + + AssertEqual + \ tolower(ale#test#GetFilename('../test-files/swiftlint/cocoapods/Pods/SwiftLint/swiftlint')), + \ tolower(ale_linters#swift#swiftlint#GetExecutable(bufnr(''))) + +Execute(Top level CocoaPods installation should take precedence over React Native installation): + call ale#test#SetFilename('../test-files/swiftlint/cocoapods-and-react-native/testfile.swift') + + AssertEqual + \ tolower(ale#test#GetFilename('../test-files/swiftlint/cocoapods-and-react-native/Pods/SwiftLint/swiftlint')), + \ tolower(ale_linters#swift#swiftlint#GetExecutable(bufnr(''))) + +Execute(use-global should override other versions): + let g:ale_swift_swiftlint_use_global = 1 + let g:ale_swift_swiftlint_executable = 'swiftlint_d' + + call ale#test#SetFilename('../test-files/swiftlint/cocoapods-and-react-native/testfile.swift') + + AssertEqual + \ 'swiftlint_d', + \ ale_linters#swift#swiftlint#GetExecutable(bufnr('')) diff --git a/test/command_callback/test_terraform_ls_command_callback.vader b/test/command_callback/test_terraform_ls_command_callback.vader index d559ba8c..9f7d3450 100644 --- a/test/command_callback/test_terraform_ls_command_callback.vader +++ b/test/command_callback/test_terraform_ls_command_callback.vader @@ -45,7 +45,7 @@ Execute(Should return current directory if it contains .terraform directory): AssertLSPProject g:dir Execute(Should return nearest directory with .terraform if found in parent directory): - call ale#test#SetFilename('../terraform_files/main.tf') + call ale#test#SetFilename('../test-files/terraform/main.tf') let b:parent_dir = ale#path#Simplify(g:dir . '/..') let b:tf_dir = b:parent_dir . '/.terraform' diff --git a/test/command_callback/test_terraform_lsp_command_callback.vader b/test/command_callback/test_terraform_lsp_command_callback.vader index 7a491d54..a292fca0 100644 --- a/test/command_callback/test_terraform_lsp_command_callback.vader +++ b/test/command_callback/test_terraform_lsp_command_callback.vader @@ -32,7 +32,7 @@ Execute(Should return current directory if it contains .terraform directory): AssertLSPProject g:dir Execute(Should return nearest directory with .terraform if found in parent directory): - call ale#test#SetFilename('../terraform_files/main.tf') + call ale#test#SetFilename('../test-files/terraform/main.tf') let b:parent_dir = ale#path#Simplify(g:dir . '/..') let b:tf_dir = b:parent_dir . '/.terraform' diff --git a/test/command_callback/test_terraform_tflint_command_callback.vader b/test/command_callback/test_terraform_tflint_command_callback.vader index 0cef0176..96811e81 100644 --- a/test/command_callback/test_terraform_tflint_command_callback.vader +++ b/test/command_callback/test_terraform_tflint_command_callback.vader @@ -19,10 +19,10 @@ Execute(Overriding options should work): AssertLinter 'fnord', ale#Escape('fnord') . ' --whatever -f json %t' Execute(Configuration files should be found): - call ale#test#SetFilename('../tflint-test-files/foo/bar.tf') + call ale#test#SetFilename('../test-files/tflint/foo/bar.tf') AssertLinter 'tflint', \ ale#Escape('tflint') \ . ' --config ' - \ . ale#Escape(ale#path#Simplify(g:dir . '/../tflint-test-files/foo/.tflint.hcl')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/tflint/foo/.tflint.hcl')) \ . ' -f json %t' diff --git a/test/command_callback/test_tex_textlint_command_callbacks.vader b/test/command_callback/test_tex_textlint_command_callbacks.vader index d1e2ab91..f99e0fd0 100644 --- a/test/command_callback/test_tex_textlint_command_callbacks.vader +++ b/test/command_callback/test_tex_textlint_command_callbacks.vader @@ -42,24 +42,24 @@ Execute(The options should be configurable): \ ale#Escape('textlint') . ' --something -f json --stdin --stdin-filename %s' Execute(The local executable from .bin should be used if available): - call ale#test#SetFilename('textlint_paths/with_bin_path/foo.txt') + call ale#test#SetFilename('../test-files/textlint/with_bin_path/foo.txt') AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_bin_path/node_modules/.bin/textlint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_bin_path/node_modules/.bin/textlint')) \ . ' -f json --stdin --stdin-filename %s' Execute(The local executable from textlint/bin should be used if available): - call ale#test#SetFilename('textlint_paths/with_textlint_bin_path/foo.txt') + call ale#test#SetFilename('../test-files/textlint/with_textlint_bin_path/foo.txt') if has('win32') AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), - \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), + \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) \ . ' -f json --stdin --stdin-filename %s' else AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), - \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) \ . ' -f json --stdin --stdin-filename %s' endif diff --git a/test/command_callback/test_texlab_command_callbacks.vader b/test/command_callback/test_texlab_command_callbacks.vader index c18793da..75fc2f25 100644 --- a/test/command_callback/test_texlab_command_callbacks.vader +++ b/test/command_callback/test_texlab_command_callbacks.vader @@ -14,10 +14,10 @@ Execute(The default executable path should be correct): AssertLinter 'texlab', ale#Escape('texlab') Execute(The project root should be detected correctly): - call ale#test#SetFilename('tex_paths/sample1.tex') - silent! call mkdir('tex_paths/.git') + call ale#test#SetFilename('../test-files/tex/sample1.tex') + silent! call mkdir('../test-files/tex/.git') - AssertLSPProject ale#path#Simplify(g:dir . '/tex_paths') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/tex') Execute(The executable should be configurable): let b:ale_tex_texlab_executable = 'foobar' diff --git a/test/command_callback/test_textlint_command_callbacks.vader b/test/command_callback/test_textlint_command_callbacks.vader index 794c7fde..6ec42b2d 100644 --- a/test/command_callback/test_textlint_command_callbacks.vader +++ b/test/command_callback/test_textlint_command_callbacks.vader @@ -42,24 +42,24 @@ Execute(The options should be configurable): \ ale#Escape('textlint') . ' --something -f json --stdin --stdin-filename %s' Execute(The local executable from .bin should be used if available): - call ale#test#SetFilename('textlint_paths/with_bin_path/foo.txt') + call ale#test#SetFilename('../test-files/textlint/with_bin_path/foo.txt') AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint'), - \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_bin_path/node_modules/.bin/textlint')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_bin_path/node_modules/.bin/textlint'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_bin_path/node_modules/.bin/textlint')) \ . ' -f json --stdin --stdin-filename %s' Execute(The local executable from textlint/bin should be used if available): - call ale#test#SetFilename('textlint_paths/with_textlint_bin_path/foo.txt') + call ale#test#SetFilename('../test-files/textlint/with_textlint_bin_path/foo.txt') if has('win32') AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), - \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), + \ ale#Escape('node.exe') . ' ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) \ . ' -f json --stdin --stdin-filename %s' else AssertLinter - \ ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), - \ ale#Escape(ale#path#Simplify(g:dir . '/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) + \ ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js')) \ . ' -f json --stdin --stdin-filename %s' endif diff --git a/test/command_callback/test_typescript_deno_lsp.vader b/test/command_callback/test_typescript_deno_lsp.vader index 01cbc851..88b2e036 100644 --- a/test/command_callback/test_typescript_deno_lsp.vader +++ b/test/command_callback/test_typescript_deno_lsp.vader @@ -1,7 +1,7 @@ Before: let g:ale_deno_unstable = 0 let g:ale_deno_executable = 'deno' - let g:ale_deno_project_root = '' + let g:ale_deno_lsp_project_root = '' runtime autoload/ale/handlers/deno.vim call ale#assert#SetUpLinterTest('typescript', 'deno') @@ -10,9 +10,6 @@ After: call ale#assert#TearDownLinterTest() Execute(Should set deno lsp for TypeScript projects using stable Deno API): - AssertLSPLanguage 'typescript' - AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/../..') AssertLSPOptions { \ 'enable': v:true, \ 'lint': v:true, @@ -21,9 +18,7 @@ Execute(Should set deno lsp for TypeScript projects using stable Deno API): Execute(Should set deno lsp using unstable Deno API if enabled by user): let g:ale_deno_unstable = 1 - AssertLSPLanguage 'typescript' - AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/../..') + AssertLSPOptions { \ 'enable': v:true, \ 'lint': v:true, @@ -31,30 +26,18 @@ Execute(Should set deno lsp using unstable Deno API if enabled by user): \} Execute(Should find project root containing tsconfig.json): - call ale#test#SetFilename('../typescript/test.ts') + call ale#test#SetFilename('../test-files/typescript/test.ts') + AssertLSPLanguage 'typescript' - AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/../typescript') - AssertLSPOptions { - \ 'enable': v:true, - \ 'lint': v:true, - \ 'unstable': v:false - \} + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/typescript') Execute(Should use user-specified project root): let g:ale_deno_lsp_project_root = '/' - call ale#test#SetFilename('../typescript/test.ts') + call ale#test#SetFilename('../test-files/typescript/test.ts') + AssertLSPLanguage 'typescript' - AssertLSPConfig {} AssertLSPProject '/' - AssertLSPOptions { - \ 'enable': v:true, - \ 'lint': v:true, - \ 'unstable': v:false - \} Execute(Check Deno LSP command): - AssertLinter 'deno', [ - \ ale#Escape('deno') . ' lsp', - \] + AssertLinter 'deno', ale#Escape('deno') . ' lsp' diff --git a/test/command_callback/test_vim_vimls.vader b/test/command_callback/test_vim_vimls.vader index ab12b637..47826a1a 100644 --- a/test/command_callback/test_vim_vimls.vader +++ b/test/command_callback/test_vim_vimls.vader @@ -15,17 +15,17 @@ Execute(should set correct defaults): AssertLinter 'vim-language-server', ale#Escape('vim-language-server') . ' --stdio' Execute(should set correct LSP values): - call ale#test#SetFilename('vim_fixtures/path_with_autoload/test.vim') + call ale#test#SetFilename('../test-files/vim/path_with_autoload/test.vim') AssertLSPLanguage 'vim' AssertLSPOptions {} AssertLSPConfig {} - AssertLSPProject ale#path#Simplify(g:dir . '/vim_fixtures/path_with_autoload') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/vim/path_with_autoload') Execute(should set correct project for .git/): let b:parent_dir = ale#path#Simplify(g:dir . '/..') let b:git_dir = b:parent_dir . '/.git' - call ale#test#SetFilename('vim_fixtures/test.vim') + call ale#test#SetFilename('../test-files/vim/test.vim') if !isdirectory(b:git_dir) call mkdir(b:git_dir) @@ -37,9 +37,9 @@ Execute(should set correct project for .git/): unlet! b:git_dir Execute(should set correct project for plugin/): - call ale#test#SetFilename('vim_fixtures/path_with_plugin/test.vim') + call ale#test#SetFilename('../test-files/vim/path_with_plugin/test.vim') - AssertLSPProject ale#path#Simplify(g:dir . '/vim_fixtures/path_with_plugin') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/vim/path_with_plugin') Execute(should accept configuration settings): AssertLSPConfig {} @@ -48,24 +48,24 @@ Execute(should accept configuration settings): AssertLSPConfig {'vim': {'foobar': v:true}} Execute(should set correct project for .vimrc): - call ale#test#SetFilename('vim_fixtures/path_with_vimrc/.vimrc') + call ale#test#SetFilename('../test-files/vim/path_with_vimrc/.vimrc') - AssertLSPProject ale#path#Simplify(g:dir . '/vim_fixtures/path_with_vimrc') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/vim/path_with_vimrc') Execute(should set correct project for init.vim): - call ale#test#SetFilename('vim_fixtures/path_with_initvim/init.vim') + call ale#test#SetFilename('../test-files/vim/path_with_initvim/init.vim') - AssertLSPProject ale#path#Simplify(g:dir . '/vim_fixtures/path_with_initvim') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/vim/path_with_initvim') Execute(should use the local executable when available): - call ale#test#SetFilename('vim_fixtures/file.vim') + call ale#test#SetFilename('../test-files/vim/file.vim') - AssertLinter ale#path#Simplify(g:dir . '/vim_fixtures/node_modules/.bin/vim-language-server'), - \ ale#Escape(ale#path#Simplify(g:dir . '/vim_fixtures/node_modules/.bin/vim-language-server')) . ' --stdio' + AssertLinter ale#path#Simplify(g:dir . '/../test-files/vim/node_modules/.bin/vim-language-server'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/vim/node_modules/.bin/vim-language-server')) . ' --stdio' Execute(should let the global executable to be used): let g:ale_vim_vimls_use_global = 1 - call ale#test#SetFilename('vim_fixtures/file.vim') + call ale#test#SetFilename('../test-files/vim/file.vim') AssertLinter 'vim-language-server', \ ale#Escape('vim-language-server') . ' --stdio' diff --git a/test/command_callback/test_vulture_command_callback.vader b/test/command_callback/test_vulture_command_callback.vader index 41a70045..74709c9e 100644 --- a/test/command_callback/test_vulture_command_callback.vader +++ b/test/command_callback/test_vulture_command_callback.vader @@ -15,9 +15,9 @@ Execute(The vulture command callback should lint file directory by default): AssertLinter 'vulture', ale#Escape('vulture') . ' .' Execute(The vulture command callback should lint project root, when present): - call ale#test#SetFilename('python_paths/no_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/no_virtualenv/subdir/foo/bar.py') - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/no_virtualenv/subdir') AssertLinter 'vulture', ale#Escape('vulture') . ' .' Execute(The option for disabling change directory works and only lints file): @@ -37,17 +37,17 @@ Execute(The vulture command callback should let you set options): AssertLinter 'vulture', ale#Escape('vulture') . ' --some-option .' Execute(The vulture command callback should detect virtualenv directories and switch to the project root): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let b:executable = ale#path#Simplify( - \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/vulture' + \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/vulture' \) - AssertLinterCwd ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir') + AssertLinterCwd ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/subdir') AssertLinter b:executable, ale#Escape(b:executable) . ' .' Execute(You should able able to use the global vulture instead): - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') let g:ale_python_vulture_use_global = 1 AssertLinter 'vulture', ale#Escape('vulture') . ' .' diff --git a/test/command_callback/test_write_good_command_callback.vader b/test/command_callback/test_write_good_command_callback.vader index 9ffa39bd..8958dd6a 100644 --- a/test/command_callback/test_write_good_command_callback.vader +++ b/test/command_callback/test_write_good_command_callback.vader @@ -30,24 +30,24 @@ Execute(The options should be used in the command): \ ale#Escape('write-good') . ' --foo --bar %t', Execute(Should use the node_modules/.bin executable, if available): - call ale#test#SetFilename('write-good-node-modules/test.txt') + call ale#test#SetFilename('../test-files/write-good/node-modules/test.txt') AssertLinter - \ ale#path#Simplify(g:dir . '/write-good-node-modules/node_modules/.bin/write-good'), - \ ale#Escape(ale#path#Simplify(g:dir . '/write-good-node-modules/node_modules/.bin/write-good')) + \ ale#path#Simplify(g:dir . '/../test-files/write-good/node-modules/node_modules/.bin/write-good'), + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/write-good/node-modules/node_modules/.bin/write-good')) \ . ' %t', Execute(Should use the node_modules/write-good executable, if available): - call ale#test#SetFilename('write-good-node-modules-2/test.txt') + call ale#test#SetFilename('../test-files/write-good/node-modules-2/test.txt') AssertLinter - \ ale#path#Simplify(g:dir . '/write-good-node-modules-2/node_modules/write-good/bin/write-good.js'), + \ ale#path#Simplify(g:dir . '/../test-files/write-good/node-modules-2/node_modules/write-good/bin/write-good.js'), \ (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/write-good-node-modules-2/node_modules/write-good/bin/write-good.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/write-good/node-modules-2/node_modules/write-good/bin/write-good.js')) \ . ' %t', Execute(Should let users configure a global executable and override local paths): - call ale#test#SetFilename('write-good-node-modules-2/test.txt') + call ale#test#SetFilename('../test-files/write-good/node-modules-2/test.txt') let g:ale_writegood_executable = 'foo-bar' let g:ale_writegood_use_global = 1 diff --git a/test/command_callback/test_zig_zls_callbacks.vader b/test/command_callback/test_zig_zls_callbacks.vader index 6e42cc4b..6d814be4 100644 --- a/test/command_callback/test_zig_zls_callbacks.vader +++ b/test/command_callback/test_zig_zls_callbacks.vader @@ -10,6 +10,6 @@ Execute(The default executable path should be correct): Execute(The project root should be detected correctly): AssertLSPProject '' - call ale#test#SetFilename('zig-zls-project/main.zig') + call ale#test#SetFilename('../test-files/zig/main.zig') - AssertLSPProject ale#path#Simplify(g:dir . '/zig-zls-project') + AssertLSPProject ale#path#Simplify(g:dir . '/../test-files/zig') diff --git a/test/compile_database_perf/test.sh b/test/compile_database_perf/test.sh deleted file mode 100755 index 15a2b442..00000000 --- a/test/compile_database_perf/test.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Generate source files for ALE to read. They don't have to be very long, the delay is in reading compile_commands, not actually running tests -mkdir -p gen_src -for i in {1..400}; do echo "const char *GeneratedFunc${i}() { return \"Word ${i}\"; }" > gen_src/source${i}.cpp; done - -# Create the compile_commands database -echo "[ {" > compile_commands.json - -for i in {1..399}; do - { - echo "\"command\": \"clang++ -c $(pwd)/gen_src/source${i}.cpp -o $(pwd)/build/obj/Debug/source${i}.o -MF $(pwd)/build/obj/Debug/source${i}.d -MMD -MP\"," - echo "\"directory\": \"$(pwd)/build\"," - echo "\"file\": \"$(pwd)/gen_src/source${i}.cpp\"" - echo "}, {" - } >> compile_commands.json -done - -{ - echo "\"command\": \"clang++ -c $(pwd)/gen_src/source400.cpp -o $(pwd)/build/obj/Debug/source400.o -MF $(pwd)/build/obj/Debug/source400.d -MMD -MP\"," - echo "\"directory\": \"$(pwd)/build\"," - echo "\"file\": \"$(pwd)/gen_src/source400.cpp\"" - echo "} ]" -} >> compile_commands.json - -# Start up vim and switch back and forth between files -- at least one of the files must be near the bottom of compile_commands.json -time vim -c "for i in range(0,20) | edit gen_src/source10.cpp | edit gen_src/source400.cpp | endfor" \ - -c "noautocmd qa!" \ - `find . | grep "source..\.cpp"` diff --git a/test/fixers/test_astyle_fixer_callback.vader b/test/fixers/test_astyle_fixer_callback.vader index ac756870..9d2e4c80 100644 --- a/test/fixers/test_astyle_fixer_callback.vader +++ b/test/fixers/test_astyle_fixer_callback.vader @@ -71,7 +71,7 @@ Execute(The astyle callback should return the correct default values with a spec \ ale#fixers#astyle#Fix(bufnr('')) Execute(The astyle callback should find nearest default option file _astylrc): - call ale#test#SetFilename('../test_c_projects/makefile_project/subdir/file.c') + call ale#test#SetFilename('../test-files/c/makefile_project/subdir/file.c') let targetfile = bufname(bufnr('%')) AssertEqual @@ -83,7 +83,7 @@ Execute(The astyle callback should find nearest default option file _astylrc): \ ale#fixers#astyle#Fix(bufnr('')) Execute(The astyle callback should find .astylrc in the same directory as src): - call ale#test#SetFilename('../test_cpp_project/dummy.cpp') + call ale#test#SetFilename('../test-files/cpp/dummy.cpp') set filetype=cpp " The test fails without this let targetfile = bufname(bufnr('%')) diff --git a/test/fixers/test_autoimport_fixer_callback.vader b/test/fixers/test_autoimport_fixer_callback.vader index bea448b5..67dc46e9 100644 --- a/test/fixers/test_autoimport_fixer_callback.vader +++ b/test/fixers/test_autoimport_fixer_callback.vader @@ -25,11 +25,11 @@ Execute(The autoimport callback should return the correct default values): \ 0, \ ale#fixers#autoimport#Fix(bufnr('')) - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual \ { \ 'cwd': '%s:h', - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/autoimport')) . ' -', + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/autoimport')) . ' -', \ }, \ ale#fixers#autoimport#Fix(bufnr('')) @@ -40,11 +40,11 @@ Execute(The autoimport callback should respect custom options): \ 0, \ ale#fixers#autoimport#Fix(bufnr('')) - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual \ { \ 'cwd': '%s:h', - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/autoimport')) + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/autoimport')) \ . ' --multi-line=3 --trailing-comma -', \ }, \ ale#fixers#autoimport#Fix(bufnr('')) diff --git a/test/fixers/test_autopep8_fixer_callback.vader b/test/fixers/test_autopep8_fixer_callback.vader index 5678aaf3..9ca90c41 100644 --- a/test/fixers/test_autopep8_fixer_callback.vader +++ b/test/fixers/test_autopep8_fixer_callback.vader @@ -25,15 +25,15 @@ Execute(The autopep8 callback should return the correct default values): \ 0, \ ale#fixers#autopep8#Fix(bufnr('')) - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/autopep8')) . ' -'}, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/autopep8')) . ' -'}, \ ale#fixers#autopep8#Fix(bufnr('')) Execute(The autopep8 callback should include options): let g:ale_python_autopep8_options = '--some-option' - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/autopep8')) . ' --some-option -' }, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/autopep8')) . ' --some-option -' }, \ ale#fixers#autopep8#Fix(bufnr('')) diff --git a/test/fixers/test_bibclean_fixer_callback.vader b/test/fixers/test_bibclean_fixer_callback.vader index 8d3081e3..dd1313d2 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/bib_paths/dummy.bib') + call ale#test#SetFilename('../command_callback/../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/bib_paths/dummy.bib') + call ale#test#SetFilename('../command_callback/../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 055f8783..6e9f3de7 100644 --- a/test/fixers/test_black_fixer_callback.vader +++ b/test/fixers/test_black_fixer_callback.vader @@ -13,36 +13,36 @@ After: unlet! b:bin_dir Execute(The black callback should return the correct default values): - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual \ { \ 'cwd': '%s:h', - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/black')) . ' -'}, + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' -'}, \ ale#fixers#black#Fix(bufnr('')) Execute(The black callback should include options): let g:ale_python_black_options = '--some-option' let g:ale_python_black_change_directory = 0 - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --some-option -' }, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --some-option -' }, \ ale#fixers#black#Fix(bufnr('')) Execute(The black callback should include --pyi for .pyi files): let g:ale_python_black_change_directory = 0 - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.pyi') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.pyi') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --pyi -' }, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --pyi -' }, \ ale#fixers#black#Fix(bufnr('')) Execute(Pipenv is detected when python_black_auto_pipenv is set): let g:ale_python_black_auto_pipenv = 1 let g:ale_python_black_change_directory = 0 - call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertEqual \ {'command': ale#Escape('pipenv') . ' run black -'}, diff --git a/test/fixers/test_break_up_long_lines_python_fixer.vader b/test/fixers/test_break_up_long_lines_python_fixer.vader index 5fd991f0..c7809acd 100644 --- a/test/fixers/test_break_up_long_lines_python_fixer.vader +++ b/test/fixers/test_break_up_long_lines_python_fixer.vader @@ -22,7 +22,7 @@ Execute(Long lines with basic function calls should be broken up correctly): \ ]) Execute(Longer lines should be permitted if a configuration file allows it): - call ale#test#SetFilename('long-line-project/foo/bar.py') + call ale#test#SetFilename('../test-files/long-line/foo/bar.py') AssertEqual \ [ diff --git a/test/fixers/test_buildifier_fixer_callback.vader b/test/fixers/test_buildifier_fixer_callback.vader index 36de9819..db9f1e55 100644 --- a/test/fixers/test_buildifier_fixer_callback.vader +++ b/test/fixers/test_buildifier_fixer_callback.vader @@ -6,7 +6,7 @@ After: call ale#assert#TearDownFixerTest() Execute(The buildifier callback should return the correct default values): - call ale#test#SetFilename('bazel_paths/WORKSPACE') + call ale#test#SetFilename('../test-files/bazel/WORKSPACE') AssertFixer \ { @@ -15,7 +15,7 @@ Execute(The buildifier callback should return the correct default values): \ } Execute(The buildifier callback should include any additional options): - call ale#test#SetFilename('bazel_paths/WORKSPACE') + call ale#test#SetFilename('../test-files/bazel/WORKSPACE') let g:ale_bazel_buildifier_options = '--some-option' AssertFixer @@ -25,7 +25,7 @@ Execute(The buildifier callback should include any additional options): \ } Execute(The buildifier callback should recognize BUILD files): - call ale#test#SetFilename('bazel_paths/BUILD') + call ale#test#SetFilename('../test-files/bazel/BUILD') AssertFixer \ { @@ -34,7 +34,7 @@ Execute(The buildifier callback should recognize BUILD files): \ } Execute(The buildifier callback should recognize .bzl files): - call ale#test#SetFilename('bazel_paths/defs.bzl') + call ale#test#SetFilename('../test-files/bazel/defs.bzl') AssertFixer \ { diff --git a/test/fixers/test_clangformat_fixer_callback.vader b/test/fixers/test_clangformat_fixer_callback.vader index b9b74ee8..3e4546d1 100644 --- a/test/fixers/test_clangformat_fixer_callback.vader +++ b/test/fixers/test_clangformat_fixer_callback.vader @@ -17,7 +17,7 @@ After: call ale#test#RestoreDirectory() Execute(The clang-format callback should return the correct default values): - call ale#test#SetFilename('c_paths/dummy.c') + call ale#test#SetFilename('../test-files/c/dummy.c') AssertEqual \ { @@ -27,7 +27,7 @@ Execute(The clang-format callback should return the correct default values): \ ale#fixers#clangformat#Fix(bufnr('')) Execute(The clangformat callback should include any additional options): - call ale#test#SetFilename('c_paths/dummy.c') + call ale#test#SetFilename('../test-files/c/dummy.c') let g:ale_c_clangformat_options = '--some-option' AssertEqual @@ -39,7 +39,7 @@ Execute(The clangformat callback should include any additional options): \ ale#fixers#clangformat#Fix(bufnr('')) Execute(The clangformat callback should include style options as well): - call ale#test#SetFilename('c_paths/dummy.c') + call ale#test#SetFilename('../test-files/c/dummy.c') let g:ale_c_clangformat_options = '--some-option' let g:ale_c_clangformat_style_option = '{BasedOnStyle: Microsoft, ColumnLimit:80,}' @@ -52,7 +52,7 @@ Execute(The clangformat callback should include style options as well): \ ale#fixers#clangformat#Fix(bufnr('')) Execute(The clangformat callback should use local file instead of style options): - call ale#test#SetFilename('clangformat_paths/with_clangformat/dummy.c') + call ale#test#SetFilename('../test-files/clangformat/with_clangformat/dummy.c') let g:ale_c_clangformat_options = '--some-option' let g:ale_c_clangformat_style_option = '{BasedOnStyle: Microsoft, ColumnLimit:80,}' let g:ale_c_clangformat_use_local_file = 1 diff --git a/test/fixers/test_clangtidy_fixer_callback.vader b/test/fixers/test_clangtidy_fixer_callback.vader index ca08e6bc..7a04e801 100644 --- a/test/fixers/test_clangtidy_fixer_callback.vader +++ b/test/fixers/test_clangtidy_fixer_callback.vader @@ -26,7 +26,7 @@ After: call ale#test#RestoreDirectory() Execute(The clangtidy callback should return the correct default values): - call ale#test#SetFilename('c_paths/dummy.c') + call ale#test#SetFilename('../test-files/c/dummy.c') AssertEqual \ { @@ -37,7 +37,7 @@ Execute(The clangtidy callback should return the correct default values): \ ale#fixers#clangtidy#Fix(bufnr('')) Execute(The clangtidy callback should include any additional options): - call ale#test#SetFilename('c_paths/dummy.c') + call ale#test#SetFilename('../test-files/c/dummy.c') let g:ale_c_clangtidy_extra_options = '--some-option' AssertEqual diff --git a/test/fixers/test_dartfmt_fixer_callback.vader b/test/fixers/test_dartfmt_fixer_callback.vader index 79c40eff..c783c9a4 100644 --- a/test/fixers/test_dartfmt_fixer_callback.vader +++ b/test/fixers/test_dartfmt_fixer_callback.vader @@ -14,7 +14,7 @@ After: call ale#test#RestoreDirectory() Execute(The dartfmt callback should return the correct default values): - call ale#test#SetFilename('../dart_files/testfile.dart') + call ale#test#SetFilename('../test-files/dart/testfile.dart') AssertEqual \ { @@ -27,7 +27,7 @@ Execute(The dartfmt callback should return the correct default values): Execute(The dartfmt callback should include custom dartfmt options): let g:ale_dart_dartfmt_options = "-l 80" - call ale#test#SetFilename('../dart_files/testfile.dart') + call ale#test#SetFilename('../test-files/dart/testfile.dart') AssertEqual \ { diff --git a/test/fixers/test_dfmt_fixer_callback.vader b/test/fixers/test_dfmt_fixer_callback.vader index 5ecb56e6..5749224e 100644 --- a/test/fixers/test_dfmt_fixer_callback.vader +++ b/test/fixers/test_dfmt_fixer_callback.vader @@ -14,7 +14,7 @@ After: call ale#test#RestoreDirectory() Execute(The dfmt callback should return the correct default values): - call ale#test#SetFilename('../d_files/test.d') + call ale#test#SetFilename('../test-files/d/test.d') AssertEqual \ { @@ -27,7 +27,7 @@ Execute(The dfmt callback should return the correct default values): Execute(The dfmt callback should include custom dfmt options): let g:ale_d_dfmt_options = "--space-after-cast" - call ale#test#SetFilename('../d_files/test.d') + call ale#test#SetFilename('../test-files/d/test.d') AssertEqual \ { diff --git a/test/fixers/test_elm_format_fixer_callback.vader b/test/fixers/test_elm_format_fixer_callback.vader index 682c22ca..35244737 100644 --- a/test/fixers/test_elm_format_fixer_callback.vader +++ b/test/fixers/test_elm_format_fixer_callback.vader @@ -9,19 +9,19 @@ After: call ale#test#RestoreDirectory() Execute(The elm-format command should have default params): - call ale#test#SetFilename('../elm-test-files/src/subdir/testfile.elm') + call ale#test#SetFilename('../test-files/elm/src/subdir/testfile.elm') AssertEqual \ { \ 'read_temporary_file': 1, \ 'command': - \ ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/node_modules/.bin/elm-format')) + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/elm/node_modules/.bin/elm-format')) \ . ' %t --yes', \ }, \ ale#fixers#elm_format#Fix(bufnr('')) Execute(The elm-format command should manage use_global = 1 param): - call ale#test#SetFilename('../elm-test-files/src/subdir/testfile.elm') + call ale#test#SetFilename('../test-files/elm/src/subdir/testfile.elm') let b:ale_elm_format_use_global = 1 AssertEqual @@ -34,7 +34,7 @@ Execute(The elm-format command should manage use_global = 1 param): \ ale#fixers#elm_format#Fix(bufnr('')) Execute(The elm-format command should manage executable param): - call ale#test#SetFilename('../elm-test-files/src/subdir/testfile.elm') + call ale#test#SetFilename('../test-files/elm/src/subdir/testfile.elm') let b:ale_elm_format_use_global = 1 let b:ale_elm_format_executable = 'elmformat' @@ -48,27 +48,27 @@ Execute(The elm-format command should manage executable param): \ ale#fixers#elm_format#Fix(bufnr('')) Execute(The elm-format command should manage empty options): - call ale#test#SetFilename('../elm-test-files/src/subdir/testfile.elm') + call ale#test#SetFilename('../test-files/elm/src/subdir/testfile.elm') let b:ale_elm_format_options = '' AssertEqual \ { \ 'read_temporary_file': 1, \ 'command': - \ ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/node_modules/.bin/elm-format')) + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/elm/node_modules/.bin/elm-format')) \ . ' %t', \ }, \ ale#fixers#elm_format#Fix(bufnr('')) Execute(The elm-format command should manage custom options): - call ale#test#SetFilename('../elm-test-files/src/subdir/testfile.elm') + call ale#test#SetFilename('../test-files/elm/src/subdir/testfile.elm') let b:ale_elm_format_options = '--param1 --param2' AssertEqual \ { \ 'read_temporary_file': 1, \ 'command': - \ ale#Escape(ale#path#Simplify(g:dir . '/../elm-test-files/node_modules/.bin/elm-format')) + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/elm/node_modules/.bin/elm-format')) \ . ' %t --param1 --param2', \ }, \ ale#fixers#elm_format#Fix(bufnr('')) diff --git a/test/fixers/test_eslint_fixer_callback.vader b/test/fixers/test_eslint_fixer_callback.vader index 48cafe78..4a1dc47c 100644 --- a/test/fixers/test_eslint_fixer_callback.vader +++ b/test/fixers/test_eslint_fixer_callback.vader @@ -10,17 +10,17 @@ After: call ale#assert#TearDownFixerTest() Execute(The executable path should be correct): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir/testfile.js') " eslint_d output with an older eslint version is used here. GivenCommandOutput ['v4.4.1 (eslint_d v5.1.0)'] AssertFixer \ { \ 'read_temporary_file': 1, - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/react-app'), + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/react-app'), \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/.eslintrc.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/.eslintrc.js')) \ . ' --fix %t', \ } @@ -162,29 +162,29 @@ Execute(The ESLint fixer should use a config file option if set for new versions \ } Execute(The lower priority configuration file in a nested directory should be preferred): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir-with-config/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir-with-config/testfile.js') AssertFixer \ { \ 'read_temporary_file': 1, - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/react-app'), + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/react-app'), \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/subdir-with-config/.eslintrc')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/subdir-with-config/.eslintrc')) \ . ' --fix %t', \ } Execute(--config in options should override configuration file detection for old versions): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir-with-config/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir-with-config/testfile.js') let b:ale_javascript_eslint_options = '--config /foo.cfg' AssertFixer \ { \ 'read_temporary_file': 1, - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/react-app'), + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/react-app'), \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) \ . ' --config /foo.cfg' \ . ' --fix %t', \ } @@ -194,50 +194,50 @@ Execute(--config in options should override configuration file detection for old AssertFixer \ { \ 'read_temporary_file': 1, - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/react-app'), + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/react-app'), \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) \ . ' -c /foo.cfg' \ . ' --fix %t', \ } Execute(package.json should be used as a last resort): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir-with-package-json/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir-with-package-json/testfile.js') AssertFixer \ { \ 'read_temporary_file': 1, - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/react-app'), + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/react-app'), \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/.eslintrc.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/.eslintrc.js')) \ . ' --fix %t', \ } - call ale#test#SetFilename('../eslint-test-files/package.json') + call ale#test#SetFilename('../test-files/eslint/package.json') AssertFixer \ { \ 'read_temporary_file': 1, - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files'), - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/node_modules/.bin/eslint')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/package.json')) + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint'), + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/node_modules/.bin/eslint')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/package.json')) \ . ' --fix %t', \ } Execute(The version check should be correct): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir-with-config/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir-with-config/testfile.js') " We should run the command to get the version the first time. GivenCommandOutput ['4.9.0'] AssertFixer [ \ (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) \ . ' --version', \ { - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/react-app'), + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/react-app'), \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) \ . ' --stdin-filename %s --stdin --fix-dry-run --format=json', \ 'process_with': 'ale#fixers#eslint#ProcessFixDryRunOutput', \ }, @@ -245,36 +245,36 @@ Execute(The version check should be correct): AssertFixer [ \ { - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/react-app'), + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/react-app'), \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) \ . ' --stdin-filename %s --stdin --fix-dry-run --format=json', \ 'process_with': 'ale#fixers#eslint#ProcessFixDryRunOutput', \ }, \] Execute(--fix-dry-run should be used for 4.9.0 and up): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir/testfile.js') GivenCommandOutput ['4.9.0'] AssertFixer \ { - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/react-app'), + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/react-app'), \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/eslint/bin/eslint.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/eslint/bin/eslint.js')) \ . ' --stdin-filename %s --stdin --fix-dry-run --format=json', \ 'process_with': 'ale#fixers#eslint#ProcessFixDryRunOutput', \ } Execute(--fix-to-stdout should be used for eslint_d): - call ale#test#SetFilename('../eslint-test-files/app-with-eslint-d/testfile.js') + call ale#test#SetFilename('../test-files/eslint/app-with-eslint-d/testfile.js') AssertFixer \ { \ 'read_temporary_file': 1, - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/app-with-eslint-d'), - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d')) - \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/package.json')) + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/app-with-eslint-d'), + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/app-with-eslint-d/node_modules/.bin/eslint_d')) + \ . ' -c ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/package.json')) \ . ' --fix %t', \ } @@ -283,8 +283,8 @@ Execute(--fix-to-stdout should be used for eslint_d): GivenCommandOutput ['v3.19.0 (eslint_d v4.2.0)'] AssertFixer \ { - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/app-with-eslint-d'), - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d')) + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/app-with-eslint-d'), + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/app-with-eslint-d/node_modules/.bin/eslint_d')) \ . ' --stdin-filename %s --stdin --fix-to-stdout', \ 'process_with': 'ale#fixers#eslint#ProcessEslintDOutput', \ } @@ -293,8 +293,8 @@ Execute(--fix-to-stdout should be used for eslint_d): GivenCommandOutput ['4.9.0'] AssertFixer \ { - \ 'cwd': ale#path#Simplify(g:dir . '/../eslint-test-files/app-with-eslint-d'), - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d')) + \ 'cwd': ale#path#Simplify(g:dir . '/../test-files/eslint/app-with-eslint-d'), + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/app-with-eslint-d/node_modules/.bin/eslint_d')) \ . ' --stdin-filename %s --stdin --fix-to-stdout', \ 'process_with': 'ale#fixers#eslint#ProcessEslintDOutput', \ } diff --git a/test/fixers/test_fecs_fixer_callback.vader b/test/fixers/test_fecs_fixer_callback.vader index 809b4d46..b218e550 100644 --- a/test/fixers/test_fecs_fixer_callback.vader +++ b/test/fixers/test_fecs_fixer_callback.vader @@ -6,7 +6,7 @@ After: call ale#assert#TearDownFixerTest() Execute(The fecs fixer should respect to g:ale_javascript_fecs_executable): - let g:ale_javascript_fecs_executable = 'fecs_paths/fecs' + 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() diff --git a/test/fixers/test_fish_indent_fixer_callback.vader b/test/fixers/test_fish_indent_fixer_callback.vader index beb0b42e..3555a974 100644 --- a/test/fixers/test_fish_indent_fixer_callback.vader +++ b/test/fixers/test_fish_indent_fixer_callback.vader @@ -14,7 +14,7 @@ After: call ale#test#RestoreDirectory() Execute(The fish_indent callback should return the correct default values): - call ale#test#SetFilename('../fish_files/testfile.fish') + call ale#test#SetFilename('../test-files/fish/testfile.fish') AssertEqual \ { @@ -27,7 +27,7 @@ Execute(The fish_indent callback should return the correct default values): Execute(The fish_indent callback should include custom fish_indent options): let g:ale_fish_fish_indent_options = "-d" - call ale#test#SetFilename('../fish_files/testfile.fish') + call ale#test#SetFilename('../test-files/fish/testfile.fish') AssertEqual \ { diff --git a/test/fixers/test_fixjson_fixer_callback.vader b/test/fixers/test_fixjson_fixer_callback.vader index 1a3bdcfc..2b023fad 100644 --- a/test/fixers/test_fixjson_fixer_callback.vader +++ b/test/fixers/test_fixjson_fixer_callback.vader @@ -20,7 +20,7 @@ Execute(The fixjson callback should return the correct default command): \ ale#fixers#fixjson#Fix(bufnr('')) Execute(The fixjson callback should set the buffer name as file name): - call ale#test#SetFilename('../json_files/testfile.json') + call ale#test#SetFilename('../test-files/json/testfile.json') AssertEqual \ { diff --git a/test/fixers/test_gnatpp_fixer_callback.vader b/test/fixers/test_gnatpp_fixer_callback.vader index a2bf898e..7a3ed517 100644 --- a/test/fixers/test_gnatpp_fixer_callback.vader +++ b/test/fixers/test_gnatpp_fixer_callback.vader @@ -8,7 +8,7 @@ After: call ale#assert#TearDownFixerTest() Execute(The default command should be correct): - call ale#test#SetFilename('../ada_files/testfile.adb') + call ale#test#SetFilename('../test-files/ada/testfile.adb') AssertFixer \ { @@ -17,7 +17,7 @@ Execute(The default command should be correct): \ } Execute(The version check should be correct): - call ale#test#SetFilename('../ada_files/testfile.adb') + call ale#test#SetFilename('../test-files/ada/testfile.adb') let g:ale_ada_gnatpp_options = '--no-alignment' AssertFixer diff --git a/test/fixers/test_gofmt_fixer_callback.vader b/test/fixers/test_gofmt_fixer_callback.vader index 99407173..579dd3db 100644 --- a/test/fixers/test_gofmt_fixer_callback.vader +++ b/test/fixers/test_gofmt_fixer_callback.vader @@ -17,7 +17,7 @@ After: call ale#test#RestoreDirectory() Execute(The gofmt callback should return the correct default values): - call ale#test#SetFilename('../go_files/testfile.go') + call ale#test#SetFilename('../test-files/go/testfile.go') AssertEqual \ { @@ -28,7 +28,7 @@ Execute(The gofmt callback should return the correct default values): Execute(The gofmt callback should include custom gofmt options): let g:ale_go_gofmt_options = "-r '(a) -> a'" - call ale#test#SetFilename('../go_files/testfile.go') + call ale#test#SetFilename('../test-files/go/testfile.go') AssertEqual \ { @@ -40,7 +40,7 @@ Execute(The gofmt callback should include custom gofmt options): Execute(The gofmt callback should support Go environment variables): let g:ale_go_go111module = 'off' - call ale#test#SetFilename('../go_files/testfile.go') + call ale#test#SetFilename('../test-files/go/testfile.go') AssertEqual \ { diff --git a/test/fixers/test_goimports_fixer_callback.vader b/test/fixers/test_goimports_fixer_callback.vader index 3ea022ff..64c75b2d 100644 --- a/test/fixers/test_goimports_fixer_callback.vader +++ b/test/fixers/test_goimports_fixer_callback.vader @@ -8,7 +8,7 @@ Before: let g:ale_go_goimports_options = '' call ale#test#SetDirectory('/testplugin/test/fixers') - call ale#test#SetFilename('../go_files/testfile.go') + call ale#test#SetFilename('../test-files/go/testfile.go') After: Restore diff --git a/test/fixers/test_gomod_fixer_callback.vader b/test/fixers/test_gomod_fixer_callback.vader index 422caf63..56fb9854 100644 --- a/test/fixers/test_gomod_fixer_callback.vader +++ b/test/fixers/test_gomod_fixer_callback.vader @@ -15,7 +15,7 @@ After: call ale#test#RestoreDirectory() Execute(The gomod callback should return the correct default values): - call ale#test#SetFilename('../go_files/go.mod') + call ale#test#SetFilename('../test-files/go/go.mod') setl filetype=gomod AssertEqual @@ -28,7 +28,7 @@ Execute(The gomod callback should return the correct default values): \ ale#fixers#gomod#Fix(bufnr('')) Execute(The gomod callback should support Go environment variables): - call ale#test#SetFilename('../go_files/go.mod') + call ale#test#SetFilename('../test-files/go/go.mod') setl filetype=gomod let g:ale_go_go111module = 'on' diff --git a/test/fixers/test_importjs_fixer_callback.vader b/test/fixers/test_importjs_fixer_callback.vader index 53b87c2e..727e6a16 100644 --- a/test/fixers/test_importjs_fixer_callback.vader +++ b/test/fixers/test_importjs_fixer_callback.vader @@ -5,7 +5,7 @@ Before: let g:ale_javascript_importjs_executable = 'xxxinvalid' call ale#test#SetDirectory('/testplugin/test/fixers') - call ale#test#SetFilename('../javascript_files/test.js') + call ale#test#SetFilename('../test-files/javascript/test.js') After: Restore diff --git a/test/fixers/test_isort_fixer_callback.vader b/test/fixers/test_isort_fixer_callback.vader index 96632c8c..5f3cc447 100644 --- a/test/fixers/test_isort_fixer_callback.vader +++ b/test/fixers/test_isort_fixer_callback.vader @@ -17,11 +17,11 @@ Execute(The isort callback should return the correct default values): \ 0, \ ale#fixers#isort#Fix(bufnr('')) - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual \ { \ 'cwd': '%s:h', - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/isort')) . ' -', + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/isort')) . ' -', \ }, \ ale#fixers#isort#Fix(bufnr('')) @@ -32,11 +32,11 @@ Execute(The isort callback should respect custom options): \ 0, \ ale#fixers#isort#Fix(bufnr('')) - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual \ { \ 'cwd': '%s:h', - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/isort')) + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/isort')) \ . ' --multi-line=3 --trailing-comma -', \ }, \ ale#fixers#isort#Fix(bufnr('')) @@ -44,7 +44,7 @@ Execute(The isort callback should respect custom options): Execute(Pipenv is detected when python_isort_auto_pipenv is set): let g:ale_python_isort_auto_pipenv = 1 - call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') AssertEqual \ { diff --git a/test/fixers/test_ktlint_fixer_callback.vader b/test/fixers/test_ktlint_fixer_callback.vader index ba01a409..cfe39205 100644 --- a/test/fixers/test_ktlint_fixer_callback.vader +++ b/test/fixers/test_ktlint_fixer_callback.vader @@ -16,7 +16,7 @@ After: call ale#test#RestoreDirectory() Execute(The ktlint callback should return the correct default values): - call ale#test#SetFilename('../kotlin_files/testfile.kt') + call ale#test#SetFilename('../test-files/kotlin/testfile.kt') AssertEqual \ { @@ -29,7 +29,7 @@ Execute(The ktlint callback should return the correct default values): Execute(The ktlint callback should include custom ktlint options): let g:ale_kotlin_ktlint_options = "--android" let g:ale_kotlin_ktlint_rulesets = ['/path/to/custom/ruleset.jar'] - call ale#test#SetFilename('../kotlin_files/testfile.kt') + call ale#test#SetFilename('../test-files/kotlin/testfile.kt') AssertEqual \ { diff --git a/test/fixers/test_latexindent_fixer_callback.vader b/test/fixers/test_latexindent_fixer_callback.vader index a440ed65..bd4ac69a 100644 --- a/test/fixers/test_latexindent_fixer_callback.vader +++ b/test/fixers/test_latexindent_fixer_callback.vader @@ -14,7 +14,7 @@ After: call ale#test#RestoreDirectory() Execute(The latexindent callback should return the correct default values): - call ale#test#SetFilename('../tex_files/testfile.tex') + call ale#test#SetFilename('../test-files/tex/testfile.tex') AssertEqual \ { @@ -25,7 +25,7 @@ Execute(The latexindent callback should return the correct default values): Execute(The latexindent callback should include custom gofmt options): let g:ale_tex_latexindent_options = "-l '~/.indentconfig.yaml'" - call ale#test#SetFilename('../tex_files/testfile.tex') + call ale#test#SetFilename('../test-files/tex/testfile.tex') AssertEqual \ { diff --git a/test/fixers/test_luafmt_fixer_callback.vader b/test/fixers/test_luafmt_fixer_callback.vader index 362da118..ef69f297 100644 --- a/test/fixers/test_luafmt_fixer_callback.vader +++ b/test/fixers/test_luafmt_fixer_callback.vader @@ -14,7 +14,7 @@ After: call ale#test#RestoreDirectory() Execute(The luafmt callback should return the correct default values): - call ale#test#SetFilename('../lua_files/testfile.lua') + call ale#test#SetFilename('../test-files/lua/testfile.lua') AssertEqual \ { @@ -24,7 +24,7 @@ Execute(The luafmt callback should return the correct default values): Execute(The luafmt callback should include custom luafmt options): let g:ale_lua_luafmt_options = "--skip-children" - call ale#test#SetFilename('../lua_files/testfile.lua') + call ale#test#SetFilename('../test-files/lua/testfile.lua') AssertEqual \ { diff --git a/test/fixers/test_mix_format_fixer_callback.vader b/test/fixers/test_mix_format_fixer_callback.vader index 365fbecf..cd492e81 100644 --- a/test/fixers/test_mix_format_fixer_callback.vader +++ b/test/fixers/test_mix_format_fixer_callback.vader @@ -13,7 +13,7 @@ After: call ale#test#RestoreDirectory() Execute(The mix_format callback should return the correct default values): - call ale#test#SetFilename('../elixir-test-files/testfile.ex') + call ale#test#SetFilename('../test-files/elixir/testfile.ex') AssertEqual \ { @@ -25,7 +25,7 @@ Execute(The mix_format callback should return the correct default values): Execute(The mix_format callback should include the correct format options): let g:ale_elixir_mix_format_options = 'invalid_options' - call ale#test#SetFilename('../elixir-test-files/testfile.ex') + call ale#test#SetFilename('../test-files/elixir/testfile.ex') AssertEqual \ { diff --git a/test/fixers/test_ocamlformat_fixer_callback.vader b/test/fixers/test_ocamlformat_fixer_callback.vader index 0ccdb070..587fcf56 100644 --- a/test/fixers/test_ocamlformat_fixer_callback.vader +++ b/test/fixers/test_ocamlformat_fixer_callback.vader @@ -14,7 +14,7 @@ After: call ale#test#RestoreDirectory() Execute(The ocamlformat callback should return the correct default values): - call ale#test#SetFilename('../ocaml-test-files/testfile.re') + call ale#test#SetFilename('../test-files/ocaml/testfile.re') AssertEqual \ { @@ -25,7 +25,7 @@ Execute(The ocamlformat callback should return the correct default values): Execute(The ocamlformat callback should include custom ocamlformat options): let g:ale_ocaml_ocamlformat_options = "-m 78" - call ale#test#SetFilename('../ocaml-test-files/testfile.re') + call ale#test#SetFilename('../test-files/ocaml/testfile.re') AssertEqual \ { diff --git a/test/fixers/test_ocp_indent_fixer_callback.vader b/test/fixers/test_ocp_indent_fixer_callback.vader index 1f61f383..fc336b2d 100644 --- a/test/fixers/test_ocp_indent_fixer_callback.vader +++ b/test/fixers/test_ocp_indent_fixer_callback.vader @@ -14,7 +14,7 @@ After: call ale#test#RestoreDirectory() Execute(The ocp_indent callback should return the correct default values): - call ale#test#SetFilename('../ocaml-test-files/ocp_inden_testfile.re') + call ale#test#SetFilename('../test-files/ocaml/ocp_inden_testfile.re') AssertEqual \ { @@ -24,7 +24,7 @@ Execute(The ocp_indent callback should return the correct default values): Execute(The ocp_indent callback should include custom ocp_indent options): let g:ale_ocaml_ocp_indent_config = "base=4, type=4" - call ale#test#SetFilename('../ocaml-test-files/ocp_inden_testfile.re') + call ale#test#SetFilename('../test-files/ocaml/ocp_inden_testfile.re') AssertEqual \ { diff --git a/test/fixers/test_php_cs_fixer.vader b/test/fixers/test_php_cs_fixer.vader index b47c190c..550f453c 100644 --- a/test/fixers/test_php_cs_fixer.vader +++ b/test/fixers/test_php_cs_fixer.vader @@ -16,22 +16,22 @@ After: Execute(project with php-cs-fixer should use local by default): - call ale#test#SetFilename('php_paths/project-with-php-cs-fixer/test.php') + call ale#test#SetFilename('../test-files/php/project-with-php-cs-fixer/test.php') AssertEqual - \ ale#path#Simplify(g:dir . '/php_paths/project-with-php-cs-fixer/vendor/bin/php-cs-fixer'), + \ ale#path#Simplify(g:dir . '/../test-files/php/project-with-php-cs-fixer/vendor/bin/php-cs-fixer'), \ ale#fixers#php_cs_fixer#GetExecutable(bufnr('')) Execute(use-global should override local detection): let g:ale_php_cs_fixer_use_global = 1 - call ale#test#SetFilename('php_paths/project-with-php-cs-fixer/test.php') + call ale#test#SetFilename('../test-files/php/project-with-php-cs-fixer/test.php') AssertEqual \ 'php-cs-fixer', \ ale#fixers#php_cs_fixer#GetExecutable(bufnr('')) Execute(project without php-cs-fixer should use global): - call ale#test#SetFilename('php_paths/project-without-php-cs-fixer/test.php') + call ale#test#SetFilename('../test-files/php/project-without-php-cs-fixer/test.php') AssertEqual \ 'php-cs-fixer', @@ -41,7 +41,7 @@ Execute(project without php-cs-fixer should use global): Execute(The php-cs-fixer callback should return the correct default values): - call ale#test#SetFilename('php_paths/project-without-php-cs-fixer/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-without-php-cs-fixer/foo/test.php') AssertEqual \ { @@ -54,7 +54,7 @@ Execute(The php-cs-fixer callback should return the correct default values): Execute(The php-cs-fixer callback should include custom php-cs-fixer options): let g:ale_php_cs_fixer_options = '--config="$HOME/.php_cs"' - call ale#test#SetFilename('php_paths/project-without-php-cs-fixer/test.php') + call ale#test#SetFilename('../test-files/php/project-without-php-cs-fixer/test.php') AssertEqual \ { diff --git a/test/fixers/test_phpcbf_fixer_callback.vader b/test/fixers/test_phpcbf_fixer_callback.vader index f7bcc2d8..2d44a44d 100644 --- a/test/fixers/test_phpcbf_fixer_callback.vader +++ b/test/fixers/test_phpcbf_fixer_callback.vader @@ -19,48 +19,48 @@ After: call ale#test#RestoreDirectory() Execute(project with phpcbf should use local by default): - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual - \ ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf'), + \ ale#path#Simplify(g:dir . '/../test-files/php/project-with-phpcbf/vendor/bin/phpcbf'), \ ale#fixers#phpcbf#GetExecutable(bufnr('')) Execute(use-global should override local detection): let g:ale_php_phpcbf_use_global = 1 - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual \ 'phpcbf_test', \ ale#fixers#phpcbf#GetExecutable(bufnr('')) Execute(project without phpcbf should use global): - call ale#test#SetFilename('php_paths/project-without-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-without-phpcbf/foo/test.php') AssertEqual \ 'phpcbf_test', \ ale#fixers#phpcbf#GetExecutable(bufnr('')) Execute(The phpcbf callback should return the correct default values): - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s -' }, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/php/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s -' }, \ ale#fixers#phpcbf#Fix(bufnr('')) Execute(The phpcbf callback should include the phpcbf_standard option): let g:ale_php_phpcbf_standard = 'phpcbf_ruleset.xml' - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml' . ' -'}, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/php/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml' . ' -'}, \ ale#fixers#phpcbf#Fix(bufnr('')) Execute(User provided options should be used): let g:ale_php_phpcbf_options = '--my-user-provided-option my-value' - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . ale#Pad('--my-user-provided-option my-value') . ' -'}, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/php/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . ale#Pad('--my-user-provided-option my-value') . ' -'}, \ ale#fixers#phpcbf#Fix(bufnr('')) @@ -85,39 +85,39 @@ After: call ale#test#RestoreDirectory() Execute(project with phpcbf should use local by default): - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual - \ ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf'), + \ ale#path#Simplify(g:dir . '/../test-files/php/project-with-phpcbf/vendor/bin/phpcbf'), \ ale#fixers#phpcbf#GetExecutable(bufnr('')) Execute(use-global should override local detection): let g:ale_php_phpcbf_use_global = 1 - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual \ 'phpcbf_test', \ ale#fixers#phpcbf#GetExecutable(bufnr('')) Execute(project without phpcbf should use global): - call ale#test#SetFilename('php_paths/project-without-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-without-phpcbf/foo/test.php') AssertEqual \ 'phpcbf_test', \ ale#fixers#phpcbf#GetExecutable(bufnr('')) Execute(The phpcbf callback should return the correct default values): - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s -' }, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/php/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s -' }, \ ale#fixers#phpcbf#Fix(bufnr('')) Execute(The phpcbf callback should include the phpcbf_standard option): let g:ale_php_phpcbf_standard = 'phpcbf_ruleset.xml' - call ale#test#SetFilename('php_paths/project-with-phpcbf/foo/test.php') + call ale#test#SetFilename('../test-files/php/project-with-phpcbf/foo/test.php') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/php_paths/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml' . ' -'}, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/php/project-with-phpcbf/vendor/bin/phpcbf')) . ' --stdin-path=%s ' . '--standard=phpcbf_ruleset.xml' . ' -'}, \ ale#fixers#phpcbf#Fix(bufnr('')) diff --git a/test/fixers/test_prettier_eslint_fixer.callback.vader b/test/fixers/test_prettier_eslint_fixer.callback.vader index 9bd6baf7..cfdd1c78 100644 --- a/test/fixers/test_prettier_eslint_fixer.callback.vader +++ b/test/fixers/test_prettier_eslint_fixer.callback.vader @@ -30,7 +30,7 @@ Execute(Additional options should be used when set): \ } Execute(--eslint-config-path should be set for 4.2.0 and up): - call ale#test#SetFilename('eslint-test-files/react-app/foo/bar.js') + call ale#test#SetFilename('../test-files/eslint/react-app/foo/bar.js') GivenCommandOutput ['4.2.0'] AssertFixer @@ -39,12 +39,12 @@ Execute(--eslint-config-path should be set for 4.2.0 and up): \ 'command': \ ale#Escape('prettier-eslint') \ . ' %t' - \ . ' --eslint-config-path ' . ale#Escape(ale#path#Simplify(g:dir . '/eslint-test-files/react-app/.eslintrc.js')) + \ . ' --eslint-config-path ' . ale#Escape(ale#test#GetFilename('../test-files/eslint/react-app/.eslintrc.js')) \ . ' --write' \ } Execute(--eslint-config-path shouldn't be used for older versions): - call ale#test#SetFilename('eslint-test-files/react-app/foo/bar.js') + call ale#test#SetFilename('../test-files/eslint/react-app/foo/bar.js') AssertFixer \ { @@ -68,14 +68,14 @@ Execute(The version check should be correct): \] Execute(The new --stdin-filepath option should be used when the version is new enough): - call ale#test#SetFilename('eslint-test-files/react-app/foo/bar.js') + call ale#test#SetFilename('../test-files/eslint/react-app/foo/bar.js') GivenCommandOutput ['4.4.0'] AssertFixer \ { \ 'cwd': '%s:h', \ 'command': ale#Escape('prettier-eslint') - \ . ' --eslint-config-path ' . ale#Escape(ale#path#Simplify(g:dir . '/eslint-test-files/react-app/.eslintrc.js')) + \ . ' --eslint-config-path ' . ale#Escape(ale#test#GetFilename('../test-files/eslint/react-app/.eslintrc.js')) \ . ' --stdin-filepath %s --stdin', \ } diff --git a/test/fixers/test_prettier_fixer_callback.vader b/test/fixers/test_prettier_fixer_callback.vader index 0857c4cb..7e7b661d 100644 --- a/test/fixers/test_prettier_fixer_callback.vader +++ b/test/fixers/test_prettier_fixer_callback.vader @@ -12,7 +12,7 @@ After: call ale#assert#TearDownFixerTest() Execute(The prettier callback should return the correct default values): - call ale#test#SetFilename('../prettier-test-files/testfile.js') + call ale#test#SetFilename('../test-files/prettier/testfile.js') AssertFixer \ { @@ -24,7 +24,7 @@ Execute(The prettier callback should return the correct default values): Execute(The --config option should not be set automatically): let g:ale_javascript_prettier_use_local_config = 1 - call ale#test#SetFilename('../prettier-test-files/with_config/testfile.js') + call ale#test#SetFilename('../test-files/prettier/with_config/testfile.js') AssertFixer \ { @@ -36,7 +36,7 @@ Execute(The --config option should not be set automatically): Execute(The prettier callback should include custom prettier options): let g:ale_javascript_prettier_options = '--no-semi' - call ale#test#SetFilename('../prettier-test-files/with_config/testfile.js') + call ale#test#SetFilename('../test-files/prettier/with_config/testfile.js') AssertFixer \ { @@ -48,7 +48,7 @@ Execute(The prettier callback should include custom prettier options): \ } Execute(The version check should be correct): - call ale#test#SetFilename('../prettier-test-files/testfile.js') + call ale#test#SetFilename('../test-files/prettier/testfile.js') AssertFixer [ \ ale#Escape('prettier') . ' --version', @@ -57,7 +57,7 @@ Execute(The version check should be correct): Execute(--stdin-filepath should be used when prettier is new enough): let g:ale_javascript_prettier_options = '--no-semi' - call ale#test#SetFilename('../prettier-test-files/with_config/testfile.js') + call ale#test#SetFilename('../test-files/prettier/with_config/testfile.js') GivenCommandOutput ['1.6.0'] AssertFixer @@ -69,7 +69,7 @@ Execute(--stdin-filepath should be used when prettier is new enough): \ } Execute(The version number should be cached): - call ale#test#SetFilename('../prettier-test-files/with_config/testfile.js') + call ale#test#SetFilename('../test-files/prettier/with_config/testfile.js') GivenCommandOutput ['1.6.0'] AssertFixer @@ -88,7 +88,7 @@ Execute(The version number should be cached): \ } Execute(Should set --parser to `babylon` by default, < 1.16.0): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=javascript @@ -102,7 +102,7 @@ Execute(Should set --parser to `babylon` by default, < 1.16.0): \ } Execute(Should set --parser to `babel` by default, >= 1.16.0): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=javascript @@ -116,7 +116,7 @@ Execute(Should set --parser to `babel` by default, >= 1.16.0): \ } Execute(Should set --parser based on filetype, TypeScript): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=typescript @@ -130,7 +130,7 @@ Execute(Should set --parser based on filetype, TypeScript): \ } Execute(Should set --parser based on filetype, CSS): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=css @@ -144,7 +144,7 @@ Execute(Should set --parser based on filetype, CSS): \ } Execute(Should set --parser based on filetype, LESS): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=less @@ -158,7 +158,7 @@ Execute(Should set --parser based on filetype, LESS): \ } Execute(Should set --parser based on filetype, SCSS): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=scss @@ -172,7 +172,7 @@ Execute(Should set --parser based on filetype, SCSS): \ } Execute(Should set --parser based on filetype, JSON): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=json @@ -186,7 +186,7 @@ Execute(Should set --parser based on filetype, JSON): \ } Execute(Should set --parser based on filetype, JSON5): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=json5 @@ -200,7 +200,7 @@ Execute(Should set --parser based on filetype, JSON5): \ } Execute(Should set --parser based on filetype, GraphQL): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=graphql @@ -214,7 +214,7 @@ Execute(Should set --parser based on filetype, GraphQL): \ } Execute(Should set --parser based on filetype, Markdown): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=markdown @@ -228,7 +228,7 @@ Execute(Should set --parser based on filetype, Markdown): \ } Execute(Should set --parser based on filetype, Vue): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=vue @@ -242,7 +242,7 @@ Execute(Should set --parser based on filetype, Vue): \ } Execute(Should set --parser based on filetype, YAML): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=yaml @@ -256,7 +256,7 @@ Execute(Should set --parser based on filetype, YAML): \ } Execute(Should set --parser based on filetype, HTML): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=html @@ -270,7 +270,7 @@ Execute(Should set --parser based on filetype, HTML): \ } Execute(Should set --parser based on filetype, Ruby): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=ruby @@ -284,7 +284,7 @@ Execute(Should set --parser based on filetype, Ruby): \ } Execute(Should set --parser based on first filetype of multiple filetypes): - call ale#test#SetFilename('../prettier-test-files/testfile') + call ale#test#SetFilename('../test-files/prettier/testfile') set filetype=css.scss @@ -298,7 +298,7 @@ Execute(Should set --parser based on first filetype of multiple filetypes): \ } Execute(Should set --parser for experimental language, Handlebars): - call ale#test#SetFilename('../prettier-test-files/testfile.hbs') + call ale#test#SetFilename('../test-files/prettier/testfile.hbs') set filetype=html.handlebars @@ -312,7 +312,7 @@ Execute(Should set --parser for experimental language, Handlebars): \ } Execute(Changes to directory where .prettierignore is found): - call ale#test#SetFilename('../prettier-test-files/with_prettierignore/src/testfile.js') + call ale#test#SetFilename('../test-files/prettier/with_prettierignore/src/testfile.js') GivenCommandOutput ['1.6.0'] AssertFixer diff --git a/test/fixers/test_prettier_standard_callback.vader b/test/fixers/test_prettier_standard_callback.vader index ab33fe20..d0cf4ecf 100644 --- a/test/fixers/test_prettier_standard_callback.vader +++ b/test/fixers/test_prettier_standard_callback.vader @@ -9,7 +9,7 @@ After: call ale#assert#TearDownFixerTest() Execute(The prettier callback should return the correct default values): - call ale#test#SetFilename('../prettier-test-files/testfile.js') + call ale#test#SetFilename('../test-files/prettier/testfile.js') AssertFixer \ { diff --git a/test/fixers/test_puppetlint_fixer_callback.vader b/test/fixers/test_puppetlint_fixer_callback.vader index 224d72ab..5ccb0137 100644 --- a/test/fixers/test_puppetlint_fixer_callback.vader +++ b/test/fixers/test_puppetlint_fixer_callback.vader @@ -17,7 +17,7 @@ After: call ale#test#RestoreDirectory() Execute(The puppetlint callback should return the correct default values): - silent execute 'file ' . fnameescape(g:dir . '/puppet_paths/dummy.pp') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/puppet/dummy.pp') AssertEqual \ {'read_temporary_file': 1, diff --git a/test/fixers/test_refmt_fixer_callback.vader b/test/fixers/test_refmt_fixer_callback.vader index 9ec331e4..01b56bee 100644 --- a/test/fixers/test_refmt_fixer_callback.vader +++ b/test/fixers/test_refmt_fixer_callback.vader @@ -14,7 +14,7 @@ After: call ale#test#RestoreDirectory() Execute(The refmt callback should return the correct default values): - call ale#test#SetFilename('../reasonml_files/testfile.re') + call ale#test#SetFilename('../test-files/reasonml/testfile.re') AssertEqual \ { @@ -27,7 +27,7 @@ Execute(The refmt callback should return the correct default values): Execute(The refmt callback should include custom refmt options): let g:ale_reasonml_refmt_options = "-w 80" - call ale#test#SetFilename('../reasonml_files/testfile.re') + call ale#test#SetFilename('../test-files/reasonml/testfile.re') AssertEqual \ { diff --git a/test/fixers/test_reorder_python_imports_fixer_callback.vader b/test/fixers/test_reorder_python_imports_fixer_callback.vader index 30b64eb8..74f3715d 100644 --- a/test/fixers/test_reorder_python_imports_fixer_callback.vader +++ b/test/fixers/test_reorder_python_imports_fixer_callback.vader @@ -25,10 +25,10 @@ Execute(The reorder_python_imports callback should return the correct default va \ 0, \ ale#fixers#reorder_python_imports#Fix(bufnr('')) - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual \ { - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' \ . b:bin_dir . '/reorder-python-imports')) . ' -', \ }, \ ale#fixers#reorder_python_imports#Fix(bufnr('')) @@ -40,10 +40,10 @@ Execute(The reorder_python_imports callback should respect custom options): \ 0, \ ale#fixers#reorder_python_imports#Fix(bufnr('')) - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual \ { - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' \ . b:bin_dir . '/reorder-python-imports')) . ' --py3-plus -', \ }, \ ale#fixers#reorder_python_imports#Fix(bufnr('')) diff --git a/test/fixers/test_rubocop_fixer_callback.vader b/test/fixers/test_rubocop_fixer_callback.vader index 84579d31..2029df23 100644 --- a/test/fixers/test_rubocop_fixer_callback.vader +++ b/test/fixers/test_rubocop_fixer_callback.vader @@ -17,7 +17,7 @@ After: call ale#test#RestoreDirectory() Execute(The rubocop callback should return the correct default values): - call ale#test#SetFilename('ruby_paths/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/dummy.rb') AssertEqual \ { @@ -28,26 +28,26 @@ Execute(The rubocop callback should return the correct default values): \ ale#fixers#rubocop#Fix(bufnr('')) Execute(The rubocop callback should include configuration files): - call ale#test#SetFilename('ruby_paths/with_config/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/with_config/dummy.rb') AssertEqual \ { \ 'process_with': 'ale#fixers#rubocop#PostProcess', \ 'command': ale#Escape(g:ale_ruby_rubocop_executable) - \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/ruby_paths/with_config/.rubocop.yml')) + \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/with_config/.rubocop.yml')) \ . ' --auto-correct --force-exclusion --stdin %s', \ }, \ ale#fixers#rubocop#Fix(bufnr('')) Execute(The rubocop callback should include custom rubocop options): let g:ale_ruby_rubocop_options = '--except Lint/Debugger' - call ale#test#SetFilename('ruby_paths/with_config/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/with_config/dummy.rb') AssertEqual \ { \ 'process_with': 'ale#fixers#rubocop#PostProcess', \ 'command': ale#Escape(g:ale_ruby_rubocop_executable) - \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/ruby_paths/with_config/.rubocop.yml')) + \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/with_config/.rubocop.yml')) \ . ' --except Lint/Debugger' \ . ' --auto-correct --force-exclusion --stdin %s', \ }, @@ -55,13 +55,13 @@ Execute(The rubocop callback should include custom rubocop options): Execute(The rubocop callback should use auto-correct-all option when set): let g:ale_ruby_rubocop_auto_correct_all = 1 - call ale#test#SetFilename('ruby_paths/with_config/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/with_config/dummy.rb') AssertEqual \ { \ 'process_with': 'ale#fixers#rubocop#PostProcess', \ 'command': ale#Escape(g:ale_ruby_rubocop_executable) - \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/ruby_paths/with_config/.rubocop.yml')) + \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/with_config/.rubocop.yml')) \ . ' --auto-correct-all --force-exclusion --stdin %s' \ }, \ ale#fixers#rubocop#Fix(bufnr('')) diff --git a/test/fixers/test_rufo_fixer_callback.vader b/test/fixers/test_rufo_fixer_callback.vader index 98108efc..54361784 100644 --- a/test/fixers/test_rufo_fixer_callback.vader +++ b/test/fixers/test_rufo_fixer_callback.vader @@ -14,14 +14,14 @@ After: Execute(The rufo command should contain `bundle exec` when executable is `bundle`): let g:ale_ruby_rufo_executable = 'bundle' - call ale#test#SetFilename('ruby_paths/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/dummy.rb') AssertEqual \ ale#Escape('bundle') . ' exec rufo %t', \ ale#fixers#rufo#GetCommand(bufnr('')) Execute(The rufo callback should return the correct default values): - call ale#test#SetFilename('ruby_paths/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/dummy.rb') AssertEqual \ { diff --git a/test/fixers/test_rustfmt_fixer_callback.vader b/test/fixers/test_rustfmt_fixer_callback.vader index 95c78dea..98761c94 100644 --- a/test/fixers/test_rustfmt_fixer_callback.vader +++ b/test/fixers/test_rustfmt_fixer_callback.vader @@ -1,34 +1,16 @@ Before: - Save g:ale_rust_rustfmt_executable - Save g:ale_rust_rustfmt_options - - " Use an invalid global executable, so we don't match it. - let g:ale_rust_rustfmt_executable = 'xxxinvalid' - let g:ale_rust_rustfmt_options = '' - - call ale#test#SetDirectory('/testplugin/test/fixers') + call ale#assert#SetUpFixerTest('rust', 'rustfmt') After: - Restore - - call ale#test#RestoreDirectory() + call ale#assert#TearDownFixerTest() Execute(The rustfmt callback should return the correct default values): - call ale#test#SetFilename('../rust_files/testfile.rs') + call ale#test#SetFilename('../test-files/rust/testfile.rs') - AssertEqual - \ { - \ 'command': ale#Escape('xxxinvalid'), - \ }, - \ ale#fixers#rustfmt#Fix(bufnr('')) + AssertFixer {'command': ale#Escape('rustfmt')} Execute(The rustfmt callback should include custom rustfmt options): let g:ale_rust_rustfmt_options = "--skip-children" - call ale#test#SetFilename('../rust_files/testfile.rs') + call ale#test#SetFilename('../test-files/rust/testfile.rs') - AssertEqual - \ { - \ 'command': ale#Escape('xxxinvalid') - \ . ' ' . g:ale_rust_rustfmt_options, - \ }, - \ ale#fixers#rustfmt#Fix(bufnr('')) + AssertFixer {'command': ale#Escape('rustfmt') . ' ' . g:ale_rust_rustfmt_options} diff --git a/test/fixers/test_scalafmt_fixer_callback.vader b/test/fixers/test_scalafmt_fixer_callback.vader index d82fda43..94f544a1 100644 --- a/test/fixers/test_scalafmt_fixer_callback.vader +++ b/test/fixers/test_scalafmt_fixer_callback.vader @@ -17,7 +17,7 @@ After: call ale#test#RestoreDirectory() Execute(The scalafmt callback should return the correct default values): - call ale#test#SetFilename('scala_paths/dummy.scala') + call ale#test#SetFilename('../test-files/scala/dummy.scala') AssertEqual \ { @@ -29,7 +29,7 @@ Execute(The scalafmt callback should return the correct default values): Execute(The scalafmt callback should use ng with scalafmt automatically): let g:ale_scala_scalafmt_executable = 'ng' - call ale#test#SetFilename('scala_paths/dummy.scala') + call ale#test#SetFilename('../test-files/scala/dummy.scala') AssertEqual \ { @@ -42,7 +42,7 @@ Execute(The scalafmt callback should use ng with scalafmt automatically): Execute(The scalafmt callback should include custom scalafmt options): let g:ale_scala_scalafmt_options = '--diff' - call ale#test#SetFilename('scala_paths/dummy.scala') + call ale#test#SetFilename('../test-files/scala/dummy.scala') AssertEqual \ { @@ -56,7 +56,7 @@ Execute(The scalafmt callback should include custom scalafmt options): Execute(The scalafmt callback should include custom scalafmt options and use ng with scalafmt): let g:ale_scala_scalafmt_options = '--diff' let g:ale_scala_scalafmt_executable = 'ng' - call ale#test#SetFilename('scala_paths/dummy.scala') + call ale#test#SetFilename('../test-files/scala/dummy.scala') AssertEqual \ { diff --git a/test/fixers/test_sorbet_fixer_callback.vader b/test/fixers/test_sorbet_fixer_callback.vader index 71870e4c..deb2b4e0 100644 --- a/test/fixers/test_sorbet_fixer_callback.vader +++ b/test/fixers/test_sorbet_fixer_callback.vader @@ -18,7 +18,7 @@ After: call ale#test#RestoreDirectory() Execute(The sorbet callback should return the correct default values): - call ale#test#SetFilename('ruby_paths/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/dummy.rb') AssertEqual \ { @@ -30,7 +30,7 @@ Execute(The sorbet callback should return the correct default values): Execute(The sorbet callback should include custom sorbet options): let g:ale_ruby_sorbet_options = '--enable-experimental-lsp-hover' - call ale#test#SetFilename('ruby_paths/with_config/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/with_config/dummy.rb') AssertEqual \ { diff --git a/test/fixers/test_standard_fixer_callback.vader b/test/fixers/test_standard_fixer_callback.vader index f5e9c487..9f5eb0e9 100644 --- a/test/fixers/test_standard_fixer_callback.vader +++ b/test/fixers/test_standard_fixer_callback.vader @@ -8,13 +8,13 @@ After: call ale#test#RestoreDirectory() Execute(The executable path should be correct): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.js') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir/testfile.js') AssertEqual \ { \ 'read_temporary_file': 1, \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/standard/bin/cmd.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/standard/bin/cmd.js')) \ . ' --fix --stdin < %s > %t', \ }, \ ale#fixers#standard#Fix(bufnr('')) diff --git a/test/fixers/test_standardrb_fixer_callback.vader b/test/fixers/test_standardrb_fixer_callback.vader index d315651f..31684c29 100644 --- a/test/fixers/test_standardrb_fixer_callback.vader +++ b/test/fixers/test_standardrb_fixer_callback.vader @@ -17,7 +17,7 @@ After: call ale#test#RestoreDirectory() Execute(The standardrb callback should return the correct default values): - call ale#test#SetFilename('ruby_paths/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/dummy.rb') AssertEqual \ { @@ -28,26 +28,26 @@ Execute(The standardrb callback should return the correct default values): \ ale#fixers#standardrb#Fix(bufnr('')) Execute(The standardrb callback should include configuration files): - call ale#test#SetFilename('ruby_paths/with_config/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/with_config/dummy.rb') AssertEqual \ { \ 'process_with': 'ale#fixers#rubocop#PostProcess', \ 'command': ale#Escape(g:ale_ruby_standardrb_executable) - \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/ruby_paths/with_config/.standard.yml')) + \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/with_config/.standard.yml')) \ . ' --fix --force-exclusion --stdin %s', \ }, \ ale#fixers#standardrb#Fix(bufnr('')) Execute(The standardrb callback should include custom rubocop options): let g:ale_ruby_standardrb_options = '--except Lint/Debugger' - call ale#test#SetFilename('ruby_paths/with_config/dummy.rb') + call ale#test#SetFilename('../test-files/ruby/with_config/dummy.rb') AssertEqual \ { \ 'process_with': 'ale#fixers#rubocop#PostProcess', \ 'command': ale#Escape(g:ale_ruby_standardrb_executable) - \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/ruby_paths/with_config/.standard.yml')) + \ . ' --config ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/ruby/with_config/.standard.yml')) \ . ' --except Lint/Debugger' \ . ' --fix --force-exclusion --stdin %s', \ }, diff --git a/test/fixers/test_stylelint_fixer_callback.vader b/test/fixers/test_stylelint_fixer_callback.vader index 95f91f91..3c843975 100644 --- a/test/fixers/test_stylelint_fixer_callback.vader +++ b/test/fixers/test_stylelint_fixer_callback.vader @@ -9,28 +9,28 @@ After: call ale#assert#TearDownFixerTest() Execute(The stylelint callback should return the correct default values): - call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.css') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir/testfile.css') AssertFixer \ { \ 'read_temporary_file': 1, \ 'cwd': '%s:h', \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/stylelint/bin/stylelint.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/stylelint/bin/stylelint.js')) \ . ' %t' \ . ' --fix', \ } Execute(The stylelint callback should include custom stylelint options): let g:ale_stylelint_options = '--cache' - call ale#test#SetFilename('../eslint-test-files/react-app/subdir/testfile.css') + call ale#test#SetFilename('../test-files/eslint/react-app/subdir/testfile.css') AssertFixer \ { \ 'read_temporary_file': 1, \ 'cwd': '%s:h', \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../eslint-test-files/react-app/node_modules/stylelint/bin/stylelint.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/eslint/react-app/node_modules/stylelint/bin/stylelint.js')) \ . ' %t' \ . ' --cache' \ . ' --fix', diff --git a/test/fixers/test_swiftformat_fixer_callback.vader b/test/fixers/test_swiftformat_fixer_callback.vader index e3674ded..d307c2b1 100644 --- a/test/fixers/test_swiftformat_fixer_callback.vader +++ b/test/fixers/test_swiftformat_fixer_callback.vader @@ -15,7 +15,7 @@ After: call ale#test#RestoreDirectory() Execute(The swiftformat callback should return the correct default values): - call ale#test#SetFilename('swift_paths/dummy.swift') + call ale#test#SetFilename('../test-files/swift/dummy.swift') AssertEqual \ { @@ -26,7 +26,7 @@ Execute(The swiftformat callback should return the correct default values): \ ale#fixers#swiftformat#Fix(bufnr('')) Execute(The swiftformat callback should include any additional options): - call ale#test#SetFilename('swift_paths/dummy.swift') + call ale#test#SetFilename('../test-files/swift/dummy.swift') let g:ale_swift_swiftformat_options = '--some-option' AssertEqual diff --git a/test/fixers/test_textlint_fixer_callback.vader b/test/fixers/test_textlint_fixer_callback.vader index 2848cfa5..5b6c5b7a 100644 --- a/test/fixers/test_textlint_fixer_callback.vader +++ b/test/fixers/test_textlint_fixer_callback.vader @@ -16,7 +16,7 @@ After: call ale#test#RestoreDirectory() Execute(The textlint callback should return the correct default values): - call ale#test#SetFilename('../markdown_files/testfile.md') + call ale#test#SetFilename('../test-files/markdown/testfile.md') AssertEqual \ { @@ -29,7 +29,7 @@ Execute(The textlint callback should return the correct default values): Execute(The textlint callback should include custom textlint options): let g:ale_textlint_options = "--quiet" - call ale#test#SetFilename('../markdown_files/testfile.md') + call ale#test#SetFilename('../test-files/markdown/testfile.md') AssertEqual \ { diff --git a/test/fixers/test_tidy_fixer_callback.vader b/test/fixers/test_tidy_fixer_callback.vader index 5677d8fd..a588d75e 100644 --- a/test/fixers/test_tidy_fixer_callback.vader +++ b/test/fixers/test_tidy_fixer_callback.vader @@ -1,7 +1,7 @@ Before: Save g:ale_html_tidy_executable - let g:ale_html_tidy_executable = 'tidy_paths/tidy' + let g:ale_html_tidy_executable = '../test-files/tidy/tidy' call ale#test#SetDirectory('/testplugin/test/fixers') @@ -23,7 +23,7 @@ Execute(The tidy callback should return 0 if tidy not found): Execute(The tidy callback should return the correct default command): AssertEqual \ { - \ 'command': ale#Escape('tidy_paths/tidy') + \ 'command': ale#Escape('../test-files/tidy/tidy') \ . ' -q --tidy-mark no --show-errors 0 --show-warnings 0' \ }, \ ale#fixers#tidy#Fix(bufnr('')) diff --git a/test/fixers/test_tslint_fixer_callback.vader b/test/fixers/test_tslint_fixer_callback.vader index a88992fa..2bcbddf7 100644 --- a/test/fixers/test_tslint_fixer_callback.vader +++ b/test/fixers/test_tslint_fixer_callback.vader @@ -20,7 +20,7 @@ After: Execute(The tslint callback should return the correct default values): let g:ale_typescript_tslint_config_path = 'tslint.json' - call ale#test#SetFilename('../prettier-test-files/testfile.ts') + call ale#test#SetFilename('../test-files/prettier/testfile.ts') AssertEqual \ { @@ -33,7 +33,7 @@ Execute(The tslint callback should return the correct default values): Execute(The tslint callback should include custom tslint config option): let g:ale_typescript_tslint_config_path = '.tslintrc' - call ale#test#SetFilename('../prettier-test-files/testfile.ts') + call ale#test#SetFilename('../test-files/prettier/testfile.ts') AssertEqual \ { diff --git a/test/fixers/test_uncrustify_fixer_callback.vader b/test/fixers/test_uncrustify_fixer_callback.vader index 8ef4e79b..6c7f6b5d 100644 --- a/test/fixers/test_uncrustify_fixer_callback.vader +++ b/test/fixers/test_uncrustify_fixer_callback.vader @@ -15,7 +15,7 @@ After: call ale#test#RestoreDirectory() Execute(The clang-format callback should return the correct default values): - call ale#test#SetFilename('c_paths/dummy.c') + call ale#test#SetFilename('../test-files/c/dummy.c') AssertEqual \ { @@ -25,7 +25,7 @@ Execute(The clang-format callback should return the correct default values): \ ale#fixers#uncrustify#Fix(bufnr('')) Execute(The uncrustify callback should include any additional options): - call ale#test#SetFilename('c_paths/dummy.c') + call ale#test#SetFilename('../test-files/c/dummy.c') let b:ale_c_uncrustify_options = '--some-option' AssertEqual diff --git a/test/fixers/test_xo_fixer_callback.vader b/test/fixers/test_xo_fixer_callback.vader index a473606e..fe2da8cc 100644 --- a/test/fixers/test_xo_fixer_callback.vader +++ b/test/fixers/test_xo_fixer_callback.vader @@ -7,38 +7,38 @@ After: call ale#assert#TearDownFixerTest() Execute(The xo callback should return the correct default values): - call ale#test#SetFilename('../xo-test-files/monorepo/packages/a/index.js') + call ale#test#SetFilename('../test-files/xo/monorepo/packages/a/index.js') AssertFixer \ { \ 'read_temporary_file': 1, \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/xo/monorepo/node_modules/xo/cli.js')) \ . ' --fix %t', \ } Execute(The xo callback should include custom xo options): let g:ale_javascript_xo_options = '--space' - call ale#test#SetFilename('../xo-test-files/monorepo/packages/a/index.js') + call ale#test#SetFilename('../test-files/xo/monorepo/packages/a/index.js') AssertFixer \ { \ 'read_temporary_file': 1, \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/xo/monorepo/node_modules/xo/cli.js')) \ . ' --fix %t' \ . ' --space', \ } Execute(--stdin should be used when xo is new enough): let g:ale_javascript_xo_options = '--space' - call ale#test#SetFilename('../xo-test-files/monorepo/packages/a/index.js') + call ale#test#SetFilename('../test-files/xo/monorepo/packages/a/index.js') GivenCommandOutput ['0.30.0'] AssertFixer \ { \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/xo/monorepo/node_modules/xo/cli.js')) \ . ' --stdin --stdin-filename %s' \ . ' --fix' \ . ' --space', diff --git a/test/fixers/test_xots_fixer_callback.vader b/test/fixers/test_xots_fixer_callback.vader index 5c7fa1d1..61a22e62 100644 --- a/test/fixers/test_xots_fixer_callback.vader +++ b/test/fixers/test_xots_fixer_callback.vader @@ -7,38 +7,38 @@ After: call ale#assert#TearDownFixerTest() Execute(The xo callback should return the correct default values): - call ale#test#SetFilename('../xo-test-files/monorepo/packages/a/index.ts') + call ale#test#SetFilename('../test-files/xo/monorepo/packages/a/index.ts') AssertFixer \ { \ 'read_temporary_file': 1, \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/xo/monorepo/node_modules/xo/cli.js')) \ . ' --fix %t', \ } Execute(The xo callback should include custom xo options): let g:ale_typescript_xo_options = '--space' - call ale#test#SetFilename('../xo-test-files/monorepo/packages/a/index.ts') + call ale#test#SetFilename('../test-files/xo/monorepo/packages/a/index.ts') AssertFixer \ { \ 'read_temporary_file': 1, \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/xo/monorepo/node_modules/xo/cli.js')) \ . ' --fix %t' \ . ' --space', \ } Execute(--stdin should be used when xo is new enough): let g:ale_typescript_xo_options = '--space' - call ale#test#SetFilename('../xo-test-files/monorepo/packages/a/index.ts') + call ale#test#SetFilename('../test-files/xo/monorepo/packages/a/index.ts') GivenCommandOutput ['0.30.0'] AssertFixer \ { \ 'command': (has('win32') ? 'node.exe ' : '') - \ . ale#Escape(ale#path#Simplify(g:dir . '/../xo-test-files/monorepo/node_modules/xo/cli.js')) + \ . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/xo/monorepo/node_modules/xo/cli.js')) \ . ' --stdin --stdin-filename %s' \ . ' --fix' \ . ' --space', diff --git a/test/fixers/test_yamlfix_fixer_callback.vader b/test/fixers/test_yamlfix_fixer_callback.vader index 75b9f0ad..4038de16 100644 --- a/test/fixers/test_yamlfix_fixer_callback.vader +++ b/test/fixers/test_yamlfix_fixer_callback.vader @@ -16,22 +16,22 @@ Execute(The yamlfix callback should return the correct default values): \ 0, \ ale#fixers#yamlfix#Fix(bufnr('')) - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.yaml') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.yaml') AssertEqual \ { \ 'cwd': '%s:h', - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yamlfix')) . ' -', + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/yamlfix')) . ' -', \ }, \ ale#fixers#yamlfix#Fix(bufnr('')) Execute(The yamlfix callback should respect custom options): let g:ale_yaml_yamlfix_options = '--multi-line=3 --trailing-comma' - silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.yaml') + silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.yaml') AssertEqual \ { \ 'cwd': '%s:h', - \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yamlfix')) + \ 'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/yamlfix')) \ . ' --multi-line=3 --trailing-comma -', \ }, \ ale#fixers#yamlfix#Fix(bufnr('')) diff --git a/test/fixers/test_yapf_fixer_callback.vader b/test/fixers/test_yapf_fixer_callback.vader index cfc508cc..2f7a12b7 100644 --- a/test/fixers/test_yapf_fixer_callback.vader +++ b/test/fixers/test_yapf_fixer_callback.vader @@ -23,20 +23,20 @@ Execute(The yapf callback should return the correct default values): \ 0, \ ale#fixers#yapf#Fix(bufnr('')) - call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py') AssertEqual - \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yapf'))}, + \ {'command': ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/yapf'))}, \ ale#fixers#yapf#Fix(bufnr('')) \ Execute(The yapf should include the .style.yapf file if present): - call ale#test#SetFilename('python_paths/with_virtualenv/dir_with_yapf_config/foo/bar.py') + call ale#test#SetFilename('../test-files/python/with_virtualenv/dir_with_yapf_config/foo/bar.py') AssertEqual \ { \ 'command': - \ ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yapf')) + \ ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/yapf')) \ . ' --no-local-style' - \ . ' --style ' . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf')), + \ . ' --style ' . ale#Escape(ale#path#Simplify(g:dir . '/../test-files/python/with_virtualenv/dir_with_yapf_config/.style.yapf')), \ }, \ ale#fixers#yapf#Fix(bufnr('')) diff --git a/test/handler/test_brakeman_handler.vader b/test/handler/test_brakeman_handler.vader index 02eb31b0..ad5376f7 100644 --- a/test/handler/test_brakeman_handler.vader +++ b/test/handler/test_brakeman_handler.vader @@ -8,7 +8,7 @@ After: call ale#linter#Reset() Execute(The brakeman handler should parse JSON correctly): - call ale#test#SetFilename('../ruby_fixtures/valid_rails_app/app/models/thing.rb') + call ale#test#SetFilename('../test-files/ruby/valid_rails_app/app/models/thing.rb') AssertEqual \ [ diff --git a/test/handler/test_lacheck_handler.vader b/test/handler/test_lacheck_handler.vader index 0bcc3be8..5a4f92dd 100644 --- a/test/handler/test_lacheck_handler.vader +++ b/test/handler/test_lacheck_handler.vader @@ -8,7 +8,7 @@ After: Execute(The lacheck handler should parse lines correctly): - call ale#test#SetFilename('command_callback/tex_paths/sample1.tex') + call ale#test#SetFilename('command_callback/../test-files/tex/sample1.tex') AssertEqual \ [ diff --git a/test/handler/test_rails_best_practices_handler.vader b/test/handler/test_rails_best_practices_handler.vader index 9875e977..f6d69eee 100644 --- a/test/handler/test_rails_best_practices_handler.vader +++ b/test/handler/test_rails_best_practices_handler.vader @@ -9,7 +9,7 @@ After: call ale#linter#Reset() Execute(The rails_best_practices handler should parse JSON correctly): - call ale#test#SetFilename('ruby_fixtures/valid_rails_app/app/models/thing.rb') + call ale#test#SetFilename('test-files/ruby/valid_rails_app/app/models/thing.rb') AssertEqual \ [ diff --git a/test/handler/test_terraform_handler.vader b/test/handler/test_terraform_handler.vader index 73730b0b..d054cb3b 100644 --- a/test/handler/test_terraform_handler.vader +++ b/test/handler/test_terraform_handler.vader @@ -1,7 +1,7 @@ Before: " Load the file which defines the linter. runtime ale_linters/terraform/terraform.vim - call ale#test#SetDirectory('/testplugin/test/terraform_files') + call ale#test#SetDirectory('/testplugin/test/test-files/terraform') call ale#test#SetFilename('providers.tf') After: diff --git a/test/dumb_named_pipe_server.py b/test/script/dumb_named_pipe_server.py similarity index 100% rename from test/dumb_named_pipe_server.py rename to test/script/dumb_named_pipe_server.py diff --git a/test/dumb_tcp_client.py b/test/script/dumb_tcp_client.py similarity index 100% rename from test/dumb_tcp_client.py rename to test/script/dumb_tcp_client.py diff --git a/test/dumb_tcp_server.py b/test/script/dumb_tcp_server.py similarity index 100% rename from test/dumb_tcp_server.py rename to test/script/dumb_tcp_server.py diff --git a/test/test-files/.gitignore b/test/test-files/.gitignore new file mode 100644 index 00000000..7d6563e0 --- /dev/null +++ b/test/test-files/.gitignore @@ -0,0 +1,2 @@ +# Don't ignore hidden files for this directory +!.* diff --git a/test/ada_files/testfile.adb b/test/test-files/ada/testfile.adb similarity index 100% rename from test/ada_files/testfile.adb rename to test/test-files/ada/testfile.adb diff --git a/test/command_callback/alex-node-modules-2/node_modules/alex/cli.js b/test/test-files/alex/node-modules-2/node_modules/alex/cli.js similarity index 100% rename from test/command_callback/alex-node-modules-2/node_modules/alex/cli.js rename to test/test-files/alex/node-modules-2/node_modules/alex/cli.js diff --git a/test/command_callback/alex-node-modules/node_modules/.bin/alex b/test/test-files/alex/node-modules/node_modules/.bin/alex similarity index 100% rename from test/command_callback/alex-node-modules/node_modules/.bin/alex rename to test/test-files/alex/node-modules/node_modules/.bin/alex diff --git a/test/ant-test-files/ant-project/build.xml b/test/test-files/angular/node_modules/@angular/language-server/bin/ngserver similarity index 100% rename from test/ant-test-files/ant-project/build.xml rename to test/test-files/angular/node_modules/@angular/language-server/bin/ngserver diff --git a/test/command_callback/java_paths/build/gen/main/java/com/something/dummy b/test/test-files/angular/node_modules/@angular/language-service/dummy similarity index 100% rename from test/command_callback/java_paths/build/gen/main/java/com/something/dummy rename to test/test-files/angular/node_modules/@angular/language-service/dummy diff --git a/test/ant-test-files/bin/ant b/test/test-files/ant/ant-project/build.xml old mode 100755 new mode 100644 similarity index 100% rename from test/ant-test-files/bin/ant rename to test/test-files/ant/ant-project/build.xml diff --git a/test/ant-test-files/bin/ant.exe b/test/test-files/ant/bin/ant similarity index 100% rename from test/ant-test-files/bin/ant.exe rename to test/test-files/ant/bin/ant diff --git a/test/command_callback/bazel_paths/BUILD b/test/test-files/ant/bin/ant.exe old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/bazel_paths/BUILD rename to test/test-files/ant/bin/ant.exe diff --git a/test/command_callback/bazel_paths/WORKSPACE b/test/test-files/bazel/BUILD similarity index 100% rename from test/command_callback/bazel_paths/WORKSPACE rename to test/test-files/bazel/BUILD diff --git a/test/command_callback/bazel_paths/defs.bzl b/test/test-files/bazel/WORKSPACE similarity index 100% rename from test/command_callback/bazel_paths/defs.bzl rename to test/test-files/bazel/WORKSPACE diff --git a/test/command_callback/bib_paths/dummy.bib b/test/test-files/bazel/defs.bzl similarity index 100% rename from test/command_callback/bib_paths/dummy.bib rename to test/test-files/bazel/defs.bzl diff --git a/test/command_callback/c_paths/dummy.c b/test/test-files/bib/dummy.bib similarity index 100% rename from test/command_callback/c_paths/dummy.c rename to test/test-files/bib/dummy.bib diff --git a/test/command_callback/cargo_paths/Cargo.toml b/test/test-files/c/build_compile_commands_project/build/bad_folder_to_test_priority similarity index 100% rename from test/command_callback/cargo_paths/Cargo.toml rename to test/test-files/c/build_compile_commands_project/build/bad_folder_to_test_priority diff --git a/test/command_callback/ccls_paths/with_build_dir/unusual_build_dir_name/compile_commands.json b/test/test-files/c/build_compile_commands_project/build/compile_commands.json similarity index 100% rename from test/command_callback/ccls_paths/with_build_dir/unusual_build_dir_name/compile_commands.json rename to test/test-files/c/build_compile_commands_project/build/compile_commands.json diff --git a/test/command_callback/cargo_workspace_paths/Cargo.toml b/test/test-files/c/configure_project/Makefile similarity index 100% rename from test/command_callback/cargo_workspace_paths/Cargo.toml rename to test/test-files/c/configure_project/Makefile diff --git a/test/command_callback/cargo_workspace_paths/subpath/Cargo.toml b/test/test-files/c/configure_project/configure similarity index 100% rename from test/command_callback/cargo_workspace_paths/subpath/Cargo.toml rename to test/test-files/c/configure_project/configure diff --git a/test/command_callback/ccls_paths/with_ccls-root/.ccls-root b/test/test-files/c/configure_project/include/test.h similarity index 100% rename from test/command_callback/ccls_paths/with_ccls-root/.ccls-root rename to test/test-files/c/configure_project/include/test.h diff --git a/test/command_callback/ccls_paths/with_ccls/.ccls b/test/test-files/c/configure_project/subdir/Makefile similarity index 100% rename from test/command_callback/ccls_paths/with_ccls/.ccls rename to test/test-files/c/configure_project/subdir/Makefile diff --git a/test/command_callback/ccls_paths/with_compile_commands_json/compile_commands.json b/test/test-files/c/dummy.c similarity index 100% rename from test/command_callback/ccls_paths/with_compile_commands_json/compile_commands.json rename to test/test-files/c/dummy.c diff --git a/test/command_callback/checkstyle_paths/other_config.xml b/test/test-files/c/git_and_nested_makefiles/include/test.h similarity index 100% rename from test/command_callback/checkstyle_paths/other_config.xml rename to test/test-files/c/git_and_nested_makefiles/include/test.h diff --git a/test/command_callback/clangd_paths/with_build_dir/unusual_build_dir_name/compile_commands.json b/test/test-files/c/git_and_nested_makefiles/src/Makefile similarity index 100% rename from test/command_callback/clangd_paths/with_build_dir/unusual_build_dir_name/compile_commands.json rename to test/test-files/c/git_and_nested_makefiles/src/Makefile diff --git a/test/command_callback/clangd_paths/with_compile_commands/compile_commands.json b/test/test-files/c/gnumakefile_project/GNUmakefile similarity index 100% rename from test/command_callback/clangd_paths/with_compile_commands/compile_commands.json rename to test/test-files/c/gnumakefile_project/GNUmakefile diff --git a/test/command_callback/cppcheck_paths/one/two/three/file.c b/test/test-files/c/gnumakefile_project/file.c similarity index 100% rename from test/command_callback/cppcheck_paths/one/two/three/file.c rename to test/test-files/c/gnumakefile_project/file.c diff --git a/test/command_callback/clangformat_paths/with_clangformat/.clang-format b/test/test-files/c/h_file_project/Makefile similarity index 100% rename from test/command_callback/clangformat_paths/with_clangformat/.clang-format rename to test/test-files/c/h_file_project/Makefile diff --git a/test/command_callback/java_paths/build/gen2/main/java/com/something/dummy b/test/test-files/c/h_file_project/subdir/dummy similarity index 100% rename from test/command_callback/java_paths/build/gen2/main/java/com/something/dummy rename to test/test-files/c/h_file_project/subdir/dummy diff --git a/test/command_callback/cppcheck_paths/one/compile_commands.json b/test/test-files/c/h_file_project/test.h similarity index 100% rename from test/command_callback/cppcheck_paths/one/compile_commands.json rename to test/test-files/c/h_file_project/test.h diff --git a/test/command_callback/cppcheck_paths/one/two/three/file.cpp b/test/test-files/c/hpp_file_project/Makefile similarity index 100% rename from test/command_callback/cppcheck_paths/one/two/three/file.cpp rename to test/test-files/c/hpp_file_project/Makefile diff --git a/test/command_callback/java_paths/src/main/java/com/something/dummy b/test/test-files/c/hpp_file_project/subdir/dummy similarity index 100% rename from test/command_callback/java_paths/src/main/java/com/something/dummy rename to test/test-files/c/hpp_file_project/subdir/dummy diff --git a/test/command_callback/cppcheck_paths/with_build_dir/build/compile_commands.json b/test/test-files/c/hpp_file_project/test.hpp similarity index 100% rename from test/command_callback/cppcheck_paths/with_build_dir/build/compile_commands.json rename to test/test-files/c/hpp_file_project/test.hpp diff --git a/test/command_callback/cquery_paths/build/compile_commands.json b/test/test-files/c/json_project/build/compile_commands.json similarity index 100% rename from test/command_callback/cquery_paths/build/compile_commands.json rename to test/test-files/c/json_project/build/compile_commands.json diff --git a/test/command_callback/cquery_paths/with_cquery/.cquery b/test/test-files/c/json_project/include/test.h similarity index 100% rename from test/command_callback/cquery_paths/with_cquery/.cquery rename to test/test-files/c/json_project/include/test.h diff --git a/test/command_callback/java_paths/src/test/java/com/something/dummy b/test/test-files/c/json_project/subdir/dummy similarity index 100% rename from test/command_callback/java_paths/src/test/java/com/something/dummy rename to test/test-files/c/json_project/subdir/dummy diff --git a/test/command_callback/dart_paths/.packages b/test/test-files/c/makefile_project/Makefile similarity index 100% rename from test/command_callback/dart_paths/.packages rename to test/test-files/c/makefile_project/Makefile diff --git a/test/command_callback/elixir_paths/mix_project/lib/app.ex b/test/test-files/c/makefile_project/_astylerc similarity index 100% rename from test/command_callback/elixir_paths/mix_project/lib/app.ex rename to test/test-files/c/makefile_project/_astylerc diff --git a/test/test_c_projects/makefile_project/args b/test/test-files/c/makefile_project/args similarity index 100% rename from test/test_c_projects/makefile_project/args rename to test/test-files/c/makefile_project/args diff --git a/test/command_callback/elixir_paths/umbrella_project/apps/app1/lib/app.ex b/test/test-files/c/makefile_project/include/test.h similarity index 100% rename from test/command_callback/elixir_paths/umbrella_project/apps/app1/lib/app.ex rename to test/test-files/c/makefile_project/include/test.h diff --git a/test/test_c_projects/makefile_project/subdir/args b/test/test-files/c/makefile_project/subdir/args similarity index 100% rename from test/test_c_projects/makefile_project/subdir/args rename to test/test-files/c/makefile_project/subdir/args diff --git a/test/command_callback/java_paths_no_main/src/test/java/com/something/dummy b/test/test-files/c/makefile_project/subdir/dummy similarity index 100% rename from test/command_callback/java_paths_no_main/src/test/java/com/something/dummy rename to test/test-files/c/makefile_project/subdir/dummy diff --git a/test/command_callback/elixir_paths/umbrella_project/apps/app1/mix.exs b/test/test-files/c/makefile_project/subdir/file.c similarity index 100% rename from test/command_callback/elixir_paths/umbrella_project/apps/app1/mix.exs rename to test/test-files/c/makefile_project/subdir/file.c diff --git a/test/command_callback/elixir_paths/umbrella_project/apps/app2/lib/app.ex b/test/test-files/cargo/Cargo.toml similarity index 100% rename from test/command_callback/elixir_paths/umbrella_project/apps/app2/lib/app.ex rename to test/test-files/cargo/Cargo.toml diff --git a/test/command_callback/elixir_paths/umbrella_project/apps/app2/mix.exs b/test/test-files/cargo/workspace_paths/Cargo.toml similarity index 100% rename from test/command_callback/elixir_paths/umbrella_project/apps/app2/mix.exs rename to test/test-files/cargo/workspace_paths/Cargo.toml diff --git a/test/command_callback/elixir_paths/umbrella_project/mix.exs b/test/test-files/cargo/workspace_paths/subpath/Cargo.toml similarity index 100% rename from test/command_callback/elixir_paths/umbrella_project/mix.exs rename to test/test-files/cargo/workspace_paths/subpath/Cargo.toml diff --git a/test/command_callback/fecs_paths/fecs b/test/test-files/ccls/with_build_dir/unusual_build_dir_name/compile_commands.json old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/fecs_paths/fecs rename to test/test-files/ccls/with_build_dir/unusual_build_dir_name/compile_commands.json diff --git a/test/command_callback/fecs_paths/fecs.exe b/test/test-files/ccls/with_ccls-root/.ccls-root old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/fecs_paths/fecs.exe rename to test/test-files/ccls/with_ccls-root/.ccls-root diff --git a/test/command_callback/go_paths/go1/prj1/file.go b/test/test-files/ccls/with_ccls/.ccls similarity index 100% rename from test/command_callback/go_paths/go1/prj1/file.go rename to test/test-files/ccls/with_ccls/.ccls diff --git a/test/command_callback/go_paths/go2/prj2/file.go b/test/test-files/ccls/with_compile_commands_json/compile_commands.json similarity index 100% rename from test/command_callback/go_paths/go2/prj2/file.go rename to test/test-files/ccls/with_compile_commands_json/compile_commands.json diff --git a/test/command_callback/hdl_server/foo.vhd b/test/test-files/checkstyle/other_config.xml similarity index 100% rename from test/command_callback/hdl_server/foo.vhd rename to test/test-files/checkstyle/other_config.xml diff --git a/test/command_callback/hdl_server/with_config_file/.hdl_checker.config b/test/test-files/clangd/with_build_dir/unusual_build_dir_name/compile_commands.json similarity index 100% rename from test/command_callback/hdl_server/with_config_file/.hdl_checker.config rename to test/test-files/clangd/with_build_dir/unusual_build_dir_name/compile_commands.json diff --git a/test/command_callback/hdl_server/with_config_file/_hdl_checker.config b/test/test-files/clangd/with_compile_commands/compile_commands.json similarity index 100% rename from test/command_callback/hdl_server/with_config_file/_hdl_checker.config rename to test/test-files/clangd/with_compile_commands/compile_commands.json diff --git a/test/command_callback/hdl_server/with_config_file/foo.vhd b/test/test-files/clangformat/with_clangformat/.clang-format similarity index 100% rename from test/command_callback/hdl_server/with_config_file/foo.vhd rename to test/test-files/clangformat/with_clangformat/.clang-format diff --git a/test/command_callback/html_beautify_paths/html-beautify b/test/test-files/cpp/.astylerc old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/html_beautify_paths/html-beautify rename to test/test-files/cpp/.astylerc diff --git a/test/command_callback/html_beautify_paths/test.html b/test/test-files/cpp/dummy.cpp similarity index 100% rename from test/command_callback/html_beautify_paths/test.html rename to test/test-files/cpp/dummy.cpp diff --git a/test/command_callback/htmlhint_paths/node_modules/.bin/htmlhint b/test/test-files/cppcheck/one/compile_commands.json old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/htmlhint_paths/node_modules/.bin/htmlhint rename to test/test-files/cppcheck/one/compile_commands.json diff --git a/test/command_callback/htmlhint_paths/with_config/.htmlhintrc b/test/test-files/cppcheck/one/two/three/file.c similarity index 100% rename from test/command_callback/htmlhint_paths/with_config/.htmlhintrc rename to test/test-files/cppcheck/one/two/three/file.c diff --git a/test/command_callback/ink_paths/story/main.ink b/test/test-files/cppcheck/one/two/three/file.cpp similarity index 100% rename from test/command_callback/ink_paths/story/main.ink rename to test/test-files/cppcheck/one/two/three/file.cpp diff --git a/test/command_callback/inko_paths/test.inko b/test/test-files/cppcheck/with_build_dir/build/compile_commands.json similarity index 100% rename from test/command_callback/inko_paths/test.inko rename to test/test-files/cppcheck/with_build_dir/build/compile_commands.json diff --git a/test/command_callback/inko_paths/tests/test/test_foo.inko b/test/test-files/cquery/build/compile_commands.json similarity index 100% rename from test/command_callback/inko_paths/tests/test/test_foo.inko rename to test/test-files/cquery/build/compile_commands.json diff --git a/test/command_callback/java_paths_with_jaxb/src/main/java/com/something/dummy b/test/test-files/cquery/with_cquery/.cquery similarity index 100% rename from test/command_callback/java_paths_with_jaxb/src/main/java/com/something/dummy rename to test/test-files/cquery/with_cquery/.cquery diff --git a/test/command_callback/java_paths_with_jaxb/src/main/jaxb/com/something/dummy b/test/test-files/csslint/other-app/testfile.css similarity index 100% rename from test/command_callback/java_paths_with_jaxb/src/main/jaxb/com/something/dummy rename to test/test-files/csslint/other-app/testfile.css diff --git a/test/command_callback/julia-languageserver-project/REQUIRE b/test/test-files/csslint/some-app/.csslintrc similarity index 100% rename from test/command_callback/julia-languageserver-project/REQUIRE rename to test/test-files/csslint/some-app/.csslintrc diff --git a/test/command_callback/julia-languageserver-project/test.jl b/test/test-files/csslint/some-app/subdir/testfile.css similarity index 100% rename from test/command_callback/julia-languageserver-project/test.jl rename to test/test-files/csslint/some-app/subdir/testfile.css diff --git a/test/command_callback/lessc_paths/node_modules/.bin/lessc b/test/test-files/cucumber/features/cuke.feature old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/lessc_paths/node_modules/.bin/lessc rename to test/test-files/cucumber/features/cuke.feature diff --git a/test/command_callback/ocamllsp_paths/dune-project b/test/test-files/cucumber/features/step_definitions/base_steps.rb similarity index 100% rename from test/command_callback/ocamllsp_paths/dune-project rename to test/test-files/cucumber/features/step_definitions/base_steps.rb diff --git a/test/command_callback/ols_paths/.merlin b/test/test-files/d/test.d similarity index 100% rename from test/command_callback/ols_paths/.merlin rename to test/test-files/d/test.d diff --git a/test/command_callback/ols_paths/node_modules/.bin/ocaml-language-server b/test/test-files/dart/.packages similarity index 100% rename from test/command_callback/ols_paths/node_modules/.bin/ocaml-language-server rename to test/test-files/dart/.packages diff --git a/test/command_callback/php-intelephense-project/with-composer/composer.json b/test/test-files/dart/testfile.dart similarity index 100% rename from test/command_callback/php-intelephense-project/with-composer/composer.json rename to test/test-files/dart/testfile.dart diff --git a/test/command_callback/php-langserver-project/vendor/bin/php-language-server.php b/test/test-files/elixir/mix_project/lib/app.ex old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/php-langserver-project/vendor/bin/php-language-server.php rename to test/test-files/elixir/mix_project/lib/app.ex diff --git a/test/command_callback/elixir_paths/mix_project/mix.exs b/test/test-files/elixir/mix_project/mix.exs similarity index 100% rename from test/command_callback/elixir_paths/mix_project/mix.exs rename to test/test-files/elixir/mix_project/mix.exs diff --git a/test/command_callback/php-langserver-project/with-composer/composer.json b/test/test-files/elixir/testfile.ex similarity index 100% rename from test/command_callback/php-langserver-project/with-composer/composer.json rename to test/test-files/elixir/testfile.ex diff --git a/test/command_callback/php-langserver-project/with-composer/vendor/bin/php-language-server.php b/test/test-files/elixir/umbrella_project/apps/app1/lib/app.ex old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/php-langserver-project/with-composer/vendor/bin/php-language-server.php rename to test/test-files/elixir/umbrella_project/apps/app1/lib/app.ex diff --git a/test/command_callback/php-langserver-project/with-git/vendor/bin/php-language-server.php b/test/test-files/elixir/umbrella_project/apps/app1/mix.exs old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/php-langserver-project/with-git/vendor/bin/php-language-server.php rename to test/test-files/elixir/umbrella_project/apps/app1/mix.exs diff --git a/test/command_callback/php_paths/project-with-php-cs-fixer/test.php b/test/test-files/elixir/umbrella_project/apps/app2/lib/app.ex similarity index 100% rename from test/command_callback/php_paths/project-with-php-cs-fixer/test.php rename to test/test-files/elixir/umbrella_project/apps/app2/lib/app.ex diff --git a/test/command_callback/php_paths/project-with-php-cs-fixer/vendor/bin/php-cs-fixer b/test/test-files/elixir/umbrella_project/apps/app2/mix.exs similarity index 100% rename from test/command_callback/php_paths/project-with-php-cs-fixer/vendor/bin/php-cs-fixer rename to test/test-files/elixir/umbrella_project/apps/app2/mix.exs diff --git a/test/command_callback/php_paths/project-with-phpcbf/foo/test.php b/test/test-files/elixir/umbrella_project/mix.exs similarity index 100% rename from test/command_callback/php_paths/project-with-phpcbf/foo/test.php rename to test/test-files/elixir/umbrella_project/mix.exs diff --git a/test/command_callback/php_paths/project-with-phpcbf/vendor/bin/phpcbf b/test/test-files/elm/newapp-notests/elm.json similarity index 100% rename from test/command_callback/php_paths/project-with-phpcbf/vendor/bin/phpcbf rename to test/test-files/elm/newapp-notests/elm.json diff --git a/test/command_callback/php_paths/project-without-php-cs-fixer/test.php b/test/test-files/elm/newapp-notests/node_modules/.bin/elm similarity index 100% rename from test/command_callback/php_paths/project-without-php-cs-fixer/test.php rename to test/test-files/elm/newapp-notests/node_modules/.bin/elm diff --git a/test/command_callback/php_paths/project-without-phpcbf/foo/test.php b/test/test-files/elm/newapp-notests/tests/TestMain.elm similarity index 100% rename from test/command_callback/php_paths/project-without-phpcbf/foo/test.php rename to test/test-files/elm/newapp-notests/tests/TestMain.elm diff --git a/test/command_callback/psalm-project/vendor/bin/psalm b/test/test-files/elm/newapp/elm.json old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/psalm-project/vendor/bin/psalm rename to test/test-files/elm/newapp/elm.json diff --git a/test/command_callback/puglint_project/node_modules/.bin/pug-lint b/test/test-files/elm/newapp/node_modules/.bin/elm similarity index 100% rename from test/command_callback/puglint_project/node_modules/.bin/pug-lint rename to test/test-files/elm/newapp/node_modules/.bin/elm diff --git a/test/command_callback/puglint_project/package.json b/test/test-files/elm/newapp/node_modules/.bin/elm-test similarity index 100% rename from test/command_callback/puglint_project/package.json rename to test/test-files/elm/newapp/node_modules/.bin/elm-test diff --git a/test/command_callback/puglint_project/puglint_rc_dir/.pug-lintrc b/test/test-files/elm/newapp/src/Main.elm similarity index 100% rename from test/command_callback/puglint_project/puglint_rc_dir/.pug-lintrc rename to test/test-files/elm/newapp/src/Main.elm diff --git a/test/command_callback/puglint_project/puglint_rc_js_dir/.pug-lintrc.js b/test/test-files/elm/newapp/tests/TestSuite.elm similarity index 100% rename from test/command_callback/puglint_project/puglint_rc_js_dir/.pug-lintrc.js rename to test/test-files/elm/newapp/tests/TestSuite.elm diff --git a/test/command_callback/puglint_project/puglint_rc_json_dir/.pug-lintrc.json b/test/test-files/elm/node_modules/.bin/elm-format similarity index 100% rename from test/command_callback/puglint_project/puglint_rc_json_dir/.pug-lintrc.json rename to test/test-files/elm/node_modules/.bin/elm-format diff --git a/test/command_callback/puppet_paths/dummy.pp b/test/test-files/elm/oldapp/elm-package.json similarity index 100% rename from test/command_callback/puppet_paths/dummy.pp rename to test/test-files/elm/oldapp/elm-package.json diff --git a/test/command_callback/purescript_paths/bower/Foo.purs b/test/test-files/elm/oldapp/node_modules/.bin/elm similarity index 100% rename from test/command_callback/purescript_paths/bower/Foo.purs rename to test/test-files/elm/oldapp/node_modules/.bin/elm diff --git a/test/command_callback/purescript_paths/bower/bower.json b/test/test-files/elm/oldapp/node_modules/.bin/elm-test similarity index 100% rename from test/command_callback/purescript_paths/bower/bower.json rename to test/test-files/elm/oldapp/node_modules/.bin/elm-test diff --git a/test/command_callback/purescript_paths/psc-package/Foo.purs b/test/test-files/elm/oldapp/src/Main.elm similarity index 100% rename from test/command_callback/purescript_paths/psc-package/Foo.purs rename to test/test-files/elm/oldapp/src/Main.elm diff --git a/test/command_callback/purescript_paths/psc-package/psc-package.json b/test/test-files/elm/oldapp/tests/TestSuite.elm similarity index 100% rename from test/command_callback/purescript_paths/psc-package/psc-package.json rename to test/test-files/elm/oldapp/tests/TestSuite.elm diff --git a/test/command_callback/purescript_paths/spago/Foo.purs b/test/test-files/elm/src/subdir/testfile.elm similarity index 100% rename from test/command_callback/purescript_paths/spago/Foo.purs rename to test/test-files/elm/src/subdir/testfile.elm diff --git a/test/command_callback/purescript_paths/spago/spago.dhall b/test/test-files/eslint/app-with-eslint-d/node_modules/.bin/eslint_d similarity index 100% rename from test/command_callback/purescript_paths/spago/spago.dhall rename to test/test-files/eslint/app-with-eslint-d/node_modules/.bin/eslint_d diff --git a/test/command_callback/python_paths/namespace_package_manifest/namespace/foo/__init__.py b/test/test-files/eslint/node_modules/.bin/eslint similarity index 100% rename from test/command_callback/python_paths/namespace_package_manifest/namespace/foo/__init__.py rename to test/test-files/eslint/node_modules/.bin/eslint diff --git a/test/command_callback/python_paths/namespace_package_manifest/namespace/foo/bar.py b/test/test-files/eslint/other-app/subdir/testfile.js similarity index 100% rename from test/command_callback/python_paths/namespace_package_manifest/namespace/foo/bar.py rename to test/test-files/eslint/other-app/subdir/testfile.js diff --git a/test/command_callback/python_paths/namespace_package_pytest/namespace/foo/__init__.py b/test/test-files/eslint/package.json similarity index 100% rename from test/command_callback/python_paths/namespace_package_pytest/namespace/foo/__init__.py rename to test/test-files/eslint/package.json diff --git a/test/command_callback/python_paths/namespace_package_pytest/namespace/foo/bar.py b/test/test-files/eslint/react-app/.eslintrc.js similarity index 100% rename from test/command_callback/python_paths/namespace_package_pytest/namespace/foo/bar.py rename to test/test-files/eslint/react-app/.eslintrc.js diff --git a/test/command_callback/python_paths/namespace_package_setup/namespace/foo/__init__.py b/test/test-files/eslint/react-app/node_modules/eslint/bin/eslint.js similarity index 100% rename from test/command_callback/python_paths/namespace_package_setup/namespace/foo/__init__.py rename to test/test-files/eslint/react-app/node_modules/eslint/bin/eslint.js diff --git a/test/command_callback/standard-test-files/with-cmd/node_modules/standard/bin/cmd.js b/test/test-files/eslint/react-app/node_modules/standard/bin/cmd.js old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/standard-test-files/with-cmd/node_modules/standard/bin/cmd.js rename to test/test-files/eslint/react-app/node_modules/standard/bin/cmd.js diff --git a/test/command_callback/python_paths/namespace_package_setup/namespace/foo/bar.py b/test/test-files/eslint/react-app/node_modules/stylelint/bin/stylelint.js similarity index 100% rename from test/command_callback/python_paths/namespace_package_setup/namespace/foo/bar.py rename to test/test-files/eslint/react-app/node_modules/stylelint/bin/stylelint.js diff --git a/test/command_callback/python_paths/namespace_package_tox/namespace/foo/__init__.py b/test/test-files/eslint/react-app/node_modules/xo/cli.js similarity index 100% rename from test/command_callback/python_paths/namespace_package_tox/namespace/foo/__init__.py rename to test/test-files/eslint/react-app/node_modules/xo/cli.js diff --git a/test/command_callback/python_paths/namespace_package_tox/namespace/foo/bar.py b/test/test-files/eslint/react-app/subdir-with-config/.eslintrc similarity index 100% rename from test/command_callback/python_paths/namespace_package_tox/namespace/foo/bar.py rename to test/test-files/eslint/react-app/subdir-with-config/.eslintrc diff --git a/test/command_callback/python_paths/no_virtualenv/subdir/foo/COMMIT_EDITMSG b/test/test-files/eslint/react-app/subdir-with-package-json/node_modules/.gitkeep similarity index 100% rename from test/command_callback/python_paths/no_virtualenv/subdir/foo/COMMIT_EDITMSG rename to test/test-files/eslint/react-app/subdir-with-package-json/node_modules/.gitkeep diff --git a/test/command_callback/python_paths/no_virtualenv/subdir/foo/__init__.py b/test/test-files/eslint/react-app/subdir-with-package-json/package.json similarity index 100% rename from test/command_callback/python_paths/no_virtualenv/subdir/foo/__init__.py rename to test/test-files/eslint/react-app/subdir-with-package-json/package.json diff --git a/test/csslint-test-files/other-app/testfile.css b/test/test-files/eslint/react-app/subdir/testfile.css similarity index 100% rename from test/csslint-test-files/other-app/testfile.css rename to test/test-files/eslint/react-app/subdir/testfile.css diff --git a/test/command_callback/python_paths/no_virtualenv/subdir/foo/bar.py b/test/test-files/eslint/react-app/subdir/testfile.js similarity index 100% rename from test/command_callback/python_paths/no_virtualenv/subdir/foo/bar.py rename to test/test-files/eslint/react-app/subdir/testfile.js diff --git a/test/command_callback/python_paths/with_bandit/.bandit b/test/test-files/eslint/react-app/subdir/testfile.ts similarity index 100% rename from test/command_callback/python_paths/with_bandit/.bandit rename to test/test-files/eslint/react-app/subdir/testfile.ts diff --git a/test/command_callback/python_paths/with_bandit/namespace/foo/__init__.py b/test/test-files/fecs/fecs old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/python_paths/with_bandit/namespace/foo/__init__.py rename to test/test-files/fecs/fecs diff --git a/test/command_callback/python_paths/with_bandit/namespace/foo/bar.py b/test/test-files/fecs/fecs.exe old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/python_paths/with_bandit/namespace/foo/bar.py rename to test/test-files/fecs/fecs.exe diff --git a/test/command_callback/python_paths/with_mypy_ini_and_pytest_ini/mypy.ini b/test/test-files/fish/testfile.fish similarity index 100% rename from test/command_callback/python_paths/with_mypy_ini_and_pytest_ini/mypy.ini rename to test/test-files/fish/testfile.fish diff --git a/test/command_callback/python_paths/with_mypy_ini_and_pytest_ini/tests/pytest.ini b/test/test-files/flow/a/.flowconfig similarity index 100% rename from test/command_callback/python_paths/with_mypy_ini_and_pytest_ini/tests/pytest.ini rename to test/test-files/flow/a/.flowconfig diff --git a/test/command_callback/python_paths/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py b/test/test-files/flow/a/sub/dummy similarity index 100% rename from test/command_callback/python_paths/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py rename to test/test-files/flow/a/sub/dummy diff --git a/test/command_callback/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf b/test/test-files/flow/b/sub/dummy similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf rename to test/test-files/flow/b/sub/dummy diff --git a/test/command_callback/fortran-fortls-project/.fortls b/test/test-files/fortls-project/.fortls similarity index 100% rename from test/command_callback/fortran-fortls-project/.fortls rename to test/test-files/fortls-project/.fortls diff --git a/test/go_files/go.mod b/test/test-files/go/go.mod similarity index 100% rename from test/go_files/go.mod rename to test/test-files/go/go.mod diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/activate b/test/test-files/go/go1/prj1/file.go similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/activate rename to test/test-files/go/go1/prj1/file.go diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/autoimport.exe b/test/test-files/go/go2/prj2/file.go old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/autoimport.exe rename to test/test-files/go/go2/prj2/file.go diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/autopep8.exe b/test/test-files/go/testfile.go old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/autopep8.exe rename to test/test-files/go/testfile.go diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/black.exe b/test/test-files/go/testfile2.go old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/black.exe rename to test/test-files/go/testfile2.go diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/flake8.exe b/test/test-files/gradle/build-gradle-project/build.gradle old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/flake8.exe rename to test/test-files/gradle/build-gradle-project/build.gradle diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/gitlint.exe b/test/test-files/gradle/build-gradle-project/src/main/kotlin/dummy.kt old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/gitlint.exe rename to test/test-files/gradle/build-gradle-project/src/main/kotlin/dummy.kt diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/isort.exe b/test/test-files/gradle/gradle similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/isort.exe rename to test/test-files/gradle/gradle diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/mypy.exe b/test/test-files/gradle/non-gradle-project/src/main/kotlin/dummy.kt old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/mypy.exe rename to test/test-files/gradle/non-gradle-project/src/main/kotlin/dummy.kt diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/pyflakes.exe b/test/test-files/gradle/settings-gradle-project/settings.gradle old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/pyflakes.exe rename to test/test-files/gradle/settings-gradle-project/settings.gradle diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/pylama.exe b/test/test-files/gradle/settings-gradle-project/src/main/kotlin/dummy.kt old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/pylama.exe rename to test/test-files/gradle/settings-gradle-project/src/main/kotlin/dummy.kt diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/pylint.exe b/test/test-files/gradle/unwrapped-project/build.gradle old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/pylint.exe rename to test/test-files/gradle/unwrapped-project/build.gradle diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/pyls.exe b/test/test-files/gradle/unwrapped-project/settings.gradle old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/pyls.exe rename to test/test-files/gradle/unwrapped-project/settings.gradle diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/pyre.exe b/test/test-files/gradle/unwrapped-project/src/main/kotlin/dummy.kt old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/pyre.exe rename to test/test-files/gradle/unwrapped-project/src/main/kotlin/dummy.kt diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/reorder-python-imports.exe b/test/test-files/gradle/wrapped-project/build.gradle old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/reorder-python-imports.exe rename to test/test-files/gradle/wrapped-project/build.gradle diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/vulture.exe b/test/test-files/gradle/wrapped-project/gradlew old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/vulture.exe rename to test/test-files/gradle/wrapped-project/gradlew diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/yamlfix.exe b/test/test-files/gradle/wrapped-project/settings.gradle similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/yamlfix.exe rename to test/test-files/gradle/wrapped-project/settings.gradle diff --git a/test/command_callback/python_paths/with_virtualenv/env/Scripts/yapf.exe b/test/test-files/gradle/wrapped-project/src/main/kotlin/dummy.kt old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/Scripts/yapf.exe rename to test/test-files/gradle/wrapped-project/src/main/kotlin/dummy.kt diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/activate b/test/test-files/hamllint/haml-lint-and-rubocop/.haml-lint.yml similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/activate rename to test/test-files/hamllint/haml-lint-and-rubocop/.haml-lint.yml diff --git a/test/command_callback/ruby_paths/with_config/.rubocop.yml b/test/test-files/hamllint/haml-lint-and-rubocop/.rubocop.yml similarity index 100% rename from test/command_callback/ruby_paths/with_config/.rubocop.yml rename to test/test-files/hamllint/haml-lint-and-rubocop/.rubocop.yml diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/autoimport b/test/test-files/hamllint/haml-lint-and-rubocop/subdir/file.haml old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/autoimport rename to test/test-files/hamllint/haml-lint-and-rubocop/subdir/file.haml diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/autopep8 b/test/test-files/hamllint/haml-lint-yml/.haml-lint.yml old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/autopep8 rename to test/test-files/hamllint/haml-lint-yml/.haml-lint.yml diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/black b/test/test-files/hamllint/haml-lint-yml/subdir/file.haml old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/black rename to test/test-files/hamllint/haml-lint-yml/subdir/file.haml diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/flake8 b/test/test-files/hamllint/rubocop-yml/.rubocop.yml old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/flake8 rename to test/test-files/hamllint/rubocop-yml/.rubocop.yml diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/gitlint b/test/test-files/hamllint/rubocop-yml/subdir/file.haml old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/gitlint rename to test/test-files/hamllint/rubocop-yml/subdir/file.haml diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/isort b/test/test-files/hdl_server/foo.vhd old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/isort rename to test/test-files/hdl_server/foo.vhd diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/mypy b/test/test-files/hdl_server/with_config_file/.hdl_checker.config old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/mypy rename to test/test-files/hdl_server/with_config_file/.hdl_checker.config diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/pyflakes b/test/test-files/hdl_server/with_config_file/_hdl_checker.config old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/pyflakes rename to test/test-files/hdl_server/with_config_file/_hdl_checker.config diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/pylama b/test/test-files/hdl_server/with_config_file/foo.vhd old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/pylama rename to test/test-files/hdl_server/with_config_file/foo.vhd diff --git a/test/command_callback/hdl_server/with_git/files/foo.vhd b/test/test-files/hdl_server/with_git/files/foo.vhd similarity index 100% rename from test/command_callback/hdl_server/with_git/files/foo.vhd rename to test/test-files/hdl_server/with_git/files/foo.vhd diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/pylint b/test/test-files/html_beautify/html-beautify similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/pylint rename to test/test-files/html_beautify/html-beautify diff --git a/test/command_callback/tidy_paths/test.html b/test/test-files/html_beautify/test.html similarity index 100% rename from test/command_callback/tidy_paths/test.html rename to test/test-files/html_beautify/test.html diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/pyls b/test/test-files/htmlhint/node_modules/.bin/htmlhint similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/pyls rename to test/test-files/htmlhint/node_modules/.bin/htmlhint diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/pyre b/test/test-files/htmlhint/with_config/.htmlhintrc old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/pyre rename to test/test-files/htmlhint/with_config/.htmlhintrc diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/reorder-python-imports b/test/test-files/ink/story/main.ink old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/reorder-python-imports rename to test/test-files/ink/story/main.ink diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/vulture b/test/test-files/inko/test.inko old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/vulture rename to test/test-files/inko/test.inko diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/yamlfix b/test/test-files/inko/tests/test/test_foo.inko old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/yamlfix rename to test/test-files/inko/tests/test/test_foo.inko diff --git a/test/flow/a/sub/dummy b/test/test-files/java/no_main/src/test/java/com/something/dummy similarity index 100% rename from test/flow/a/sub/dummy rename to test/test-files/java/no_main/src/test/java/com/something/dummy diff --git a/test/flow/b/sub/dummy b/test/test-files/java/with_jaxb/src/main/java/com/something/dummy similarity index 100% rename from test/flow/b/sub/dummy rename to test/test-files/java/with_jaxb/src/main/java/com/something/dummy diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/yapf b/test/test-files/java/with_jaxb/src/main/jaxb/com/something/dummy old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/env/bin/yapf rename to test/test-files/java/with_jaxb/src/main/jaxb/com/something/dummy diff --git a/test/command_callback/python_paths/with_virtualenv/subdir/foo/COMMIT_EDITMSG b/test/test-files/java/with_main/build/gen/main/java/com/something/dummy similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/subdir/foo/COMMIT_EDITMSG rename to test/test-files/java/with_main/build/gen/main/java/com/something/dummy diff --git a/test/command_callback/python_paths/with_virtualenv/subdir/foo/__init__.py b/test/test-files/java/with_main/build/gen2/main/java/com/something/dummy similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/subdir/foo/__init__.py rename to test/test-files/java/with_main/build/gen2/main/java/com/something/dummy diff --git a/test/command_callback/python_paths/with_virtualenv/subdir/foo/bar.py b/test/test-files/java/with_main/src/main/java/com/something/dummy similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/subdir/foo/bar.py rename to test/test-files/java/with_main/src/main/java/com/something/dummy diff --git a/test/command_callback/python_paths/with_virtualenv/subdir/foo/bar.pyi b/test/test-files/java/with_main/src/test/java/com/something/dummy similarity index 100% rename from test/command_callback/python_paths/with_virtualenv/subdir/foo/bar.pyi rename to test/test-files/java/with_main/src/test/java/com/something/dummy diff --git a/test/command_callback/r_paths/.Rprofile b/test/test-files/javascript/test.js similarity index 100% rename from test/command_callback/r_paths/.Rprofile rename to test/test-files/javascript/test.js diff --git a/test/json_files/testfile.json b/test/test-files/json/testfile.json similarity index 100% rename from test/json_files/testfile.json rename to test/test-files/json/testfile.json diff --git a/test/command_callback/reason_ls_paths/bsconfig.json b/test/test-files/jsonlint/app-without-jsonlint/src/app.json similarity index 100% rename from test/command_callback/reason_ls_paths/bsconfig.json rename to test/test-files/jsonlint/app-without-jsonlint/src/app.json diff --git a/test/command_callback/remark_lint_paths/with_bin_path/node_modules/.bin/remark b/test/test-files/jsonlint/app/node_modules/.bin/jsonlint old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/remark_lint_paths/with_bin_path/node_modules/.bin/remark rename to test/test-files/jsonlint/app/node_modules/.bin/jsonlint diff --git a/test/command_callback/ruby_paths/dummy.rb b/test/test-files/jsonlint/app/src/app.json similarity index 100% rename from test/command_callback/ruby_paths/dummy.rb rename to test/test-files/jsonlint/app/src/app.json diff --git a/test/eslint-test-files/react-app/node_modules/xo/cli.js b/test/test-files/jsonlint/node_modules/jsonlint/lib/cli.js similarity index 100% rename from test/eslint-test-files/react-app/node_modules/xo/cli.js rename to test/test-files/jsonlint/node_modules/jsonlint/lib/cli.js diff --git a/test/command_callback/ruby_paths/with_config/.standard.yml b/test/test-files/julia/REQUIRE similarity index 100% rename from test/command_callback/ruby_paths/with_config/.standard.yml rename to test/test-files/julia/REQUIRE diff --git a/test/command_callback/rust-rls-project/Cargo.toml b/test/test-files/julia/test.jl similarity index 100% rename from test/command_callback/rust-rls-project/Cargo.toml rename to test/test-files/julia/test.jl diff --git a/test/command_callback/sasslint-test-files/with-bin/node_modules/.bin/sass-lint b/test/test-files/kotlin/testfile.kt old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/sasslint-test-files/with-bin/node_modules/.bin/sass-lint rename to test/test-files/kotlin/testfile.kt diff --git a/test/command_callback/sasslint-test-files/with-source/node_modules/sass-lint/bin/sass-lint.js b/test/test-files/lessc/node_modules/.bin/lessc similarity index 100% rename from test/command_callback/sasslint-test-files/with-source/node_modules/sass-lint/bin/sass-lint.js rename to test/test-files/lessc/node_modules/.bin/lessc diff --git a/test/fixers/long-line-project/setup.cfg b/test/test-files/long-line/setup.cfg similarity index 100% rename from test/fixers/long-line-project/setup.cfg rename to test/test-files/long-line/setup.cfg diff --git a/test/command_callback/scala_paths/dummy.scala b/test/test-files/lua/testfile.lua similarity index 100% rename from test/command_callback/scala_paths/dummy.scala rename to test/test-files/lua/testfile.lua diff --git a/test/command_callback/spectral_paths/node_modules/.bin/spectral b/test/test-files/markdown/testfile.md similarity index 100% rename from test/command_callback/spectral_paths/node_modules/.bin/spectral rename to test/test-files/markdown/testfile.md diff --git a/test/command_callback/spectral_paths/openapi.yaml b/test/test-files/maven/maven-java-project/module1/mvnw old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/spectral_paths/openapi.yaml rename to test/test-files/maven/maven-java-project/module1/mvnw diff --git a/test/command_callback/stack_build_paths/stack.yaml b/test/test-files/maven/maven-java-project/module1/mvnw.cmd old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/stack_build_paths/stack.yaml rename to test/test-files/maven/maven-java-project/module1/mvnw.cmd diff --git a/test/maven-test-files/maven-java-project/module1/pom.xml b/test/test-files/maven/maven-java-project/module1/pom.xml similarity index 100% rename from test/maven-test-files/maven-java-project/module1/pom.xml rename to test/test-files/maven/maven-java-project/module1/pom.xml diff --git a/test/command_callback/stack_ghc_paths/stack.yaml b/test/test-files/maven/maven-java-project/module1/src/main/java/dummy1.java similarity index 100% rename from test/command_callback/stack_ghc_paths/stack.yaml rename to test/test-files/maven/maven-java-project/module1/src/main/java/dummy1.java diff --git a/test/maven-test-files/maven-java-project/module2/pom.xml b/test/test-files/maven/maven-java-project/module2/pom.xml similarity index 100% rename from test/maven-test-files/maven-java-project/module2/pom.xml rename to test/test-files/maven/maven-java-project/module2/pom.xml diff --git a/test/command_callback/standard-test-files/with-bin/node_modules/.bin/standard b/test/test-files/maven/maven-java-project/module2/src/main/java/dummy2.java old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/standard-test-files/with-bin/node_modules/.bin/standard rename to test/test-files/maven/maven-java-project/module2/src/main/java/dummy2.java diff --git a/test/maven-test-files/maven-kotlin-project/pom.xml b/test/test-files/maven/maven-kotlin-project/pom.xml similarity index 100% rename from test/maven-test-files/maven-kotlin-project/pom.xml rename to test/test-files/maven/maven-kotlin-project/pom.xml diff --git a/test/maven-test-files/maven-kotlin-project/src/main/kotlin/dummy.kt b/test/test-files/maven/maven-kotlin-project/src/main/kotlin/dummy.kt similarity index 100% rename from test/maven-test-files/maven-kotlin-project/src/main/kotlin/dummy.kt rename to test/test-files/maven/maven-kotlin-project/src/main/kotlin/dummy.kt diff --git a/test/command_callback/stylelint_paths/node_modules/.bin/stylelint b/test/test-files/maven/mvn similarity index 100% rename from test/command_callback/stylelint_paths/node_modules/.bin/stylelint rename to test/test-files/maven/mvn diff --git a/test/command_callback/swaglint_paths/docs/swagger.yaml b/test/test-files/maven/non-maven-project/src/main/java/dummy.java similarity index 100% rename from test/command_callback/swaglint_paths/docs/swagger.yaml rename to test/test-files/maven/non-maven-project/src/main/java/dummy.java diff --git a/test/command_callback/swaglint_paths/node_modules/.bin/swaglint b/test/test-files/nim/with-git/src/source.nim similarity index 100% rename from test/command_callback/swaglint_paths/node_modules/.bin/swaglint rename to test/test-files/nim/with-git/src/source.nim diff --git a/test/command_callback/swift_paths/dummy.swift b/test/test-files/ocaml/testfile.ml similarity index 100% rename from test/command_callback/swift_paths/dummy.swift rename to test/test-files/ocaml/testfile.ml diff --git a/test/command_callback/tex_paths/sample1.tex b/test/test-files/ocamllsp/dune-project similarity index 100% rename from test/command_callback/tex_paths/sample1.tex rename to test/test-files/ocamllsp/dune-project diff --git a/test/command_callback/tex_paths/sample2.tex b/test/test-files/ols/.merlin similarity index 100% rename from test/command_callback/tex_paths/sample2.tex rename to test/test-files/ols/.merlin diff --git a/test/command_callback/textlint_paths/with_bin_path/node_modules/.bin/textlint b/test/test-files/ols/node_modules/.bin/ocaml-language-server old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/textlint_paths/with_bin_path/node_modules/.bin/textlint rename to test/test-files/ols/node_modules/.bin/ocaml-language-server diff --git a/test/command_callback/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js b/test/test-files/php/project-with-php-cs-fixer/test.php old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/textlint_paths/with_textlint_bin_path/node_modules/textlint/bin/textlint.js rename to test/test-files/php/project-with-php-cs-fixer/test.php diff --git a/test/command_callback/tidy_paths/.tidyrc b/test/test-files/php/project-with-php-cs-fixer/vendor/bin/php-cs-fixer similarity index 100% rename from test/command_callback/tidy_paths/.tidyrc rename to test/test-files/php/project-with-php-cs-fixer/vendor/bin/php-cs-fixer diff --git a/test/command_callback/tidy_paths/tidy b/test/test-files/php/project-with-phpcbf/foo/test.php old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/tidy_paths/tidy rename to test/test-files/php/project-with-phpcbf/foo/test.php diff --git a/test/command_callback/tidy_paths/tidy.exe b/test/test-files/php/project-with-phpcbf/vendor/bin/phpcbf old mode 100755 new mode 100644 similarity index 100% rename from test/command_callback/tidy_paths/tidy.exe rename to test/test-files/php/project-with-phpcbf/vendor/bin/phpcbf diff --git a/test/command_callback/tsserver_paths/src/file1.ts b/test/test-files/php/project-without-php-cs-fixer/test.php similarity index 100% rename from test/command_callback/tsserver_paths/src/file1.ts rename to test/test-files/php/project-without-php-cs-fixer/test.php diff --git a/test/command_callback/tsserver_paths/src/level-1/file2.ts b/test/test-files/php/project-without-phpcbf/foo/test.php similarity index 100% rename from test/command_callback/tsserver_paths/src/level-1/file2.ts rename to test/test-files/php/project-without-phpcbf/foo/test.php diff --git a/test/command_callback/tsserver_paths/src/level-1/level-2/file3.ts b/test/test-files/php/vendor/bin/php-language-server.php old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/tsserver_paths/src/level-1/level-2/file3.ts rename to test/test-files/php/vendor/bin/php-language-server.php diff --git a/test/command_callback/tsserver_paths/src/level-1/tsconfig.json b/test/test-files/php/with-composer/composer.json similarity index 100% rename from test/command_callback/tsserver_paths/src/level-1/tsconfig.json rename to test/test-files/php/with-composer/composer.json diff --git a/test/command_callback/tsserver_paths/tsconfig.json b/test/test-files/php/with-composer/vendor/bin/php-language-server.php old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/tsserver_paths/tsconfig.json rename to test/test-files/php/with-composer/vendor/bin/php-language-server.php diff --git a/test/command_callback/vim_fixtures/invalid_vim_project/test.vim b/test/test-files/php/with-git/vendor/bin/php-language-server.php old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/vim_fixtures/invalid_vim_project/test.vim rename to test/test-files/php/with-git/vendor/bin/php-language-server.php diff --git a/test/phpcs-test-files/project-with-phpcs/foo/test.php b/test/test-files/phpcs/project-with-phpcs/foo/test.php similarity index 100% rename from test/phpcs-test-files/project-with-phpcs/foo/test.php rename to test/test-files/phpcs/project-with-phpcs/foo/test.php diff --git a/test/phpcs-test-files/project-with-phpcs/vendor/bin/phpcs b/test/test-files/phpcs/project-with-phpcs/vendor/bin/phpcs similarity index 100% rename from test/phpcs-test-files/project-with-phpcs/vendor/bin/phpcs rename to test/test-files/phpcs/project-with-phpcs/vendor/bin/phpcs diff --git a/test/phpcs-test-files/project-without-phpcs/foo/test.php b/test/test-files/phpcs/project-without-phpcs/foo/test.php similarity index 100% rename from test/phpcs-test-files/project-without-phpcs/foo/test.php rename to test/test-files/phpcs/project-without-phpcs/foo/test.php diff --git a/test/prettier-test-files/testfile b/test/test-files/prettier/testfile similarity index 100% rename from test/prettier-test-files/testfile rename to test/test-files/prettier/testfile diff --git a/test/csslint-test-files/some-app/subdir/testfile.css b/test/test-files/prettier/testfile.css similarity index 100% rename from test/csslint-test-files/some-app/subdir/testfile.css rename to test/test-files/prettier/testfile.css diff --git a/test/eslint-test-files/other-app/subdir/testfile.js b/test/test-files/prettier/testfile.js similarity index 100% rename from test/eslint-test-files/other-app/subdir/testfile.js rename to test/test-files/prettier/testfile.js diff --git a/test/prettier-test-files/testfile.json b/test/test-files/prettier/testfile.json similarity index 100% rename from test/prettier-test-files/testfile.json rename to test/test-files/prettier/testfile.json diff --git a/test/prettier-test-files/testfile.scss b/test/test-files/prettier/testfile.scss similarity index 100% rename from test/prettier-test-files/testfile.scss rename to test/test-files/prettier/testfile.scss diff --git a/test/eslint-test-files/react-app/subdir/testfile.ts b/test/test-files/prettier/testfile.ts similarity index 100% rename from test/eslint-test-files/react-app/subdir/testfile.ts rename to test/test-files/prettier/testfile.ts diff --git a/test/prettier-test-files/with_config/.prettierrc b/test/test-files/prettier/with_config/.prettierrc similarity index 100% rename from test/prettier-test-files/with_config/.prettierrc rename to test/test-files/prettier/with_config/.prettierrc diff --git a/test/eslint-test-files/react-app/subdir/testfile.js b/test/test-files/prettier/with_config/testfile.js similarity index 100% rename from test/eslint-test-files/react-app/subdir/testfile.js rename to test/test-files/prettier/with_config/testfile.js diff --git a/test/prettier-test-files/with_prettierignore/.prettierignore b/test/test-files/prettier/with_prettierignore/.prettierignore similarity index 100% rename from test/prettier-test-files/with_prettierignore/.prettierignore rename to test/test-files/prettier/with_prettierignore/.prettierignore diff --git a/test/fixers/eslint-test-files/other-app/subdir/testfile.js b/test/test-files/prettier/with_prettierignore/src/testfile.js similarity index 100% rename from test/fixers/eslint-test-files/other-app/subdir/testfile.js rename to test/test-files/prettier/with_prettierignore/src/testfile.js diff --git a/test/command_callback/vim_fixtures/node_modules/.bin/vim-language-server b/test/test-files/psalm/vendor/bin/psalm old mode 100644 new mode 100755 similarity index 100% rename from test/command_callback/vim_fixtures/node_modules/.bin/vim-language-server rename to test/test-files/psalm/vendor/bin/psalm diff --git a/test/command_callback/vim_fixtures/path_with_autoload/autoload/test.vim b/test/test-files/puglint/node_modules/.bin/pug-lint similarity index 100% rename from test/command_callback/vim_fixtures/path_with_autoload/autoload/test.vim rename to test/test-files/puglint/node_modules/.bin/pug-lint diff --git a/test/ember-template-lint-test-files/package.json b/test/test-files/puglint/package.json similarity index 100% rename from test/ember-template-lint-test-files/package.json rename to test/test-files/puglint/package.json diff --git a/test/command_callback/vim_fixtures/path_with_autoload/test.vim b/test/test-files/puglint/puglint_rc_dir/.pug-lintrc similarity index 100% rename from test/command_callback/vim_fixtures/path_with_autoload/test.vim rename to test/test-files/puglint/puglint_rc_dir/.pug-lintrc diff --git a/test/command_callback/vim_fixtures/path_with_initvim/init.vim b/test/test-files/puglint/puglint_rc_js_dir/.pug-lintrc.js similarity index 100% rename from test/command_callback/vim_fixtures/path_with_initvim/init.vim rename to test/test-files/puglint/puglint_rc_js_dir/.pug-lintrc.js diff --git a/test/command_callback/vim_fixtures/path_with_plugin/plugin/test.vim b/test/test-files/puglint/puglint_rc_json_dir/.pug-lintrc.json similarity index 100% rename from test/command_callback/vim_fixtures/path_with_plugin/plugin/test.vim rename to test/test-files/puglint/puglint_rc_json_dir/.pug-lintrc.json diff --git a/test/command_callback/vim_fixtures/path_with_plugin/test.vim b/test/test-files/puppet/dummy.pp similarity index 100% rename from test/command_callback/vim_fixtures/path_with_plugin/test.vim rename to test/test-files/puppet/dummy.pp diff --git a/test/puppet-test-files/new-style-module/lib/puppet/types/exampletype.rb b/test/test-files/puppet/new-style-module/lib/puppet/types/exampletype.rb similarity index 100% rename from test/puppet-test-files/new-style-module/lib/puppet/types/exampletype.rb rename to test/test-files/puppet/new-style-module/lib/puppet/types/exampletype.rb diff --git a/test/puppet-test-files/new-style-module/metadata.json b/test/test-files/puppet/new-style-module/metadata.json similarity index 100% rename from test/puppet-test-files/new-style-module/metadata.json rename to test/test-files/puppet/new-style-module/metadata.json diff --git a/test/puppet-test-files/new-style-module/template/template.epp b/test/test-files/puppet/new-style-module/template/template.epp similarity index 100% rename from test/puppet-test-files/new-style-module/template/template.epp rename to test/test-files/puppet/new-style-module/template/template.epp diff --git a/test/puppet-test-files/old-style-module/manifests/init.pp b/test/test-files/puppet/old-style-module/manifests/init.pp similarity index 100% rename from test/puppet-test-files/old-style-module/manifests/init.pp rename to test/test-files/puppet/old-style-module/manifests/init.pp diff --git a/test/puppet-test-files/old-style-module/templates/template.epp b/test/test-files/puppet/old-style-module/templates/template.epp similarity index 100% rename from test/puppet-test-files/old-style-module/templates/template.epp rename to test/test-files/puppet/old-style-module/templates/template.epp diff --git a/test/command_callback/vim_fixtures/path_with_vimrc/.vimrc b/test/test-files/purescript/bower/Foo.purs similarity index 100% rename from test/command_callback/vim_fixtures/path_with_vimrc/.vimrc rename to test/test-files/purescript/bower/Foo.purs diff --git a/test/command_callback/write-good-node-modules-2/node_modules/write-good/bin/write-good.js b/test/test-files/purescript/bower/bower.json similarity index 100% rename from test/command_callback/write-good-node-modules-2/node_modules/write-good/bin/write-good.js rename to test/test-files/purescript/bower/bower.json diff --git a/test/command_callback/write-good-node-modules/node_modules/.bin/write-good b/test/test-files/purescript/psc-package/Foo.purs similarity index 100% rename from test/command_callback/write-good-node-modules/node_modules/.bin/write-good rename to test/test-files/purescript/psc-package/Foo.purs diff --git a/test/command_callback/zig-zls-project/build.zig b/test/test-files/purescript/psc-package/psc-package.json similarity index 100% rename from test/command_callback/zig-zls-project/build.zig rename to test/test-files/purescript/psc-package/psc-package.json diff --git a/test/csslint-test-files/some-app/.csslintrc b/test/test-files/purescript/spago/Foo.purs similarity index 100% rename from test/csslint-test-files/some-app/.csslintrc rename to test/test-files/purescript/spago/Foo.purs diff --git a/test/cucumber_fixtures/features/cuke.feature b/test/test-files/purescript/spago/spago.dhall similarity index 100% rename from test/cucumber_fixtures/features/cuke.feature rename to test/test-files/purescript/spago/spago.dhall diff --git a/test/command_callback/python_paths/namespace_package_manifest/MANIFEST.in b/test/test-files/python/namespace_package_manifest/MANIFEST.in similarity index 100% rename from test/command_callback/python_paths/namespace_package_manifest/MANIFEST.in rename to test/test-files/python/namespace_package_manifest/MANIFEST.in diff --git a/test/cucumber_fixtures/features/step_definitions/base_steps.rb b/test/test-files/python/namespace_package_manifest/namespace/foo/__init__.py similarity index 100% rename from test/cucumber_fixtures/features/step_definitions/base_steps.rb rename to test/test-files/python/namespace_package_manifest/namespace/foo/__init__.py diff --git a/test/d_files/test.d b/test/test-files/python/namespace_package_manifest/namespace/foo/bar.py similarity index 100% rename from test/d_files/test.d rename to test/test-files/python/namespace_package_manifest/namespace/foo/bar.py diff --git a/test/dart_files/testfile.dart b/test/test-files/python/namespace_package_pytest/namespace/foo/__init__.py similarity index 100% rename from test/dart_files/testfile.dart rename to test/test-files/python/namespace_package_pytest/namespace/foo/__init__.py diff --git a/test/elixir-test-files/testfile.ex b/test/test-files/python/namespace_package_pytest/namespace/foo/bar.py similarity index 100% rename from test/elixir-test-files/testfile.ex rename to test/test-files/python/namespace_package_pytest/namespace/foo/bar.py diff --git a/test/command_callback/python_paths/namespace_package_pytest/pytest.ini b/test/test-files/python/namespace_package_pytest/pytest.ini similarity index 100% rename from test/command_callback/python_paths/namespace_package_pytest/pytest.ini rename to test/test-files/python/namespace_package_pytest/pytest.ini diff --git a/test/elm-test-files/newapp-notests/elm.json b/test/test-files/python/namespace_package_setup/namespace/foo/__init__.py similarity index 100% rename from test/elm-test-files/newapp-notests/elm.json rename to test/test-files/python/namespace_package_setup/namespace/foo/__init__.py diff --git a/test/elm-test-files/newapp-notests/node_modules/.bin/elm b/test/test-files/python/namespace_package_setup/namespace/foo/bar.py similarity index 100% rename from test/elm-test-files/newapp-notests/node_modules/.bin/elm rename to test/test-files/python/namespace_package_setup/namespace/foo/bar.py diff --git a/test/command_callback/python_paths/namespace_package_setup/setup.cfg b/test/test-files/python/namespace_package_setup/setup.cfg similarity index 100% rename from test/command_callback/python_paths/namespace_package_setup/setup.cfg rename to test/test-files/python/namespace_package_setup/setup.cfg diff --git a/test/elm-test-files/newapp-notests/tests/TestMain.elm b/test/test-files/python/namespace_package_tox/namespace/foo/__init__.py similarity index 100% rename from test/elm-test-files/newapp-notests/tests/TestMain.elm rename to test/test-files/python/namespace_package_tox/namespace/foo/__init__.py diff --git a/test/elm-test-files/newapp/elm.json b/test/test-files/python/namespace_package_tox/namespace/foo/bar.py similarity index 100% rename from test/elm-test-files/newapp/elm.json rename to test/test-files/python/namespace_package_tox/namespace/foo/bar.py diff --git a/test/command_callback/python_paths/namespace_package_tox/tox.ini b/test/test-files/python/namespace_package_tox/tox.ini similarity index 100% rename from test/command_callback/python_paths/namespace_package_tox/tox.ini rename to test/test-files/python/namespace_package_tox/tox.ini diff --git a/test/elm-test-files/newapp/node_modules/.bin/elm b/test/test-files/python/no_virtualenv/subdir/foo/COMMIT_EDITMSG similarity index 100% rename from test/elm-test-files/newapp/node_modules/.bin/elm rename to test/test-files/python/no_virtualenv/subdir/foo/COMMIT_EDITMSG diff --git a/test/elm-test-files/newapp/node_modules/.bin/elm-test b/test/test-files/python/no_virtualenv/subdir/foo/__init__.py similarity index 100% rename from test/elm-test-files/newapp/node_modules/.bin/elm-test rename to test/test-files/python/no_virtualenv/subdir/foo/__init__.py diff --git a/test/elm-test-files/newapp/src/Main.elm b/test/test-files/python/no_virtualenv/subdir/foo/bar.py similarity index 100% rename from test/elm-test-files/newapp/src/Main.elm rename to test/test-files/python/no_virtualenv/subdir/foo/bar.py diff --git a/test/python_fixtures/pipenv/Pipfile.lock b/test/test-files/python/pipenv/Pipfile.lock similarity index 100% rename from test/python_fixtures/pipenv/Pipfile.lock rename to test/test-files/python/pipenv/Pipfile.lock diff --git a/test/python-test-files/python-package-project/.flake8 b/test/test-files/python/python-package-project/.flake8 similarity index 100% rename from test/python-test-files/python-package-project/.flake8 rename to test/test-files/python/python-package-project/.flake8 diff --git a/test/python-test-files/python-package-project/package-name/module.py b/test/test-files/python/python-package-project/package-name/module.py similarity index 100% rename from test/python-test-files/python-package-project/package-name/module.py rename to test/test-files/python/python-package-project/package-name/module.py diff --git a/test/elm-test-files/newapp/tests/TestSuite.elm b/test/test-files/python/with_bandit/.bandit similarity index 100% rename from test/elm-test-files/newapp/tests/TestSuite.elm rename to test/test-files/python/with_bandit/.bandit diff --git a/test/elm-test-files/node_modules/.bin/elm-format b/test/test-files/python/with_bandit/namespace/foo/__init__.py similarity index 100% rename from test/elm-test-files/node_modules/.bin/elm-format rename to test/test-files/python/with_bandit/namespace/foo/__init__.py diff --git a/test/elm-test-files/oldapp/elm-package.json b/test/test-files/python/with_bandit/namespace/foo/bar.py similarity index 100% rename from test/elm-test-files/oldapp/elm-package.json rename to test/test-files/python/with_bandit/namespace/foo/bar.py diff --git a/test/elm-test-files/oldapp/node_modules/.bin/elm b/test/test-files/python/with_mypy_ini_and_pytest_ini/mypy.ini similarity index 100% rename from test/elm-test-files/oldapp/node_modules/.bin/elm rename to test/test-files/python/with_mypy_ini_and_pytest_ini/mypy.ini diff --git a/test/elm-test-files/oldapp/node_modules/.bin/elm-test b/test/test-files/python/with_mypy_ini_and_pytest_ini/tests/pytest.ini similarity index 100% rename from test/elm-test-files/oldapp/node_modules/.bin/elm-test rename to test/test-files/python/with_mypy_ini_and_pytest_ini/tests/pytest.ini diff --git a/test/elm-test-files/oldapp/src/Main.elm b/test/test-files/python/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py similarity index 100% rename from test/elm-test-files/oldapp/src/Main.elm rename to test/test-files/python/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py diff --git a/test/elm-test-files/oldapp/tests/TestSuite.elm b/test/test-files/python/with_virtualenv/dir_with_yapf_config/.style.yapf similarity index 100% rename from test/elm-test-files/oldapp/tests/TestSuite.elm rename to test/test-files/python/with_virtualenv/dir_with_yapf_config/.style.yapf diff --git a/test/elm-test-files/src/subdir/testfile.elm b/test/test-files/python/with_virtualenv/env/Scripts/activate similarity index 100% rename from test/elm-test-files/src/subdir/testfile.elm rename to test/test-files/python/with_virtualenv/env/Scripts/activate diff --git a/test/ember-template-lint-test-files/app/template.hbs b/test/test-files/python/with_virtualenv/env/Scripts/autoimport.exe old mode 100644 new mode 100755 similarity index 100% rename from test/ember-template-lint-test-files/app/template.hbs rename to test/test-files/python/with_virtualenv/env/Scripts/autoimport.exe diff --git a/test/eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d b/test/test-files/python/with_virtualenv/env/Scripts/autopep8.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d rename to test/test-files/python/with_virtualenv/env/Scripts/autopep8.exe diff --git a/test/eslint-test-files/node_modules/.bin/eslint b/test/test-files/python/with_virtualenv/env/Scripts/black.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/node_modules/.bin/eslint rename to test/test-files/python/with_virtualenv/env/Scripts/black.exe diff --git a/test/eslint-test-files/package.json b/test/test-files/python/with_virtualenv/env/Scripts/flake8.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/package.json rename to test/test-files/python/with_virtualenv/env/Scripts/flake8.exe diff --git a/test/eslint-test-files/react-app/.eslintrc.js b/test/test-files/python/with_virtualenv/env/Scripts/gitlint.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/react-app/.eslintrc.js rename to test/test-files/python/with_virtualenv/env/Scripts/gitlint.exe diff --git a/test/eslint-test-files/react-app/node_modules/eslint/bin/eslint.js b/test/test-files/python/with_virtualenv/env/Scripts/isort.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/react-app/node_modules/eslint/bin/eslint.js rename to test/test-files/python/with_virtualenv/env/Scripts/isort.exe diff --git a/test/eslint-test-files/react-app/node_modules/standard/bin/cmd.js b/test/test-files/python/with_virtualenv/env/Scripts/mypy.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/react-app/node_modules/standard/bin/cmd.js rename to test/test-files/python/with_virtualenv/env/Scripts/mypy.exe diff --git a/test/eslint-test-files/react-app/node_modules/stylelint/bin/stylelint.js b/test/test-files/python/with_virtualenv/env/Scripts/pyflakes.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/react-app/node_modules/stylelint/bin/stylelint.js rename to test/test-files/python/with_virtualenv/env/Scripts/pyflakes.exe diff --git a/test/eslint-test-files/react-app/subdir-with-config/.eslintrc b/test/test-files/python/with_virtualenv/env/Scripts/pylama.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/react-app/subdir-with-config/.eslintrc rename to test/test-files/python/with_virtualenv/env/Scripts/pylama.exe diff --git a/test/eslint-test-files/react-app/subdir-with-package-json/node_modules/.gitkeep b/test/test-files/python/with_virtualenv/env/Scripts/pylint.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/react-app/subdir-with-package-json/node_modules/.gitkeep rename to test/test-files/python/with_virtualenv/env/Scripts/pylint.exe diff --git a/test/eslint-test-files/react-app/subdir-with-package-json/package.json b/test/test-files/python/with_virtualenv/env/Scripts/pyls.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/react-app/subdir-with-package-json/package.json rename to test/test-files/python/with_virtualenv/env/Scripts/pyls.exe diff --git a/test/eslint-test-files/react-app/subdir/testfile.css b/test/test-files/python/with_virtualenv/env/Scripts/pyre.exe old mode 100644 new mode 100755 similarity index 100% rename from test/eslint-test-files/react-app/subdir/testfile.css rename to test/test-files/python/with_virtualenv/env/Scripts/pyre.exe diff --git a/test/fish_files/testfile.fish b/test/test-files/python/with_virtualenv/env/Scripts/reorder-python-imports.exe old mode 100644 new mode 100755 similarity index 100% rename from test/fish_files/testfile.fish rename to test/test-files/python/with_virtualenv/env/Scripts/reorder-python-imports.exe diff --git a/test/fixers/eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d b/test/test-files/python/with_virtualenv/env/Scripts/vulture.exe old mode 100644 new mode 100755 similarity index 100% rename from test/fixers/eslint-test-files/app-with-eslint-d/node_modules/.bin/eslint_d rename to test/test-files/python/with_virtualenv/env/Scripts/vulture.exe diff --git a/test/fixers/eslint-test-files/node_modules/.bin/eslint b/test/test-files/python/with_virtualenv/env/Scripts/yamlfix.exe similarity index 100% rename from test/fixers/eslint-test-files/node_modules/.bin/eslint rename to test/test-files/python/with_virtualenv/env/Scripts/yamlfix.exe diff --git a/test/fixers/eslint-test-files/react-app/.eslintrc.js b/test/test-files/python/with_virtualenv/env/Scripts/yapf.exe old mode 100644 new mode 100755 similarity index 100% rename from test/fixers/eslint-test-files/react-app/.eslintrc.js rename to test/test-files/python/with_virtualenv/env/Scripts/yapf.exe diff --git a/test/fixers/eslint-test-files/react-app/node_modules/eslint/bin/eslint.js b/test/test-files/python/with_virtualenv/env/bin/activate similarity index 100% rename from test/fixers/eslint-test-files/react-app/node_modules/eslint/bin/eslint.js rename to test/test-files/python/with_virtualenv/env/bin/activate diff --git a/test/fixers/eslint-test-files/react-app/node_modules/standard/bin/cmd.js b/test/test-files/python/with_virtualenv/env/bin/autoimport old mode 100644 new mode 100755 similarity index 100% rename from test/fixers/eslint-test-files/react-app/node_modules/standard/bin/cmd.js rename to test/test-files/python/with_virtualenv/env/bin/autoimport diff --git a/test/fixers/eslint-test-files/react-app/node_modules/stylelint/bin/stylelint.js b/test/test-files/python/with_virtualenv/env/bin/autopep8 old mode 100644 new mode 100755 similarity index 100% rename from test/fixers/eslint-test-files/react-app/node_modules/stylelint/bin/stylelint.js rename to test/test-files/python/with_virtualenv/env/bin/autopep8 diff --git a/test/fixers/eslint-test-files/react-app/subdir/testfile.css b/test/test-files/python/with_virtualenv/env/bin/black old mode 100644 new mode 100755 similarity index 100% rename from test/fixers/eslint-test-files/react-app/subdir/testfile.css rename to test/test-files/python/with_virtualenv/env/bin/black diff --git a/test/fixers/eslint-test-files/react-app/subdir/testfile.js b/test/test-files/python/with_virtualenv/env/bin/flake8 old mode 100644 new mode 100755 similarity index 100% rename from test/fixers/eslint-test-files/react-app/subdir/testfile.js rename to test/test-files/python/with_virtualenv/env/bin/flake8 diff --git a/test/flow/a/.flowconfig b/test/test-files/python/with_virtualenv/env/bin/gitlint old mode 100644 new mode 100755 similarity index 100% rename from test/flow/a/.flowconfig rename to test/test-files/python/with_virtualenv/env/bin/gitlint diff --git a/test/go_files/testfile.go b/test/test-files/python/with_virtualenv/env/bin/isort old mode 100644 new mode 100755 similarity index 100% rename from test/go_files/testfile.go rename to test/test-files/python/with_virtualenv/env/bin/isort diff --git a/test/go_files/testfile2.go b/test/test-files/python/with_virtualenv/env/bin/mypy old mode 100644 new mode 100755 similarity index 100% rename from test/go_files/testfile2.go rename to test/test-files/python/with_virtualenv/env/bin/mypy diff --git a/test/gradle-test-files/build-gradle-project/build.gradle b/test/test-files/python/with_virtualenv/env/bin/pyflakes old mode 100644 new mode 100755 similarity index 100% rename from test/gradle-test-files/build-gradle-project/build.gradle rename to test/test-files/python/with_virtualenv/env/bin/pyflakes diff --git a/test/gradle-test-files/build-gradle-project/src/main/kotlin/dummy.kt b/test/test-files/python/with_virtualenv/env/bin/pylama old mode 100644 new mode 100755 similarity index 100% rename from test/gradle-test-files/build-gradle-project/src/main/kotlin/dummy.kt rename to test/test-files/python/with_virtualenv/env/bin/pylama diff --git a/test/gradle-test-files/gradle b/test/test-files/python/with_virtualenv/env/bin/pylint similarity index 100% rename from test/gradle-test-files/gradle rename to test/test-files/python/with_virtualenv/env/bin/pylint diff --git a/test/gradle-test-files/non-gradle-project/src/main/kotlin/dummy.kt b/test/test-files/python/with_virtualenv/env/bin/pyls old mode 100644 new mode 100755 similarity index 100% rename from test/gradle-test-files/non-gradle-project/src/main/kotlin/dummy.kt rename to test/test-files/python/with_virtualenv/env/bin/pyls diff --git a/test/gradle-test-files/settings-gradle-project/settings.gradle b/test/test-files/python/with_virtualenv/env/bin/pyre old mode 100644 new mode 100755 similarity index 100% rename from test/gradle-test-files/settings-gradle-project/settings.gradle rename to test/test-files/python/with_virtualenv/env/bin/pyre diff --git a/test/gradle-test-files/settings-gradle-project/src/main/kotlin/dummy.kt b/test/test-files/python/with_virtualenv/env/bin/reorder-python-imports old mode 100644 new mode 100755 similarity index 100% rename from test/gradle-test-files/settings-gradle-project/src/main/kotlin/dummy.kt rename to test/test-files/python/with_virtualenv/env/bin/reorder-python-imports diff --git a/test/gradle-test-files/unwrapped-project/build.gradle b/test/test-files/python/with_virtualenv/env/bin/vulture old mode 100644 new mode 100755 similarity index 100% rename from test/gradle-test-files/unwrapped-project/build.gradle rename to test/test-files/python/with_virtualenv/env/bin/vulture diff --git a/test/gradle-test-files/unwrapped-project/settings.gradle b/test/test-files/python/with_virtualenv/env/bin/yamlfix old mode 100644 new mode 100755 similarity index 100% rename from test/gradle-test-files/unwrapped-project/settings.gradle rename to test/test-files/python/with_virtualenv/env/bin/yamlfix diff --git a/test/gradle-test-files/unwrapped-project/src/main/kotlin/dummy.kt b/test/test-files/python/with_virtualenv/env/bin/yapf old mode 100644 new mode 100755 similarity index 100% rename from test/gradle-test-files/unwrapped-project/src/main/kotlin/dummy.kt rename to test/test-files/python/with_virtualenv/env/bin/yapf diff --git a/test/gradle-test-files/wrapped-project/build.gradle b/test/test-files/python/with_virtualenv/subdir/foo/COMMIT_EDITMSG similarity index 100% rename from test/gradle-test-files/wrapped-project/build.gradle rename to test/test-files/python/with_virtualenv/subdir/foo/COMMIT_EDITMSG diff --git a/test/gradle-test-files/wrapped-project/gradlew b/test/test-files/python/with_virtualenv/subdir/foo/__init__.py similarity index 100% rename from test/gradle-test-files/wrapped-project/gradlew rename to test/test-files/python/with_virtualenv/subdir/foo/__init__.py diff --git a/test/gradle-test-files/wrapped-project/settings.gradle b/test/test-files/python/with_virtualenv/subdir/foo/bar.py similarity index 100% rename from test/gradle-test-files/wrapped-project/settings.gradle rename to test/test-files/python/with_virtualenv/subdir/foo/bar.py diff --git a/test/gradle-test-files/wrapped-project/src/main/kotlin/dummy.kt b/test/test-files/python/with_virtualenv/subdir/foo/bar.pyi similarity index 100% rename from test/gradle-test-files/wrapped-project/src/main/kotlin/dummy.kt rename to test/test-files/python/with_virtualenv/subdir/foo/bar.pyi diff --git a/test/hamllint-test-files/haml-lint-and-rubocop/.haml-lint.yml b/test/test-files/r/.Rprofile similarity index 100% rename from test/hamllint-test-files/haml-lint-and-rubocop/.haml-lint.yml rename to test/test-files/r/.Rprofile diff --git a/test/hamllint-test-files/haml-lint-and-rubocop/.rubocop.yml b/test/test-files/reasonml/bsconfig.json similarity index 100% rename from test/hamllint-test-files/haml-lint-and-rubocop/.rubocop.yml rename to test/test-files/reasonml/bsconfig.json diff --git a/test/reasonml_files/testfile.re b/test/test-files/reasonml/testfile.re similarity index 100% rename from test/reasonml_files/testfile.re rename to test/test-files/reasonml/testfile.re diff --git a/test/hamllint-test-files/haml-lint-and-rubocop/subdir/file.haml b/test/test-files/remark_lint/with_bin_path/node_modules/.bin/remark old mode 100644 new mode 100755 similarity index 100% rename from test/hamllint-test-files/haml-lint-and-rubocop/subdir/file.haml rename to test/test-files/remark_lint/with_bin_path/node_modules/.bin/remark diff --git a/test/ruby_fixtures/valid_rails_app/app/dummy.rb b/test/test-files/ruby/dummy.rb similarity index 100% rename from test/ruby_fixtures/valid_rails_app/app/dummy.rb rename to test/test-files/ruby/dummy.rb diff --git a/test/ruby_fixtures/not_a_rails_app/file.rb b/test/test-files/ruby/not_a_rails_app/file.rb similarity index 100% rename from test/ruby_fixtures/not_a_rails_app/file.rb rename to test/test-files/ruby/not_a_rails_app/file.rb diff --git a/test/ruby_fixtures/valid_rails_app/config/dummy.rb b/test/test-files/ruby/valid_rails_app/app/dummy.rb similarity index 100% rename from test/ruby_fixtures/valid_rails_app/config/dummy.rb rename to test/test-files/ruby/valid_rails_app/app/dummy.rb diff --git a/test/ruby_fixtures/valid_rails_app/app/models/thing.rb b/test/test-files/ruby/valid_rails_app/app/models/thing.rb similarity index 100% rename from test/ruby_fixtures/valid_rails_app/app/models/thing.rb rename to test/test-files/ruby/valid_rails_app/app/models/thing.rb diff --git a/test/ruby_fixtures/valid_rails_app/app/views/my_great_view.html.erb b/test/test-files/ruby/valid_rails_app/app/views/my_great_view.html.erb similarity index 100% rename from test/ruby_fixtures/valid_rails_app/app/views/my_great_view.html.erb rename to test/test-files/ruby/valid_rails_app/app/views/my_great_view.html.erb diff --git a/test/ruby_fixtures/valid_rails_app/db/dummy.rb b/test/test-files/ruby/valid_rails_app/config/dummy.rb similarity index 100% rename from test/ruby_fixtures/valid_rails_app/db/dummy.rb rename to test/test-files/ruby/valid_rails_app/config/dummy.rb diff --git a/test/hamllint-test-files/haml-lint-yml/.haml-lint.yml b/test/test-files/ruby/valid_rails_app/db/dummy.rb similarity index 100% rename from test/hamllint-test-files/haml-lint-yml/.haml-lint.yml rename to test/test-files/ruby/valid_rails_app/db/dummy.rb diff --git a/test/ruby_fixtures/valid_ruby_app1/Rakefile b/test/test-files/ruby/valid_ruby_app1/Rakefile similarity index 100% rename from test/ruby_fixtures/valid_ruby_app1/Rakefile rename to test/test-files/ruby/valid_ruby_app1/Rakefile diff --git a/test/ruby_fixtures/valid_ruby_app1/lib/file.rb b/test/test-files/ruby/valid_ruby_app1/lib/file.rb similarity index 100% rename from test/ruby_fixtures/valid_ruby_app1/lib/file.rb rename to test/test-files/ruby/valid_ruby_app1/lib/file.rb diff --git a/test/ruby_fixtures/valid_ruby_app2/Gemfile b/test/test-files/ruby/valid_ruby_app2/Gemfile similarity index 100% rename from test/ruby_fixtures/valid_ruby_app2/Gemfile rename to test/test-files/ruby/valid_ruby_app2/Gemfile diff --git a/test/ruby_fixtures/valid_ruby_app2/lib/file.rb b/test/test-files/ruby/valid_ruby_app2/lib/file.rb similarity index 100% rename from test/ruby_fixtures/valid_ruby_app2/lib/file.rb rename to test/test-files/ruby/valid_ruby_app2/lib/file.rb diff --git a/test/ruby_fixtures/valid_ruby_app3/.solargraph.yml b/test/test-files/ruby/valid_ruby_app3/.solargraph.yml similarity index 100% rename from test/ruby_fixtures/valid_ruby_app3/.solargraph.yml rename to test/test-files/ruby/valid_ruby_app3/.solargraph.yml diff --git a/test/ruby_fixtures/valid_ruby_app3/lib/file.rb b/test/test-files/ruby/valid_ruby_app3/lib/file.rb similarity index 100% rename from test/ruby_fixtures/valid_ruby_app3/lib/file.rb rename to test/test-files/ruby/valid_ruby_app3/lib/file.rb diff --git a/test/hamllint-test-files/rubocop-yml/.rubocop.yml b/test/test-files/ruby/with_config/.rubocop.yml similarity index 100% rename from test/hamllint-test-files/rubocop-yml/.rubocop.yml rename to test/test-files/ruby/with_config/.rubocop.yml diff --git a/test/hamllint-test-files/haml-lint-yml/subdir/file.haml b/test/test-files/ruby/with_config/.standard.yml similarity index 100% rename from test/hamllint-test-files/haml-lint-yml/subdir/file.haml rename to test/test-files/ruby/with_config/.standard.yml diff --git a/test/hamllint-test-files/rubocop-yml/subdir/file.haml b/test/test-files/rust/Cargo.toml similarity index 100% rename from test/hamllint-test-files/rubocop-yml/subdir/file.haml rename to test/test-files/rust/Cargo.toml diff --git a/test/rust_files/testfile.rs b/test/test-files/rust/testfile.rs similarity index 100% rename from test/rust_files/testfile.rs rename to test/test-files/rust/testfile.rs diff --git a/test/javascript_files/test.js b/test/test-files/sasslint/with-bin/node_modules/.bin/sass-lint old mode 100644 new mode 100755 similarity index 100% rename from test/javascript_files/test.js rename to test/test-files/sasslint/with-bin/node_modules/.bin/sass-lint diff --git a/test/jsonlint-test-files/app-without-jsonlint/src/app.json b/test/test-files/sasslint/with-source/node_modules/sass-lint/bin/sass-lint.js old mode 100644 new mode 100755 similarity index 100% rename from test/jsonlint-test-files/app-without-jsonlint/src/app.json rename to test/test-files/sasslint/with-source/node_modules/sass-lint/bin/sass-lint.js diff --git a/test/jsonlint-test-files/app/node_modules/.bin/jsonlint b/test/test-files/scala/dummy.scala similarity index 100% rename from test/jsonlint-test-files/app/node_modules/.bin/jsonlint rename to test/test-files/scala/dummy.scala diff --git a/test/scala_fixtures/invalid_sbt_project/Main.scala b/test/test-files/scala/invalid_sbt_project/Main.scala similarity index 100% rename from test/scala_fixtures/invalid_sbt_project/Main.scala rename to test/test-files/scala/invalid_sbt_project/Main.scala diff --git a/test/scala_fixtures/valid_sbt_project/Main.scala b/test/test-files/scala/valid_sbt_project/Main.scala similarity index 100% rename from test/scala_fixtures/valid_sbt_project/Main.scala rename to test/test-files/scala/valid_sbt_project/Main.scala diff --git a/test/scala_fixtures/valid_sbt_project/build.sbt b/test/test-files/scala/valid_sbt_project/build.sbt similarity index 100% rename from test/scala_fixtures/valid_sbt_project/build.sbt rename to test/test-files/scala/valid_sbt_project/build.sbt diff --git a/test/slimlint-test-files/.rubocop.yml b/test/test-files/slimlint/.rubocop.yml similarity index 100% rename from test/slimlint-test-files/.rubocop.yml rename to test/test-files/slimlint/.rubocop.yml diff --git a/test/slimlint-test-files/subdir/file.slim b/test/test-files/slimlint/subdir/file.slim similarity index 100% rename from test/slimlint-test-files/subdir/file.slim rename to test/test-files/slimlint/subdir/file.slim diff --git a/test/smlnj/cm/foo.sml b/test/test-files/smlnj/cm/foo.sml similarity index 100% rename from test/smlnj/cm/foo.sml rename to test/test-files/smlnj/cm/foo.sml diff --git a/test/smlnj/cm/path/to/bar.sml b/test/test-files/smlnj/cm/path/to/bar.sml similarity index 100% rename from test/smlnj/cm/path/to/bar.sml rename to test/test-files/smlnj/cm/path/to/bar.sml diff --git a/test/smlnj/cm/sources.cm b/test/test-files/smlnj/cm/sources.cm similarity index 100% rename from test/smlnj/cm/sources.cm rename to test/test-files/smlnj/cm/sources.cm diff --git a/test/smlnj/file/qux.sml b/test/test-files/smlnj/file/qux.sml similarity index 100% rename from test/smlnj/file/qux.sml rename to test/test-files/smlnj/file/qux.sml diff --git a/test/jsonlint-test-files/app/src/app.json b/test/test-files/spectral/node_modules/.bin/spectral similarity index 100% rename from test/jsonlint-test-files/app/src/app.json rename to test/test-files/spectral/node_modules/.bin/spectral diff --git a/test/jsonlint-test-files/node_modules/jsonlint/lib/cli.js b/test/test-files/spectral/openapi.yaml similarity index 100% rename from test/jsonlint-test-files/node_modules/jsonlint/lib/cli.js rename to test/test-files/spectral/openapi.yaml diff --git a/test/kotlin_files/testfile.kt b/test/test-files/stack/stack.yaml similarity index 100% rename from test/kotlin_files/testfile.kt rename to test/test-files/stack/stack.yaml diff --git a/test/lua_files/testfile.lua b/test/test-files/standard/with-bin/node_modules/.bin/standard old mode 100644 new mode 100755 similarity index 100% rename from test/lua_files/testfile.lua rename to test/test-files/standard/with-bin/node_modules/.bin/standard diff --git a/test/markdown_files/testfile.md b/test/test-files/standard/with-cmd/node_modules/standard/bin/cmd.js old mode 100644 new mode 100755 similarity index 100% rename from test/markdown_files/testfile.md rename to test/test-files/standard/with-cmd/node_modules/standard/bin/cmd.js diff --git a/test/maven-test-files/maven-java-project/module1/mvnw b/test/test-files/stylelint/node_modules/.bin/stylelint similarity index 100% rename from test/maven-test-files/maven-java-project/module1/mvnw rename to test/test-files/stylelint/node_modules/.bin/stylelint diff --git a/test/maven-test-files/maven-java-project/module1/mvnw.cmd b/test/test-files/swaglint/docs/swagger.yaml old mode 100755 new mode 100644 similarity index 100% rename from test/maven-test-files/maven-java-project/module1/mvnw.cmd rename to test/test-files/swaglint/docs/swagger.yaml diff --git a/test/maven-test-files/maven-java-project/module1/src/main/java/dummy1.java b/test/test-files/swaglint/node_modules/.bin/swaglint similarity index 100% rename from test/maven-test-files/maven-java-project/module1/src/main/java/dummy1.java rename to test/test-files/swaglint/node_modules/.bin/swaglint diff --git a/test/swift-test-files/non-swift-package-project/src/folder/dummy.swift b/test/test-files/swift/dummy.swift similarity index 100% rename from test/swift-test-files/non-swift-package-project/src/folder/dummy.swift rename to test/test-files/swift/dummy.swift diff --git a/test/swift-test-files/swift-package-project/src/folder/dummy.swift b/test/test-files/swift/non-swift-package-project/src/folder/dummy.swift similarity index 100% rename from test/swift-test-files/swift-package-project/src/folder/dummy.swift rename to test/test-files/swift/non-swift-package-project/src/folder/dummy.swift diff --git a/test/swift-test-files/swift-package-project/Package.swift b/test/test-files/swift/swift-package-project/Package.swift similarity index 100% rename from test/swift-test-files/swift-package-project/Package.swift rename to test/test-files/swift/swift-package-project/Package.swift diff --git a/test/maven-test-files/maven-java-project/module2/src/main/java/dummy2.java b/test/test-files/swift/swift-package-project/src/folder/dummy.swift similarity index 100% rename from test/maven-test-files/maven-java-project/module2/src/main/java/dummy2.java rename to test/test-files/swift/swift-package-project/src/folder/dummy.swift diff --git a/test/swiftlint-test-files/cocoapods-and-react-native/Pods/SwiftLint/swiftlint b/test/test-files/swiftlint/cocoapods-and-react-native/Pods/SwiftLint/swiftlint similarity index 100% rename from test/swiftlint-test-files/cocoapods-and-react-native/Pods/SwiftLint/swiftlint rename to test/test-files/swiftlint/cocoapods-and-react-native/Pods/SwiftLint/swiftlint diff --git a/test/swiftlint-test-files/cocoapods-and-react-native/ios/Pods/SwiftLint/swiftlint b/test/test-files/swiftlint/cocoapods-and-react-native/ios/Pods/SwiftLint/swiftlint similarity index 100% rename from test/swiftlint-test-files/cocoapods-and-react-native/ios/Pods/SwiftLint/swiftlint rename to test/test-files/swiftlint/cocoapods-and-react-native/ios/Pods/SwiftLint/swiftlint diff --git a/test/swiftlint-test-files/cocoapods/Pods/SwiftLint/swiftlint b/test/test-files/swiftlint/cocoapods/Pods/SwiftLint/swiftlint similarity index 100% rename from test/swiftlint-test-files/cocoapods/Pods/SwiftLint/swiftlint rename to test/test-files/swiftlint/cocoapods/Pods/SwiftLint/swiftlint diff --git a/test/swiftlint-test-files/react-native/ios/Pods/SwiftLint/swiftlint b/test/test-files/swiftlint/react-native/ios/Pods/SwiftLint/swiftlint similarity index 100% rename from test/swiftlint-test-files/react-native/ios/Pods/SwiftLint/swiftlint rename to test/test-files/swiftlint/react-native/ios/Pods/SwiftLint/swiftlint diff --git a/test/terraform_files/main.tf b/test/test-files/terraform/main.tf similarity index 100% rename from test/terraform_files/main.tf rename to test/test-files/terraform/main.tf diff --git a/test/maven-test-files/mvn b/test/test-files/tex/sample1.tex old mode 100755 new mode 100644 similarity index 100% rename from test/maven-test-files/mvn rename to test/test-files/tex/sample1.tex diff --git a/test/maven-test-files/non-maven-project/src/main/java/dummy.java b/test/test-files/tex/sample2.tex similarity index 100% rename from test/maven-test-files/non-maven-project/src/main/java/dummy.java rename to test/test-files/tex/sample2.tex diff --git a/test/tex_files/testfile.tex b/test/test-files/tex/testfile.tex similarity index 100% rename from test/tex_files/testfile.tex rename to test/test-files/tex/testfile.tex diff --git a/test/nim-test-files/with-git/src/source.nim b/test/test-files/textlint/with_bin_path/node_modules/.bin/textlint old mode 100644 new mode 100755 similarity index 100% rename from test/nim-test-files/with-git/src/source.nim rename to test/test-files/textlint/with_bin_path/node_modules/.bin/textlint diff --git a/test/nix/test.nix b/test/test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js old mode 100644 new mode 100755 similarity index 100% rename from test/nix/test.nix rename to test/test-files/textlint/with_textlint_bin_path/node_modules/textlint/bin/textlint.js diff --git a/test/tflint-test-files/foo/.tflint.hcl b/test/test-files/tflint/foo/.tflint.hcl similarity index 100% rename from test/tflint-test-files/foo/.tflint.hcl rename to test/test-files/tflint/foo/.tflint.hcl diff --git a/test/tflint-test-files/foo/bar.tf b/test/test-files/tflint/foo/bar.tf similarity index 100% rename from test/tflint-test-files/foo/bar.tf rename to test/test-files/tflint/foo/bar.tf diff --git a/test/ocaml-test-files/testfile.ml b/test/test-files/tidy/.tidyrc similarity index 100% rename from test/ocaml-test-files/testfile.ml rename to test/test-files/tidy/.tidyrc diff --git a/test/prettier-test-files/testfile.css b/test/test-files/tidy/test.html similarity index 100% rename from test/prettier-test-files/testfile.css rename to test/test-files/tidy/test.html diff --git a/test/prettier-test-files/testfile.js b/test/test-files/tidy/tidy old mode 100644 new mode 100755 similarity index 100% rename from test/prettier-test-files/testfile.js rename to test/test-files/tidy/tidy diff --git a/test/prettier-test-files/testfile.ts b/test/test-files/tidy/tidy.exe old mode 100644 new mode 100755 similarity index 100% rename from test/prettier-test-files/testfile.ts rename to test/test-files/tidy/tidy.exe diff --git a/test/top/ale-special-directory-name-dont-use-this-please/empty-file b/test/test-files/top/ale-special-directory-name-dont-use-this-please/empty-file similarity index 100% rename from test/top/ale-special-directory-name-dont-use-this-please/empty-file rename to test/test-files/top/ale-special-directory-name-dont-use-this-please/empty-file diff --git a/test/top/example.ini b/test/test-files/top/example.ini similarity index 100% rename from test/top/example.ini rename to test/test-files/top/example.ini diff --git a/test/top/middle/bottom/dummy.txt b/test/test-files/top/middle/bottom/dummy.txt similarity index 100% rename from test/top/middle/bottom/dummy.txt rename to test/test-files/top/middle/bottom/dummy.txt diff --git a/test/prettier-test-files/with_config/testfile.js b/test/test-files/tsserver/src/file1.ts similarity index 100% rename from test/prettier-test-files/with_config/testfile.js rename to test/test-files/tsserver/src/file1.ts diff --git a/test/prettier-test-files/with_prettierignore/src/testfile.js b/test/test-files/tsserver/src/level-1/file2.ts similarity index 100% rename from test/prettier-test-files/with_prettierignore/src/testfile.js rename to test/test-files/tsserver/src/level-1/file2.ts diff --git a/test/test-projects/angular/node_modules/@angular/language-server/bin/ngserver b/test/test-files/tsserver/src/level-1/level-2/file3.ts similarity index 100% rename from test/test-projects/angular/node_modules/@angular/language-server/bin/ngserver rename to test/test-files/tsserver/src/level-1/level-2/file3.ts diff --git a/test/typescript/tsconfig.json b/test/test-files/tsserver/src/level-1/tsconfig.json similarity index 100% rename from test/typescript/tsconfig.json rename to test/test-files/tsserver/src/level-1/tsconfig.json diff --git a/test/test-projects/angular/node_modules/@angular/language-service/dummy b/test/test-files/tsserver/tsconfig.json similarity index 100% rename from test/test-projects/angular/node_modules/@angular/language-service/dummy rename to test/test-files/tsserver/tsconfig.json diff --git a/test/typescript/test.ts b/test/test-files/typescript/test.ts similarity index 100% rename from test/typescript/test.ts rename to test/test-files/typescript/test.ts diff --git a/test/test_c_projects/build_compile_commands_project/build/bad_folder_to_test_priority b/test/test-files/typescript/tsconfig.json similarity index 100% rename from test/test_c_projects/build_compile_commands_project/build/bad_folder_to_test_priority rename to test/test-files/typescript/tsconfig.json diff --git a/test/test_c_projects/build_compile_commands_project/build/compile_commands.json b/test/test-files/vim/invalid_vim_project/test.vim similarity index 100% rename from test/test_c_projects/build_compile_commands_project/build/compile_commands.json rename to test/test-files/vim/invalid_vim_project/test.vim diff --git a/test/test_c_projects/configure_project/Makefile b/test/test-files/vim/node_modules/.bin/vim-language-server similarity index 100% rename from test/test_c_projects/configure_project/Makefile rename to test/test-files/vim/node_modules/.bin/vim-language-server diff --git a/test/test_c_projects/configure_project/configure b/test/test-files/vim/path_with_autoload/autoload/test.vim similarity index 100% rename from test/test_c_projects/configure_project/configure rename to test/test-files/vim/path_with_autoload/autoload/test.vim diff --git a/test/test_c_projects/configure_project/include/test.h b/test/test-files/vim/path_with_autoload/test.vim similarity index 100% rename from test/test_c_projects/configure_project/include/test.h rename to test/test-files/vim/path_with_autoload/test.vim diff --git a/test/test_c_projects/configure_project/subdir/Makefile b/test/test-files/vim/path_with_initvim/init.vim similarity index 100% rename from test/test_c_projects/configure_project/subdir/Makefile rename to test/test-files/vim/path_with_initvim/init.vim diff --git a/test/test_c_projects/git_and_nested_makefiles/include/test.h b/test/test-files/vim/path_with_plugin/plugin/test.vim similarity index 100% rename from test/test_c_projects/git_and_nested_makefiles/include/test.h rename to test/test-files/vim/path_with_plugin/plugin/test.vim diff --git a/test/test_c_projects/git_and_nested_makefiles/src/Makefile b/test/test-files/vim/path_with_plugin/test.vim similarity index 100% rename from test/test_c_projects/git_and_nested_makefiles/src/Makefile rename to test/test-files/vim/path_with_plugin/test.vim diff --git a/test/test_c_projects/gnumakefile_project/GNUmakefile b/test/test-files/vim/path_with_vimrc/.vimrc similarity index 100% rename from test/test_c_projects/gnumakefile_project/GNUmakefile rename to test/test-files/vim/path_with_vimrc/.vimrc diff --git a/test/test_c_projects/gnumakefile_project/file.c b/test/test-files/write-good/node-modules-2/node_modules/write-good/bin/write-good.js similarity index 100% rename from test/test_c_projects/gnumakefile_project/file.c rename to test/test-files/write-good/node-modules-2/node_modules/write-good/bin/write-good.js diff --git a/test/test_c_projects/h_file_project/Makefile b/test/test-files/write-good/node-modules/node_modules/.bin/write-good similarity index 100% rename from test/test_c_projects/h_file_project/Makefile rename to test/test-files/write-good/node-modules/node_modules/.bin/write-good diff --git a/test/xo-test-files/monorepo/node_modules/xo/cli.js b/test/test-files/xo/monorepo/node_modules/xo/cli.js similarity index 100% rename from test/xo-test-files/monorepo/node_modules/xo/cli.js rename to test/test-files/xo/monorepo/node_modules/xo/cli.js diff --git a/test/xo-test-files/monorepo/package.json b/test/test-files/xo/monorepo/package.json similarity index 100% rename from test/xo-test-files/monorepo/package.json rename to test/test-files/xo/monorepo/package.json diff --git a/test/xo-test-files/monorepo/packages/a/index.js b/test/test-files/xo/monorepo/packages/a/index.js similarity index 100% rename from test/xo-test-files/monorepo/packages/a/index.js rename to test/test-files/xo/monorepo/packages/a/index.js diff --git a/test/xo-test-files/monorepo/packages/a/index.ts b/test/test-files/xo/monorepo/packages/a/index.ts similarity index 100% rename from test/xo-test-files/monorepo/packages/a/index.ts rename to test/test-files/xo/monorepo/packages/a/index.ts diff --git a/test/xo-test-files/monorepo/packages/a/package.json b/test/test-files/xo/monorepo/packages/a/package.json similarity index 100% rename from test/xo-test-files/monorepo/packages/a/package.json rename to test/test-files/xo/monorepo/packages/a/package.json diff --git a/test/test_c_projects/h_file_project/subdir/dummy b/test/test-files/zig/build.zig similarity index 100% rename from test/test_c_projects/h_file_project/subdir/dummy rename to test/test-files/zig/build.zig diff --git a/test/test_ant_build_classpath_command.vader b/test/test_ant_build_classpath_command.vader index 72a7688d..b97dc594 100644 --- a/test/test_ant_build_classpath_command.vader +++ b/test/test_ant_build_classpath_command.vader @@ -3,7 +3,7 @@ Before: runtime ale_linters/java/javac.vim Save $PATH - let $PATH = ale#path#Simplify(g:dir . '/ant-test-files/bin') + let $PATH = ale#path#Simplify(g:dir . '/test-files/ant/bin') After: Restore @@ -12,16 +12,16 @@ After: call ale#linter#Reset() Execute(Should return `cd '[dir]' && 'ant' classpath -S -q`): - call ale#test#SetFilename('ant-test-files/ant-project/Main.java') + call ale#test#SetFilename('test-files/ant/ant-project/Main.java') AssertEqual \ [ - \ ale#path#Simplify(g:dir . '/ant-test-files/ant-project'), + \ ale#path#Simplify(g:dir . '/test-files/ant/ant-project'), \ ale#Escape('ant') . ' classpath' . ' -S' . ' -q', \ ], \ ale#ant#BuildClasspathCommand(bufnr('')) Execute(Should return empty string if ant cannot be executed): - call ale#test#SetFilename('ant-test-files/not-an-ant-project/Main.java') + call ale#test#SetFilename('test-files/ant/not-an-ant-project/Main.java') AssertEqual ['', ''], ale#ant#BuildClasspathCommand(bufnr('')) diff --git a/test/test_ant_find_project_root.vader b/test/test_ant_find_project_root.vader index bde33f00..b0868ad7 100644 --- a/test/test_ant_find_project_root.vader +++ b/test/test_ant_find_project_root.vader @@ -7,28 +7,28 @@ After: call ale#linter#Reset() Execute(Should return current directory if called on the project root): - call ale#test#SetFilename('ant-test-files/ant-project/Main.java') + call ale#test#SetFilename('test-files/ant/ant-project/Main.java') AssertEqual - \ ale#path#Simplify(g:dir . '/ant-test-files/ant-project'), + \ ale#path#Simplify(g:dir . '/test-files/ant/ant-project'), \ ale#ant#FindProjectRoot(bufnr('')) Execute(Should return root directory if called on a deeply nested source file): - call ale#test#SetFilename('ant-test-files/ant-project/src/several/namespace/layers/A.java') + call ale#test#SetFilename('test-files/ant/ant-project/src/several/namespace/layers/A.java') AssertEqual - \ ale#path#Simplify(g:dir . '/ant-test-files/ant-project'), + \ ale#path#Simplify(g:dir . '/test-files/ant/ant-project'), \ ale#ant#FindProjectRoot(bufnr('')) Execute(Should return empty string if called on a non-ant project): - call ale#test#SetFilename('ant-test-files/non-ant-project/Main.java') + call ale#test#SetFilename('test-files/ant/non-ant-project/Main.java') AssertEqual \ '', \ ale#ant#FindProjectRoot(bufnr('')) Execute(Should return empty string if called on a file in a non-ant project): - call ale#test#SetFilename('ant-test-files/non-ant-project/several/namespace/layers/A.java') + call ale#test#SetFilename('test-files/ant/non-ant-project/several/namespace/layers/A.java') AssertEqual \ '', diff --git a/test/test_c_flag_parsing.vader b/test/test_c_flag_parsing.vader index 4329b573..4204d8ea 100644 --- a/test/test_c_flag_parsing.vader +++ b/test/test_c_flag_parsing.vader @@ -23,11 +23,11 @@ After: call ale#test#RestoreDirectory() Execute(The make command should be correct): - call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c') + call ale#test#SetFilename('test-files/c/makefile_project/subdir/file.c') AssertEqual \ [ - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 'make -n --always-make', \ ], \ ale#c#GetMakeCommand(bufnr('')) @@ -37,26 +37,26 @@ Execute(The make command should be correct): AssertEqual \ [ - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 'make -n', \ ], \ ale#c#GetMakeCommand(bufnr('')) Execute(Should recognize GNUmakefile as a makefile): - call ale#test#SetFilename('test_c_projects/gnumakefile_project/file.c') + call ale#test#SetFilename('test-files/c/gnumakefile_project/file.c') AssertEqual \ [ - \ ale#path#Simplify(g:dir. '/test_c_projects/gnumakefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/gnumakefile_project'), \ 'make -n --always-make', \ ], \ ale#c#GetMakeCommand(bufnr('')) Execute(The CFlags parser should be able to parse include directives): - call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c') + call ale#test#SetFilename('test-files/c/makefile_project/subdir/file.c') AssertEqual - \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')), + \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')), \ ale#c#ParseCFlagsFromMakeOutput(bufnr(''), ['gcc -Isubdir -c file.c']) AssertEqual @@ -64,43 +64,43 @@ Execute(The CFlags parser should be able to parse include directives): \ ale#c#ParseCFlagsFromMakeOutput(bufnr(''), ['gcc -isystem /usr/include/dir -c file.c']) Execute(ParseCFlags should ignore -c and -o): - call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c') + call ale#test#SetFilename('test-files/c/makefile_project/subdir/file.c') AssertEqual - \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')), + \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')), \ ale#c#ParseCFlagsFromMakeOutput(bufnr(''), ['gcc -Isubdir -c file.c -o a.out']) Execute(The CFlags parser should be able to parse macro directives): - call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c') + call ale#test#SetFilename('test-files/c/makefile_project/subdir/file.c') AssertEqual - \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) + \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) \ . ' -DTEST=1', \ ale#c#ParseCFlagsFromMakeOutput(bufnr(''), ['gcc -Isubdir -DTEST=1 -c file.c']) Execute(The CFlags parser should be able to parse macro directives with spaces): - call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c') + call ale#test#SetFilename('test-files/c/makefile_project/subdir/file.c') AssertEqual - \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) + \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) \ . ' -DTEST=$(( 2 * 4 ))', \ ale#c#ParseCFlagsFromMakeOutput(bufnr(''), ['gcc -Isubdir -DTEST=$(( 2 * 4 )) -c file.c']) Execute(The CFlags parser should be able to parse shell directives with spaces): - call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c') + call ale#test#SetFilename('test-files/c/makefile_project/subdir/file.c') AssertEqual - \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) + \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) \ . ' -DTEST=`date +%s`', \ ale#c#ParseCFlagsFromMakeOutput(bufnr(''), ['gcc -Isubdir -DTEST=`date +%s` -c file.c']) Execute(ParseCFlags should be able to parse flags with relative paths): AssertEqual - \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/kernel/include')) + \ '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/kernel/include')) \ . ' -DTEST=`date +%s`', \ SplitAndParse( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 'gcc -Isubdir ' \ . '-I'. ale#path#Simplify('kernel/include') \ . ' -DTEST=`date +%s` -c file.c' @@ -109,12 +109,12 @@ Execute(ParseCFlags should be able to parse flags with relative paths): Execute(We should handle paths with spaces in double quotes): AssertEqual \ '-Dgoal=9' - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/dir with spaces')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/kernel/include')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/dir with spaces')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/kernel/include')) \ . ' -DTEST=`date +%s`', \ SplitAndParse( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 'gcc -Dgoal=9 -Tlinkerfile.ld blabla -Isubdir ' \ . '-I"dir with spaces"' . ' -I'. ale#path#Simplify('kernel/include') \ . ' -DTEST=`date +%s` -c file.c' @@ -123,12 +123,12 @@ Execute(We should handle paths with spaces in double quotes): Execute(ParseCFlags should handle paths with spaces in single quotes): AssertEqual \ '-Dgoal=9' - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/dir with spaces')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/kernel/include')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/dir with spaces')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/kernel/include')) \ . ' -DTEST=`date +%s`', \ SplitAndParse( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 'gcc -Dgoal=9 -Tlinkerfile.ld blabla -Isubdir ' \ . '-I''dir with spaces''' . ' -I'. ale#path#Simplify('kernel/include') \ . ' -DTEST=`date +%s` -c file.c' @@ -137,13 +137,13 @@ Execute(ParseCFlags should handle paths with spaces in single quotes): Execute(ParseCFlags should handle paths with minuses): AssertEqual \ '-Dgoal=9' - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/dir with spaces')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/dir-with-dash')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/kernel/include')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/dir with spaces')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/dir-with-dash')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/kernel/include')) \ . ' -DTEST=`date +%s`', \ SplitAndParse( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 'gcc -Dgoal=9 -Tlinkerfile.ld blabla -Isubdir ' \ . '-I''dir with spaces''' . ' -Idir-with-dash' \ . ' -I'. ale#path#Simplify('kernel/include') @@ -153,14 +153,14 @@ Execute(ParseCFlags should handle paths with minuses): Execute(We should handle -D with minuses): AssertEqual \ '-Dgoal=9' - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) \ . ' -Dmacro-with-dash' - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/dir with spaces')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/dir-with-dash')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/kernel/include')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/dir with spaces')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/dir-with-dash')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/kernel/include')) \ . ' -DTEST=`date +%s`', \ SplitAndParse( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 'gcc -Dgoal=9 -Tlinkerfile.ld blabla -Isubdir ' \ . '-Dmacro-with-dash ' \ . '-I''dir with spaces''' . ' -Idir-with-dash' @@ -171,13 +171,13 @@ Execute(We should handle -D with minuses): Execute(We should handle flags at the end of the line): AssertEqual \ '-Dgoal=9' - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/subdir')) \ . ' -Dmacro-with-dash' - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/dir with spaces')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/dir-with-dash')) - \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/kernel/include')), + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/dir with spaces')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/dir-with-dash')) + \ . ' ' . '-I' . ' ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/kernel/include')), \ SplitAndParse( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 'gcc -Dgoal=9 -Tlinkerfile.ld blabla -Isubdir ' \ . '-Dmacro-with-dash ' \ . '-I''dir with spaces''' . ' -Idir-with-dash' @@ -489,14 +489,14 @@ Execute(ShellSplit should handle parenthesis and quotes): Execute(We should include several important flags): AssertEqual - \ '-I ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/inc')) - \ . ' -I ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/include')) - \ . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incquote')) - \ . ' -isystem ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incsystem')) - \ . ' -idirafter ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/incafter')) - \ . ' -iframework ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incframework')) - \ . ' -include ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/foo bar')) - \ . ' -imacros ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incmacros')) + \ '-I ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/inc')) + \ . ' -I ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/include')) + \ . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/incquote')) + \ . ' -isystem ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/incsystem')) + \ . ' -idirafter ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/incafter')) + \ . ' -iframework ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/incframework')) + \ . ' -include ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/foo bar')) + \ . ' -imacros ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/incmacros')) \ . ' -Dmacro="value"' \ . ' -DGoal=9' \ . ' -D macro2' @@ -509,7 +509,7 @@ Execute(We should include several important flags): \ . ' -foption -O2 -C -CC -trigraphs -nostdinc -nostdinc++' \ . ' -iplugindir=dir -march=native -w', \ ale#c#ParseCFlags( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 0, \ [ \ 'gcc', @@ -569,14 +569,14 @@ Execute(We should include several important flags): Execute(We should quote the flags we need to quote): AssertEqual - \ '-I ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/inc')) - \ . ' -I ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/include')) - \ . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incquote')) - \ . ' -isystem ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incsystem')) - \ . ' -idirafter ' . ale#Escape(ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/incafter')) - \ . ' -iframework ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incframework')) - \ . ' -include ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/foo bar')) - \ . ' -imacros ' . ale#Escape(ale#path#Simplify(g:dir . '/test_c_projects/makefile_project/incmacros')) + \ '-I ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/inc')) + \ . ' -I ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/include')) + \ . ' -iquote ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/incquote')) + \ . ' -isystem ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/incsystem')) + \ . ' -idirafter ' . ale#Escape(ale#path#Simplify(g:dir. '/test-files/c/makefile_project/incafter')) + \ . ' -iframework ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/incframework')) + \ . ' -include ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/foo bar')) + \ . ' -imacros ' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/c/makefile_project/incmacros')) \ . ' ' . ale#Escape('-Dmacro="value"') \ . ' -DGoal=9' \ . ' -D macro2' @@ -592,7 +592,7 @@ Execute(We should quote the flags we need to quote): \ . ' -foption -O2 -C -CC -trigraphs -nostdinc -nostdinc++' \ . ' -iplugindir=dir -march=native -w', \ ale#c#ParseCFlags( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 1, \ [ \ 'gcc', @@ -656,7 +656,7 @@ Execute(We should exclude other flags that cause problems): AssertEqual \ '', \ ale#c#ParseCFlags( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 0, \ [ \ 'gcc', @@ -678,7 +678,7 @@ Execute(We should expand @file in CFlags): AssertEqual \ '-DARGS1 -DARGS2 -O2', \ ale#c#ParseCFlags( - \ ale#path#Simplify(g:dir. '/test_c_projects/makefile_project'), + \ ale#path#Simplify(g:dir. '/test-files/c/makefile_project'), \ 0, \ [ \ 'gcc', diff --git a/test/test_c_projects/h_file_project/test.h b/test/test_c_projects/h_file_project/test.h deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/hpp_file_project/Makefile b/test/test_c_projects/hpp_file_project/Makefile deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/hpp_file_project/subdir/dummy b/test/test_c_projects/hpp_file_project/subdir/dummy deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/hpp_file_project/test.hpp b/test/test_c_projects/hpp_file_project/test.hpp deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/json_project/build/compile_commands.json b/test/test_c_projects/json_project/build/compile_commands.json deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/json_project/include/test.h b/test/test_c_projects/json_project/include/test.h deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/json_project/subdir/dummy b/test/test_c_projects/json_project/subdir/dummy deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/makefile_project/Makefile b/test/test_c_projects/makefile_project/Makefile deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/makefile_project/_astylerc b/test/test_c_projects/makefile_project/_astylerc deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/makefile_project/include/test.h b/test/test_c_projects/makefile_project/include/test.h deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/makefile_project/subdir/dummy b/test/test_c_projects/makefile_project/subdir/dummy deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_c_projects/makefile_project/subdir/file.c b/test/test_c_projects/makefile_project/subdir/file.c deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_cpp_project/.astylerc b/test/test_cpp_project/.astylerc deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_cpp_project/dummy.cpp b/test/test_cpp_project/dummy.cpp deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_csslint_config_detection.vader b/test/test_csslint_config_detection.vader index 47e80d09..c8e5fa98 100644 --- a/test/test_csslint_config_detection.vader +++ b/test/test_csslint_config_detection.vader @@ -8,18 +8,18 @@ After: call ale#linter#Reset() Execute(--config should be set when the .csslintrc file is found): - call ale#test#SetFilename('csslint-test-files/some-app/subdir/testfile.js') + call ale#test#SetFilename('test-files/csslint/some-app/subdir/testfile.js') AssertEqual \ ( \ 'csslint --format=compact ' - \ . '--config=' . ale#Escape(ale#path#Simplify(g:dir . '/csslint-test-files/some-app/.csslintrc')) + \ . '--config=' . ale#Escape(ale#path#Simplify(g:dir . '/test-files/csslint/some-app/.csslintrc')) \ . ' %t' \ ), \ ale_linters#css#csslint#GetCommand(bufnr('')) Execute(--config should not be used when no .csslintrc file exists): - call ale#test#SetFilename('csslint-test-files/other-app/testfile.css') + call ale#test#SetFilename('test-files/csslint/other-app/testfile.css') AssertEqual \ ( diff --git a/test/test_find_nearest_directory.vader b/test/test_find_nearest_directory.vader index 2529950f..740668da 100644 --- a/test/test_find_nearest_directory.vader +++ b/test/test_find_nearest_directory.vader @@ -5,10 +5,10 @@ After: call ale#test#RestoreDirectory() Execute(We should be able to find a directory some directory down): - call ale#test#SetFilename('top/middle/bottom/dummy.txt') + call ale#test#SetFilename('test-files/top/middle/bottom/dummy.txt') AssertEqual - \ ale#path#Simplify(expand('%:p:h:h:h:h') . '/top/ale-special-directory-name-dont-use-this-please/'), + \ ale#path#Simplify(expand('%:p:h:h:h:h:h') . '/test-files/top/ale-special-directory-name-dont-use-this-please/'), \ ale#path#FindNearestDirectory(bufnr('%'), 'ale-special-directory-name-dont-use-this-please') Execute(We shouldn't find anything for files which don't match): diff --git a/test/test_gradle_build_classpath_command.vader b/test/test_gradle_build_classpath_command.vader index e274797d..9557aa0d 100644 --- a/test/test_gradle_build_classpath_command.vader +++ b/test/test_gradle_build_classpath_command.vader @@ -22,30 +22,30 @@ After: call ale#linter#Reset() Execute(Should return 'gradlew' command if project includes gradle wapper): - call ale#test#SetFilename('gradle-test-files/wrapped-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/wrapped-project/src/main/kotlin/dummy.kt') AssertEqual \ [ - \ ale#path#Simplify(g:dir . '/gradle-test-files/wrapped-project'), - \ ale#Escape(ale#path#Simplify(g:dir . '/gradle-test-files/wrapped-project/gradlew')) + \ ale#path#Simplify(g:dir . '/test-files/gradle/wrapped-project'), + \ ale#Escape(ale#path#Simplify(g:dir . '/test-files/gradle/wrapped-project/gradlew')) \ . g:command_tail, \ ], \ ale#gradle#BuildClasspathCommand(bufnr('')) Execute(Should return 'gradle' command if project does not include gradle wapper): - call ale#test#SetFilename('gradle-test-files/unwrapped-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/unwrapped-project/src/main/kotlin/dummy.kt') let $PATH .= (has('win32') ? ';' : ':') - \ . ale#path#Simplify(g:dir . '/gradle-test-files') + \ . ale#path#Simplify(g:dir . '/test-files/gradle') AssertEqual \ [ - \ ale#path#Simplify(g:dir . '/gradle-test-files/unwrapped-project'), + \ ale#path#Simplify(g:dir . '/test-files/gradle/unwrapped-project'), \ ale#Escape('gradle') . g:command_tail \ ], \ ale#gradle#BuildClasspathCommand(bufnr('')) Execute(Should return empty string if gradle cannot be executed): - call ale#test#SetFilename('gradle-test-files/non-gradle-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/non-gradle-project/src/main/kotlin/dummy.kt') AssertEqual \ ['', ''], diff --git a/test/test_gradle_find_executable.vader b/test/test_gradle_find_executable.vader index 5daa4906..f874748c 100644 --- a/test/test_gradle_find_executable.vader +++ b/test/test_gradle_find_executable.vader @@ -15,22 +15,22 @@ After: call ale#linter#Reset() Execute(Should return 'gradlew' if found in parent directory): - call ale#test#SetFilename('gradle-test-files/wrapped-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/wrapped-project/src/main/kotlin/dummy.kt') AssertEqual - \ ale#path#Simplify(g:dir . '/gradle-test-files/wrapped-project/gradlew'), + \ ale#path#Simplify(g:dir . '/test-files/gradle/wrapped-project/gradlew'), \ ale#gradle#FindExecutable(bufnr('')) Execute(Should return 'gradle' if 'gradlew' not found in parent directory): - call ale#test#SetFilename('gradle-test-files/unwrapped-project/src/main/kotlin/dummy.kt') - let $PATH .= (has('win32') ? ';': ':') . ale#path#Simplify(g:dir . '/gradle-test-files') + call ale#test#SetFilename('test-files/gradle/unwrapped-project/src/main/kotlin/dummy.kt') + let $PATH .= (has('win32') ? ';': ':') . ale#path#Simplify(g:dir . '/test-files/gradle') AssertEqual \ 'gradle', \ ale#gradle#FindExecutable(bufnr('')) Execute(Should return empty string if 'gradlew' not in parent directory and gradle not in path): - call ale#test#SetFilename('gradle-test-files/unwrapped-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/unwrapped-project/src/main/kotlin/dummy.kt') AssertEqual \ '', diff --git a/test/test_gradle_find_project_root.vader b/test/test_gradle_find_project_root.vader index 8305bba5..b6159188 100644 --- a/test/test_gradle_find_project_root.vader +++ b/test/test_gradle_find_project_root.vader @@ -7,28 +7,28 @@ After: call ale#linter#Reset() Execute(Should return directory for 'gradlew' if found in parent directory): - call ale#test#SetFilename('gradle-test-files/wrapped-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/wrapped-project/src/main/kotlin/dummy.kt') AssertEqual - \ ale#path#Simplify(g:dir . '/gradle-test-files/wrapped-project'), + \ ale#path#Simplify(g:dir . '/test-files/gradle/wrapped-project'), \ ale#gradle#FindProjectRoot(bufnr('')) Execute(Should return directory for 'settings.gradle' if found in parent directory): - call ale#test#SetFilename('gradle-test-files/settings-gradle-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/settings-gradle-project/src/main/kotlin/dummy.kt') AssertEqual - \ ale#path#Simplify(g:dir . '/gradle-test-files/settings-gradle-project'), + \ ale#path#Simplify(g:dir . '/test-files/gradle/settings-gradle-project'), \ ale#gradle#FindProjectRoot(bufnr('')) Execute(Should return directory for 'build.gradle' if found in parent directory): - call ale#test#SetFilename('gradle-test-files/build-gradle-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/build-gradle-project/src/main/kotlin/dummy.kt') AssertEqual - \ ale#path#Simplify(g:dir . '/gradle-test-files/build-gradle-project'), + \ ale#path#Simplify(g:dir . '/test-files/gradle/build-gradle-project'), \ ale#gradle#FindProjectRoot(bufnr('')) Execute(Should return empty string if gradle files are not found in parent directory): - call ale#test#SetFilename('gradle-test-files/non-gradle-project/src/main/kotlin/dummy.kt') + call ale#test#SetFilename('test-files/gradle/non-gradle-project/src/main/kotlin/dummy.kt') AssertEqual \ '', diff --git a/test/test_hdl_checker_options.vader b/test/test_hdl_checker_options.vader index f93e3c1a..6e7eef46 100644 --- a/test/test_hdl_checker_options.vader +++ b/test/test_hdl_checker_options.vader @@ -50,20 +50,20 @@ Execute(Customize executable): \ ale#handlers#hdl_checker#GetCommand(bufnr('')) Execute(Get project root based on .git): - call ale#test#SetFilename('hdl_server/with_git/files/foo.vhd') + call ale#test#SetFilename('../test-files/hdl_server/with_git/files/foo.vhd') " Create .git file - silent! call mkdir(g:dir . '/hdl_server/with_git/.git') - AssertNotEqual '', glob(g:dir . '/hdl_server/with_git/.git') + silent! call mkdir(g:dir . '/../test-files/hdl_server/with_git/.git') + AssertNotEqual '', glob(g:dir . '/../test-files/hdl_server/with_git/.git') AssertEqual - \ ale#path#Simplify(g:dir . '/hdl_server/with_git'), + \ ale#path#Simplify(g:dir . '/../test-files/hdl_server/with_git'), \ ale#handlers#hdl_checker#GetProjectRoot(bufnr('')) Execute(Get project root based on config file): - call ale#test#SetFilename('hdl_server/with_config_file/foo.vhd') + call ale#test#SetFilename('../test-files/hdl_server/with_config_file/foo.vhd') AssertEqual - \ ale#path#Simplify(g:dir . '/hdl_server/with_config_file'), + \ ale#path#Simplify(g:dir . '/../test-files/hdl_server/with_config_file'), \ ale#handlers#hdl_checker#GetProjectRoot(bufnr('')) Execute(Return no project root if neither .git or config file are found): @@ -75,7 +75,7 @@ Execute(Return no project root if neither .git or config file are found): return 0 endfunction - call ale#test#SetFilename('hdl_server/foo.vhd') + call ale#test#SetFilename('../test-files/hdl_server/foo.vhd') AssertEqual \ '', diff --git a/test/test_jsonlint_executable_detection.vader b/test/test_jsonlint_executable_detection.vader index de52f846..60bc6d75 100644 --- a/test/test_jsonlint_executable_detection.vader +++ b/test/test_jsonlint_executable_detection.vader @@ -11,23 +11,23 @@ After: call ale#linter#Reset() Execute(local executable should be detected correctly): - call ale#test#SetFilename('jsonlint-test-files/app/src/app.json') + call ale#test#SetFilename('test-files/jsonlint/app/src/app.json') AssertEqual - \ ale#path#Simplify(g:dir . '/jsonlint-test-files/app/node_modules/.bin/jsonlint'), + \ ale#path#Simplify(g:dir . '/test-files/jsonlint/app/node_modules/.bin/jsonlint'), \ ale_linters#json#jsonlint#GetExecutable(bufnr('')) Execute(recursively executable should be detected correctly): - call ale#test#SetFilename('jsonlint-test-files/app-without-jsonlint/src/app.json') + call ale#test#SetFilename('test-files/jsonlint/app-without-jsonlint/src/app.json') AssertEqual - \ ale#path#Simplify(g:dir . '/jsonlint-test-files/node_modules/jsonlint/lib/cli.js'), + \ ale#path#Simplify(g:dir . '/test-files/jsonlint/node_modules/jsonlint/lib/cli.js'), \ ale_linters#json#jsonlint#GetExecutable(bufnr('')) Execute(use_global should override project executable): let g:ale_json_jsonlint_use_global = 1 - call ale#test#SetFilename('jsonlint-test-files/app/src/app.json') + call ale#test#SetFilename('test-files/jsonlint/app/src/app.json') AssertEqual \ 'jsonlint', @@ -37,7 +37,7 @@ Execute(manually defined should override default executable): let g:ale_json_jsonlint_use_global = 1 let g:ale_json_jsonlint_executable = 'custom_jsonlint' - call ale#test#SetFilename('jsonlint-test-files/app/src/app.json') + call ale#test#SetFilename('test-files/jsonlint/app/src/app.json') AssertEqual \ 'custom_jsonlint', diff --git a/test/test_kotlin_languageserver_path_detection.vader b/test/test_kotlin_languageserver_path_detection.vader deleted file mode 100644 index 36e6368e..00000000 --- a/test/test_kotlin_languageserver_path_detection.vader +++ /dev/null @@ -1,25 +0,0 @@ -Before: - call ale#test#SetDirectory('/testplugin/test') - runtime ale_linters/kotlin/languageserver.vim - -After: - call ale#test#RestoreDirectory() - call ale#linter#Reset() - -Execute(Detect root of gradle project with build.gradle correctly): - call ale#test#SetFilename('gradle-test-files/build-gradle-project/src/main/kotlin/dummy.kt') - AssertEqual - \ ale#path#Simplify(g:dir . '/gradle-test-files/build-gradle-project'), - \ ale_linters#kotlin#languageserver#GetProjectRoot(bufnr('')) - -Execute(Detect root of maven project with pom.xml correctly): - call ale#test#SetFilename('maven-test-files/maven-kotlin-project/src/main/kotlin/dummy.kt') - AssertEqual - \ ale#path#Simplify(g:dir . '/maven-test-files/maven-kotlin-project'), - \ ale_linters#kotlin#languageserver#GetProjectRoot(bufnr('')) - -Execute(Detect no root in case of non maven/gradle project): - call ale#test#SetFilename('gradle-test-files/non-gradle-project/src/main/kotlin/dummy.kt') - AssertEqual - \ '', - \ ale_linters#kotlin#languageserver#GetProjectRoot(bufnr('')) diff --git a/test/test_maven_build_classpath_command.vader b/test/test_maven_build_classpath_command.vader index 633bb2a1..c10f457b 100644 --- a/test/test_maven_build_classpath_command.vader +++ b/test/test_maven_build_classpath_command.vader @@ -22,31 +22,31 @@ After: call ale#linter#Reset() Execute(Should use 'mvnw' in classpath command if available): - call ale#test#SetFilename('maven-test-files/maven-java-project/module1/src/main/java/dummy1.java') + call ale#test#SetFilename('test-files/maven/maven-java-project/module1/src/main/java/dummy1.java') AssertEqual \ [ - \ ale#path#Simplify(g:dir . '/maven-test-files/maven-java-project/module1'), - \ ale#Escape(ale#path#Simplify(g:dir . '/maven-test-files/maven-java-project/module1/' . g:expected_wrapper)) + \ ale#path#Simplify(g:dir . '/test-files/maven/maven-java-project/module1'), + \ ale#Escape(ale#path#Simplify(g:dir . '/test-files/maven/maven-java-project/module1/' . g:expected_wrapper)) \ . ' dependency:build-classpath', \ ], \ ale#maven#BuildClasspathCommand(bufnr('')) Execute(Should use 'mvn' in classpath command if it is executable and 'mvnw' is unavailable): - call ale#test#SetFilename('maven-test-files/maven-java-project/module2/src/main/java/dummy2.java') + call ale#test#SetFilename('test-files/maven/maven-java-project/module2/src/main/java/dummy2.java') let $PATH .= (has('win32') ? ';' : ':') - \ . ale#path#Simplify(g:dir . '/maven-test-files') + \ . ale#path#Simplify(g:dir . '/test-files/maven') AssertEqual \ [ - \ ale#path#Simplify(g:dir . '/maven-test-files/maven-java-project/module2'), + \ ale#path#Simplify(g:dir . '/test-files/maven/maven-java-project/module2'), \ ale#Escape('mvn') \ . ' dependency:build-classpath', \ ], \ ale#maven#BuildClasspathCommand(bufnr('')) Execute(Should return empty string if maven cannot be executed): - call ale#test#SetFilename('maven-test-files/non-maven-project/src/main/java/dummy.java') + call ale#test#SetFilename('test-files/maven/non-maven-project/src/main/java/dummy.java') AssertEqual \ ['', ''], diff --git a/test/test_maven_find_executable.vader b/test/test_maven_find_executable.vader index 1d2f6da2..f0f06b12 100644 --- a/test/test_maven_find_executable.vader +++ b/test/test_maven_find_executable.vader @@ -23,16 +23,16 @@ After: call ale#linter#Reset() Execute(Should return 'mvnw' if found in parent directory): - call ale#test#SetFilename('maven-test-files/maven-java-project/module1/src/main/java/dummy1.java') + call ale#test#SetFilename('test-files/maven/maven-java-project/module1/src/main/java/dummy1.java') AssertEqual - \ ale#path#Simplify(g:dir . '/maven-test-files/maven-java-project/module1/' . g:expected_wrapper), + \ ale#path#Simplify(g:dir . '/test-files/maven/maven-java-project/module1/' . g:expected_wrapper), \ ale#maven#FindExecutable(bufnr('')) Execute(Should return 'mvn' if 'mvnw' not found in parent directory): - call ale#test#SetFilename('maven-test-files/maven-java-project/module2/src/main/java/dummy2.java') + call ale#test#SetFilename('test-files/maven/maven-java-project/module2/src/main/java/dummy2.java') let $PATH .= (has('win32') ? ';' : ':') - \ . ale#path#Simplify(g:dir . '/maven-test-files') + \ . ale#path#Simplify(g:dir . '/test-files/maven') AssertEqual \ 'mvn', diff --git a/test/test_maven_find_project_root.vader b/test/test_maven_find_project_root.vader index 3a2138d1..f761b2ef 100644 --- a/test/test_maven_find_project_root.vader +++ b/test/test_maven_find_project_root.vader @@ -7,21 +7,21 @@ After: call ale#linter#Reset() Execute(Should return directory for 'mvnw' if found in parent directory): - call ale#test#SetFilename('maven-test-files/maven-java-project/module1/src/main/java/dummy1.java') + call ale#test#SetFilename('test-files/maven/maven-java-project/module1/src/main/java/dummy1.java') AssertEqual - \ ale#path#Simplify(g:dir . '/maven-test-files/maven-java-project/module1'), + \ ale#path#Simplify(g:dir . '/test-files/maven/maven-java-project/module1'), \ ale#maven#FindProjectRoot(bufnr('')) Execute(Should return directory for 'pom.xml' if found in parent directory): - call ale#test#SetFilename('maven-test-files/maven-java-project/module2/src/main/java/dummy2.java') + call ale#test#SetFilename('test-files/maven/maven-java-project/module2/src/main/java/dummy2.java') AssertEqual - \ ale#path#Simplify(g:dir . '/maven-test-files/maven-java-project/module2'), + \ ale#path#Simplify(g:dir . '/test-files/maven/maven-java-project/module2'), \ ale#maven#FindProjectRoot(bufnr('')) Execute(Should return empty string if maven files are not found in parent directory): - call ale#test#SetFilename('maven-test-files/non-maven-project/src/main/java/dummy.java') + call ale#test#SetFilename('test-files/maven/non-maven-project/src/main/java/dummy.java') AssertEqual \ '', diff --git a/test/test_nearest_file_search.vader b/test/test_nearest_file_search.vader index 10d2cb36..f5c12de4 100644 --- a/test/test_nearest_file_search.vader +++ b/test/test_nearest_file_search.vader @@ -5,10 +5,10 @@ After: call ale#test#RestoreDirectory() Execute(We should be able to find a configuration file further up): - call ale#test#SetFilename('top/middle/bottom/dummy.txt') + call ale#test#SetFilename('test-files/top/middle/bottom/dummy.txt') AssertEqual - \ ale#path#Simplify(expand('%:p:h:h:h:h') . '/top/example.ini'), + \ ale#path#Simplify(expand('%:p:h:h:h:h:h') . '/test-files/top/example.ini'), \ ale#path#FindNearestFile(bufnr('%'), 'example.ini') Execute(We shouldn't find anything for files which don't match): diff --git a/test/test_nimlsp_project_root.vader b/test/test_nimlsp_project_root.vader index e7027575..d10989b3 100644 --- a/test/test_nimlsp_project_root.vader +++ b/test/test_nimlsp_project_root.vader @@ -12,7 +12,7 @@ After: Execute(Detect root of nim project with .git/ correctly): - call ale#test#SetFilename('nim-test-files/with-git/src/source.nim') + call ale#test#SetFilename('test-files/nim/with-git/src/source.nim') call mkdir(g:dir . '/.git') AssertEqual \ ale#path#Simplify(g:dir), diff --git a/test/test_puppet_path_detection.vader b/test/test_puppet_path_detection.vader index f8d3a0fa..e918e916 100644 --- a/test/test_puppet_path_detection.vader +++ b/test/test_puppet_path_detection.vader @@ -8,15 +8,15 @@ After: call ale#linter#Reset() Execute(old-style module should find its root correctly): - call ale#test#SetFilename('puppet-test-files/old-style-module/manifests/init.pp') + call ale#test#SetFilename('test-files/puppet/old-style-module/manifests/init.pp') AssertEqual - \ ale#path#Simplify(g:dir . '/puppet-test-files/old-style-module'), + \ ale#path#Simplify(g:dir . '/test-files/puppet/old-style-module'), \ ale_linters#puppet#languageserver#GetProjectRoot(bufnr('')) Execute(new-style module should find its root correctly): - call ale#test#SetFilename('puppet-test-files/new-style-module/lib/puppet/types/exampletype.rb') + call ale#test#SetFilename('test-files/puppet/new-style-module/lib/puppet/types/exampletype.rb') AssertEqual - \ ale#path#Simplify(g:dir . '/puppet-test-files/new-style-module'), + \ ale#path#Simplify(g:dir . '/test-files/puppet/new-style-module'), \ ale_linters#puppet#languageserver#GetProjectRoot(bufnr('')) diff --git a/test/test_python_find_project_root.vader b/test/test_python_find_project_root.vader index 176e819a..e323c866 100644 --- a/test/test_python_find_project_root.vader +++ b/test/test_python_find_project_root.vader @@ -5,7 +5,7 @@ After: call ale#test#RestoreDirectory() Execute(Detect root of Python project with .flake8 correctly): - call ale#test#SetFilename('python-test-files/python-package-project/package-name/module.py') + call ale#test#SetFilename('test-files/python/python-package-project/package-name/module.py') AssertEqual - \ ale#path#Simplify(g:dir . '/python-test-files/python-package-project'), + \ ale#path#Simplify(g:dir . '/test-files/python/python-package-project'), \ ale#python#FindProjectRoot(bufnr('')) diff --git a/test/test_python_pipenv.vader b/test/test_python_pipenv.vader index 91d957f8..8b1e9ab0 100644 --- a/test/test_python_pipenv.vader +++ b/test/test_python_pipenv.vader @@ -1,12 +1,18 @@ +Before: + call ale#test#SetDirectory('/testplugin/test') + +After: + call ale#test#RestoreDirectory() + Execute(ale#python#PipenvPresent is true when a pipenv environment is present): - call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py') + call ale#test#SetFilename('test-files/python/pipenv/whatever.py') AssertEqual \ ale#python#PipenvPresent(bufnr('%')), \ 1 Execute(ale#python#PipenvPresent is false true when no pipenv environment is present): - call ale#test#SetFilename('/testplugin/test/python_fixtures/no_pipenv/whatever.py') + call ale#test#SetFilename('test-files/python/no_pipenv/whatever.py') AssertEqual \ ale#python#PipenvPresent(bufnr('%')), diff --git a/test/test_resolve_local_path.vader b/test/test_resolve_local_path.vader index 3f0fb20a..d8a8ec52 100644 --- a/test/test_resolve_local_path.vader +++ b/test/test_resolve_local_path.vader @@ -5,10 +5,10 @@ After: call ale#test#RestoreDirectory() Execute(We should be able to find the local version of a file): - call ale#test#SetFilename('top/middle/bottom/dummy.txt') + call ale#test#SetFilename('test-files/top/middle/bottom/dummy.txt') AssertEqual - \ ale#path#Simplify(expand('%:p:h:h:h:h') . '/top/example.ini'), + \ ale#path#Simplify(expand('%:p:h:h:h:h:h') . '/test-files/top/example.ini'), \ ale#path#ResolveLocalPath(bufnr('%'), 'example.ini', '/global/config.ini') Execute(We shouldn't find anything for files which don't match): diff --git a/test/test_sml_command.vader b/test/test_sml_command.vader index d26f650f..e89486c4 100644 --- a/test/test_sml_command.vader +++ b/test/test_sml_command.vader @@ -6,40 +6,40 @@ After: call ale#linter#Reset() Execute(smlnj finds CM file if it exists): - call ale#test#SetFilename('smlnj/cm/foo.sml') + call ale#test#SetFilename('test-files/smlnj/cm/foo.sml') AssertEqual - \ ale#path#Simplify(g:dir . '/smlnj/cm/sources.cm'), + \ ale#test#GetFilename('test-files/smlnj/cm/sources.cm'), \ ale#handlers#sml#GetCmFile(bufnr('%')) Execute(smlnj finds CM file by searching upwards): - call ale#test#SetFilename('smlnj/cm/path/to/bar.sml') + call ale#test#SetFilename('test-files/smlnj/cm/path/to/bar.sml') AssertEqual - \ ale#path#Simplify(g:dir . '/smlnj/cm/sources.cm'), + \ ale#test#GetFilename('test-files/smlnj/cm/sources.cm'), \ ale#handlers#sml#GetCmFile(bufnr('%')) Execute(smlnj returns '' when no CM file found): - call ale#test#SetFilename('smlnj/file/qux.sml') + call ale#test#SetFilename('test-files/smlnj/file/qux.sml') AssertEqual '', ale#handlers#sml#GetCmFile(bufnr('%')) Execute(CM-project mode enabled when CM file found): - call ale#test#SetFilename('smlnj/cm/foo.sml') + call ale#test#SetFilename('test-files/smlnj/cm/foo.sml') AssertEqual 'sml', ale#handlers#sml#GetExecutableSmlnjCm(bufnr('%')) Execute(single-file mode disabled when CM file found): - call ale#test#SetFilename('smlnj/cm/foo.sml') + call ale#test#SetFilename('test-files/smlnj/cm/foo.sml') AssertEqual '', ale#handlers#sml#GetExecutableSmlnjFile(bufnr('%')) Execute(CM-project mode disabled when CM file not found): - call ale#test#SetFilename('smlnj/file/qux.sml') + call ale#test#SetFilename('test-files/smlnj/file/qux.sml') AssertEqual '', ale#handlers#sml#GetExecutableSmlnjCm(bufnr('%')) Execute(single-file mode enabled when CM file found): - call ale#test#SetFilename('smlnj/file/qux.sml') + call ale#test#SetFilename('test-files/smlnj/file/qux.sml') AssertEqual 'sml', ale#handlers#sml#GetExecutableSmlnjFile(bufnr('%')) diff --git a/test/test_socket_connections.vader b/test/test_socket_connections.vader index 9ea5580d..c59b942d 100644 --- a/test/test_socket_connections.vader +++ b/test/test_socket_connections.vader @@ -30,13 +30,13 @@ Before: let g:port = 10347 let g:pid_tcp = str2nr(system( \ 'python' - \ . ' ' . ale#Escape(g:dir . '/dumb_tcp_server.py') + \ . ' ' . ale#Escape(g:dir . '/script/dumb_tcp_server.py') \ . ' ' . g:port \)) - let g:pipe_path = 'tmp_named_pipe' + let g:pipe_path = tempname() let g:pid_pipe = str2nr(system( \ 'python' - \ . ' ' . ale#Escape(g:dir . '/dumb_named_pipe_server.py') + \ . ' ' . ale#Escape(g:dir . '/script/dumb_named_pipe_server.py') \ . ' ' . g:pipe_path \)) endif @@ -104,7 +104,7 @@ Execute(Sending and receiving connections to tcp sockets should work): endif Execute(Sending and receiving connections to named pipe sockets should work): - if g:can_run_socket_tests && has('nvim') + if g:can_run_socket_tests && has('nvim-0.4') let g:channel_id = ale#socket#Open( \ g:pipe_path, \ {'callback': function('TestCallback')} @@ -131,9 +131,9 @@ Execute(Sending and receiving connections to named pipe sockets should work): endif " NeoVim versions which can't connect to sockets should just fail. - if has('nvim') && !exists('*chanclose') + if has('nvim-0.4') && !exists('*chanclose') AssertEqual -1, ale#socket#Open( - \ 'tmp_named_pipe', + \ g:pipe_path, \ {'callback': function('function')} \) endif diff --git a/test/test_swift_find_project_root.vader b/test/test_swift_find_project_root.vader index 7cb1cc29..88a26021 100644 --- a/test/test_swift_find_project_root.vader +++ b/test/test_swift_find_project_root.vader @@ -5,13 +5,13 @@ After: call ale#test#RestoreDirectory() Execute(Detect root of Swift project with Package.swift correctly): - call ale#test#SetFilename('swift-test-files/swift-package-project/src/folder/dummy.swift') + call ale#test#SetFilename('test-files/swift/swift-package-project/src/folder/dummy.swift') AssertEqual - \ ale#path#Simplify(g:dir . '/swift-test-files/swift-package-project'), + \ ale#path#Simplify(g:dir . '/test-files/swift/swift-package-project'), \ ale#swift#FindProjectRoot(bufnr('')) Execute(Detect no root in case of non-Package.swift project): - call ale#test#SetFilename('swift-test-files/non-swift-package-project/src/folder/dummy.swift') + call ale#test#SetFilename('test-files/swift/non-swift-package-project/src/folder/dummy.swift') AssertEqual \ '', \ ale#swift#FindProjectRoot(bufnr('')) diff --git a/test/test_swiftlint_executable_detection.vader b/test/test_swiftlint_executable_detection.vader deleted file mode 100644 index ac83ff8f..00000000 --- a/test/test_swiftlint_executable_detection.vader +++ /dev/null @@ -1,49 +0,0 @@ -Before: - let g:ale_swift_swiftlint_executable = 'swiftlint_d' - - call ale#test#SetDirectory('/testplugin/test') - - runtime ale_linters/swift/swiftlint.vim - -After: - let g:ale_swift_swiftlint_executable = 'swiftlint' - let g:ale_swift_swiftlint_use_global = 0 - - call ale#test#RestoreDirectory() - call ale#linter#Reset() - -Execute(Global installation should be the default executable): - call ale#test#SetFilename('swiftlint-test-files/global/testfile.swift') - - AssertEqual - \ 'swiftlint_d', - \ ale_linters#swift#swiftlint#GetExecutable(bufnr('')) - -Execute(React Native apps using CocoaPods should take precedence over the default executable): - call ale#test#SetFilename('swiftlint-test-files/react-native/testfile.swift') - - AssertEqual - \ tolower(ale#path#Simplify(g:dir . '/swiftlint-test-files/react-native/ios/Pods/SwiftLint/swiftlint')), - \ tolower(ale_linters#swift#swiftlint#GetExecutable(bufnr(''))) - -Execute(CocoaPods installation should take precedence over the default executable): - call ale#test#SetFilename('swiftlint-test-files/cocoapods/testfile.swift') - - AssertEqual - \ tolower(ale#path#Simplify(g:dir . '/swiftlint-test-files/cocoapods/Pods/SwiftLint/swiftlint')), - \ tolower(ale_linters#swift#swiftlint#GetExecutable(bufnr(''))) - -Execute(Top level CocoaPods installation should take precedence over React Native installation): - call ale#test#SetFilename('swiftlint-test-files/cocoapods-and-react-native/testfile.swift') - - AssertEqual - \ tolower(ale#path#Simplify(g:dir . '/swiftlint-test-files/cocoapods-and-react-native/Pods/SwiftLint/swiftlint')), - \ tolower(ale_linters#swift#swiftlint#GetExecutable(bufnr(''))) - -Execute(use-global should override other versions): - let g:ale_swift_swiftlint_use_global = 1 - call ale#test#SetFilename('swiftlint-test-files/cocoapods-and-react-native/testfile.swift') - - AssertEqual - \ 'swiftlint_d', - \ ale_linters#swift#swiftlint#GetExecutable(bufnr(''))