typing test_model_edges_protocols, test_model_lined_protocols, test_model_points_protocols, test_model_surfaces_protocols and add typing for get_response

Author: MaxNumerique

src/tests/conftest.py

@@ -10,14 +10,14 @@
 import os
 from pathlib import Path
 import xml.etree.ElementTree as ET
-from typing import Callable, Optional
+from typing import Callable, Optional, Union, Dict, Any, List
 from opengeodeweb_viewer import config
 from opengeodeweb_microservice.database.connection import get_session, init_database
 from opengeodeweb_microservice.database.data import Data
 
 
 class ServerMonitor:
-    def __init__(self, log):
+    def __init__(self, log: str) -> None:
         self.log = log
         self.ws = create_connection("ws://localhost:1234/ws")
         self.images_dir_path = os.path.abspath(
@@ -31,7 +31,7 @@ def __init__(self, log):
         self._init_ws()
         self._drain_initial_messages()
 
-    def call(self, rpc, params=[{}]) -> None:
+    def call(self, rpc: str, params: List[Dict[str, Any]] = [{}]) -> None:
         return self.ws.send(
             json.dumps(
                 {
@@ -42,7 +42,7 @@ def call(self, rpc, params=[{}]) -> None:
             )
         )
 
-    def print_log(self):
+    def print_log(self) -> None:
         output = ""
         with open(self.log) as f:
             for line in f:
@@ -52,7 +52,7 @@ def print_log(self):
                 output += line
         print(output)
 
-    def get_response(self):
+    def get_response(self) -> Union[bytes, Dict[str, Any], str]:
         response = self.ws.recv()
         if isinstance(response, bytes):
             return response
@@ -144,10 +144,10 @@ def _drain_initial_messages(
 
 
 class FixtureHelper:
-    def __init__(self, root_path):
+    def __init__(self, root_path: Path) -> None:
         self.root_path = Path(root_path)
 
-    def get_xprocess_args(self):
+    def get_xprocess_args(self) -> tuple:
         class Starter(ProcessStarter):
             terminate_on_interrupt = True
             pattern = "wslink: Starting factory"
@@ -166,7 +166,7 @@ class Starter(ProcessStarter):
 
 
 @pytest.fixture
-def server(xprocess):
+def server(xprocess) -> ServerMonitor:
     name, Starter, Monitor = HELPER.get_xprocess_args()
     os.environ["PYTHON_ENV"] = "test"
     _, log = xprocess.ensure(name, Starter)
@@ -181,7 +181,7 @@ def server(xprocess):
 
 
 @pytest.fixture(scope="session", autouse=True)
-def configure_test_environment():
+def configure_test_environment() -> None:
     base_path = Path(__file__).parent
     config.test_config(base_path)
     db_path = base_path / "project.db"
@@ -197,7 +197,6 @@ def configure_test_environment():
 
 @pytest.fixture
 def dataset_factory() -> Callable[..., str]:
-
     def create_dataset(
         *, id: str, viewable_file_name: str, geode_object: Optional[str] = None
     ) -> str:

src/tests/model/edges/test_model_edges_protocols.py

@@ -1,4 +1,5 @@
 # Standard library imports
+from typing import Callable
 
 # Third party imports
 from opengeodeweb_viewer.rpc.model.edges.model_edges_protocols import (
@@ -7,9 +8,10 @@
 
 # Local application imports
 from src.tests.model.test_model_protocols import test_register_model
+from ...conftest import ServerMonitor
 
 
-def test_edges_visibility(server, dataset_factory):
+def test_edges_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_register_model(server, dataset_factory)
 

src/tests/model/lines/test_model_lines_protocols.py

@@ -1,4 +1,5 @@
 # Standard library imports
+from typing import Callable
 
 # Third party imports
 from opengeodeweb_viewer.rpc.model.lines.model_lines_protocols import (
@@ -7,9 +8,10 @@
 
 # Local application imports
 from src.tests.model.test_model_protocols import test_register_model_cube
+from ...conftest import ServerMonitor
 
 
-def test_lines_edges_visibility(server, dataset_factory):
+def test_lines_edges_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_register_model_cube(server, dataset_factory)
 
@@ -40,7 +42,7 @@ def test_lines_edges_visibility(server, dataset_factory):
     assert server.compare_image(3, "model/lines/visibility.jpeg") == True
 
 
-def test_lines_edges_color(server, dataset_factory):
+def test_lines_edges_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_lines_edges_visibility(server, dataset_factory)
 

src/tests/model/points/test_model_points_protocols.py

@@ -1,4 +1,5 @@
 # Standard library imports
+from typing import Callable
 
 # Third party imports
 from opengeodeweb_viewer.rpc.model.points.model_points_protocols import (
@@ -7,9 +8,10 @@
 
 # Local application imports
 from src.tests.model.test_model_protocols import test_register_model
+from ...conftest import ServerMonitor
 
 
-def test_points_visibility(server, dataset_factory):
+def test_points_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_register_model(server, dataset_factory)
 
@@ -21,7 +23,7 @@ def test_points_visibility(server, dataset_factory):
     assert server.compare_image(3, "model/points/visibility.jpeg") == True
 
 
-def test_points_size(server, dataset_factory):
+def test_points_size(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_points_visibility(server, dataset_factory)
 

src/tests/model/surfaces/test_model_surfaces_protocols.py

@@ -1,4 +1,5 @@
 # Standard library imports
+from typing import Callable
 
 # Third party imports
 from opengeodeweb_viewer.rpc.model.surfaces.model_surfaces_protocols import (
@@ -7,9 +8,10 @@
 
 # Local application imports
 from src.tests.model.test_model_protocols import test_register_model_cube
+from ...conftest import ServerMonitor
 
 
-def test_surfaces_polygons_visibility(server, dataset_factory):
+def test_surfaces_polygons_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_register_model_cube(server, dataset_factory)
 
@@ -41,7 +43,7 @@ def test_surfaces_polygons_visibility(server, dataset_factory):
     assert server.compare_image(3, "model/surfaces/visibility.jpeg") == True
 
 
-def test_surfaces_polygons_color(server, dataset_factory):
+def test_surfaces_polygons_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_surfaces_polygons_visibility(server, dataset_factory)