Reduce code duplication: consolidate ForwardBody tests and reuse shared EchoRequest

alexeyzimarev · claude · alexeyzimarev · commit a866fe2b5bd4 · 2026-02-27T13:07:38.000+01:00
- Merge ForwardBody_False and ForwardBody_True into a single parameterized Theory
- Replace inline echo-request callback with shared WireMockTestServer.EchoRequest
- Make EchoRequest public for cross-project reuse

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/test/RestSharp.Tests.Integrated/CookieRedirectTests.cs b/test/RestSharp.Tests.Integrated/CookieRedirectTests.cs
@@ -193,12 +193,7 @@ public async Task ForwardAuthorizationToExternalHost_Controls_Cross_Origin_Auth(
         using var externalServer = WireMockServer.Start();
         externalServer
             .Given(Request.Create().WithPath("/echo-request"))
-            .RespondWith(Response.Create().WithCallback(request => {
-                var headers = request.Headers?
-                    .ToDictionary(x => x.Key, x => string.Join(", ", x.Value))
-                    ?? new Dictionary<string, string>();
-                return WireMockTestServer.CreateJson(new { Method = request.Method, Headers = headers, Body = request.Body ?? "" });
-            }));
+            .RespondWith(Response.Create().WithCallback(WireMockTestServer.EchoRequest));
 
         // Main server redirects to the external server
         var redirectPath = $"/redirect-external-{allowExternal}";
@@ -256,38 +251,27 @@ public async Task ForwardCookies_False_Should_Not_Send_Cookies_On_Redirect() {
 
     // ─── ForwardBody ────────────────────────────────────────────────────
 
-    [Fact]
-    public async Task ForwardBody_False_Should_Drop_Body_Even_When_Verb_Preserved() {
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task ForwardBody_Controls_Body_Forwarding_When_Verb_Preserved(bool forwardBody) {
         using var client = CreateClient(o =>
-            o.RedirectOptions = new RedirectOptions { ForwardBody = false }
+            o.RedirectOptions = new RedirectOptions { ForwardBody = forwardBody }
         );
 
         var request = new RestRequest("/redirect-with-status?status=307", Method.Post);
-        request.AddJsonBody(new { data = "should-be-dropped" });
+        request.AddJsonBody(new { data = "test-body" });
 
         var response = await client.ExecuteAsync(request);
 
         response.StatusCode.Should().Be(HttpStatusCode.OK);
         var doc = JsonDocument.Parse(response.Content!);
         doc.RootElement.GetProperty("Method").GetString().Should().Be("POST");
-        doc.RootElement.GetProperty("Body").GetString().Should().BeEmpty();
-    }
 
-    [Fact]
-    public async Task ForwardBody_True_Should_Forward_Body_When_Verb_Preserved() {
-        using var client = CreateClient(o =>
-            o.RedirectOptions = new RedirectOptions { ForwardBody = true }
-        );
-
-        var request = new RestRequest("/redirect-with-status?status=307", Method.Post);
-        request.AddJsonBody(new { data = "keep-me" });
-
-        var response = await client.ExecuteAsync(request);
-
-        response.StatusCode.Should().Be(HttpStatusCode.OK);
-        var doc = JsonDocument.Parse(response.Content!);
-        doc.RootElement.GetProperty("Method").GetString().Should().Be("POST");
-        doc.RootElement.GetProperty("Body").GetString().Should().Contain("keep-me");
+        if (forwardBody)
+            doc.RootElement.GetProperty("Body").GetString().Should().Contain("test-body");
+        else
+            doc.RootElement.GetProperty("Body").GetString().Should().BeEmpty();
     }
 
     // ─── ForwardQuery ───────────────────────────────────────────────────
diff --git a/test/RestSharp.Tests.Shared/Server/WireMockTestServer.cs b/test/RestSharp.Tests.Shared/Server/WireMockTestServer.cs
@@ -161,7 +161,7 @@ static ResponseMessage RedirectWithStatus(IRequestMessage request) {
         };
     }
 
-    static ResponseMessage EchoRequest(IRequestMessage request) {
+    public static ResponseMessage EchoRequest(IRequestMessage request) {
         var headers = request.Headers?
             .ToDictionary(x => x.Key, x => string.Join(", ", x.Value))
             ?? new Dictionary<string, string>();

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ static ResponseMessage RedirectWithStatus(IRequestMessage request) {`
`161`	`161`	`};`
`162`	`162`	`}`
`163`	`163`
`164`		`- static ResponseMessage EchoRequest(IRequestMessage request) {`
	`164`	`+ public static ResponseMessage EchoRequest(IRequestMessage request) {`
`165`	`165`	`var headers = request.Headers?`
`166`	`166`	`.ToDictionary(x => x.Key, x => string.Join(", ", x.Value))`
`167`	`167`	`?? new Dictionary<string, string>();`