pytest

Signed-off-by: rakdutta <rakhibiswas@yahoo.com>

Author: rakdutta

tests/unit/mcpgateway/services/test_prompt_service_extended.py

@@ -49,14 +49,14 @@ async def test_prompt_name_conflict_error_init(self):
         # Test active prompt conflict
         error = PromptNameConflictError("test_prompt")
         assert error.name == "test_prompt"
-        assert error.is_active is True
+        assert error.enabled is True
         assert error.prompt_id is None
         assert "test_prompt" in str(error)
 
         # Test inactive prompt conflict
         error_inactive = PromptNameConflictError("inactive_prompt", False, 123)
         assert error_inactive.name == "inactive_prompt"
-        assert error_inactive.is_active is False
+        assert error_inactive.enabled is False
         assert error_inactive.prompt_id == 123
         assert "inactive_prompt" in str(error_inactive)
         assert "currently inactive, ID: 123" in str(error_inactive)

tests/unit/mcpgateway/services/test_server_service.py

@@ -80,7 +80,7 @@ def mock_server(mock_tool, mock_resource, mock_prompt):
     server.modified_by = "test_user"
     server.created_at = "2023-01-01T00:00:00"
     server.updated_at = "2023-01-01T00:00:00"
-    server.is_active = True
+    server.enabled = True
 
     # Ownership fields for RBAC
     server.owner_email = "user@example.com"  # Match default test user
@@ -215,7 +215,7 @@ def query_side_effect(model):
                 icon="http://example.com/image.jpg",
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=[],
                 associated_resources=[],
                 associated_prompts=[],
