chore: Make UT of a2a consistent about how tests should be skipped when python verison < 3.10

PiperOrigin-RevId: 801040421

tests/unittests/a2a/utils/test_agent_card_builder.py

@@ -54,39 +54,10 @@ try:
   from google.adk.tools.example_tool import ExampleTool
 except ImportError as e:
   if sys.version_info < (3, 10):
-    # Create dummy classes to prevent NameError during test collection
-    # Tests will be skipped anyway due to pytestmark
-    class DummyTypes:
-      pass
-
-    AgentCapabilities = DummyTypes()
-    AgentCard = DummyTypes()
-    AgentProvider = DummyTypes()
-    AgentSkill = DummyTypes()
-    SecurityScheme = DummyTypes()
-    AgentCardBuilder = DummyTypes()
-    BaseAgent = DummyTypes()
-    LlmAgent = DummyTypes()
-    LoopAgent = DummyTypes()
-    ParallelAgent = DummyTypes()
-    SequentialAgent = DummyTypes()
-    ExampleTool = DummyTypes()
-    # Dummy functions
-    _build_agent_description = lambda x: ""
-    _build_llm_agent_description_with_instructions = lambda x: ""
-    _build_orchestration_skill = lambda x, y: None
-    _build_parallel_description = lambda x: ""
-    _build_sequential_description = lambda x: ""
-    _build_loop_description = lambda x: ""
-    _convert_example_tool_examples = lambda x: []
-    _extract_examples_from_instruction = lambda x: None
-    _get_agent_skill_name = lambda x: ""
-    _get_agent_type = lambda x: ""
-    _get_default_description = lambda x: ""
-    _get_input_modes = lambda x: None
-    _get_output_modes = lambda x: None
-    _get_workflow_description = lambda x: None
-    _replace_pronouns = lambda x: ""
+    # Imports are not needed since tests will be skipped due to pytestmark.
+    # The imported names are only used within test methods, not at module level,
+    # so no NameError occurs during module compilation.
+    pass
   else:
     raise e
 

tests/unittests/a2a/utils/test_agent_to_a2a.py

@@ -42,25 +42,10 @@ try:
   from starlette.applications import Starlette
 except ImportError as e:
   if sys.version_info < (3, 10):
-    # Create dummy classes to prevent NameError during test collection
-    # Tests will be skipped anyway due to pytestmark
-    class DummyTypes:
-      pass
-
-    A2AStarletteApplication = DummyTypes()
-    DefaultRequestHandler = DummyTypes()
-    InMemoryTaskStore = DummyTypes()
-    AgentCard = DummyTypes()
-    Starlette = DummyTypes()
-    BaseAgent = DummyTypes()
-    InMemoryArtifactService = DummyTypes()
-    InMemoryCredentialService = DummyTypes()
-    InMemoryMemoryService = DummyTypes()
-    Runner = DummyTypes()
-    InMemorySessionService = DummyTypes()
-    A2aAgentExecutor = DummyTypes()
-    AgentCardBuilder = DummyTypes()
-    to_a2a = lambda x, **kwargs: None
+    # Imports are not needed since tests will be skipped due to pytestmark.
+    # The imported names are only used within test methods, not at module level,
+    # so no NameError occurs during module compilation.
+    pass
   else:
     raise e
 
@@ -123,7 +108,7 @@ class TestToA2A:
   @patch("google.adk.a2a.utils.agent_to_a2a.InMemoryTaskStore")
   @patch("google.adk.a2a.utils.agent_to_a2a.AgentCardBuilder")
   @patch("google.adk.a2a.utils.agent_to_a2a.Starlette")
