typing test_mesh_points_protocols aand test_mesh_polygons_protocols

Author: MaxNumerique

src/tests/conftest.py

@@ -91,7 +91,7 @@ def images_diff(self, first_image_path: str, second_image_path: str) -> float:
         print(f"{images_diff.GetThresholdedError()=}")
         return images_diff.GetThresholdedError()
 
-    def compare_image(self, nb_messages, filename):
+    def compare_image(self, nb_messages: int, filename: str) -> bool:
         for message in range(nb_messages):
             print(f"{message=}", flush=True)
             image = self.ws.recv()
@@ -116,6 +116,8 @@ def compare_image(self, nb_messages, filename):
             path_image = os.path.join(self.images_dir_path, filename)
 
             return self.images_diff(test_file_path, path_image) == 0.0
+        
+        return False  # Add explicit return for the case when image is not bytes
 
     def _init_ws(self) -> None:
         self.ws.send(

src/tests/mesh/points/test_mesh_points_protocols.py

@@ -1,16 +1,16 @@
 # Standard library imports
+from typing import Callable
 
 # Third party imports
 from opengeodeweb_viewer.rpc.mesh.mesh_protocols import VtkMeshView
 from opengeodeweb_viewer.rpc.mesh.points.mesh_points_protocols import VtkMeshPointsView
 
 # Local application imports
 from src.tests.mesh.test_mesh_protocols import test_register_mesh
+from ...conftest import ServerMonitor
 
-# from src.tests.test_data_helpers import create_mesh_data
 
-
-def test_points_visibility(server, dataset_factory: callable):
+def test_points_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
     mesh_id = "123456789"
     test_register_mesh(server, dataset_factory)
 
@@ -22,7 +22,7 @@ def test_points_visibility(server, dataset_factory: callable):
     assert server.compare_image(3, "mesh/points/visibility.jpeg") == True
 
 
-def test_points_size(server, dataset_factory: callable):
+def test_points_size(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
     mesh_id = "123456789"
     test_points_visibility(server, dataset_factory)
 
@@ -34,7 +34,7 @@ def test_points_size(server, dataset_factory: callable):
     assert server.compare_image(3, "mesh/points/size.jpeg") == True
 
 
-def test_points_color(server, dataset_factory: callable):
+def test_points_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
     mesh_id = "123456789"
     test_points_size(server, dataset_factory)
 
@@ -46,7 +46,7 @@ def test_points_color(server, dataset_factory: callable):
     assert server.compare_image(3, "mesh/points/color.jpeg") == True
 
 
-def test_points_with_point_set(server, dataset_factory: callable):
+def test_points_with_point_set(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
     mesh_id = "44556677"
 
     dataset_factory(id=mesh_id, viewable_file_name="points.vtp")

src/tests/mesh/polygons/test_mesh_polygons_protocols.py

@@ -1,13 +1,15 @@
 # Standard library imports
+from typing import Callable
 
 # Third party imports
 from opengeodeweb_viewer.rpc.mesh.polygons.polygons_protocols import VtkMeshPolygonsView
 
 # Local application imports
 from src.tests.mesh.test_mesh_protocols import test_register_mesh
+from ...conftest import ServerMonitor
 
 
-def test_polygons_color(server, dataset_factory):
+def test_polygons_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_register_mesh(server, dataset_factory)
 
@@ -19,7 +21,7 @@ def test_polygons_color(server, dataset_factory):
     assert server.compare_image(3, "mesh/polygons/color.jpeg") == True
 
 
-def test_polygons_visibility(server, dataset_factory):
+def test_polygons_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_register_mesh(server, dataset_factory)