Added more Post tests

alexeyzimarev · alexeyzimarev · commit b41f67082744 · 2022-02-09T15:35:36.000+01:00
diff --git a/benchmarks/RestSharp.Benchmarks/Program.cs b/benchmarks/RestSharp.Benchmarks/Program.cs
@@ -1,3 +1,4 @@
-﻿using BenchmarkDotNet.Running;
+﻿using System.Reflection;
+using BenchmarkDotNet.Running;
 
-BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
+BenchmarkSwitcher.FromAssembly(Assembly.GetExecutingAssembly()).Run(args);
diff --git a/test/RestSharp.Tests.Integrated/Authentication/AuthenticationTests.cs b/test/RestSharp.Tests.Integrated/Authentication/AuthenticationTests.cs
@@ -2,6 +2,7 @@
 using System.Web;
 using RestSharp.Authenticators;
 using RestSharp.Tests.Integrated.Fixtures;
+using RestSharp.Tests.Integrated.Server;
 
 namespace RestSharp.Tests.Integrated.Authentication;
 
diff --git a/test/RestSharp.Tests.Integrated/Authentication/OAuth2Tests.cs b/test/RestSharp.Tests.Integrated/Authentication/OAuth2Tests.cs
@@ -1,5 +1,6 @@
 using RestSharp.Authenticators.OAuth2;
 using RestSharp.Tests.Integrated.Fixtures;
+using RestSharp.Tests.Integrated.Server;
 
 namespace RestSharp.Tests.Integrated.Authentication; 
 
diff --git a/test/RestSharp.Tests.Integrated/DefaultParameterTests.cs b/test/RestSharp.Tests.Integrated/DefaultParameterTests.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using RestSharp.Tests.Integrated.Fixtures;
+using RestSharp.Tests.Integrated.Server;
 using RestSharp.Tests.Shared.Fixtures;
 
 namespace RestSharp.Tests.Integrated;
diff --git a/test/RestSharp.Tests.Integrated/HttpClientTests.cs b/test/RestSharp.Tests.Integrated/HttpClientTests.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using RestSharp.Tests.Integrated.Fixtures;
+using RestSharp.Tests.Integrated.Server;
 
 namespace RestSharp.Tests.Integrated; 
 
diff --git a/test/RestSharp.Tests.Integrated/PostTests.cs b/test/RestSharp.Tests.Integrated/PostTests.cs
@@ -0,0 +1,36 @@
+using RestSharp.Tests.Integrated.Server;
+
+namespace RestSharp.Tests.Integrated;
+
+[Collection(nameof(TestServerCollection))]
+public class PostTests {
+    readonly RestClient _client;
+
+    public PostTests(TestServerFixture fixture) => _client = new RestClient(fixture.Server.Url);
+
+    [Fact]
+    public async Task Should_post_json() {
+        var body     = new TestRequest("foo", 100);
+        var request  = new RestRequest("post/json").AddJsonBody(body);
+        var response = await _client.ExecutePostAsync<TestResponse>(request);
+
+        response.Data.Message.Should().Be(body.Data);
+    }
+    
+    [Fact]
+    public async Task Should_post_json_with_PostAsync() {
+        var body     = new TestRequest("foo", 100);
+        var request  = new RestRequest("post/json").AddJsonBody(body);
+        var response = await _client.PostAsync<TestResponse>(request);
+
+        response.Message.Should().Be(body.Data);
+    }
+    
+    [Fact]
+    public async Task Should_post_json_with_PostJsonAsync() {
+        var body     = new TestRequest("foo", 100);
+        var response = await _client.PostJsonAsync<TestRequest, TestResponse>("post/json", body);
+
+        response.Message.Should().Be(body.Data);
+    }
+}
diff --git a/test/RestSharp.Tests.Integrated/PutTests.cs b/test/RestSharp.Tests.Integrated/PutTests.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using RestSharp.Tests.Integrated.Fixtures;
-using static RestSharp.Tests.Integrated.Fixtures.HttpServer;
+using RestSharp.Tests.Integrated.Server;
+using static RestSharp.Tests.Integrated.Server.HttpServer;
 
 namespace RestSharp.Tests.Integrated; 
 
@@ -49,4 +50,4 @@ public async Task Can_Timeout_PUT_Async() {
     
 }
 
-record TestRequest(string Data, int Number);
+public record TestRequest(string Data, int Number);
diff --git a/test/RestSharp.Tests.Integrated/RequestFailureTests.cs b/test/RestSharp.Tests.Integrated/RequestFailureTests.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using RestSharp.Tests.Integrated.Fixtures;
+using RestSharp.Tests.Integrated.Server;
 
 namespace RestSharp.Tests.Integrated;
 
