From 4901f72629175e25b3ba1f4b78c239888d3f39ac Mon Sep 17 00:00:00 2001 From: Michael Panchenko Date: Mon, 19 May 2025 12:57:26 +0200 Subject: [PATCH] Made paths in test os independent --- test/multilspy/php/test_php_basic.py | 6 ------ test/serena/test_serena_agent.py | 11 ++++++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/test/multilspy/php/test_php_basic.py b/test/multilspy/php/test_php_basic.py index 896302e..6f7aba0 100644 --- a/test/multilspy/php/test_php_basic.py +++ b/test/multilspy/php/test_php_basic.py @@ -1,4 +1,3 @@ -import time # Import time module from pathlib import Path import pytest @@ -16,7 +15,6 @@ class TestPhpLanguageServer: # The fixture already handles start and stop assert language_server.is_running() - @pytest.mark.parametrize("language_server", [Language.PHP], indirect=True) @pytest.mark.parametrize("repo_path", [Language.PHP], indirect=True) def test_find_definition_within_file(self, language_server: SyncLanguageServer, repo_path: Path) -> None: @@ -40,7 +38,6 @@ class TestPhpLanguageServer: assert definition_location["range"]["start"]["line"] == 9 assert definition_location["range"]["start"]["character"] == 0 - @pytest.mark.parametrize("language_server", [Language.PHP], indirect=True) @pytest.mark.parametrize("repo_path", [Language.PHP], indirect=True) def test_find_definition_across_files(self, language_server: SyncLanguageServer, repo_path: Path) -> None: @@ -53,7 +50,6 @@ class TestPhpLanguageServer: assert definition_location["range"]["start"]["line"] == 2 assert definition_location["range"]["start"]["character"] == 0 - @pytest.mark.parametrize("language_server", [Language.PHP], indirect=True) @pytest.mark.parametrize("repo_path", [Language.PHP], indirect=True) def test_find_definition_simple_variable(self, language_server: SyncLanguageServer, repo_path: Path) -> None: @@ -75,7 +71,6 @@ class TestPhpLanguageServer: assert definition_location["range"]["start"]["line"] == 1 # Definition of $localVar (0-indexed) assert definition_location["range"]["start"]["character"] == 0 # $localVar (0-indexed) - @pytest.mark.parametrize("language_server", [Language.PHP], indirect=True) @pytest.mark.parametrize("repo_path", [Language.PHP], indirect=True) def test_find_references_within_file(self, language_server: SyncLanguageServer, repo_path: Path) -> None: @@ -110,7 +105,6 @@ class TestPhpLanguageServer: assert actual_locations == expected_locations - @pytest.mark.parametrize("language_server", [Language.PHP], indirect=True) @pytest.mark.parametrize("repo_path", [Language.PHP], indirect=True) def test_find_references_across_files(self, language_server: SyncLanguageServer, repo_path: Path) -> None: diff --git a/test/serena/test_serena_agent.py b/test/serena/test_serena_agent.py index 7c3d76e..03d660d 100644 --- a/test/serena/test_serena_agent.py +++ b/test/serena/test_serena_agent.py @@ -47,10 +47,15 @@ class TestSerenaAgent: @pytest.mark.parametrize( "serena_agent,symbol_name,def_file,ref_file", [ - (Language.PYTHON, "User", "test_repo/models.py", "test_repo/services.py"), + (Language.PYTHON, "User", os.path.join("test_repo", "models.py"), os.path.join("test_repo", "services.py")), (Language.GO, "Helper", "main.go", "main.go"), - (Language.JAVA, "Model", "src/main/java/test_repo/Model.java", "src/main/java/test_repo/Main.java"), - (Language.RUST, "add", "src/lib.rs", "src/main.rs"), + ( + Language.JAVA, + "Model", + os.path.join("src", "main", "java", "test_repo", "Model.java"), + os.path.join("src", "main", "java", "test_repo", "Main.java"), + ), + (Language.RUST, "add", os.path.join("src", "lib.rs"), os.path.join("src", "main.rs")), (Language.TYPESCRIPT, "helperFunction", "index.ts", "use_helper.ts"), ], indirect=["serena_agent"],