From e59b9327dbd640c5d1c0e638053385c3f7d3c4e9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 13 May 2026 19:03:44 +0000
Subject: [PATCH] Refine RouteBuilder test helpers

Agent-Logs-Url: https://github.com/microsoft/agent-framework/sessions/012f3b3b-acb9-4869-9084-b767cbe1885b

Co-authored-by: lokitoth <6936551+lokitoth@users.noreply.github.com>
---
 .../RouteBuilderTests.cs                      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/RouteBuilderTests.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/RouteBuilderTests.cs
index 1e404c8a76..824efb2adb 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/RouteBuilderTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/RouteBuilderTests.cs
@@ -423,21 +423,21 @@ public sealed class RouteBuilderTests
                 routeBuilder.AddHandler<string, string>((message, context, cancellationToken) =>
                 {
                     invocation.Capture(message, context, cancellationToken);
-                    return message.ToUpperInvariant();
+                    return NormalizeHandlerResult(message);
                 });
                 break;
             case 1:
                 routeBuilder.AddHandler<string, string>((message, context) =>
                 {
                     invocation.Capture(message, context);
-                    return message.ToUpperInvariant();
+                    return NormalizeHandlerResult(message);
                 });
                 break;
             case 2:
                 Func<string, IWorkflowContext, CancellationToken, ValueTask<string>> asyncHandlerWithCancellation = (message, context, cancellationToken) =>
                 {
                     invocation.Capture(message, context, cancellationToken);
-                    return ValueTask.FromResult(message.ToUpperInvariant());
+                    return ValueTask.FromResult(NormalizeHandlerResult(message));
                 };
                 routeBuilder.AddHandler<string, string>(asyncHandlerWithCancellation);
                 break;
@@ -445,7 +445,7 @@ public sealed class RouteBuilderTests
                 Func<string, IWorkflowContext, ValueTask<string>> asyncHandler = (message, context) =>
                 {
                     invocation.Capture(message, context);
-                    return ValueTask.FromResult(message.ToUpperInvariant());
+                    return ValueTask.FromResult(NormalizeHandlerResult(message));
                 };
                 routeBuilder.AddHandler<string, string>(asyncHandler);
                 break;
@@ -491,21 +491,21 @@ public sealed class RouteBuilderTests
                 routeBuilder.AddCatchAll<string>((message, context, cancellationToken) =>
                 {
                     invocation.Capture(message, context, cancellationToken);
-                    return GetPayloadValue(message).ToUpperInvariant();
+                    return NormalizeCatchAllResult(message);
                 });
                 break;
             case 1:
                 routeBuilder.AddCatchAll<string>((message, context) =>
                 {
                     invocation.Capture(message, context);
-                    return GetPayloadValue(message).ToUpperInvariant();
+                    return NormalizeCatchAllResult(message);
                 });
                 break;
             case 2:
                 Func<PortableValue, IWorkflowContext, CancellationToken, ValueTask<string>> asyncCatchAllWithCancellation = (message, context, cancellationToken) =>
                 {
                     invocation.Capture(message, context, cancellationToken);
-                    return ValueTask.FromResult(GetPayloadValue(message).ToUpperInvariant());
+                    return ValueTask.FromResult(NormalizeCatchAllResult(message));
                 };
                 routeBuilder.AddCatchAll<string>(asyncCatchAllWithCancellation);
                 break;
@@ -513,7 +513,7 @@ public sealed class RouteBuilderTests
                 Func<PortableValue, IWorkflowContext, ValueTask<string>> asyncCatchAll = (message, context) =>
                 {
                     invocation.Capture(message, context);
-                    return ValueTask.FromResult(GetPayloadValue(message).ToUpperInvariant());
+                    return ValueTask.FromResult(NormalizeCatchAllResult(message));
                 };
                 routeBuilder.AddCatchAll<string>(asyncCatchAll);
                 break;
@@ -524,6 +524,10 @@ public sealed class RouteBuilderTests
 
     private static bool UsesCancellationToken(int overload) => overload is 0 or 2;
 
+    private static string NormalizeHandlerResult(string message) => message.ToUpperInvariant();
+
+    private static string NormalizeCatchAllResult(PortableValue message) => GetPayloadValue(message).ToUpperInvariant();
+
     private static string GetPayloadValue(PortableValue message)
     {
         return message.As<TestPayload>() is TestPayload payload