diff --git a/test/RestSharp.Tests.Integrated/RequestTests.cs b/test/RestSharp.Tests.Integrated/RequestTests.cs
@@ -1,5 +1,6 @@
 ﻿using System.Net;
 using RestSharp.Tests.Integrated.Fixtures;
+using RestSharp.Tests.Integrated.Server;
 
 namespace RestSharp.Tests.Integrated;
 
@@ -23,7 +24,7 @@ public async Task Can_Handle_Exception_Thrown_By_OnBeforeDeserialization_Handler
 
         var request = new RestRequest("success");
 
-        request.OnBeforeDeserialization += r => throw new Exception(exceptionMessage);
+        request.OnBeforeDeserialization += _ => throw new Exception(exceptionMessage);
 
         var response = await _client.ExecuteAsync<Response>(request);
 
diff --git a/test/RestSharp.Tests.Integrated/Server/Models.cs b/test/RestSharp.Tests.Integrated/Server/Models.cs
@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.Http;
+
+namespace RestSharp.Tests.Integrated.Server; 
+
+record TestServerResponse(string Name, string Value);
+
+record UploadRequest(string Filename, IFormFile File);
+
+record UploadResponse(string FileName, long Length, bool Equal);
+
+record ContentResponse(string Content);
diff --git a/test/RestSharp.Tests.Integrated/Server/TestServer.cs b/test/RestSharp.Tests.Integrated/Server/TestServer.cs
@@ -2,24 +2,12 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing.Constraints;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using RestSharp.Extensions;
 using RestSharp.Tests.Shared.Extensions;
 
-namespace RestSharp.Tests.Integrated.Fixtures;
-
-public class TestServerFixture : IAsyncLifetime {
-    public HttpServer Server { get; } = new();
-
-    public Task InitializeAsync() => Server.Start();
-
-    public Task DisposeAsync() => Server.Stop();
-}
-
-[CollectionDefinition(nameof(TestServerCollection))]
-public class TestServerCollection : ICollectionFixture<TestServerFixture> { }
+namespace RestSharp.Tests.Integrated.Server;
 
 public sealed class HttpServer {
     readonly WebApplication _app;
@@ -34,12 +22,10 @@ public HttpServer(ITestOutputHelper output = null) {
 
         if (output != null)
             builder.WebHost.ConfigureLogging(x => x.SetMinimumLevel(LogLevel.Information).AddXunit(output, LogLevel.Debug));
-
+        
         builder.WebHost.UseUrls(Address);
         _app = builder.Build();
 
-        var jsonOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web);
-
         // GET
         _app.MapGet("success", () => new TestResponse { Message = "Works!" });
         _app.MapGet("echo", (string msg) => msg);
@@ -64,6 +50,9 @@ public HttpServer(ITestOutputHelper output = null) {
         var assetPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets");
 
         _app.MapPost("/upload", HandleUpload);
+        
+        // POST
+        _app.MapPost("/post/json", (TestRequest request) => new TestResponse { Message = request.Data });
 
         IResult HandleHeaders(HttpContext ctx) {
             var response = ctx.Request.Headers.Select(x => new TestServerResponse(x.Key, x.Value));
@@ -99,12 +88,4 @@ public async Task Stop() {
         await _app.StopAsync();
         await _app.DisposeAsync();
     }
-}
-
-record TestServerResponse(string Name, string Value);
-
-record UploadRequest(string Filename, IFormFile File);
-
-record UploadResponse(string FileName, long Length, bool Equal);
-
-record ContentResponse(string Content);
+}
diff --git a/test/RestSharp.Tests.Integrated/Server/TestServerFixture.cs b/test/RestSharp.Tests.Integrated/Server/TestServerFixture.cs
@@ -0,0 +1,13 @@
+namespace RestSharp.Tests.Integrated.Server;
+
+public class TestServerFixture : IAsyncLifetime {
+    public HttpServer Server { get; } = new();
+
+    public Task InitializeAsync() => Server.Start();
+
+    public Task DisposeAsync() => Server.Stop();
+}
+
+[CollectionDefinition(nameof(TestServerCollection))]
+public class TestServerCollection : ICollectionFixture<TestServerFixture> { }
+
diff --git a/test/RestSharp.Tests.Integrated/UploadFileTests.cs b/test/RestSharp.Tests.Integrated/UploadFileTests.cs
@@ -1,4 +1,5 @@
 using RestSharp.Tests.Integrated.Fixtures;
+using RestSharp.Tests.Integrated.Server;
 
 namespace RestSharp.Tests.Integrated;
 