@@ -260,7 +260,7 @@ async def test_register_server(self, server_service, test_db, mock_tool, mock_re
         mock_db_server.modified_by = "test_user"
         mock_db_server.created_at = "2023-01-01T00:00:00"
         mock_db_server.updated_at = "2023-01-01T00:00:00"
-        mock_db_server.is_active = True
+        mock_db_server.enabled = True
         mock_db_server.metrics = []
 
         # Create mock lists with append methods
@@ -307,8 +307,8 @@ def capture_add(server):
         test_db.get = Mock(
             side_effect=lambda cls, _id: {
                 (DbTool, "101"): mock_tool,
-                (DbResource, 201): mock_resource,
-                (DbPrompt, 301): mock_prompt,
+                (DbResource, "201"): mock_resource,
+                (DbPrompt, "301"): mock_prompt,
             }.get((cls, _id))
         )
 
@@ -322,10 +322,10 @@ def capture_add(server):
                 icon="server-icon",
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=["101"],
-                associated_resources=[201],
-                associated_prompts=[301],
+                associated_resources=["201"],
+                associated_prompts=["301"],
                 metrics={
                     "total_executions": 0,
                     "successful_executions": 0,
@@ -359,8 +359,8 @@ def capture_add(server):
 
         assert result.name == "test_server"
         assert "101" in result.associated_tools
-        assert 201 in result.associated_resources
-        assert 301 in result.associated_prompts
+        assert "201" in result.associated_resources
+        assert "301" in result.associated_prompts
 
     @pytest.mark.asyncio
     async def test_register_server_name_conflict(self, server_service, mock_server, test_db):
@@ -428,10 +428,10 @@ async def test_list_servers(self, server_service, mock_server, test_db):
             icon="http://example.com/image.jgp",
             created_at="2023-01-01T00:00:00",
             updated_at="2023-01-01T00:00:00",
-            is_active=True,
+            enabled=True,
             associated_tools=["101"],
-            associated_resources=[201],
-            associated_prompts=[301],
+            associated_resources=["201"],
+            associated_prompts=["301"],
             metrics={
                 "total_executions": 0,
                 "successful_executions": 0,
@@ -464,10 +464,10 @@ async def test_get_server(self, server_service, mock_server, test_db):
             icon="http://example.com/image.jpg",
             created_at="2023-01-01T00:00:00",
             updated_at="2023-01-01T00:00:00",
-            is_active=True,
+            enabled=True,
             associated_tools=["101"],
-            associated_resources=[201],
-            associated_prompts=[301],
+            associated_resources=["201"],
+            associated_prompts=["301"],
             metrics={
                 "total_executions": 0,
                 "successful_executions": 0,
@@ -568,10 +568,10 @@ async def test_update_server(self, server_service, mock_server, test_db, mock_to
                 icon="http://example.com/image.jpg",
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=["102"],
-                associated_resources=[202],
-                associated_prompts=[302],
+                associated_resources=["202"],
+                associated_prompts=["302"],
                 metrics={
                     "total_executions": 0,
                     "successful_executions": 0,
@@ -660,7 +660,7 @@ async def test_update_server_name_conflict(self, server_service, mock_server, te
             server_team.visibility = "team"
             server_team.team_id = "teamA"
 
-            conflict_team_server = types.SimpleNamespace(id="3", name="existing_server", is_active=True, visibility="team", team_id="teamA")
+            conflict_team_server = types.SimpleNamespace(id="3", name="existing_server", enabled=True, visibility="team", team_id="teamA")
 
             test_db.get = Mock(return_value=server_team)
             mock_scalar = Mock()
@@ -688,7 +688,7 @@ async def test_update_server_name_conflict(self, server_service, mock_server, te
             server_public.visibility = "public"
             server_public.team_id = None
 
-            conflict_public_server = types.SimpleNamespace(id="5", name="existing_server", is_active=True, visibility="public", team_id=None)
+            conflict_public_server = types.SimpleNamespace(id="5", name="existing_server", enabled=True, visibility="public", team_id=None)
 
             test_db.get = Mock(return_value=server_public)
             mock_scalar = Mock()
@@ -727,10 +727,10 @@ async def test_toggle_server_status(self, server_service, mock_server, test_db):
                 icon="server-icon",
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=False,
+                enabled=False,
                 associated_tools=["101"],
-                associated_resources=[201],
-                associated_prompts=[301],
+                associated_resources=["201"],
+                associated_prompts=["301"],
                 metrics={
                     "total_executions": 0,
                     "successful_executions": 0,
@@ -750,7 +750,7 @@ async def test_toggle_server_status(self, server_service, mock_server, test_db):
         test_db.commit.assert_called_once()
         test_db.refresh.assert_called_once()
         server_service._notify_server_deactivated.assert_called_once()
-        assert result.is_active is False
+        assert result.enabled is False
 
     # --------------------------- delete -------------------------------- #
     @pytest.mark.asyncio
@@ -821,7 +821,7 @@ def capture_add(server):
                 icon=None,
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=[],
                 associated_resources=[],
                 associated_prompts=[],
@@ -892,7 +892,7 @@ def capture_add(server):
                 icon=None,
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=[],
                 associated_resources=[],
                 associated_prompts=[],
@@ -956,7 +956,7 @@ def capture_add(server):
                 icon=None,
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=[],
                 associated_resources=[],
                 associated_prompts=[],
@@ -1018,7 +1018,7 @@ async def test_update_server_uuid_normalization(self, server_service, test_db):
         existing_server = MagicMock(spec=DbServer)
         existing_server.id = "oldserverid"
         existing_server.name = "Old Name"
-        existing_server.is_active = True
+        existing_server.enabled = True
         existing_server.tools = []
         existing_server.resources = []
         existing_server.prompts = []
@@ -1053,7 +1053,7 @@ async def test_update_server_uuid_normalization(self, server_service, test_db):
                 icon=None,
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=[],
                 associated_resources=[],
                 associated_prompts=[],

tests/unit/mcpgateway/test_display_name_uuid_features.py

@@ -160,7 +160,7 @@ def test_server_create_with_custom_uuid(self, db_session):
         custom_uuid = "12345678-1234-1234-1234-123456789abc"
 
         # Create server with custom UUID
-        db_server = DbServer(id=custom_uuid, name="Test Server", description="Test server with custom UUID", is_active=True)
+        db_server = DbServer(id=custom_uuid, name="Test Server", description="Test server with custom UUID", enabled=True)
 
         db_session.add(db_server)
         db_session.commit()
@@ -173,7 +173,7 @@ def test_server_create_with_custom_uuid(self, db_session):
     def test_server_create_without_uuid(self, db_session):
         """Test creating a server without specifying UUID (auto-generated)."""
         # Create server without specifying UUID
-        db_server = DbServer(name="Auto UUID Server", description="Test server with auto UUID", is_active=True)
+        db_server = DbServer(name="Auto UUID Server", description="Test server with auto UUID", enabled=True)
 
         db_session.add(db_server)
         db_session.commit()
@@ -190,7 +190,7 @@ def test_server_update_uuid(self, db_session):
         new_uuid = "new-uuid-5678"
 
         # Create server with original UUID
-        db_server = DbServer(id=original_uuid, name="UUID Update Server", description="Test server for UUID update", is_active=True)
+        db_server = DbServer(id=original_uuid, name="UUID Update Server", description="Test server for UUID update", enabled=True)
 
         db_session.add(db_server)
         db_session.commit()
@@ -211,12 +211,12 @@ def test_server_uuid_uniqueness(self, db_session):
         duplicate_uuid = "duplicate-uuid-1234"
 
         # Create first server with UUID
-        db_server1 = DbServer(id=duplicate_uuid, name="First Server", description="First server", is_active=True)
+        db_server1 = DbServer(id=duplicate_uuid, name="First Server", description="First server", enabled=True)
         db_session.add(db_server1)
         db_session.commit()
 
         # Try to create second server with same UUID
-        db_server2 = DbServer(id=duplicate_uuid, name="Second Server", description="Second server", is_active=True)
+        db_server2 = DbServer(id=duplicate_uuid, name="Second Server", description="Second server", enabled=True)
 
         db_session.add(db_server2)
 
@@ -333,7 +333,7 @@ def capture_add(server):
                 icon=None,
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=[],
                 associated_resources=[],
                 associated_prompts=[],
@@ -401,7 +401,7 @@ def capture_add(server):
                 icon=None,
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=[],
                 associated_resources=[],
                 associated_prompts=[],
@@ -465,7 +465,7 @@ def capture_add(server):
                 icon=None,
                 created_at="2023-01-01T00:00:00",
                 updated_at="2023-01-01T00:00:00",
-                is_active=True,
+                enabled=True,
                 associated_tools=[],
                 associated_resources=[],
                 associated_prompts=[],
@@ -561,7 +561,7 @@ def test_database_storage_format_verification(self, db_session):
             id=expected_hex,  # Simulate the normalized UUID
             name="Storage Test Server",
             description="Test UUID storage format",
-            is_active=True,
+            enabled=True,
         )
 
         db_session.add(db_server)
@@ -616,7 +616,7 @@ def capture_add(server):
                     icon=None,
                     created_at="2023-01-01T00:00:00",
                     updated_at="2023-01-01T00:00:00",
-                    is_active=True,
+                    enabled=True,
                     associated_tools=[],
                     associated_resources=[],
                     associated_prompts=[],

tests/unit/mcpgateway/test_main.py

@@ -55,10 +55,10 @@
     "icon": "server-icon",
     "created_at": "2023-01-01T00:00:00+00:00",
     "updated_at": "2023-01-01T00:00:00+00:00",
-    "is_active": True,
+    "enabled": True,
     "associated_tools": ["101"],
-    "associated_resources": [201],
-    "associated_prompts": [301],
+    "associated_resources": ["201"],
+    "associated_prompts": ["301"],
     "metrics": MOCK_METRICS,
 }
 
@@ -125,7 +125,7 @@ def camel_to_snake_tool(d: dict) -> dict:
     "size": 12,
     "created_at": "2023-01-01T00:00:00+00:00",
     "updated_at": "2023-01-01T00:00:00+00:00",
-    "is_active": True,
+    "enabled": True,
     "metrics": MOCK_METRICS,
 }
 
@@ -137,7 +137,7 @@ def camel_to_snake_tool(d: dict) -> dict:
     "arguments": [],
     "created_at": "2023-01-01T00:00:00+00:00",
     "updated_at": "2023-01-01T00:00:00+00:00",
-    "is_active": True,
+    "enabled": True,
     "metrics": MOCK_METRICS,
 }
 
@@ -505,7 +505,7 @@ def test_update_server_endpoint(self, mock_update, test_client, auth_headers):
     def test_toggle_server_status(self, mock_toggle, test_client, auth_headers):
         """Test toggling server active/inactive status."""
         updated_server = MOCK_SERVER_READ.copy()
-        updated_server["is_active"] = False
+        updated_server["enabled"] = False
         mock_toggle.return_value = ServerRead(**updated_server)
         response = test_client.post("/servers/1/toggle?activate=false", headers=auth_headers)
         assert response.status_code == 200
@@ -740,7 +740,7 @@ def test_list_resource_templates(self, mock_list, test_client, auth_headers):
     def test_toggle_resource_status(self, mock_toggle, test_client, auth_headers):
         """Test toggling resource active/inactive status."""
         mock_resource = MagicMock()
-        mock_resource.model_dump.return_value = {"id": 1, "is_active": False}
+        mock_resource.model_dump.return_value = {"id": "1", "enabled": False}
         mock_toggle.return_value = mock_resource
         response = test_client.post("/resources/1/toggle?activate=false", headers=auth_headers)
         assert response.status_code == 200

tests/unit/mcpgateway/test_main_extended.py

@@ -290,7 +290,7 @@ def test_server_toggle_edge_cases(self, test_client, auth_headers):
                 "icon": None,
                 "created_at": "2023-01-01T00:00:00+00:00",
                 "updated_at": "2023-01-01T00:00:00+00:00",
-                "is_active": True,
+                "enabled": True,
                 "associated_tools": [],
                 "associated_resources": [],
                 "associated_prompts": [],
@@ -313,7 +313,7 @@ def test_server_toggle_edge_cases(self, test_client, auth_headers):
             assert response.status_code == 200
 
             # Test activate=false
-            mock_server_data["is_active"] = False
+            mock_server_data["enabled"] = False
             mock_toggle.return_value = ServerRead(**mock_server_data)
             response = test_client.post("/servers/1/toggle?activate=false", headers=auth_headers)
             assert response.status_code == 200