refactor metadata tests

Author: nb950

src/face-detection-recognition/test/test_app_main.py

@@ -171,7 +171,7 @@ def get_expected_routes(self):
                 "task_schema": f"/{APP_NAME}/bulkupload/task_schema",
                 "run_task": f"/{APP_NAME}/bulkupload",
                 "short_title": "Bulk Upload",
-                "order": 3,
+                "order": 0,
             },
             # {
             #     "task_schema": f"/{APP_NAME}/multi_pipeline_bulkupload/task_schema",
@@ -189,7 +189,7 @@ def get_expected_routes(self):
                 "task_schema": f"/{APP_NAME}/deletecollection/task_schema",
                 "run_task": f"/{APP_NAME}/deletecollection",
                 "short_title": "Delete Collection",
-                "order": 4,
+                "order": 2,
             },
             # {
             #     "task_schema": f"/{APP_NAME}/listcollections/task_schema",

src/rb-lib/rb/lib/common_tests.py

@@ -1,4 +1,6 @@
 from abc import ABC, abstractmethod
+import json
+import ast
 from typing import List, Tuple
 from rb.api.models import AppMetadata, TaskSchema
 from typer.testing import CliRunner
@@ -67,6 +69,9 @@ def test_routes_command(self, caplog):
                 assert any(
                     route["short_title"] in message for message in caplog.messages
                 )
+                assert any(
+                    str(route["order"]) in message for message in caplog.messages
+                )
 
     def check_if_str_in_messages(self, str_to_check: str, messages: List[str]):
         """
@@ -81,10 +86,14 @@ def test_metadata_command(self, caplog):
                 self.cli_app, [f"/{self.app_name}/api/app_metadata"]
             )
             assert result.exit_code == 0
+            for message in caplog.messages:
+                out_data = json.loads(json.dumps(message))
+                actual_metadata = ast.literal_eval(out_data)
+                print("debug", actual_metadata.keys())
             for key, value in expected_metadata:
                 print("debug", key, value)
-                assert any(str(key) in message for message in caplog.messages)
-                assert len(str(value)) > 0
+                assert any(str(key) in k for k in actual_metadata.keys())
+                assert len(json.dumps(value)) == len(json.dumps(actual_metadata[key]))
 
     def test_schema_command(self, caplog):
         with caplog.at_level("INFO"):
@@ -112,9 +121,11 @@ def test_api_metadata(self):
         response = self.client.get(f"/{self.app_name}/api/app_metadata")
         assert response.status_code == 200
         body = response.json()
+        actual_metadata = json.loads(json.dumps(body))
         expected_metadata = self.get_metadata().model_dump(mode="json")
-        assert len(body) > 0
-        assert len(expected_metadata) > 0
+        for key in expected_metadata.keys():
+            assert any(str(key) in k for k in actual_metadata.keys())
+            assert len(expected_metadata[key]) == len(actual_metadata[key])
 
     def test_api_task_schema(self):
         ml_services = self.get_all_ml_services()

src/ufdr-mounter/tests/test_main_ufdr_mounter.py

@@ -1,4 +1,4 @@
-from ufdr_mounter.ufdr_server import app as cli_app, APP_NAME, ufdr_task_schema
+from ufdr_mounter.ufdr_server import app as cli_app, APP_NAME, ufdr_task_schema, server
 from rb.lib.common_tests import RBAppTest
 from rb.api.models import AppMetadata, ResponseBody
 from pathlib import Path
@@ -12,13 +12,8 @@ def setup_method(self):
         self.set_app(cli_app, APP_NAME)
 
     def get_metadata(self):
-        return AppMetadata(
-            name="UFDR Mount Service",
-            author="Sribatscha Maharana",
-            version="1.0.0",
-            info="Mounts a UFDR file using FUSE and returns status.",
-            plugin_name=APP_NAME,
-        )
+        """Return app metadata for testing"""
+        return server._app_metadata
 
     def get_all_ml_services(self):
         return [