Moves signature help unittest to separate file

Author: gnikit

test/test_server.py

@@ -209,44 +209,3 @@ def check_return(result_array):
     #
     assert errcode == 0
     check_return(results[1])
-
-
-def test_sig():
-    def check_return(results, checks):
-        assert results.get("activeParameter", -1) == checks[0]
-        signatures = results.get("signatures")
-        assert signatures[0].get("label") == checks[2]
-        assert len(signatures[0].get("parameters")) == checks[1]
-
-    def sig_request(file_path, line, char):
-        return write_rpc_request(
-            1,
-            "textDocument/signatureHelp",
-            {
-                "textDocument": {"uri": str(file_path)},
-                "position": {"line": line, "character": char},
-            },
-        )
-
-    #
-    string = write_rpc_request(1, "initialize", {"rootPath": str(test_dir)})
-    file_path = test_dir / "test_prog.f08"
-    string += sig_request(file_path, 25, 18)
-    string += sig_request(file_path, 25, 20)
-    string += sig_request(file_path, 25, 22)
-    string += sig_request(file_path, 25, 27)
-    string += sig_request(file_path, 25, 29)
-    errcode, results = run_request(string)
-    assert errcode == 0
-    #
-    sub_sig = "test_sig_Sub(arg1, arg2, opt1=opt1, opt2=opt2, opt3=opt3)"
-    exp_results = (
-        [0, 5, sub_sig],
-        [1, 5, sub_sig],
-        [2, 5, sub_sig],
-        [3, 5, sub_sig],
-        [4, 5, sub_sig],
-    )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])

test/test_server_signature_help.py

@@ -0,0 +1,48 @@
+from pathlib import Path
+
+from setup_tests import run_request, test_dir, write_rpc_request
+
+
+def sigh_request(uri: Path, line: int, char: int):
+    return write_rpc_request(
+        1,
+        "textDocument/signatureHelp",
+        {
+            "textDocument": {"uri": str(uri)},
+            "position": {"line": line, "character": char},
+        },
+    )
+
+
+def validate_sigh(results, refs):
+    assert results.get("activeParameter", -1) == refs[0]
+    signatures = results.get("signatures")
+    assert signatures[0].get("label") == refs[2]
+    assert len(signatures[0].get("parameters")) == refs[1]
+
+
+def test_subroutine_signature_help():
+    """Test that the signature help is correctly resolved for all arguments and
+    that the autocompletion is correct for the subroutine signature.
+    """
+    string = write_rpc_request(1, "initialize", {"rootPath": str(test_dir)})
+    file_path = test_dir / "test_prog.f08"
+    string += sigh_request(file_path, 25, 18)
+    string += sigh_request(file_path, 25, 20)
+    string += sigh_request(file_path, 25, 22)
+    string += sigh_request(file_path, 25, 27)
+    string += sigh_request(file_path, 25, 29)
+    errcode, results = run_request(string)
+    assert errcode == 0
+
+    sub_sig = "test_sig_Sub(arg1, arg2, opt1=opt1, opt2=opt2, opt3=opt3)"
+    ref = (
+        [0, 5, sub_sig],
+        [1, 5, sub_sig],
+        [2, 5, sub_sig],
+        [3, 5, sub_sig],
+        [4, 5, sub_sig],
+    )
+    assert len(ref) == len(results) - 1
+    for i in range(len(ref)):
+        validate_sigh(results[i + 1], ref[i])