👽 consequence changes due to changes on YAML dependency

codebeltnet · Oct 11, 2024 · e7203fd · e7203fd
1 parent 227febb
commit e7203fd
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 36 deletions.
diff --git a/test/Codebelt.Extensions.Asp.Versioning.Tests/ApiVersionReaderTest.cs b/test/Codebelt.Extensions.Asp.Versioning.Tests/ApiVersionReaderTest.cs
@@ -19,6 +19,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 using Xunit.Abstractions;
+using YamlDotNet.Serialization.NamingConventions;
 
 namespace Codebelt.Extensions.Asp.Versioning
 {
@@ -207,7 +208,7 @@ public async Task GetRequest_ShouldFailWithBadRequestFormattedAsXmlResponse_As_d
                            .AddApplicationPart(typeof(FakeController).Assembly)
                            .AddJsonFormatters()
                            .AddXmlFormatters()
-                           .AddYamlFormatters();
+                           .AddYamlFormatters(o => o.Settings.NamingConvention = PascalCaseNamingConvention.Instance);
                        services.AddHttpContextAccessor();
                        services.AddRestfulApiVersioning();
                    }, app =>
@@ -228,13 +229,14 @@ public async Task GetRequest_ShouldFailWithBadRequestFormattedAsXmlResponse_As_d
                 Assert.Equal(HttpStatusCode.BadRequest, sut.StatusCode);
                 Assert.Equal(HttpMethod.Get, sut.RequestMessage.Method);
                 Assert.EndsWith(yamlAccept, sut.Content.Headers.ContentType.ToString());
-                Assert.Equal("""
+                Assert.True(Match("""
                              Error:
+                               Instance: http://localhost/fake/throw
                                Status: 400
                                Code: BadRequest
                                Message: The HTTP resource that matches the request URI 'http://localhost/fake/throw' does not support the API version 'd3'.
-
-                             """, await sut.Content.ReadAsStringAsync(), ignoreLineEndingDifferences: true);
+                             TraceId: *
+                             """.ReplaceLineEndings(), await sut.Content.ReadAsStringAsync(), o => o.ThrowOnNoMatch = true));
             }
         }
 

diff --git a/test/Codebelt.Extensions.Asp.Versioning.Tests/ProblemDetailsFactoryTest.cs b/test/Codebelt.Extensions.Asp.Versioning.Tests/ProblemDetailsFactoryTest.cs
@@ -18,6 +18,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 using Xunit.Abstractions;
+using YamlDotNet.Serialization.NamingConventions;
 
 namespace Codebelt.Extensions.Asp.Versioning
 {
@@ -162,7 +163,7 @@ public async Task GetRequest_ShouldFailWithBadRequestFormattedAsYamlResponse_As_
                        services.AddFaultDescriptorOptions();
                        services.AddControllers(o => o.Filters.AddFaultDescriptor())
                            .AddApplicationPart(typeof(FakeController).Assembly)
-                           .AddYamlFormatters();
+                           .AddYamlFormatters(o => o.Settings.NamingConvention = PascalCaseNamingConvention.Instance);
                        services.AddHttpContextAccessor()
                            .AddRestfulApiVersioning(o =>
                            {
@@ -186,37 +187,45 @@ public async Task GetRequest_ShouldFailWithBadRequestFormattedAsYamlResponse_As_
                 Assert.Equal(HttpStatusCode.BadRequest, sut.StatusCode);
                 Assert.Equal(HttpMethod.Get, sut.RequestMessage.Method);
                 Assert.EndsWith("*/*", sut.Content.Headers.ContentType.ToString());
-                Assert.StartsWith(@"Error:
-  Status: 400
-  Code: BadRequest
-  Message: The HTTP resource that matches the request URI 'http://localhost/fake/throw' does not support the API version 'b3'.
-  Failure:
-    Type: Cuemon.AspNetCore.Http.BadRequestException
-    Source: Codebelt.Extensions.Asp.Versioning
-    Message: The HTTP resource that matches the request URI 'http://localhost/fake/throw' does not support the API version 'b3'.
-    Stack:
-".ReplaceLineEndings(), await sut.Content.ReadAsStringAsync());
-                Assert.EndsWith(@"Evidence:
-  Request:
-    Location: http://localhost/fake/throw
-    Method: GET
-    Headers:
-      Accept:
-        - text/html
-        - application/xhtml+xml
-        - image/avif
-        - image/webp
-        - image/apng
-        - '*/*; q=0.8'
-        - application/signed-exchange; v=b3; q=0.9
-        - application/json; q=10.0
-      Host:
-        - localhost
-    Query: []
-    Form: 
-    Cookies: []
-    Body: ''
-".ReplaceLineEndings(), await sut.Content.ReadAsStringAsync());
+                Assert.True(Match("""
+                            Error:
+                              Instance: http://localhost/fake/throw
+                              Status: 400
+                              Code: BadRequest
+                              Message: The HTTP resource that matches the request URI 'http://localhost/fake/throw' does not support the API version 'b3'.
+                              Failure:
+                                Type: Cuemon.AspNetCore.Http.BadRequestException
+                                Source: Codebelt.Extensions.Asp.Versioning
+                                Message: The HTTP resource that matches the request URI 'http://localhost/fake/throw' does not support the API version 'b3'.
+                                Stack:
+                                  - at Codebelt.Extensions.Asp.Versioning.ServiceCollectionExtensions.<>c.<AddRestfulApiVersioning>*
+                                  - at Microsoft.AspNetCore.Http.DefaultProblemDetailsWriter.WriteAsync(ProblemDetailsContext context)
+                                  - at Microsoft.AspNetCore.Http.ProblemDetailsService.TryWriteAsync(ProblemDetailsContext context)
+                                  - at Microsoft.AspNetCore.Routing.EndpointMiddleware.<Invoke>g__AwaitRequestTask|7_0(Endpoint endpoint, Task requestTask, ILogger logger)
+                                  - at Microsoft.AspNetCore.Diagnostics.ExceptionHandlerMiddlewareImpl.<Invoke>g__Awaited|10_0(ExceptionHandlerMiddlewareImpl middleware, HttpContext context, Task task)
+                                StatusCode: 400
+                                ReasonPhrase: Bad Request
+                            Evidence:
+                              Request:
+                                Location: http://localhost/fake/throw
+                                Method: GET
+                                Headers:
+                                  Accept:
+                                    - text/html
+                                    - application/xhtml+xml
+                                    - image/avif
+                                    - image/webp
+                                    - image/apng
+                                    - '*/*; q=0.8'
+                                    - application/signed-exchange; v=b3; q=0.9
+                                    - application/json; q=10.0
+                                  Host:
+                                    - localhost
+                                Query: []
+                                Cookies: []
+                                Body: ''
+                            TraceId: *
+                            """.ReplaceLineEndings(), await sut.Content.ReadAsStringAsync(), o => o.ThrowOnNoMatch = true));
             }
         }