models_routes & test_models_routes adjusted to fit data/id/ path

Author: MaxNumerique

tests/conftest.py

@@ -1,13 +1,8 @@
-# Standard library imports
+import os
 import time
 import shutil
-import os
 
-# Third party imports
 import pytest
-import uuid
-
-# Local application imports
 from app import app
 
 
@@ -33,24 +28,3 @@ def client():
 def app_context():
     with app.app_context():
         yield
-
-
-@pytest.fixture
-def uuid_project_structure():
-    uuid_project = uuid.uuid4().hex
-    uuid_data = uuid.uuid4().hex
-
-    base_path = os.path.join("tmp", "vease", uuid_project)
-    data_path = os.path.join(base_path, uuid_data)
-    uploads_path = os.path.join(base_path, "uploads")
-
-    os.makedirs(data_path, exist_ok=True)
-    os.makedirs(uploads_path, exist_ok=True)
-
-    return {
-        "uuid_project": uuid_project,
-        "uuid_data": uuid_data,
-        "base_path": base_path,
-        "data_path": data_path,
-        "uploads_path": uploads_path,
-    }

tests/test_models_routes.py

@@ -1,57 +1,55 @@
-import shutil
 import os
+import shutil
 
-
-def test_model_mesh_components(client, uuid_project_structure):
+def test_model_mesh_components(client):
+    test_id = "1"
     route = "/models/vtm_component_indices"
-    uuid_data = uuid_project_structure["uuid_data"]
-    data_path = uuid_project_structure["data_path"]
 
-    shutil.copy("./tests/data/cube.vtm", os.path.join(data_path, "viewable.vtm"))
+    base_path = client.application.config["DATA_FOLDER_PATH"]
+    data_path = os.path.join(base_path, test_id)
+    os.makedirs(data_path, exist_ok=True)
+    shutil.copy(
+        "./tests/data/cube.vtm",
+        os.path.join(data_path, "viewable.vtm")
+    )
 
-    original_path = client.application.config["DATA_FOLDER_PATH"]
-    client.application.config["DATA_FOLDER_PATH"] = uuid_project_structure["base_path"]
+    response = client.post(route, json={"id": test_id})
+    assert response.status_code == 200
 
-    try:
-        response = client.post(route, json={"id": uuid_data})
-        assert response.status_code == 200
-        uuid_dict = response.json["uuid_to_flat_index"]
-        assert isinstance(uuid_dict, dict)
+    uuid_dict = response.json["uuid_to_flat_index"]
+    assert isinstance(uuid_dict, dict)
 
-        indices = list(uuid_dict.values())
-        indices.sort()
-        assert all(indices[i] > indices[i - 1] for i in range(1, len(indices)))
-        for uuid_key in uuid_dict.keys():
-            assert isinstance(uuid_key, str)
-    finally:
-        client.application.config["DATA_FOLDER_PATH"] = original_path
+    indices = sorted(uuid_dict.values())
+    assert all(indices[i] > indices[i-1] for i in range(1, len(indices)))
+    for key in uuid_dict:
+        assert isinstance(key, str)
 
 
-def test_extract_brep_uuids(client, uuid_project_structure):
+def test_extract_brep_uuids(client):
+    test_id = "1"
     route = "/models/mesh_components"
-    uuid_data = uuid_project_structure["uuid_data"]
-    data_path = uuid_project_structure["data_path"]
-
-    shutil.copy("./tests/data/cube.og_brep", os.path.join(data_path, "cube.og_brep"))
-
-    original_path = client.application.config["DATA_FOLDER_PATH"]
-    client.application.config["DATA_FOLDER_PATH"] = uuid_project_structure["base_path"]
-
-    try:
-        json_data = {
-            "filename": "cube.og_brep",
-            "geode_object": "BRep",
-            "id": uuid_data,
-        }
-        response = client.post(route, json=json_data)
-        assert response.status_code == 200
-
-        uuid_dict = response.json["uuid_dict"]
-        assert isinstance(uuid_dict, dict)
-        expected_keys = {"Block", "Line", "Surface", "Corner"}
-        assert any(key in uuid_dict for key in expected_keys)
-        for key, value in uuid_dict.items():
-            assert isinstance(value, list)
-            assert all(isinstance(v, str) for v in value)
-    finally:
-        client.application.config["DATA_FOLDER_PATH"] = original_path
+
+    base_path = client.application.config["DATA_FOLDER_PATH"]
+    data_path = os.path.join(base_path, test_id)
+    os.makedirs(data_path, exist_ok=True)
+    shutil.copy(
+        "./tests/data/cube.og_brep",
+        os.path.join(data_path, "cube.og_brep")
+    )
+
+    json_data = {
+        "id": test_id,
+        "geode_object": "BRep",
+        "filename": "cube.og_brep"
+    }
+    response = client.post(route, json=json_data)
+    assert response.status_code == 200
+
+    uuid_dict = response.json["uuid_dict"]
+    assert isinstance(uuid_dict, dict)
+    expected = {"Block", "Line", "Surface", "Corner"}
+    assert any(k in uuid_dict for k in expected)
+    for values in uuid_dict.values():
+        assert isinstance(values, list)
+        assert all(isinstance(v, str) for v in values)
+