tests 2

Author: cotovanu-cristian

tests/agent/react/test_json_utils.py

@@ -2,6 +2,7 @@
 
 from typing import Optional
 
+import pytest
 from pydantic import BaseModel
 
 from uipath_langchain.agent.react.json_utils import (
@@ -171,57 +172,46 @@ def test_extract_nested_path(self) -> None:
 class TestUnwrapOptional:
     """Tests for _unwrap_optional."""
 
-    def test_unwraps_optional_type(self) -> None:
-        result = _unwrap_optional(Optional[str])
-        assert result is str
-
-    def test_non_optional_unchanged(self) -> None:
-        result = _unwrap_optional(str)
-        assert result is str
-
-    def test_unwraps_optional_basemodel(self) -> None:
-        result = _unwrap_optional(Optional[Attachment])
-        assert result is Attachment
+    @pytest.mark.parametrize(
+        "input_type,expected",
+        [
+            (Optional[str], str),
+            (str, str),
+            (Optional[Attachment], Attachment),
+        ],
+        ids=["optional-str", "plain-str", "optional-basemodel"],
+    )
+    def test_unwraps_correctly(self, input_type: type, expected: type) -> None:
+        assert _unwrap_optional(input_type) is expected
 
 
 class TestIsPydanticModel:
     """Tests for _is_pydantic_model."""
 
-    def test_basemodel_returns_true(self) -> None:
-        assert _is_pydantic_model(Attachment) is True
-
-    def test_str_returns_false(self) -> None:
-        assert _is_pydantic_model(str) is False
-
-    def test_int_returns_false(self) -> None:
-        assert _is_pydantic_model(int) is False
-
-    def test_none_returns_false(self) -> None:
-        assert _is_pydantic_model(None) is False
-
-    def test_instance_returns_false(self) -> None:
-        assert _is_pydantic_model(Attachment(id="1", filename="f")) is False
+    @pytest.mark.parametrize(
+        "value,expected",
+        [
+            (Attachment, True),
+            (str, False),
+            (None, False),
+            (Attachment(id="1", filename="f"), False),
+        ],
+        ids=["basemodel-class", "builtin-type", "none", "instance"],
+    )
+    def test_identifies_pydantic_models(self, value: object, expected: bool) -> None:
+        assert _is_pydantic_model(value) is expected
 
 
 class TestCreateTypeMatcher:
     """Tests for _create_type_matcher."""
 
-    def test_matches_by_name(self) -> None:
+    def test_matches_by_class_and_string_annotation(self) -> None:
         matcher = _create_type_matcher("Attachment", None)
         assert matcher(Attachment) is True
+        assert matcher("Attachment") is True
+        assert matcher(str) is False
+        assert matcher("OtherType") is False
 
     def test_matches_by_target_type(self) -> None:
         matcher = _create_type_matcher("Attachment", Attachment)
         assert matcher(Attachment) is True
-
-    def test_no_match_returns_false(self) -> None:
-        matcher = _create_type_matcher("Attachment", None)
-        assert matcher(str) is False
-
-    def test_string_annotation_match(self) -> None:
-        matcher = _create_type_matcher("Attachment", None)
-        assert matcher("Attachment") is True
-
-    def test_string_annotation_no_match(self) -> None:
-        matcher = _create_type_matcher("Attachment", None)
-        assert matcher("OtherType") is False

tests/agent/react/test_merge_objects.py

@@ -200,10 +200,6 @@ def test_empty_left_returns_right(self):
         result = reducer_merge_dicts({}, right)
         assert result is right
 
-    def test_both_empty_returns_left(self):
-        result = reducer_merge_dicts({}, {})
-        assert result == {}
-
     def test_disjoint_keys_merged(self):
         left = {"a": 1}
         right = {"b": 2}

tests/agent/tools/test_mcp_tool.py

@@ -10,11 +10,11 @@
     AgentResourceType,
 )
 
