tests

Author: KSemenenko

ManagedCode.Communication.Extensions/CommunicationMiddleware.cs

@@ -34,25 +34,25 @@ public async Task Invoke(HttpContext httpContext)
                                    ex is InvalidDataContractException)
         {
             _logger.LogError("Request throw an error", ex);
-            //httpContext.Response.Clear();
             httpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
-            var json = JsonSerializer.Serialize(Result.Fail(HttpStatusCode.InternalServerError, ex));
+            var result = Result.Fail(HttpStatusCode.InternalServerError, ex);
+            var json = JsonSerializer.Serialize(result);
             await httpContext.Response.WriteAsJsonAsync(json);
         }
         catch (Exception ex) when (ex is ValidationException)
         {
             _logger.LogError("Request throw an error", ex);
-            //httpContext.Response.Clear();
             httpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
-            var json = JsonSerializer.Serialize(Result.Fail(HttpStatusCode.InternalServerError, ex));
+            var result = Result.Fail(HttpStatusCode.InternalServerError, ex.Message);
+            var json = JsonSerializer.Serialize(result);
             await httpContext.Response.WriteAsJsonAsync(json);
         }
         catch (Exception ex)
         {
             _logger.LogError("Request throw an error", ex);
-            //httpContext.Response.Clear();
             httpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
-            var json = JsonSerializer.Serialize(Result.Fail(HttpStatusCode.InternalServerError, ex));
+            var result = Result.Fail(HttpStatusCode.InternalServerError, ex.Message);
+            var json = JsonSerializer.Serialize(result);
             await httpContext.Response.WriteAsJsonAsync(json);
         }
         sw.Stop();

ManagedCode.Communication.Tests/ControllerTests.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.Net;
 using System.Net.Http.Json;
 using System.Net.Mime;
@@ -6,6 +7,7 @@
 using ManagedCode.Communication.Tests.TestApp;
 using Xunit;
 using Xunit.Abstractions;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace ManagedCode.Communication.Tests;
 
@@ -22,13 +24,20 @@ public MiddlewareTests(ITestOutputHelper outputHelper, TestClusterApplication ap
     }
 
     [Fact]
-    public async Task Track()
+    public async Task ValidationException()
     {
         var response = await _application.CreateClient().GetAsync($"test/test1");
         response.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
         var content = await response.Content.ReadAsStringAsync();
         var result = await response.Content.ReadFromJsonAsync<Result>();
     }
-
 
+    [Fact]
+    public async Task InvalidDataException()
+    {
+        var response = await _application.CreateClient().GetAsync($"test/test2");
+        response.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
+        var content = await response.Content.ReadAsStringAsync();
+        var result = await response.Content.ReadFromJsonAsync<Result>();
+    }
 }

ManagedCode.Communication.Tests/ControllerTests/MiddlewareTests.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using System.IO;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ManagedCode.Communication.Tests.TestApp.Controllers;
@@ -7,9 +8,15 @@ namespace ManagedCode.Communication.Tests.TestApp.Controllers;
 public class TestController : ControllerBase
 {
     [HttpGet("test1")]
-    public ActionResult<string> Authorize()
+    public ActionResult<string> Test1()
     {
         throw new ValidationException();
     }
 
+    [HttpGet("test2")]
+    public ActionResult<string> Test2()
+    {
+        throw new InvalidDataException();
+    }
+    
 }