-  def test_to_a2a_custom_host_port_protocol(
+  def test_to_a2a_custom_host_port(
       self,
       mock_starlette_class,
       mock_card_builder_class,
@@ -131,7 +116,7 @@ class TestToA2A:
       mock_request_handler_class,
       mock_agent_executor_class,
   ):
-    """Test to_a2a with custom host, port, and protocol."""
+    """Test to_a2a with custom host and port."""
     # Arrange
     mock_app = Mock(spec=Starlette)
     mock_starlette_class.return_value = mock_app
@@ -145,14 +130,12 @@ class TestToA2A:
     mock_card_builder_class.return_value = mock_card_builder
 
     # Act
-    result = to_a2a(
-        self.mock_agent, host="example.com", port=9000, protocol="https"
-    )
+    result = to_a2a(self.mock_agent, host="example.com", port=9000)
 
     # Assert
     assert result == mock_app
     mock_card_builder_class.assert_called_once_with(
-        agent=self.mock_agent, rpc_url="https://example.com:9000/"
+        agent=self.mock_agent, rpc_url="http://example.com:9000/"
     )
 
   @patch("google.adk.a2a.utils.agent_to_a2a.A2aAgentExecutor")
@@ -706,110 +689,3 @@ class TestToA2A:
     mock_card_builder_class.assert_called_once_with(
         agent=self.mock_agent, rpc_url="http://192.168.1.1:8000/"
     )
-
-  @patch("google.adk.a2a.utils.agent_to_a2a.A2aAgentExecutor")
-  @patch("google.adk.a2a.utils.agent_to_a2a.DefaultRequestHandler")
-  @patch("google.adk.a2a.utils.agent_to_a2a.InMemoryTaskStore")
-  @patch("google.adk.a2a.utils.agent_to_a2a.AgentCardBuilder")
-  @patch("google.adk.a2a.utils.agent_to_a2a.Starlette")
-  def test_to_a2a_with_https_protocol(
-      self,
-      mock_starlette_class,
-      mock_card_builder_class,
-      mock_task_store_class,
-      mock_request_handler_class,
-      mock_agent_executor_class,
-  ):
-    """Test to_a2a with HTTPS protocol."""
-    # Arrange
-    mock_app = Mock(spec=Starlette)
-    mock_starlette_class.return_value = mock_app
-    mock_task_store = Mock(spec=InMemoryTaskStore)
-    mock_task_store_class.return_value = mock_task_store
-    mock_agent_executor = Mock(spec=A2aAgentExecutor)
-    mock_agent_executor_class.return_value = mock_agent_executor
-    mock_request_handler = Mock(spec=DefaultRequestHandler)
-    mock_request_handler_class.return_value = mock_request_handler
-    mock_card_builder = Mock(spec=AgentCardBuilder)
-    mock_card_builder_class.return_value = mock_card_builder
-
-    # Act
-    result = to_a2a(self.mock_agent, protocol="https")
-
-    # Assert
-    assert result == mock_app
-    mock_card_builder_class.assert_called_once_with(
-        agent=self.mock_agent, rpc_url="https://localhost:8000/"
-    )
-
-  @patch("google.adk.a2a.utils.agent_to_a2a.A2aAgentExecutor")
-  @patch("google.adk.a2a.utils.agent_to_a2a.DefaultRequestHandler")
-  @patch("google.adk.a2a.utils.agent_to_a2a.InMemoryTaskStore")
-  @patch("google.adk.a2a.utils.agent_to_a2a.AgentCardBuilder")
-  @patch("google.adk.a2a.utils.agent_to_a2a.Starlette")
-  def test_to_a2a_with_custom_protocol(
-      self,
-      mock_starlette_class,
-      mock_card_builder_class,
-      mock_task_store_class,
-      mock_request_handler_class,
-      mock_agent_executor_class,
-  ):
-    """Test to_a2a with custom protocol."""
-    # Arrange
-    mock_app = Mock(spec=Starlette)
-    mock_starlette_class.return_value = mock_app
-    mock_task_store = Mock(spec=InMemoryTaskStore)
-    mock_task_store_class.return_value = mock_task_store
-    mock_agent_executor = Mock(spec=A2aAgentExecutor)
-    mock_agent_executor_class.return_value = mock_agent_executor
-    mock_request_handler = Mock(spec=DefaultRequestHandler)
-    mock_request_handler_class.return_value = mock_request_handler
-    mock_card_builder = Mock(spec=AgentCardBuilder)
-    mock_card_builder_class.return_value = mock_card_builder
-
-    # Act
-    result = to_a2a(self.mock_agent, protocol="ws")
-
-    # Assert
-    assert result == mock_app
-    mock_card_builder_class.assert_called_once_with(
-        agent=self.mock_agent, rpc_url="ws://localhost:8000/"
-    )
-
-  @patch("google.adk.a2a.utils.agent_to_a2a.A2aAgentExecutor")
-  @patch("google.adk.a2a.utils.agent_to_a2a.DefaultRequestHandler")
-  @patch("google.adk.a2a.utils.agent_to_a2a.InMemoryTaskStore")
-  @patch("google.adk.a2a.utils.agent_to_a2a.AgentCardBuilder")
-  @patch("google.adk.a2a.utils.agent_to_a2a.Starlette")
-  def test_to_a2a_with_all_custom_parameters(
-      self,
-      mock_starlette_class,
-      mock_card_builder_class,
-      mock_task_store_class,
-      mock_request_handler_class,
-      mock_agent_executor_class,
-  ):
-    """Test to_a2a with all custom parameters."""
-    # Arrange
-    mock_app = Mock(spec=Starlette)
-    mock_starlette_class.return_value = mock_app
-    mock_task_store = Mock(spec=InMemoryTaskStore)
-    mock_task_store_class.return_value = mock_task_store
-    mock_agent_executor = Mock(spec=A2aAgentExecutor)
-    mock_agent_executor_class.return_value = mock_agent_executor
-    mock_request_handler = Mock(spec=DefaultRequestHandler)
-    mock_request_handler_class.return_value = mock_request_handler
-    mock_card_builder = Mock(spec=AgentCardBuilder)
-    mock_card_builder_class.return_value = mock_card_builder
-
-    # Act
-    result = to_a2a(
-        self.mock_agent, host="api.example.com", port=443, protocol="https"
-    )
-
-    # Assert
-    assert result == mock_app
-    mock_card_builder_class.assert_called_once_with(
-        agent=self.mock_agent, rpc_url="https://api.example.com:443/"
-    )