tests almost cleared

Author: MaxNumerique

src/opengeodeweb_viewer/config.py

@@ -1,6 +1,7 @@
 import os
 from shutil import copyfile, copytree
 from sys import platform
+import tempfile
 
 
 def default_config():
@@ -48,7 +49,9 @@ def _copy_test_assets(
 
 def test_config(path):
     default_config()
-    os.environ["DATA_FOLDER_PATH"] = os.path.join(path, "data")
+    tmp_data_root = tempfile.mkdtemp(prefix="ogw_test_data_")
+    os.environ["DATA_FOLDER_PATH"] = tmp_data_root
+
     os.environ["DATABASE_PATH"] = str(path)
     db_file = os.path.join(path, "project.db")
     if not os.path.exists(db_file):

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -24,8 +24,29 @@ def registerMesh(self, params):
         validate_schema(params, self.mesh_schemas_dict["register"], self.mesh_prefix)
         data_id = params["id"]
         try:
-            self.registerObject(data_id)
-            reader = self.get_object(data_id)["reader"]
+            _ = self.get_data(data_id)
+            file_path = self.get_data_file_path(data_id)
+            ext = os.path.splitext(file_path)[1].lower()
+            if ext == ".vtu":
+                reader = vtk.vtkXMLUnstructuredGridReader()
+                reader.SetFileName(file_path)
+                mapper = vtk.vtkDataSetMapper()
+                mapper.SetInputConnection(reader.GetOutputPort())
+            else:
+                reader = vtk.vtkXMLPolyDataReader()
+                reader.SetFileName(file_path)
+                mapper = vtk.vtkPolyDataMapper()
+                mapper.SetInputConnection(reader.GetOutputPort())
+            
+            actor = vtk.vtkActor()
+            actor.SetMapper(mapper)
+            
+            renderer = self.get_renderer()
+            renderer.AddActor(actor)
+            
+            self.register_object(data_id, reader, None, actor, mapper, {})
+            
+            reader.Update()
             data_object = reader.GetOutput()
             data_set = vtk.vtkDataSet.SafeDownCast(data_object)
             cell_types = vtk.vtkCellTypes()
@@ -45,7 +66,12 @@ def registerMesh(self, params):
                 max_dimension = "polygons"
             elif max_id >= 7:
                 max_dimension = "polyhedra"
-            self.get_data_base()[data_id]["max_dimension"] = max_dimension
+            self.get_object(data_id)["max_dimension"] = max_dimension
+            
+            renderWindow = self.getView("-1")
+            renderer.ResetCamera()
+            renderWindow.Render()
+            self.render()
         except Exception as e:
             print(f"Error registering mesh {data_id}: {str(e)}", flush=True)
             raise

src/tests/conftest.py

@@ -70,7 +70,7 @@ def _reader_for_file(path: str):
             return vtk.vtkJPEGReader()
         return vtk.vtkJPEGReader()
 
-    def images_diff(self, first_image_path, second_image_path):
+    def images_diff(self, first_image_path, second_image_path, tolerance: float = 0.0):
         first_reader = self._reader_for_file(first_image_path)
         first_reader.SetFileName(first_image_path)
 
@@ -82,9 +82,11 @@ def images_diff(self, first_image_path, second_image_path):
         images_diff.SetImageConnection(second_reader.GetOutputPort())
         images_diff.Update()
 
-        return images_diff.GetThresholdedError()
+        error = images_diff.GetThresholdedError()
+        print(f"Image comparison error for {second_image_path}: {error} (tolerance: {tolerance})", flush=True)
+        return error <= tolerance
 
-    def compare_image(self, nb_messages, filename):
+    def compare_image(self, nb_messages, filename, tolerance=0.0):
 
         self.ws.settimeout(4.0)
         image = None
@@ -97,7 +99,7 @@ def compare_image(self, nb_messages, filename):
             if isinstance(msg, bytes):
                 image = msg
                 break
-        if not isinstance(image, bytes):
+        if not isinstance(msg, bytes):
             return False
         test_file_path = os.path.abspath(
             os.path.join(self.test_output_dir, "test.jpeg")
@@ -122,7 +124,7 @@ def compare_image(self, nb_messages, filename):
             test_file_path = new_path
 
         path_image = os.path.join(self.images_dir_path, filename)
-        return self.images_diff(test_file_path, path_image) == 0.0
+        return self.images_diff(test_file_path, path_image, tolerance)
 
     def _init_ws(self):
         self.ws.send(
@@ -249,8 +251,8 @@ def create_dataset(
         if dst_path.suffix.lower() == ".vtm":
             tree = ET.parse(dst_path)
             root = tree.getroot()
-            for piece in root.findall(".//Piece"):
-                file_attr = piece.get("Source")
+            for dataset in root.findall(".//DataSet"):
+                file_attr = dataset.get("file")
                 if file_attr:
                     src_piece = src_path.parent / file_attr
                     dst_piece = data_folder / file_attr

src/tests/mesh/edges/test_mesh_edges_protocols.py

@@ -8,8 +8,8 @@
 from src.tests.mesh.test_mesh_protocols import test_register_mesh
 
 
-def test_edges_visibility(server):
-    test_register_mesh(server)
+def test_edges_visibility(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshEdgesView.mesh_edges_prefix
@@ -19,8 +19,8 @@ def test_edges_visibility(server):
     assert server.compare_image(3, "mesh/edges/visibility.jpeg") == True
 
 
-def test_edges_color(server):
-    test_edges_visibility(server)
+def test_edges_color(server, dataset_factory):
+    test_edges_visibility(server, dataset_factory)
 
     server.call(
         VtkMeshEdgesView.mesh_edges_prefix

src/tests/mesh/points/test_mesh_points_protocols.py

@@ -10,9 +10,9 @@
 # from src.tests.test_data_helpers import create_mesh_data
 
 
-def test_points_visibility(server):
+def test_points_visibility(server, dataset_factory):
     mesh_id = "123456789"
-    test_register_mesh(server)
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshPointsView.mesh_points_prefix
@@ -22,9 +22,9 @@ def test_points_visibility(server):
     assert server.compare_image(3, "mesh/points/visibility.jpeg") == True
 
 
-def test_points_size(server):
+def test_points_size(server, dataset_factory):
     mesh_id = "123456789"
-    test_points_visibility(server)
+    test_points_visibility(server, dataset_factory)
 
     server.call(
         VtkMeshPointsView.mesh_points_prefix
@@ -34,9 +34,9 @@ def test_points_size(server):
     assert server.compare_image(3, "mesh/points/size.jpeg") == True
 
 
-def test_points_color(server):
+def test_points_color(server, dataset_factory):
     mesh_id = "123456789"
-    test_points_size(server)
+    test_points_size(server, dataset_factory)
 
     server.call(
         VtkMeshPointsView.mesh_points_prefix

src/tests/mesh/polygons/test_mesh_polygons_protocols.py

@@ -7,9 +7,9 @@
 from src.tests.mesh.test_mesh_protocols import test_register_mesh
 
 
-def test_polygons_color(server):
+def test_polygons_color(server, dataset_factory):
 
-    test_register_mesh(server)
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshPolygonsView.mesh_polygons_prefix
@@ -19,9 +19,9 @@ def test_polygons_color(server):
     assert server.compare_image(3, "mesh/polygons/color.jpeg") == True
 
 
-def test_polygons_visibility(server):
+def test_polygons_visibility(server, dataset_factory):
 
-    test_register_mesh(server)
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshPolygonsView.mesh_polygons_prefix

src/tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py

@@ -9,7 +9,8 @@
 # Local application imports
 
 
-def test_register_mesh(server):
+def test_register_mesh(server, dataset_factory):
+    dataset_factory(id="11223344", viewable_file_name="polyhedron_attribute.vtu")
 
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
@@ -18,8 +19,8 @@ def test_register_mesh(server):
     assert server.compare_image(3, "mesh/polyhedra/register.jpeg") == True
 
 
-def test_polyhedra_color(server):
-    test_register_mesh(server)
+def test_polyhedra_color(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshPolyhedraView.mesh_polyhedra_prefix
@@ -29,8 +30,8 @@ def test_polyhedra_color(server):
     assert server.compare_image(3, "mesh/polyhedra/color.jpeg") == True
 
 
-def test_polyhedra_visibility(server):
-    test_register_mesh(server)
+def test_polyhedra_visibility(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshPolyhedraView.mesh_polyhedra_prefix
@@ -40,8 +41,8 @@ def test_polyhedra_visibility(server):
     assert server.compare_image(3, "mesh/polyhedra/visibility.jpeg") == True
 
 
-def test_vertex_attribute(server):
-    test_register_mesh(server)
+def test_vertex_attribute(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshPolyhedraView.mesh_polyhedra_prefix
@@ -51,8 +52,8 @@ def test_vertex_attribute(server):
     assert server.compare_image(3, "mesh/polyhedra/vertex_attribute.jpeg") == True
 
 
-def test_polyhedron_attribute(server):
-    test_register_mesh(server)
+def test_polyhedron_attribute(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshPolyhedraView.mesh_polyhedra_prefix

src/tests/mesh/test_mesh_protocols.py

@@ -3,36 +3,33 @@
 from opengeodeweb_microservice.database.data import Data
 
 
-def test_register_mesh(server):
-    session = server.get_session()
-    session.add(
-        Data(
-            id="123456789",
-            viewable_file_name="hat.vtp",
-            # geode_object="mesh",
-        )
-    )
+def test_register_mesh(server, dataset_factory):
+    dataset_factory(id="123456789", viewable_file_name="hat.vtp")
+    
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
     )
     assert server.compare_image(3, "mesh/register.jpeg") == True
 
 
-def test_deregister_mesh(server):
-
-    test_register_mesh(server)
-
+def test_deregister_mesh(server, dataset_factory):
+    dataset_factory(id="123456789", viewable_file_name="hat.vtp")
+    
+    server.call(
+        VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
+        [{"id": "123456789"}],
+    )
+    
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["deregister"]["rpc"],
         [{"id": "123456789"}],
     )
     assert server.compare_image(3, "mesh/deregister.jpeg") == True
 
 
-def test_opacity(server):
-
-    test_register_mesh(server)
+def test_opacity(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["opacity"]["rpc"],
@@ -41,9 +38,8 @@ def test_opacity(server):
     assert server.compare_image(3, "mesh/opacity.jpeg") == True
 
 
-def test_visibility(server):
-
-    test_register_mesh(server)
+def test_visibility(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["visibility"]["rpc"],
@@ -52,9 +48,8 @@ def test_visibility(server):
     assert server.compare_image(3, "mesh/visibility.jpeg") == True
 
 
-def test_color(server):
-
-    test_register_mesh(server)
+def test_color(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["color"]["rpc"],
@@ -63,9 +58,8 @@ def test_color(server):
     assert server.compare_image(3, "mesh/color.jpeg") == True
 
 
-def test_apply_textures(server):
-
-    test_register_mesh(server)
+def test_apply_textures(server, dataset_factory):
+    test_register_mesh(server, dataset_factory)
 
     server.call(
         VtkMeshView.mesh_prefix

src/tests/model/blocks/test_model_blocks_protocols.py

@@ -9,9 +9,9 @@
 from src.tests.model.test_model_protocols import test_register_model_cube
 
 
-def test_blocks_polyhedra_visibility(server):
+def test_blocks_polyhedra_visibility(server, dataset_factory):
 
-    test_register_model_cube(server)
+    test_register_model_cube(server, dataset_factory)
 
     server.call(
         VtkModelBlocksView.model_blocks_prefix
@@ -42,9 +42,9 @@ def test_blocks_polyhedra_visibility(server):
     assert server.compare_image(3, "model/blocks/visibility.jpeg") == True
 
 
-def test_blocks_polyhedra_color(server):
+def test_blocks_polyhedra_color(server, dataset_factory):
 
-    test_blocks_polyhedra_visibility(server)
+    test_blocks_polyhedra_visibility(server, dataset_factory)
 
     server.call(
         VtkModelBlocksView.model_blocks_prefix

src/tests/model/corners/test_model_corners_protocols.py

@@ -9,9 +9,9 @@
 from src.tests.model.test_model_protocols import test_register_model_cube
 
 
-def test_corners_points_visibility(server):
+def test_corners_points_visibility(server, dataset_factory):
 
-    test_register_model_cube(server)
+    test_register_model_cube(server, dataset_factory)
 
     server.call(
         VtkModelCornersView.model_corners_prefix
@@ -40,9 +40,9 @@ def test_corners_points_visibility(server):
     assert server.compare_image(3, "model/corners/visibility.jpeg") == True
 
 
-def test_corners_points_color(server):
+def test_corners_points_color(server, dataset_factory):
 
-    test_corners_points_visibility(server)
+    test_corners_points_visibility(server, dataset_factory)
 
     server.call(
         VtkModelCornersView.model_corners_prefix