From c78e38fafd22c8c7d53f28696a6552e3b9b7ea7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20Breu=C3=9F?= Date: Sun, 1 Feb 2026 10:43:51 +0100 Subject: [PATCH 1/4] feat: make `HttpContent` parameter optional --- .../Web/HttpClientExtensions.Setup.Delete.cs | 8 +-- .../Web/HttpClientExtensions.Setup.Get.cs | 8 +-- .../Web/HttpClientExtensions.Setup.Patch.cs | 22 ++++--- .../Web/HttpClientExtensions.Setup.Post.cs | 22 ++++--- .../Web/HttpClientExtensions.Setup.Put.cs | 22 ++++--- .../Web/HttpClientExtensions.Verify.Delete.cs | 8 +-- .../Web/HttpClientExtensions.Verify.Get.cs | 8 +-- .../Web/HttpClientExtensions.Verify.Patch.cs | 22 ++++--- .../Web/HttpClientExtensions.Verify.Post.cs | 22 ++++--- .../Web/HttpClientExtensions.Verify.Put.cs | 22 ++++--- Source/Mockolate/Web/HttpClientExtensions.cs | 7 +- .../Expected/Mockolate_net10.0.txt | 64 +++++++++---------- .../Expected/Mockolate_net8.0.txt | 64 +++++++++---------- .../Expected/Mockolate_netstandard2.0.txt | 48 +++++++------- Tests/Mockolate.Internal.Tests/WebTests.cs | 57 +++++++++++++++++ 15 files changed, 248 insertions(+), 156 deletions(-) create mode 100644 Tests/Mockolate.Internal.Tests/WebTests.cs diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs index fc7de5e4..4089c1fd 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs @@ -24,7 +24,7 @@ public static partial class HttpClientExtensions /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> DeleteAsync( IParameter? requestUri) - => setup.DeleteAsync(requestUri, It.IsAny()); + => setup.DeleteAsync(requestUri ?? It.IsAny(), It.IsAny()); /// /// Setup for the method @@ -33,7 +33,7 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> DeleteAsync( IParameter? requestUri) - => setup.DeleteAsync(requestUri, It.IsAny()); + => setup.DeleteAsync(requestUri ?? It.IsAny(), It.IsAny()); /// /// Setup for the method @@ -41,7 +41,7 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> DeleteAsync( - IParameter? requestUri, + IParameter requestUri, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -65,7 +65,7 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> DeleteAsync( - IParameter? requestUri, + IParameter requestUri, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs index e66c16ba..9885b99d 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs @@ -24,7 +24,7 @@ public static partial class HttpClientExtensions /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> GetAsync( IParameter? requestUri) - => setup.GetAsync(requestUri, It.IsAny()); + => setup.GetAsync(requestUri ?? It.IsAny(), It.IsAny()); /// /// Setup for the method @@ -33,7 +33,7 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> GetAsync( IParameter? requestUri) - => setup.GetAsync(requestUri, It.IsAny()); + => setup.GetAsync(requestUri ?? It.IsAny(), It.IsAny()); /// /// Setup for the method @@ -41,7 +41,7 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> GetAsync( - IParameter? requestUri, + IParameter requestUri, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -65,7 +65,7 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> GetAsync( - IParameter? requestUri, + IParameter requestUri, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs index 2d6f7b11..c911ee14 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs @@ -25,8 +25,11 @@ public static partial class HttpClientExtensions /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PatchAsync( IParameter? requestUri, - IParameter? content) - => setup.PatchAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => setup.PatchAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Setup for the method @@ -35,8 +38,11 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PatchAsync( IParameter? requestUri, - IParameter? content) - => setup.PatchAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => setup.PatchAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Setup for the method @@ -44,8 +50,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PatchAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -70,8 +76,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PatchAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs index d726a6c0..ecf9b401 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs @@ -24,8 +24,11 @@ public static partial class HttpClientExtensions /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PostAsync( IParameter? requestUri, - IParameter? content) - => setup.PostAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => setup.PostAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Setup for the method @@ -34,8 +37,11 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PostAsync( IParameter? requestUri, - IParameter? content) - => setup.PostAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => setup.PostAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Setup for the method @@ -43,8 +49,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PostAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -69,8 +75,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PostAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs index 99658d0b..2b14f7f7 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs @@ -24,8 +24,11 @@ public static partial class HttpClientExtensions /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PutAsync( IParameter? requestUri, - IParameter? content) - => setup.PutAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => setup.PutAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Setup for the method @@ -34,8 +37,11 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PutAsync( IParameter? requestUri, - IParameter? content) - => setup.PutAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => setup.PutAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Setup for the method @@ -43,8 +49,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PutAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -69,8 +75,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given and . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PutAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (setup is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs index ff57907b..ec95e6a0 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs @@ -23,7 +23,7 @@ public static partial class HttpClientExtensions /// public VerificationResult DeleteAsync( IParameter? requestUri) - => verifyInvoked.DeleteAsync(requestUri, It.IsAny()); + => verifyInvoked.DeleteAsync(requestUri ?? It.IsAny(), It.IsAny()); /// /// Validates the invocations for the method @@ -32,7 +32,7 @@ public VerificationResult DeleteAsync( /// public VerificationResult DeleteAsync( IParameter? requestUri) - => verifyInvoked.DeleteAsync(requestUri, It.IsAny()); + => verifyInvoked.DeleteAsync(requestUri ?? It.IsAny(), It.IsAny()); /// /// Validates the invocations for the method @@ -40,7 +40,7 @@ public VerificationResult DeleteAsync( /// with the given and . /// public VerificationResult DeleteAsync( - IParameter? requestUri, + IParameter requestUri, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -62,7 +62,7 @@ public VerificationResult DeleteAsync( /// with the given and . /// public VerificationResult DeleteAsync( - IParameter? requestUri, + IParameter requestUri, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs index f3e06baa..d8b96d33 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs @@ -23,7 +23,7 @@ public static partial class HttpClientExtensions /// public VerificationResult GetAsync( IParameter? requestUri) - => verifyInvoked.GetAsync(requestUri, It.IsAny()); + => verifyInvoked.GetAsync(requestUri ?? It.IsAny(), It.IsAny()); /// /// Validates the invocations for the method @@ -32,7 +32,7 @@ public VerificationResult GetAsync( /// public VerificationResult GetAsync( IParameter? requestUri) - => verifyInvoked.GetAsync(requestUri, It.IsAny()); + => verifyInvoked.GetAsync(requestUri ?? It.IsAny(), It.IsAny()); /// /// Validates the invocations for the method @@ -40,7 +40,7 @@ public VerificationResult GetAsync( /// with the given and . /// public VerificationResult GetAsync( - IParameter? requestUri, + IParameter requestUri, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -62,7 +62,7 @@ public VerificationResult GetAsync( /// with the given and . /// public VerificationResult GetAsync( - IParameter? requestUri, + IParameter requestUri, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs index 6560eddf..3534e53f 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs @@ -24,8 +24,11 @@ public static partial class HttpClientExtensions /// public VerificationResult PatchAsync( IParameter? requestUri, - IParameter? content) - => verifyInvoked.PatchAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => verifyInvoked.PatchAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Validates the invocations for the method @@ -34,8 +37,11 @@ public VerificationResult PatchAsync( /// public VerificationResult PatchAsync( IParameter? requestUri, - IParameter? content) - => verifyInvoked.PatchAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => verifyInvoked.PatchAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Validates the invocations for the method @@ -43,8 +49,8 @@ public VerificationResult PatchAsync( /// with the given and . /// public VerificationResult PatchAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -67,8 +73,8 @@ public VerificationResult PatchAsync( /// with the given and . /// public VerificationResult PatchAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs index 3ff4343c..6628f738 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs @@ -23,8 +23,11 @@ public static partial class HttpClientExtensions /// public VerificationResult PostAsync( IParameter? requestUri, - IParameter? content) - => verifyInvoked.PostAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => verifyInvoked.PostAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Validates the invocations for the method @@ -33,8 +36,11 @@ public VerificationResult PostAsync( /// public VerificationResult PostAsync( IParameter? requestUri, - IParameter? content) - => verifyInvoked.PostAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => verifyInvoked.PostAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Validates the invocations for the method @@ -42,8 +48,8 @@ public VerificationResult PostAsync( /// with the given and . /// public VerificationResult PostAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -66,8 +72,8 @@ public VerificationResult PostAsync( /// with the given and . /// public VerificationResult PostAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs index 27b130ce..2b077db1 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs @@ -23,8 +23,11 @@ public static partial class HttpClientExtensions /// public VerificationResult PutAsync( IParameter? requestUri, - IParameter? content) - => verifyInvoked.PutAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => verifyInvoked.PutAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Validates the invocations for the method @@ -33,8 +36,11 @@ public VerificationResult PutAsync( /// public VerificationResult PutAsync( IParameter? requestUri, - IParameter? content) - => verifyInvoked.PutAsync(requestUri, content, It.IsAny()); + IParameter? content = null) + => verifyInvoked.PutAsync( + requestUri ?? It.IsAny(), + content ?? It.IsAny(), + It.IsAny()); /// /// Validates the invocations for the method @@ -42,8 +48,8 @@ public VerificationResult PutAsync( /// with the given and . /// public VerificationResult PutAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && @@ -66,8 +72,8 @@ public VerificationResult PutAsync( /// with the given and . /// public VerificationResult PutAsync( - IParameter? requestUri, - IParameter? content, + IParameter requestUri, + IParameter content, IParameter cancellationToken) { if (verifyInvoked is Mock { ConstructorParameters.Length: > 0, } httpClientMock && diff --git a/Source/Mockolate/Web/HttpClientExtensions.cs b/Source/Mockolate/Web/HttpClientExtensions.cs index c759344c..18ae46fe 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.cs @@ -51,12 +51,11 @@ private interface IHttpRequestMessageParameter private sealed class HttpRequestMessageParameter( Func valueSelector, - IParameter? parameter) + IParameter parameter) : IHttpRequestMessageParameter { public bool Matches(HttpRequestMessage value) - => parameter is null || - ((IParameter)parameter).Matches(valueSelector(value)); + => ((IParameter)parameter).Matches(valueSelector(value)); public void InvokeCallbacks(HttpRequestMessage value) { @@ -67,7 +66,7 @@ public void InvokeCallbacks(HttpRequestMessage value) } } - private sealed class HttpStringUriParameter(IParameter? parameter) + private sealed class HttpStringUriParameter(IParameter parameter) : IHttpRequestMessageParameter { public bool Matches(HttpRequestMessage value) diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt index 627319b5..f8739ef9 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt @@ -1796,47 +1796,47 @@ namespace Mockolate.Web { public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } } public static class ItExtensions diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt index 1e5e8bf8..ec7b2915 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt @@ -1795,47 +1795,47 @@ namespace Mockolate.Web { public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } } public static class ItExtensions diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt index b9a169bb..b93025cc 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt @@ -1744,39 +1744,39 @@ namespace Mockolate.Web { public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } } public static class ItExtensions diff --git a/Tests/Mockolate.Internal.Tests/WebTests.cs b/Tests/Mockolate.Internal.Tests/WebTests.cs new file mode 100644 index 00000000..ef0c62e1 --- /dev/null +++ b/Tests/Mockolate.Internal.Tests/WebTests.cs @@ -0,0 +1,57 @@ +using System.IO; +using System.Net; +using System.Net.Http; +using Mockolate.Parameters; +using Mockolate.Web; + +namespace Mockolate.Internal.Tests; + +public class WebTests +{ + [Fact] + public async Task HttpContentParameter_MatchesSomeOtherObject_ShouldReturnFalse() + { + ItExtensions.IStringContentParameter sut = It.IsStringContent(); + IParameter parameter = (IParameter)sut; + + bool result = parameter.Matches(new SomeOtherObject()); + + await That(result).IsFalse(); + } + + [Fact] + public async Task WithoutMediaTypeHeader_WhenNoneIsRequired_ShouldReturnTrue() + { + ItExtensions.IStringContentParameter sut = It.IsStringContent(); + IParameter parameter = (IParameter)sut; + + bool result = parameter.Matches(new MyHttpContent()); + + await That(result).IsTrue(); + } + + [Fact] + public async Task WithoutMediaTypeHeader_WhenOneIsRequired_ShouldReturnFalse() + { + ItExtensions.IStringContentParameter sut = It.IsStringContent("*"); + IParameter parameter = (IParameter)sut; + + bool result = parameter.Matches(new MyHttpContent()); + + await That(result).IsFalse(); + } + + private class MyHttpContent : HttpContent + { + protected override Task SerializeToStreamAsync(Stream stream, TransportContext context) + => Task.CompletedTask; + + protected override bool TryComputeLength(out long length) + { + length = 0; + return false; + } + } + + private class SomeOtherObject; +} From ed452862b9a05b49c5ad0744527bf3c3ca1e4ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20Breu=C3=9F?= Date: Sun, 1 Feb 2026 10:46:58 +0100 Subject: [PATCH 2/4] Adjust tests --- .../HttpClientExtensionsTests.Setup.PatchTests.cs | 12 ++++++------ .../Web/HttpClientExtensionsTests.Setup.PostTests.cs | 12 ++++++------ .../Web/HttpClientExtensionsTests.Setup.PutTests.cs | 12 ++++++------ .../HttpClientExtensionsTests.Verify.PatchTests.cs | 4 ++-- .../HttpClientExtensionsTests.Verify.PostTests.cs | 4 ++-- .../Web/HttpClientExtensionsTests.Verify.PutTests.cs | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PatchTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PatchTests.cs index 6100c5f7..6c5fead1 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PatchTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PatchTests.cs @@ -43,7 +43,7 @@ public async Task StringUri_ShouldVerifyHttpMethod(string method, bool expectSuc { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PatchAsync(It.Matches("*aweXpect.com*"), It.IsAny()) + .PatchAsync(It.Matches("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.SendAsync( @@ -63,7 +63,7 @@ public async Task StringUri_ShouldVerifyUriString(string pattern, bool expectSuc { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PatchAsync(It.Matches(pattern), It.IsAny()) + .PatchAsync(It.Matches(pattern)) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.PatchAsync("https://www.aweXpect.com", @@ -103,7 +103,7 @@ public async Task StringUri_WithoutMockedHttpMessageHandler_ShouldThrowMockExcep void Act() { httpClient.SetupMock.Method - .PatchAsync(It.Matches("*aweXpect.com*"), It.IsAny()) + .PatchAsync(It.Matches("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); } @@ -141,7 +141,7 @@ public async Task Uri_ShouldVerifyHttpMethod(string method, bool expectSuccess) { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PatchAsync(It.IsUri("*aweXpect.com*"), It.IsAny()) + .PatchAsync(It.IsUri("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.SendAsync( @@ -161,7 +161,7 @@ public async Task Uri_ShouldVerifyUri(string pattern, bool expectSuccess) { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PatchAsync(It.IsUri(pattern), It.IsAny()) + .PatchAsync(It.IsUri(pattern)) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.PatchAsync("https://www.aweXpect.com", @@ -201,7 +201,7 @@ public async Task Uri_WithoutMockedHttpMessageHandler_ShouldThrowMockException() void Act() { httpClient.SetupMock.Method - .PatchAsync(It.IsUri("*aweXpect.com*"), It.IsAny()) + .PatchAsync(It.IsUri("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); } diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PostTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PostTests.cs index 90262f66..8957bc02 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PostTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PostTests.cs @@ -41,7 +41,7 @@ public async Task StringUri_ShouldVerifyHttpMethod(string method, bool expectSuc { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PostAsync(It.Matches("*aweXpect.com*"), It.IsAny()) + .PostAsync(It.Matches("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.SendAsync( @@ -61,7 +61,7 @@ public async Task StringUri_ShouldVerifyUriString(string pattern, bool expectSuc { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PostAsync(It.Matches(pattern), It.IsAny()) + .PostAsync(It.Matches(pattern)) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", @@ -101,7 +101,7 @@ public async Task StringUri_WithoutMockedHttpMessageHandler_ShouldThrowMockExcep void Act() { httpClient.SetupMock.Method - .PostAsync(It.Matches("*aweXpect.com*"), It.IsAny()) + .PostAsync(It.Matches("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); } @@ -138,7 +138,7 @@ public async Task Uri_ShouldVerifyHttpMethod(string method, bool expectSuccess) { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PostAsync(It.IsUri("*aweXpect.com*"), It.IsAny()) + .PostAsync(It.IsUri("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.SendAsync( @@ -158,7 +158,7 @@ public async Task Uri_ShouldVerifyUri(string pattern, bool expectSuccess) { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PostAsync(It.IsUri(pattern), It.IsAny()) + .PostAsync(It.IsUri(pattern)) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", @@ -198,7 +198,7 @@ public async Task Uri_WithoutMockedHttpMessageHandler_ShouldThrowMockException() void Act() { httpClient.SetupMock.Method - .PostAsync(It.IsUri("*aweXpect.com*"), It.IsAny()) + .PostAsync(It.IsUri("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); } diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PutTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PutTests.cs index be99e82c..0e24d635 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PutTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PutTests.cs @@ -41,7 +41,7 @@ public async Task StringUri_ShouldVerifyHttpMethod(string method, bool expectSuc { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PutAsync(It.Matches("*aweXpect.com*"), It.IsAny()) + .PutAsync(It.Matches("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.SendAsync( @@ -61,7 +61,7 @@ public async Task StringUri_ShouldVerifyUriString(string pattern, bool expectSuc { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PutAsync(It.Matches(pattern), It.IsAny()) + .PutAsync(It.Matches(pattern)) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.PutAsync("https://www.aweXpect.com", @@ -101,7 +101,7 @@ public async Task StringUri_WithoutMockedHttpMessageHandler_ShouldThrowMockExcep void Act() { httpClient.SetupMock.Method - .PutAsync(It.Matches("*aweXpect.com*"), It.IsAny()) + .PutAsync(It.Matches("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); } @@ -138,7 +138,7 @@ public async Task Uri_ShouldVerifyHttpMethod(string method, bool expectSuccess) { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PutAsync(It.IsUri("*aweXpect.com*"), It.IsAny()) + .PutAsync(It.IsUri("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.SendAsync( @@ -158,7 +158,7 @@ public async Task Uri_ShouldVerifyUri(string pattern, bool expectSuccess) { HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method - .PutAsync(It.IsUri(pattern), It.IsAny()) + .PutAsync(It.IsUri(pattern)) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); HttpResponseMessage result = await httpClient.PutAsync("https://www.aweXpect.com", @@ -198,7 +198,7 @@ public async Task Uri_WithoutMockedHttpMessageHandler_ShouldThrowMockException() void Act() { httpClient.SetupMock.Method - .PutAsync(It.IsUri("*aweXpect.com*"), It.IsAny()) + .PutAsync(It.IsUri("*aweXpect.com*")) .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); } diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PatchTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PatchTests.cs index 764f0459..b7db9497 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PatchTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PatchTests.cs @@ -94,7 +94,7 @@ public async Task StringUri_WithoutMockedHttpMessageHandler_ShouldThrowMockExcep void Act() { httpClient.VerifyMock.Invoked - .PatchAsync(It.Matches("*aweXpect.com*"), It.IsAny()).Never(); + .PatchAsync(It.Matches("*aweXpect.com*")).Never(); } await That(Act).Throws() @@ -181,7 +181,7 @@ public async Task Uri_WithoutMockedHttpMessageHandler_ShouldThrowMockException() void Act() { httpClient.VerifyMock.Invoked - .PatchAsync(It.IsUri("*aweXpect.com*"), It.IsAny()).Never(); + .PatchAsync(It.IsUri("*aweXpect.com*")).Never(); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PostTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PostTests.cs index 0a869b9a..7fbf628d 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PostTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PostTests.cs @@ -92,7 +92,7 @@ public async Task StringUri_WithoutMockedHttpMessageHandler_ShouldThrowMockExcep void Act() { httpClient.VerifyMock.Invoked - .PostAsync(It.Matches("*aweXpect.com*"), It.IsAny()).Never(); + .PostAsync(It.Matches("*aweXpect.com*")).Never(); } await That(Act).Throws() @@ -178,7 +178,7 @@ public async Task Uri_WithoutMockedHttpMessageHandler_ShouldThrowMockException() void Act() { httpClient.VerifyMock.Invoked - .PostAsync(It.IsUri("*aweXpect.com*"), It.IsAny()).Never(); + .PostAsync(It.IsUri("*aweXpect.com*")).Never(); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PutTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PutTests.cs index c0fcdbd2..6f424b9e 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PutTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Verify.PutTests.cs @@ -92,7 +92,7 @@ public async Task StringUri_WithoutMockedHttpMessageHandler_ShouldThrowMockExcep void Act() { httpClient.VerifyMock.Invoked - .PutAsync(It.Matches("*aweXpect.com*"), It.IsAny()).Never(); + .PutAsync(It.Matches("*aweXpect.com*")).Never(); } await That(Act).Throws() @@ -178,7 +178,7 @@ public async Task Uri_WithoutMockedHttpMessageHandler_ShouldThrowMockException() void Act() { httpClient.VerifyMock.Invoked - .PutAsync(It.IsUri("*aweXpect.com*"), It.IsAny()).Never(); + .PutAsync(It.IsUri("*aweXpect.com*")).Never(); } await That(Act).Throws() From 8162c0e0f0cec3be9e2b61f8cf2b29a71ab34c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20Breu=C3=9F?= Date: Sun, 1 Feb 2026 10:51:18 +0100 Subject: [PATCH 3/4] Make uri required --- .../Web/HttpClientExtensions.Setup.Delete.cs | 14 ++++--- .../Web/HttpClientExtensions.Setup.Get.cs | 14 ++++--- .../Web/HttpClientExtensions.Setup.Patch.cs | 14 ++++--- .../Web/HttpClientExtensions.Setup.Post.cs | 14 ++++--- .../Web/HttpClientExtensions.Setup.Put.cs | 14 ++++--- .../Web/HttpClientExtensions.Verify.Delete.cs | 14 ++++--- .../Web/HttpClientExtensions.Verify.Get.cs | 14 ++++--- .../Web/HttpClientExtensions.Verify.Patch.cs | 14 ++++--- .../Web/HttpClientExtensions.Verify.Post.cs | 14 ++++--- .../Web/HttpClientExtensions.Verify.Put.cs | 14 ++++--- .../Expected/Mockolate_net10.0.txt | 40 +++++++++---------- .../Expected/Mockolate_net8.0.txt | 40 +++++++++---------- .../Expected/Mockolate_netstandard2.0.txt | 32 +++++++-------- 13 files changed, 136 insertions(+), 116 deletions(-) diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs index 4089c1fd..4b1e3e1e 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs @@ -23,8 +23,8 @@ public static partial class HttpClientExtensions /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> DeleteAsync( - IParameter? requestUri) - => setup.DeleteAsync(requestUri ?? It.IsAny(), It.IsAny()); + IParameter requestUri) + => setup.DeleteAsync(requestUri, It.IsAny()); /// /// Setup for the method @@ -32,8 +32,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> DeleteAsync( - IParameter? requestUri) - => setup.DeleteAsync(requestUri ?? It.IsAny(), It.IsAny()); + IParameter requestUri) + => setup.DeleteAsync(requestUri, It.IsAny()); /// /// Setup for the method @@ -56,7 +56,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -80,7 +81,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs index 9885b99d..3008922c 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs @@ -23,8 +23,8 @@ public static partial class HttpClientExtensions /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> GetAsync( - IParameter? requestUri) - => setup.GetAsync(requestUri ?? It.IsAny(), It.IsAny()); + IParameter requestUri) + => setup.GetAsync(requestUri, It.IsAny()); /// /// Setup for the method @@ -32,8 +32,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> GetAsync( - IParameter? requestUri) - => setup.GetAsync(requestUri ?? It.IsAny(), It.IsAny()); + IParameter requestUri) + => setup.GetAsync(requestUri, It.IsAny()); /// /// Setup for the method @@ -56,7 +56,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -80,7 +81,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs index c911ee14..6be80c19 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs @@ -24,10 +24,10 @@ public static partial class HttpClientExtensions /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PatchAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => setup.PatchAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -37,10 +37,10 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PatchAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => setup.PatchAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -67,7 +67,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -93,7 +94,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs index ecf9b401..5b6ac660 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs @@ -23,10 +23,10 @@ public static partial class HttpClientExtensions /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PostAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => setup.PostAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -36,10 +36,10 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PostAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => setup.PostAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -66,7 +66,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -92,7 +93,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs index 2b14f7f7..94f75289 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs @@ -23,10 +23,10 @@ public static partial class HttpClientExtensions /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PutAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => setup.PutAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -36,10 +36,10 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell /// with the given . /// public IReturnMethodSetup, HttpRequestMessage, CancellationToken> PutAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => setup.PutAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -66,7 +66,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -92,7 +93,8 @@ public IReturnMethodSetup, HttpRequestMessage, Cancell return methodSetup; } - throw new MockException("Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot setup HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs index ec95e6a0..b075d633 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs @@ -22,8 +22,8 @@ public static partial class HttpClientExtensions /// with the given . /// public VerificationResult DeleteAsync( - IParameter? requestUri) - => verifyInvoked.DeleteAsync(requestUri ?? It.IsAny(), It.IsAny()); + IParameter requestUri) + => verifyInvoked.DeleteAsync(requestUri, It.IsAny()); /// /// Validates the invocations for the method @@ -31,8 +31,8 @@ public VerificationResult DeleteAsync( /// with the given . /// public VerificationResult DeleteAsync( - IParameter? requestUri) - => verifyInvoked.DeleteAsync(requestUri ?? It.IsAny(), It.IsAny()); + IParameter requestUri) + => verifyInvoked.DeleteAsync(requestUri, It.IsAny()); /// /// Validates the invocations for the method @@ -53,7 +53,8 @@ public VerificationResult DeleteAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -75,7 +76,8 @@ public VerificationResult DeleteAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs index d8b96d33..7d78de1d 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs @@ -22,8 +22,8 @@ public static partial class HttpClientExtensions /// with the given . /// public VerificationResult GetAsync( - IParameter? requestUri) - => verifyInvoked.GetAsync(requestUri ?? It.IsAny(), It.IsAny()); + IParameter requestUri) + => verifyInvoked.GetAsync(requestUri, It.IsAny()); /// /// Validates the invocations for the method @@ -31,8 +31,8 @@ public VerificationResult GetAsync( /// with the given . /// public VerificationResult GetAsync( - IParameter? requestUri) - => verifyInvoked.GetAsync(requestUri ?? It.IsAny(), It.IsAny()); + IParameter requestUri) + => verifyInvoked.GetAsync(requestUri, It.IsAny()); /// /// Validates the invocations for the method @@ -53,7 +53,8 @@ public VerificationResult GetAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -75,7 +76,8 @@ public VerificationResult GetAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs index 3534e53f..8a4f2159 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs @@ -23,10 +23,10 @@ public static partial class HttpClientExtensions /// with the given . /// public VerificationResult PatchAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => verifyInvoked.PatchAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -36,10 +36,10 @@ public VerificationResult PatchAsync( /// with the given . /// public VerificationResult PatchAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => verifyInvoked.PatchAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -64,7 +64,8 @@ public VerificationResult PatchAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -88,7 +89,8 @@ public VerificationResult PatchAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs index 6628f738..a71e2420 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs @@ -22,10 +22,10 @@ public static partial class HttpClientExtensions /// with the given . /// public VerificationResult PostAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => verifyInvoked.PostAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -35,10 +35,10 @@ public VerificationResult PostAsync( /// with the given . /// public VerificationResult PostAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => verifyInvoked.PostAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -63,7 +63,8 @@ public VerificationResult PostAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -87,7 +88,8 @@ public VerificationResult PostAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs index 2b077db1..69c946bc 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs @@ -22,10 +22,10 @@ public static partial class HttpClientExtensions /// with the given . /// public VerificationResult PutAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => verifyInvoked.PutAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -35,10 +35,10 @@ public VerificationResult PutAsync( /// with the given . /// public VerificationResult PutAsync( - IParameter? requestUri, + IParameter requestUri, IParameter? content = null) => verifyInvoked.PutAsync( - requestUri ?? It.IsAny(), + requestUri, content ?? It.IsAny(), It.IsAny()); @@ -63,7 +63,8 @@ public VerificationResult PutAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } /// @@ -87,7 +88,8 @@ public VerificationResult PutAsync( .Map(httpClientMock.Subject); } - throw new MockException("Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); + throw new MockException( + "Cannot verify HttpClient when it is not mocked with a mockable HttpMessageHandler."); } } } diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt index f8739ef9..bd23b280 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt @@ -1794,47 +1794,47 @@ namespace Mockolate.Web { extension(Mockolate.Setup.IMockMethodSetup setup) { - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt index ec7b2915..1aaeb578 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt @@ -1793,47 +1793,47 @@ namespace Mockolate.Web { extension(Mockolate.Setup.IMockMethodSetup setup) { - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult PatchAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt index b93025cc..e5ae231c 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt @@ -1742,39 +1742,39 @@ namespace Mockolate.Web { extension(Mockolate.Setup.IMockMethodSetup setup) { - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } - public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter? requestUri) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri) { } + public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult GetAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult PostAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } - public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter? requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } + public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter? content = null) { } public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Verify.VerificationResult PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } From e4f0e18768a0784031cbda13fbae0212ec290651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20Breu=C3=9F?= Date: Sun, 1 Feb 2026 10:52:08 +0100 Subject: [PATCH 4/4] Fix sonar issue --- Tests/Mockolate.Internal.Tests/WebTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/Mockolate.Internal.Tests/WebTests.cs b/Tests/Mockolate.Internal.Tests/WebTests.cs index ef0c62e1..88c53e12 100644 --- a/Tests/Mockolate.Internal.Tests/WebTests.cs +++ b/Tests/Mockolate.Internal.Tests/WebTests.cs @@ -41,9 +41,9 @@ public async Task WithoutMediaTypeHeader_WhenOneIsRequired_ShouldReturnFalse() await That(result).IsFalse(); } - private class MyHttpContent : HttpContent + private sealed class MyHttpContent : HttpContent { - protected override Task SerializeToStreamAsync(Stream stream, TransportContext context) + protected override Task SerializeToStreamAsync(Stream stream, TransportContext? context) => Task.CompletedTask; protected override bool TryComputeLength(out long length) @@ -53,5 +53,5 @@ protected override bool TryComputeLength(out long length) } } - private class SomeOtherObject; + private sealed class SomeOtherObject; }