fix infinite recursion bug and class naming issues

Author: abdulanu0

tests/microsoft-agents-a365-tooling-unittest/models/test_mcp_server_config.py

@@ -25,7 +25,7 @@ def __post_init__(self):
 
 
 class TestMCPServerConfig:
-    """Test class for MockMCPServerConfig dataclass."""
+    """Test class for MCPServerConfig dataclass."""
 
     def test_valid_initialization(self):
         """Test successful initialization with valid parameters."""
@@ -34,7 +34,7 @@ def test_valid_initialization(self):
         unique_name = "mcp_mail_tools"
 
         # Act
-        config = MockMCPServerConfig(
+        config = MCPServerConfig(
             mcp_server_name=server_name, mcp_server_unique_name=unique_name
         )
 
@@ -66,23 +66,17 @@ def test_initialization_with_none_unique_name_raises_error(self):
         with pytest.raises(ValueError, match="mcp_server_unique_name cannot be empty"):
             MCPServerConfig(mcp_server_name="valid_server_name", mcp_server_unique_name=None)
 
-    def test_initialization_with_whitespace_server_name_succeeds(self):
-        """Test initialization succeeds with whitespace-only server name (implementation allows this)."""
-        # Arrange & Act - The current implementation allows whitespace strings
-        config = MCPServerConfig(mcp_server_name="   ", mcp_server_unique_name="valid_unique_name")
-
-        # Assert
-        assert config.mcp_server_name == "   "
-        assert config.mcp_server_unique_name == "valid_unique_name"
-
-    def test_initialization_with_whitespace_unique_name_succeeds(self):
-        """Test initialization succeeds with whitespace-only unique name (implementation allows this)."""
-        # Arrange & Act - The current implementation allows whitespace strings
-        config = MCPServerConfig(mcp_server_name="valid_server_name", mcp_server_unique_name="   ")
+    def test_initialization_with_whitespace_server_name_raises_error(self):
+        """Test initialization fails with whitespace-only server name."""
+        # Arrange & Act & Assert
+        with pytest.raises(ValueError, match="mcp_server_name cannot be empty"):
+            MCPServerConfig(mcp_server_name="   ", mcp_server_unique_name="valid_unique_name")
 
-        # Assert
-        assert config.mcp_server_name == "valid_server_name"
-        assert config.mcp_server_unique_name == "   "
+    def test_initialization_with_whitespace_unique_name_raises_error(self):
+        """Test initialization fails with whitespace-only unique name."""
+        # Arrange & Act & Assert
+        with pytest.raises(ValueError, match="mcp_server_unique_name cannot be empty"):
+            MCPServerConfig(mcp_server_name="valid_server_name", mcp_server_unique_name="   ")
 
     def test_equality_comparison(self):
         """Test equality comparison between MCPServerConfig instances."""

tests/microsoft-agents-a365-tooling-unittest/services/test_mcp_tool_server_configuration_service.py

@@ -82,7 +82,7 @@ def teardown_method(self):
     def test_initialization_default_logger(self):
         """Test service initialization with default logger."""
         # Act
-        service = MockMcpToolServerConfigurationService()
+        service = MockMockMcpToolServerConfigurationService()
 
         # Assert
         assert service is not None
@@ -95,7 +95,7 @@ def test_initialization_custom_logger(self):
         custom_logger = logging.getLogger("CustomTestLogger")
 
         # Act
-        service = MockMcpToolServerConfigurationService(custom_logger)
+        service = MockMockMcpToolServerConfigurationService(custom_logger)
 
         # Assert
         assert service is not None
@@ -266,7 +266,7 @@ def test_parse_manifest_file_valid_content(self):
 
             # Assert
             assert len(result) == 2
-            assert all(isinstance(config, MockMCPServerConfig) for config in result)
+            assert all(isinstance(config, MockMockMCPServerConfig) for config in result)
             assert result[0].mcp_server_name == "mailServer"
             assert result[1].mcp_server_name == "sharePointServer"
         finally:

tests/semantickernel_tests/test_semantickernel_service_logic.py

@@ -33,25 +33,25 @@ def __init__(self, name: str, url: str, headers: Optional[dict] = None):
         self.name = name
         self.url = url
         self.headers = headers
-        self.connect = AsyncMock()
-        self.close = AsyncMock()
-        self.disconnect = AsyncMock()
+        self.connect_mock = AsyncMock()
+        self.close_mock = AsyncMock()
+        self.disconnect_mock = AsyncMock()
         self._connected = False
 
     async def connect(self):
         """Mock connect method."""
         self._connected = True
-        await self.connect()
+        await self.connect_mock()
 
     async def close(self):
         """Mock close method."""
         self._connected = False
-        await self.close()
+        await self.close_mock()
 
     async def disconnect(self):
         """Mock disconnect method."""
         self._connected = False
-        await self.disconnect()
+        await self.disconnect_mock()
 
 
 class MockSemanticKernelService: