test: add tests for request_state and header propagation

Add comprehensive tests for request_state merging in ReadonlyContext,
header provider creation, state_header_mapping config, credential_key
shorthand, RFC 7230 header validation, CRLF injection prevention, and
strict mode. Update existing mocks to include request_state.

Author: timof1308

src/google/adk/cli/adk_web_server.py

@@ -990,7 +990,9 @@ async def version() -> dict[str, str]:
       return {
           "version": __version__,
           "language": "python",
-          "language_version": f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
+          "language_version": (
+              f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+          ),
       }
 
     @app.get("/list-apps")

tests/unittests/agents/test_mcp_instruction_provider.py

@@ -68,6 +68,7 @@ async def test_call_success_no_args(self):
 
     mock_invocation_context = MagicMock()
     mock_invocation_context.session.state = {}
+    mock_invocation_context.request_state = {}
     context = ReadonlyContext(mock_invocation_context)
 
     # Call
@@ -98,6 +99,7 @@ async def test_call_success_with_args(self):
 
     mock_invocation_context = MagicMock()
     mock_invocation_context.session.state = {"arg1": "value1", "arg2": "value2"}
+    mock_invocation_context.request_state = {}
     context = ReadonlyContext(mock_invocation_context)
 
     instruction = await self.provider(context)
@@ -119,6 +121,7 @@ async def test_call_prompt_not_found_in_list_prompts(self):
 
     mock_invocation_context = MagicMock()
     mock_invocation_context.session.state = {"arg1": "value1"}
+    mock_invocation_context.request_state = {}
     context = ReadonlyContext(mock_invocation_context)
 
     instruction = await self.provider(context)
@@ -137,6 +140,7 @@ async def test_call_get_prompt_returns_no_messages(self):
 
     mock_invocation_context = MagicMock()
     mock_invocation_context.session.state = {}
+    mock_invocation_context.request_state = {}
     context = ReadonlyContext(mock_invocation_context)
 
     # Call and assert
@@ -179,6 +183,7 @@ async def test_call_ignore_non_text_messages(self):
 
     mock_invocation_context = MagicMock()
     mock_invocation_context.session.state = {}
+    mock_invocation_context.request_state = {}
     context = ReadonlyContext(mock_invocation_context)
 
     # Call

tests/unittests/agents/test_readonly_context.py

@@ -25,6 +25,7 @@ def mock_invocation_context():
   mock_context.invocation_id = "test-invocation-id"
   mock_context.agent.name = "test-agent-name"
   mock_context.session.state = {"key1": "value1", "key2": "value2"}
+  mock_context.request_state = {}
   mock_context.user_id = "test-user-id"
   return mock_context
 

tests/unittests/agents/test_readonly_context_state.py

@@ -0,0 +1,83 @@
+from collections import ChainMap
+import unittest
+from unittest.mock import MagicMock
+
+from google.adk.agents.invocation_context import InvocationContext
+from google.adk.agents.readonly_context import ReadonlyContext
+from google.adk.sessions.session import Session
+
+
+class TestReadonlyContextState(unittest.TestCase):
+
+  def test_state_merging_precedence(self):
+    # Setup
+    mock_session = MagicMock(spec=Session)
+    mock_session.state = {
+        "persistent_key": "persistent_value",
+        "conflict_key": "persistent_value",
+    }
+
+    mock_invocation_context = MagicMock(spec=InvocationContext)
+    mock_invocation_context.session = mock_session
+    mock_invocation_context.request_state = {
+        "ephemeral_key": "ephemeral_value",
+        "conflict_key": "ephemeral_value",
+    }
+
+    readonly_context = ReadonlyContext(mock_invocation_context)
+
+    # Verify
+    state = readonly_context.state
+
+    # Check that ephemeral keys are present
+    self.assertEqual(state["ephemeral_key"], "ephemeral_value")
+
+    # Check that persistent keys are present
+    self.assertEqual(state["persistent_key"], "persistent_value")
+
+    # Check that ephemeral keys override persistent keys
+    self.assertEqual(state["conflict_key"], "ephemeral_value")
+
+    # Verify it behaves like a mapping
+    self.assertIn("ephemeral_key", state)
+    self.assertIn("persistent_key", state)
+    self.assertEqual(state.get("ephemeral_key"), "ephemeral_value")
+
+  def test_state_merging_empty_request_state(self):
+    # Setup
+    mock_session = MagicMock(spec=Session)
+    mock_session.state = {"persistent_key": "persistent_value"}
+
+    mock_invocation_context = MagicMock(spec=InvocationContext)
+    mock_invocation_context.session = mock_session
+    mock_invocation_context.request_state = {}
+
+    readonly_context = ReadonlyContext(mock_invocation_context)
+
+    # Verify
+    state = readonly_context.state
+    self.assertEqual(state["persistent_key"], "persistent_value")
+    self.assertNotIn("ephemeral_key", state)
+
+  def test_state_immutability(self):
+    # Setup
+    mock_session = MagicMock(spec=Session)
+    mock_session.state = {"key": "value"}
+
+    mock_invocation_context = MagicMock(spec=InvocationContext)
+    mock_invocation_context.session = mock_session
+    mock_invocation_context.request_state = {}
+
+    readonly_context = ReadonlyContext(mock_invocation_context)
+    state = readonly_context.state
+
+    # Verify it raises TypeError on assignment
+    with self.assertRaises(TypeError):
+      state["key"] = "new_value"
+
+    with self.assertRaises(TypeError):
+      state["new_key"] = "value"
+
+
+if __name__ == "__main__":
+  unittest.main()

tests/unittests/cli/test_fast_api.py

@@ -128,6 +128,7 @@ async def dummy_run_async(
     session_id,
     new_message,
     state_delta=None,
+    request_state=None,
     run_config: Optional[RunConfig] = None,
     invocation_id: Optional[str] = None,
 ):
@@ -1356,9 +1357,18 @@ async def run_async_capture(
       invocation_id: Optional[str] = None,
       new_message: Optional[types.Content] = None,
       state_delta: Optional[dict[str, Any]] = None,
+      request_state: Optional[dict[str, Any]] = None,
       run_config: Optional[RunConfig] = None,
   ):
-    del self, user_id, session_id, new_message, state_delta, run_config
+    del (
+        self,
+        user_id,
+        session_id,
+        new_message,
+        state_delta,
+        request_state,
+        run_config,
+    )
     captured_invocation_id["invocation_id"] = invocation_id
     yield _event_1()
 
@@ -1393,9 +1403,18 @@ async def run_async_with_artifact_delta(
       invocation_id: Optional[str] = None,
       new_message: Optional[types.Content] = None,
       state_delta: Optional[dict[str, Any]] = None,
+      request_state: Optional[dict[str, Any]] = None,
       run_config: Optional[RunConfig] = None,
   ):
-    del user_id, session_id, invocation_id, new_message, state_delta, run_config
+    del (
+        user_id,
+        session_id,
+        invocation_id,
+        new_message,
+        state_delta,
+        request_state,
+        run_config,
+    )
     yield Event(
         author="dummy agent",
         invocation_id="invocation_id",
@@ -1449,9 +1468,18 @@ async def run_async_with_artifact_delta(
       invocation_id: Optional[str] = None,
       new_message: Optional[types.Content] = None,
       state_delta: Optional[dict[str, Any]] = None,
+      request_state: Optional[dict[str, Any]] = None,
       run_config: Optional[RunConfig] = None,
   ):
-    del user_id, session_id, invocation_id, new_message, state_delta, run_config
+    del (
+        user_id,
+        session_id,
+        invocation_id,
+        new_message,
+        state_delta,
+        request_state,
+        run_config,
+    )
     yield Event(
         author="dummy agent",
         invocation_id="invocation_id",