Tests for TS and Go, general improvements in tests

This commit is contained in:
Michael Panchenko
2025-04-28 15:34:29 +02:00
parent 42fdb01d9a
commit e48031ea73
11 changed files with 178 additions and 120 deletions
+15 -33
View File
@@ -1,30 +1,22 @@
import os
import pytest
from conftest import symbol_tree_contains_name
from multilspy import SyncLanguageServer
from multilspy.multilspy_config import Language
def find_symbol_recursive(symbols, name):
for symbol in symbols:
if symbol.get("name") == name:
return True
if symbol.get("children"):
if find_symbol_recursive(symbol["children"], name):
return True
return False
class TestJavaLanguageServer:
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
def test_find_symbol(self, language_server):
def test_find_symbol(self, language_server: SyncLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert find_symbol_recursive(symbols, "Main"), "Main class not found in symbol tree"
assert find_symbol_recursive(symbols, "Utils"), "Utils class not found in symbol tree"
assert find_symbol_recursive(symbols, "Model"), "Model class not found in 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"
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
def test_find_referencing_symbols(self, language_server):
def test_find_referencing_symbols(self, language_server: SyncLanguageServer) -> None:
# Use correct Maven/Java file paths
file_path = os.path.join("src", "main", "java", "test_repo", "Utils.java")
refs = language_server.request_references(file_path, 4, 20)
@@ -42,26 +34,16 @@ class TestJavaLanguageServer:
# Use selectionRange if present, otherwise fall back to range
if "selectionRange" in model_symbol:
sel_start = model_symbol["selectionRange"]["start"]
sel_end = model_symbol["selectionRange"]["end"]
else:
sel_start = model_symbol["range"]["start"]
sel_end = model_symbol["range"]["end"]
found = False
if sel_start["line"] == sel_end["line"]:
for col in range(sel_start["character"], sel_end["character"] + 1):
refs = language_server.request_references(file_path, sel_start["line"], col)
if any("Main.java" in ref.get("relativePath", "") for ref in refs):
found = True
else:
refs_start = language_server.request_references(file_path, sel_start["line"], sel_start["character"])
refs_end = language_server.request_references(file_path, sel_end["line"], sel_end["character"])
if any("Main.java" in ref.get("relativePath", "") for ref in refs_start + refs_end):
found = True
assert found, "Main should reference Model (tried all positions in selectionRange)"
refs = language_server.request_references(file_path, sel_start["line"], sel_start["character"])
assert any(
"Main.java" in ref.get("relativePath", "") for ref in refs
), "Main should reference Model (tried all positions in selectionRange)"
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
def test_overview_methods(self, language_server):
def test_overview_methods(self, language_server: SyncLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert find_symbol_recursive(symbols, "Main"), "Main missing from overview"
assert find_symbol_recursive(symbols, "Utils"), "Utils missing from overview"
assert find_symbol_recursive(symbols, "Model"), "Model missing from overview"
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"