tiennm99/serena
1
0
Fork 0
mirror of https://github.com/tiennm99/serena.git synced 2026-09-02 20:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: don't import util from conftest

Browse Source
This commit is contained in:
Michael Panchenko
2025-04-28 15:44:37 +02:00
parent add17381b8
commit 7293478fa5
5 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/conftest.py
-10
View File
@@ -5,7 +5,6 @@ import pytest
from multilspy.language_server import SyncLanguageServer
from multilspy.multilspy_config import Language, MultilspyConfig
from multilspy.multilspy_logger import MultilspyLogger
from multilspy.multilspy_types import UnifiedSymbolInformation
@pytest.fixture(scope="session")
@@ -84,12 +83,3 @@ def language_server(request: LanguageParamRequest):
yield server
finally:
server.stop()
def symbol_tree_contains_name(roots: list[UnifiedSymbolInformation], name: str) -> bool:
for symbol in roots:
if symbol["name"] == name:
return True
if symbol_tree_contains_name(symbol["children"], name):
return True
return False
test/multilspy/go/test_go_basic.py
+4 -4
View File
@@ -1,19 +1,19 @@
import os
import pytest
from conftest import symbol_tree_contains_name
from multilspy import SyncLanguageServer
from multilspy.multilspy_config import Language
from multilspy.multilspy_utils import SymbolUtils
class TestGoLanguageServer:
@pytest.mark.parametrize("language_server", [Language.GO], indirect=True)
def test_find_symbol(self, language_server: SyncLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert symbol_tree_contains_name(symbols, "main"), "main function not found in symbol tree"
assert symbol_tree_contains_name(symbols, "Helper"), "Helper function not found in symbol tree"
assert symbol_tree_contains_name(symbols, "DemoStruct"), "DemoStruct not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "main"), "main function not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Helper"), "Helper function not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "DemoStruct"), "DemoStruct not found in symbol tree"
@pytest.mark.parametrize("language_server", [Language.GO], indirect=True)
def test_find_referencing_symbols(self, language_server: SyncLanguageServer) -> None:
test/multilspy/java/test_java_basic.py
+7 -7
View File
@@ -1,19 +1,19 @@
import os
import pytest
from conftest import symbol_tree_contains_name
from multilspy import SyncLanguageServer
from multilspy.multilspy_config import Language
from multilspy.multilspy_utils import SymbolUtils
class TestJavaLanguageServer:
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
def test_find_symbol(self, language_server: SyncLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert symbol_tree_contains_name(symbols, "Main"), "Main class not found in symbol tree"
assert symbol_tree_contains_name(symbols, "Utils"), "Utils class not found in symbol tree"
assert symbol_tree_contains_name(symbols, "Model"), "Model class not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Main"), "Main class not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Utils"), "Utils class not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Model"), "Model class not found in symbol tree"
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
def test_find_referencing_symbols(self, language_server: SyncLanguageServer) -> None:
@@ -44,6 +44,6 @@ class TestJavaLanguageServer:
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
def test_overview_methods(self, language_server: SyncLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert symbol_tree_contains_name(symbols, "Main"), "Main missing from overview"
assert symbol_tree_contains_name(symbols, "Utils"), "Utils missing from overview"
assert symbol_tree_contains_name(symbols, "Model"), "Model missing from overview"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Main"), "Main missing from overview"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Utils"), "Utils missing from overview"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Model"), "Model missing from overview"
test/multilspy/rust/test_rust_basic.py
+5 -5
View File
@@ -1,10 +1,10 @@
import os
import pytest
from conftest import symbol_tree_contains_name
from multilspy import SyncLanguageServer
from multilspy.multilspy_config import Language
from multilspy.multilspy_utils import SymbolUtils
class TestRustLanguageServer:
@@ -28,8 +28,8 @@ class TestRustLanguageServer:
@pytest.mark.parametrize("language_server", [Language.RUST], indirect=True)
def test_find_symbol(self, language_server: SyncLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert symbol_tree_contains_name(symbols, "main"), "main function not found in symbol tree"
assert symbol_tree_contains_name(symbols, "add"), "add function not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "main"), "main function not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "add"), "add function not found in symbol tree"
# Add more as needed based on test_repo
@pytest.mark.parametrize("language_server", [Language.RUST], indirect=True)
@@ -52,5 +52,5 @@ class TestRustLanguageServer:
@pytest.mark.parametrize("language_server", [Language.RUST], indirect=True)
def test_overview_methods(self, language_server: SyncLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert symbol_tree_contains_name(symbols, "main"), "main missing from overview"
assert symbol_tree_contains_name(symbols, "add"), "add missing from overview"
assert SymbolUtils.symbol_tree_contains_name(symbols, "main"), "main missing from overview"
assert SymbolUtils.symbol_tree_contains_name(symbols, "add"), "add missing from overview"
test/multilspy/typescript/test_typescript_basic.py
+4 -4
View File
@@ -1,19 +1,19 @@
import os
import pytest
from conftest import symbol_tree_contains_name
from multilspy import SyncLanguageServer
from multilspy.multilspy_config import Language
from multilspy.multilspy_utils import SymbolUtils
class TestTypescriptLanguageServer:
@pytest.mark.parametrize("language_server", [Language.TYPESCRIPT], indirect=True)
def test_find_symbol(self, language_server: SyncLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert symbol_tree_contains_name(symbols, "DemoClass"), "DemoClass not found in symbol tree"
assert symbol_tree_contains_name(symbols, "helperFunction"), "helperFunction not found in symbol tree"
assert symbol_tree_contains_name(symbols, "printValue"), "printValue method not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "DemoClass"), "DemoClass not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "helperFunction"), "helperFunction not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "printValue"), "printValue method not found in symbol tree"
@pytest.mark.parametrize("language_server", [Language.TYPESCRIPT], indirect=True)
def test_find_referencing_symbols(self, language_server: SyncLanguageServer) -> None: