From 8fca1bb8c18fcac5438cb42c43173113b20e862d Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Tue, 4 May 2021 06:21:08 +0000 Subject: [PATCH] Fix some SonarCloud issues in UnitTests --- .../Http/HttpRequestMessageHelperTests.cs | 9 +++++---- test/WireMock.Net.Tests/ObservableLogEntriesTest.cs | 4 ++-- .../Owin/WireMockMiddlewareTests.cs | 12 ++++++------ test/WireMock.Net.Tests/WireMockServer.Admin.cs | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs index 671a1444f..71c090c15 100644 --- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs @@ -1,6 +1,7 @@ using NFluent; using System.Collections.Generic; using System.Text; +using System.Threading.Tasks; using WireMock.Http; using WireMock.Models; using WireMock.Types; @@ -28,7 +29,7 @@ public void HttpRequestMessageHelper_Create() } [Fact] - public async void HttpRequestMessageHelper_Create_Bytes() + public async Task HttpRequestMessageHelper_Create_Bytes() { // Assign var body = new BodyData @@ -46,7 +47,7 @@ public async void HttpRequestMessageHelper_Create_Bytes() } [Fact] - public async void HttpRequestMessageHelper_Create_Json() + public async Task HttpRequestMessageHelper_Create_Json() { // Assign var body = new BodyData @@ -64,7 +65,7 @@ public async void HttpRequestMessageHelper_Create_Json() } [Fact] - public async void HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson() + public async Task HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson() { // Assign var headers = new Dictionary { { "Content-Type", new[] { "application/json" } } }; @@ -84,7 +85,7 @@ public async void HttpRequestMessageHelper_Create_Json_With_ContentType_Applicat } [Fact] - public async void HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson_UTF8() + public async Task HttpRequestMessageHelper_Create_Json_With_ContentType_ApplicationJson_UTF8() { // Assign var headers = new Dictionary { { "Content-Type", new[] { "application/json; charset=utf-8" } } }; diff --git a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs index 9ded30329..e3dfaed40 100644 --- a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs +++ b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs @@ -19,7 +19,7 @@ namespace WireMock.Net.Tests public class ObservableLogEntriesTest { [Fact] - public async void WireMockServer_LogEntriesChanged_WithException_Should_LogError() + public async Task WireMockServer_LogEntriesChanged_WithException_Should_LogError() { // Assign string path = $"/log_{Guid.NewGuid()}"; @@ -48,7 +48,7 @@ public async void WireMockServer_LogEntriesChanged_WithException_Should_LogError } [Fact] - public async void WireMockServer_LogEntriesChanged() + public async Task WireMockServer_LogEntriesChanged() { // Assign string path = $"/log_{Guid.NewGuid()}"; diff --git a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs index 92afea4f1..298664a2e 100644 --- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs +++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs @@ -77,7 +77,7 @@ public WireMockMiddlewareTests() } [Fact] - public async void WireMockMiddleware_Invoke_NoMatch() + public async Task WireMockMiddleware_Invoke_NoMatch() { // Act await _sut.Invoke(_contextMock.Object); @@ -90,7 +90,7 @@ public async void WireMockMiddleware_Invoke_NoMatch() } [Fact] - public async void WireMockMiddleware_Invoke_IsAdminInterface_EmptyHeaders_401() + public async Task WireMockMiddleware_Invoke_IsAdminInterface_EmptyHeaders_401() { // Assign var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary()); @@ -113,7 +113,7 @@ public async void WireMockMiddleware_Invoke_IsAdminInterface_EmptyHeaders_401() } [Fact] - public async void WireMockMiddleware_Invoke_IsAdminInterface_MissingHeader_401() + public async Task WireMockMiddleware_Invoke_IsAdminInterface_MissingHeader_401() { // Assign var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary { { "h", new[] { "x" } } }); @@ -136,7 +136,7 @@ public async void WireMockMiddleware_Invoke_IsAdminInterface_MissingHeader_401() } [Fact] - public async void WireMockMiddleware_Invoke_RequestLogExpirationDurationIsDefined() + public async Task WireMockMiddleware_Invoke_RequestLogExpirationDurationIsDefined() { // Assign _optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1); @@ -146,7 +146,7 @@ public async void WireMockMiddleware_Invoke_RequestLogExpirationDurationIsDefine } [Fact] - public async void WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_And_SaveMapping_Is_True() + public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_And_SaveMapping_Is_True() { // Assign var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary()); @@ -195,7 +195,7 @@ public async void WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_A } [Fact] - public async void WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_And_SaveMapping_Is_False_But_WireMockServerSettings_SaveMapping_Is_True() + public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_And_SaveMapping_Is_False_But_WireMockServerSettings_SaveMapping_Is_True() { // Assign var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary()); diff --git a/test/WireMock.Net.Tests/WireMockServer.Admin.cs b/test/WireMock.Net.Tests/WireMockServer.Admin.cs index 8b72a6bbd..9906e853d 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Admin.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Admin.cs @@ -422,7 +422,7 @@ public void WireMockServer_Admin_AddMappingsAndSaveToFile() } [Fact] - public async void WireMockServer_Admin_DeleteMappings() + public async Task WireMockServer_Admin_DeleteMappings() { // Arrange var server = WireMockServer.Start(new WireMockServerSettings