From 515870b55b9d02612d8306cff850f606326a7394 Mon Sep 17 00:00:00 2001 From: Michael Panchenko Date: Thu, 1 May 2025 22:57:55 +0200 Subject: [PATCH] Tests: use markers --- src/serena/symbol.py | 1 - test/multilspy/java/test_java_basic.py | 1 + test/multilspy/python/test_python_basic.py | 1 + .../python/test_retrieval_with_ignored_dirs.py | 3 +++ test/multilspy/python/test_symbol_retrieval.py | 2 ++ test/multilspy/rust/test_rust_basic.py | 1 + test/multilspy/typescript/test_typescript_basic.py | 1 + test/serena/test_serena_agent.py | 12 ++++++------ 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/serena/symbol.py b/src/serena/symbol.py index f49e33f6..0fcc553f 100644 --- a/src/serena/symbol.py +++ b/src/serena/symbol.py @@ -301,7 +301,6 @@ class SymbolManager: f.write(file_buffer.contents) self.agent.mark_file_modified(relative_path) - @contextmanager def _edited_symbol_location(self, location: SymbolLocation) -> Iterator[Symbol]: symbol = self.find_by_location(location) diff --git a/test/multilspy/java/test_java_basic.py b/test/multilspy/java/test_java_basic.py index 8dcf4efd..e7ff5a8c 100644 --- a/test/multilspy/java/test_java_basic.py +++ b/test/multilspy/java/test_java_basic.py @@ -7,6 +7,7 @@ from multilspy.multilspy_config import Language from multilspy.multilspy_utils import SymbolUtils +@pytest.mark.java class TestJavaLanguageServer: @pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True) def test_find_symbol(self, language_server: SyncLanguageServer) -> None: diff --git a/test/multilspy/python/test_python_basic.py b/test/multilspy/python/test_python_basic.py index 635b19fe..5af4f953 100644 --- a/test/multilspy/python/test_python_basic.py +++ b/test/multilspy/python/test_python_basic.py @@ -14,6 +14,7 @@ from multilspy.multilspy_config import Language from serena.text_utils import LineType +@pytest.mark.python class TestLanguageServerBasics: """Test basic functionality of the language server.""" diff --git a/test/multilspy/python/test_retrieval_with_ignored_dirs.py b/test/multilspy/python/test_retrieval_with_ignored_dirs.py index 7615830f..5150d53a 100644 --- a/test/multilspy/python/test_retrieval_with_ignored_dirs.py +++ b/test/multilspy/python/test_retrieval_with_ignored_dirs.py @@ -8,6 +8,9 @@ from multilspy.multilspy_config import Language, MultilspyConfig from multilspy.multilspy_logger import MultilspyLogger from test.conftest import get_repo_path +# This mark will be applied to all tests in this module +pytestmark = pytest.mark.python + @pytest.fixture(scope="module") def ls_with_ignored_dirs() -> Generator[SyncLanguageServer, None, None]: diff --git a/test/multilspy/python/test_symbol_retrieval.py b/test/multilspy/python/test_symbol_retrieval.py index 6f7b22cd..61a83cea 100644 --- a/test/multilspy/python/test_symbol_retrieval.py +++ b/test/multilspy/python/test_symbol_retrieval.py @@ -14,6 +14,8 @@ from multilspy.language_server import SyncLanguageServer from multilspy.multilspy_config import Language from multilspy.multilspy_types import SymbolKind +pytestmark = pytest.mark.python + class TestLanguageServerSymbols: """Test the language server's symbol-related functionality.""" diff --git a/test/multilspy/rust/test_rust_basic.py b/test/multilspy/rust/test_rust_basic.py index aeaf85a4..02e9d502 100644 --- a/test/multilspy/rust/test_rust_basic.py +++ b/test/multilspy/rust/test_rust_basic.py @@ -7,6 +7,7 @@ from multilspy.multilspy_config import Language from multilspy.multilspy_utils import SymbolUtils +@pytest.mark.rust class TestRustLanguageServer: @pytest.mark.parametrize("language_server", [Language.RUST], indirect=True) def test_find_references_raw(self, language_server: SyncLanguageServer) -> None: diff --git a/test/multilspy/typescript/test_typescript_basic.py b/test/multilspy/typescript/test_typescript_basic.py index 0b8243d9..442b5a1e 100644 --- a/test/multilspy/typescript/test_typescript_basic.py +++ b/test/multilspy/typescript/test_typescript_basic.py @@ -7,6 +7,7 @@ from multilspy.multilspy_config import Language from multilspy.multilspy_utils import SymbolUtils +@pytest.mark.typescript class TestTypescriptLanguageServer: @pytest.mark.parametrize("language_server", [Language.TYPESCRIPT], indirect=True) def test_find_symbol(self, language_server: SyncLanguageServer) -> None: diff --git a/test/serena/test_serena_agent.py b/test/serena/test_serena_agent.py index 4d16bbec..7c3d76eb 100644 --- a/test/serena/test_serena_agent.py +++ b/test/serena/test_serena_agent.py @@ -26,15 +26,15 @@ class TestSerenaAgent: @pytest.mark.parametrize( "serena_agent,symbol_name,expected_kind,expected_file", [ - (Language.PYTHON, "User", "Class", "models.py"), - (Language.GO, "Helper", "Function", "main.go"), - (Language.JAVA, "Model", "Class", "Model.java"), - (Language.RUST, "add", "Function", "lib.rs"), - (Language.TYPESCRIPT, "DemoClass", "Class", "index.ts"), + pytest.param(Language.PYTHON, "User", "Class", "models.py", marks=pytest.mark.python), + pytest.param(Language.GO, "Helper", "Function", "main.go", marks=pytest.mark.go), + pytest.param(Language.JAVA, "Model", "Class", "Model.java", marks=pytest.mark.java), + pytest.param(Language.RUST, "add", "Function", "lib.rs", marks=pytest.mark.rust), + pytest.param(Language.TYPESCRIPT, "DemoClass", "Class", "index.ts", marks=pytest.mark.typescript), ], indirect=["serena_agent"], ) - def test_find_symbol(self, serena_agent, symbol_name, expected_kind, expected_file): + def test_find_symbol(self, serena_agent: SerenaAgent, symbol_name: str, expected_kind: str, expected_file: str): agent = serena_agent find_symbol_tool = agent.get_tool(FindSymbolTool) result = find_symbol_tool.apply(symbol_name)