-from uipath_langchain.agent.tools.mcp_tool import (
+from uipath_langchain.agent.tools.mcp.mcp_tool import (
     _deduplicate_tools,
     _filter_tools,
     create_mcp_tools,
-    create_mcp_tools_from_metadata,
+    create_mcp_tools_from_metadata_for_mcp_server,
 )
 
 
@@ -52,35 +52,19 @@ def _make_mcp_resource(
 class TestDeduplicateTools:
     """Tests for _deduplicate_tools."""
 
-    def test_no_duplicates_unchanged(self) -> None:
+    def test_unique_names_unchanged(self) -> None:
         tools = [_make_tool("alpha"), _make_tool("beta"), _make_tool("gamma")]
         result = _deduplicate_tools(tools)
         assert [t.name for t in result] == ["alpha", "beta", "gamma"]
 
-    def test_all_duplicates_get_suffix(self) -> None:
-        tools = [_make_tool("search"), _make_tool("search"), _make_tool("search")]
+    def test_duplicate_names_get_numeric_suffix(self) -> None:
+        tools = [_make_tool("search"), _make_tool("calc"), _make_tool("search")]
         result = _deduplicate_tools(tools)
-        assert [t.name for t in result] == ["search_1", "search_2", "search_3"]
-
-    def test_partial_duplicates(self) -> None:
-        tools = [
-            _make_tool("search"),
-            _make_tool("calc"),
-            _make_tool("search"),
-        ]
-        result = _deduplicate_tools(tools)
-        assert result[0].name == "search_1"
-        assert result[1].name == "calc"
-        assert result[2].name == "search_2"
+        assert [t.name for t in result] == ["search_1", "calc", "search_2"]
 
     def test_empty_list(self) -> None:
         assert _deduplicate_tools([]) == []
 
-    def test_single_tool(self) -> None:
-        tools = [_make_tool("only")]
-        result = _deduplicate_tools(tools)
-        assert result[0].name == "only"
-
 
 class TestFilterTools:
     """Tests for _filter_tools."""
@@ -158,17 +142,11 @@ async def test_disabled_configs_yield_empty(
         monkeypatch.setenv("UIPATH_URL", "https://example.com")
         monkeypatch.setenv("UIPATH_ACCESS_TOKEN", "test-token")
 
+        # Both single config and list of configs should yield empty
         cfg = _make_mcp_resource(is_enabled=False)
         async with create_mcp_tools(cfg) as tools:
             assert tools == []
 
-    @pytest.mark.asyncio
-    async def test_all_disabled_in_list_yield_empty(
-        self, monkeypatch: pytest.MonkeyPatch
-    ) -> None:
-        monkeypatch.setenv("UIPATH_URL", "https://example.com")
-        monkeypatch.setenv("UIPATH_ACCESS_TOKEN", "test-token")
-
         configs = [
             _make_mcp_resource(is_enabled=False),
             _make_mcp_resource(is_enabled=False),
@@ -178,10 +156,10 @@ async def test_all_disabled_in_list_yield_empty(
 
 
 class TestCreateMcpToolsFromMetadata:
-    """Tests for create_mcp_tools_from_metadata."""
+    """Tests for create_mcp_tools_from_metadata_for_mcp_server."""
 
     @pytest.mark.asyncio
-    async def test_creates_tools_from_available_tools(self) -> None:
+    async def test_creates_tools_with_correct_metadata(self) -> None:
         mcp_tools = [
             AgentMcpTool(
                 name="get_weather",
@@ -201,38 +179,27 @@ async def test_creates_tools_from_available_tools(self) -> None:
             ),
         ]
         cfg = _make_mcp_resource(available_tools=mcp_tools)
+        mock_client = MagicMock()
 
-        tools = await create_mcp_tools_from_metadata(cfg)
+        tools = await create_mcp_tools_from_metadata_for_mcp_server(cfg, mock_client)
 
         assert len(tools) == 2
         assert tools[0].name == "get_weather"
-        assert tools[1].name == "search_docs"
         assert tools[0].description == "Get weather data"
-
-    @pytest.mark.asyncio
-    async def test_tool_metadata_contains_expected_fields(self) -> None:
-        mcp_tools = [
-            AgentMcpTool(
-                name="my_tool",
-                description="A tool",
-                inputSchema={"type": "object", "properties": {}},
-            ),
-        ]
-        cfg = _make_mcp_resource(available_tools=mcp_tools)
-
-        tools = await create_mcp_tools_from_metadata(cfg)
-
+        assert tools[1].name == "search_docs"
+        # Validate metadata on first tool
         assert tools[0].metadata is not None
         assert tools[0].metadata["tool_type"] == "mcp"
-        assert tools[0].metadata["display_name"] == "my_tool"
+        assert tools[0].metadata["display_name"] == "get_weather"
         assert tools[0].metadata["folder_path"] == "/Shared"
         assert tools[0].metadata["slug"] == "test-slug"
 
     @pytest.mark.asyncio
     async def test_empty_available_tools_returns_empty(self) -> None:
         cfg = _make_mcp_resource(available_tools=[])
+        mock_client = MagicMock()
 
-        tools = await create_mcp_tools_from_metadata(cfg)
+        tools = await create_mcp_tools_from_metadata_for_mcp_server(cfg, mock_client)
 
         assert tools == []
 
@@ -246,9 +213,9 @@ async def test_tool_name_sanitized(self) -> None:
             ),
         ]
         cfg = _make_mcp_resource(available_tools=mcp_tools)
+        mock_client = MagicMock()
 
-        tools = await create_mcp_tools_from_metadata(cfg)
+        tools = await create_mcp_tools_from_metadata_for_mcp_server(cfg, mock_client)
 
-        # sanitize_tool_name replaces spaces with underscores and strips non-alphanum
         assert " " not in tools[0].name
         assert "!" not in tools[0].name

tests/agent/tools/test_process_tool.py

@@ -54,60 +54,22 @@ def process_resource_with_input() -> AgentProcessToolResourceConfig:
     )
 
 
-class TestProcessToolMetadata:
-    """Test that process tool has correct metadata for observability."""
+class TestProcessToolCreation:
+    """Test process tool creation, metadata, and structural properties."""
 
-    def test_process_tool_has_metadata(
+    def test_tool_properties_and_metadata(
         self, process_resource: AgentProcessToolResourceConfig
     ) -> None:
         tool = create_process_tool(process_resource)
 
-        assert tool.metadata is not None
-        assert isinstance(tool.metadata, dict)
-
-    def test_process_tool_metadata_has_tool_type(
-        self, process_resource: AgentProcessToolResourceConfig
-    ) -> None:
-        tool = create_process_tool(process_resource)
+        assert tool.name == "test_process"
+        assert tool.description == "Test process description"
+        assert tool.coroutine is not None
         assert tool.metadata is not None
         assert tool.metadata["tool_type"] == "process"
-
-    def test_process_tool_metadata_has_display_name(
-        self, process_resource: AgentProcessToolResourceConfig
-    ) -> None:
-        tool = create_process_tool(process_resource)
-        assert tool.metadata is not None
         assert tool.metadata["display_name"] == "MyProcess"
-
-    def test_process_tool_metadata_has_folder_path(
-        self, process_resource: AgentProcessToolResourceConfig
-    ) -> None:
-        tool = create_process_tool(process_resource)
-        assert tool.metadata is not None
         assert tool.metadata["folder_path"] == "/Shared/MyFolder"
 
-
-class TestProcessToolCreation:
-    """Test process tool structural properties."""
-
-    def test_tool_name_matches_resource_name(
-        self, process_resource: AgentProcessToolResourceConfig
-    ) -> None:
-        tool = create_process_tool(process_resource)
-        assert tool.name == "test_process"
-
-    def test_tool_description_matches_resource(
-        self, process_resource: AgentProcessToolResourceConfig
-    ) -> None:
-        tool = create_process_tool(process_resource)
-        assert tool.description == "Test process description"
-
-    def test_tool_is_async(
-        self, process_resource: AgentProcessToolResourceConfig
-    ) -> None:
-        tool = create_process_tool(process_resource)
-        assert tool.coroutine is not None
-
     def test_tool_name_sanitized_for_special_chars(self) -> None:
         resource = AgentProcessToolResourceConfig(
             type=AgentToolType.PROCESS,
@@ -125,16 +87,11 @@ def test_tool_name_sanitized_for_special_chars(self) -> None:
         assert "(" not in tool.name
         assert "!" not in tool.name
 
-    def test_tool_with_input_schema_has_args_schema(
+    def test_tool_with_input_schema(
         self, process_resource_with_input: AgentProcessToolResourceConfig
     ) -> None:
         tool = create_process_tool(process_resource_with_input)
         assert tool.args_schema is not None
-
-    def test_tool_metadata_includes_args_schema(
-        self, process_resource_with_input: AgentProcessToolResourceConfig
-    ) -> None:
-        tool = create_process_tool(process_resource_with_input)
         assert tool.metadata is not None
         assert "args_schema" in tool.metadata