diff --git a/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs b/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs index 47fee895..ac6a4bd1 100644 --- a/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs +++ b/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using System; -using System.Threading.Tasks; -using Newtonsoft.Json; -using WireMock.Owin.Mappers; -using Stef.Validation; using Microsoft.AspNetCore.Http; +using Newtonsoft.Json; +using Stef.Validation; +using WireMock.Owin.Mappers; namespace WireMock.Owin; diff --git a/src/WireMock.Net/WireMock.Net.csproj b/src/WireMock.Net/WireMock.Net.csproj index c5141205..cf0f3a6b 100644 --- a/src/WireMock.Net/WireMock.Net.csproj +++ b/src/WireMock.Net/WireMock.Net.csproj @@ -1,9 +1,9 @@ - + Lightweight Http Mocking Server for .NET, inspired by WireMock from the Java landscape. WireMock.Net Stef Heyenrath - net462;netstandard2.1;netstandard2.0;net8.0 + net462;netstandard2.1;net8.0 true WireMock.Net WireMock.Net diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs index 86fff36b..dbc58b4f 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs @@ -2,10 +2,9 @@ using System.Net.Http; using System.Text; -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; -using NFluent; + using RestEase; using WireMock.Admin.Mappings; using WireMock.Client; @@ -73,12 +72,12 @@ public partial class WireMockAdminApiTests var result = await api.PostMappingsAsync([model1, model2], TestContext.Current.CancellationToken); // Assert - Check.That(result).IsNotNull(); - Check.That(result.Status).IsNotNull(); - Check.That(result.Guid).IsNull(); - Check.That(server.Mappings.Where(m => !m.IsAdminInterface)).HasSize(2); - Check.That(server.Mappings.Single(x => x.Title == "test 1").Description).IsEqualTo("description 1"); - Check.That(server.Mappings.Single(x => x.Title == "test 2").Description).IsEqualTo("description 2"); + result.Should().NotBeNull(); + result.Status.Should().NotBeNull(); + result.Guid.Should().BeNull(); + server.Mappings.Where(m => !m.IsAdminInterface).Should().HaveCount(2); + server.Mappings.Single(x => x.Title == "test 1").Description.Should().Be("description 1"); + server.Mappings.Single(x => x.Title == "test 2").Description.Should().Be("description 2"); server.Stop(); } @@ -106,16 +105,16 @@ public partial class WireMockAdminApiTests var result = await api.PostMappingAsync(model, TestContext.Current.CancellationToken); // Assert - Check.That(result).IsNotNull(); - Check.That(result.Status).IsNotNull(); - Check.That(result.Guid).IsNotNull(); + result.Should().NotBeNull(); + result.Status.Should().NotBeNull(); + result.Guid.Should().NotBeNull(); var mapping = server.Mappings.Single(m => m.Priority == 500); - Check.That(mapping).IsNotNull(); - Check.That(mapping.Title).Equals("test"); + mapping.Should().NotBeNull(); + mapping.Title.Should().Be("test"); var response = await mapping.ProvideResponseAsync(Mock.Of(), new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")); - Check.That(response.Message.StatusCode).Equals(expectedStatusCode); + response.Message.StatusCode.Should().Be(expectedStatusCode); server.Stop(); } diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs index d02280ad..a5387c39 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs @@ -4,9 +4,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using AwesomeAssertions; using Moq; -using NFluent; using RestEase; using WireMock.Admin.Mappings; using WireMock.Admin.Scenarios; @@ -94,7 +92,7 @@ public partial class WireMockAdminApiTests // Act var settings = await api.GetSettingsAsync(TestContext.Current.CancellationToken); - Check.That(settings).IsNotNull(); + settings.Should().NotBeNull(); } [Fact] @@ -112,7 +110,7 @@ public partial class WireMockAdminApiTests var settings = await api.GetSettingsAsync(TestContext.Current.CancellationToken); // Assert - Check.That(settings).IsNotNull(); + settings.Should().NotBeNull(); // Cleanup server.Stop(); @@ -129,7 +127,7 @@ public partial class WireMockAdminApiTests // Act var settings = new SettingsModel(); var status = await api.PostSettingsAsync(settings, TestContext.Current.CancellationToken); - Check.That(status.Status).Equals("Settings updated"); + status.Status.Should().Be("Settings updated"); } [Fact] @@ -142,7 +140,7 @@ public partial class WireMockAdminApiTests // Act var settings = new SettingsModel(); var status = await api.PutSettingsAsync(settings, TestContext.Current.CancellationToken); - Check.That(status.Status).Equals("Settings updated"); + status.Status.Should().Be("Settings updated"); } // https://github.com/wiremock/WireMock.Net/issues/325 @@ -164,13 +162,13 @@ public partial class WireMockAdminApiTests var result = await api.PutMappingAsync(new Guid("a0000000-0000-0000-0000-000000000000"), model, TestContext.Current.CancellationToken); // Assert - Check.That(result).IsNotNull(); - Check.That(result.Status).Equals("Mapping added or updated"); - Check.That(result.Guid).IsNotNull(); + result.Should().NotBeNull(); + result.Status.Should().Be("Mapping added or updated"); + result.Guid.Should().NotBeNull(); var mapping = server.Mappings.Single(m => m.Priority == 500); - Check.That(mapping).IsNotNull(); - Check.That(mapping.Title).Equals("test"); + mapping.Should().NotBeNull(); + mapping.Title.Should().Be("test"); server.Stop(); } @@ -202,7 +200,7 @@ public partial class WireMockAdminApiTests // Assert requests.Should().HaveCount(1); var requestLogged = requests.First(); - requestLogged.Request.Method.Should().Be("GET"); + requestLogged.Request!.Method.Should().Be("GET"); requestLogged.Request.Body.Should().BeNull(); requestLogged.Request.Path.Should().Be("/foo"); } @@ -235,15 +233,15 @@ public partial class WireMockAdminApiTests // Assert logEntryModels.Should().HaveCount(2); logEntryModels[0].Should().NotBeNull(); - logEntryModels[0]!.Request.Method.Should().Be("GET"); - logEntryModels[0]!.Request.Body.Should().BeNull(); - logEntryModels[0]!.Request.Path.Should().Be("/foo"); - logEntryModels[0]!.Request.Query.Should().BeNullOrEmpty(); + logEntryModels[0].Request!.Method.Should().Be("GET"); + logEntryModels[0].Request!.Body.Should().BeNull(); + logEntryModels[0].Request!.Path.Should().Be("/foo"); + logEntryModels[0].Request!.Query.Should().BeNullOrEmpty(); logEntryModels[1].Should().NotBeNull(); - logEntryModels[1]!.Request.Method.Should().Be("GET"); - logEntryModels[1]!.Request.Body.Should().BeNull(); - logEntryModels[1]!.Request.Path.Should().Be("/foo"); - logEntryModels[1]!.Request.Query.Should().BeEquivalentTo(new Dictionary> + logEntryModels[1].Request!.Method.Should().Be("GET"); + logEntryModels[1].Request!.Body.Should().BeNull(); + logEntryModels[1].Request!.Path.Should().Be("/foo"); + logEntryModels[1].Request!.Query.Should().BeEquivalentTo(new Dictionary> { {"bar", new WireMockList("baz")} }); @@ -312,11 +310,11 @@ public partial class WireMockAdminApiTests var requests = await api.GetRequestsAsync(cancellationToken); // Assert - Check.That(requests).HasSize(1); + requests.Should().HaveCount(1); var requestLogged = requests.First(); - Check.That(requestLogged.Request.Method).IsEqualTo("GET"); - Check.That(requestLogged.Request.Body).IsNull(); - Check.That(requestLogged.Request.Path).IsEqualTo("/foo"); + requestLogged.Request.Method.Should().Be("GET"); + requestLogged.Request.Body.Should().BeNull(); + requestLogged.Request.Path.Should().Be("/foo"); } [Fact] @@ -342,7 +340,7 @@ public partial class WireMockAdminApiTests using var client = new HttpClient(); var response = await client.SendAsync(request, cancellationToken); - Check.That(response).IsNotNull(); + response.Should().NotBeNull(); var api = RestClient.For(serverUrl); @@ -350,11 +348,11 @@ public partial class WireMockAdminApiTests var requests = await api.GetRequestsAsync(cancellationToken); // Assert - Check.That(requests).HasSize(1); + requests.Should().HaveCount(1); var requestLogged = requests.First(); - Check.That(requestLogged.Request.Method).IsEqualTo("POST"); - Check.That(requestLogged.Request.Body).IsNotNull(); - Check.That(requestLogged.Request.Body).Contains("T000001"); + requestLogged.Request.Method.Should().Be("POST"); + requestLogged.Request.Body.Should().NotBeNull(); + requestLogged.Request.Body.Should().Contain("T000001"); } [Fact] @@ -524,7 +522,7 @@ public partial class WireMockAdminApiTests request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(jsonApiContentType); using var client = new HttpClient(); var response = await client.SendAsync(request, cancellationToken); - Check.That(response).IsNotNull(); + response.Should().NotBeNull(); var api = RestClient.For(serverUrl); @@ -532,11 +530,11 @@ public partial class WireMockAdminApiTests var requests = await api.GetRequestsAsync(cancellationToken); // Assert - Check.That(requests).HasSize(1); + requests.Should().HaveCount(1); var requestLogged = requests.First(); - Check.That(requestLogged.Request.Method).IsEqualTo("POST"); - Check.That(requestLogged.Request.Body).IsNotNull(); - Check.That(requestLogged.Request.Body).Contains("T000001"); + requestLogged.Request.Method.Should().Be("POST"); + requestLogged.Request.Body.Should().NotBeNull(); + requestLogged.Request.Body.Should().Contain("T000001"); } [Fact] @@ -561,8 +559,8 @@ public partial class WireMockAdminApiTests var request = await api.PostFileAsync("filename.txt", "abc", TestContext.Current.CancellationToken); // Assert - Check.That(request.Guid).IsNull(); - Check.That(request.Status).Contains("File"); + request.Guid.Should().BeNull(); + request.Status.Should().Contain("File"); // Verify filesystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Once); @@ -594,8 +592,8 @@ public partial class WireMockAdminApiTests var request = await api.PutFileAsync("filename.txt", "abc-abc", TestContext.Current.CancellationToken); // Assert - Check.That(request.Guid).IsNull(); - Check.That(request.Status).Contains("File"); + request.Guid.Should().BeNull(); + request.Status.Should().Contain("File"); // Verify filesystemHandlerMock.Verify(fs => fs.WriteFile(It.Is(p => p == "filename.txt"), It.IsAny()), Times.Once); @@ -606,7 +604,7 @@ public partial class WireMockAdminApiTests } [Fact] - public void IWireMockAdminApi_PutFileAsync_NotFound() + public async Task IWireMockAdminApi_PutFileAsync_NotFound() { // Arrange var filesystemHandlerMock = new Mock(MockBehavior.Strict); @@ -622,7 +620,8 @@ public partial class WireMockAdminApiTests var api = RestClient.For(server.Urls[0]); // Act and Assert - Check.ThatCode(() => api.PutFileAsync("filename.txt", "xxx", TestContext.Current.CancellationToken)).Throws(); + Func act = () => api.PutFileAsync("filename.txt", "xxx", TestContext.Current.CancellationToken); + await act.Should().ThrowAsync(); // Verify filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is(p => p == "filename.txt")), Times.Once); @@ -632,7 +631,7 @@ public partial class WireMockAdminApiTests } [Fact] - public void IWireMockAdminApi_GetFileAsync_NotFound() + public async Task IWireMockAdminApi_GetFileAsync_NotFound() { // Arrange var filesystemHandlerMock = new Mock(MockBehavior.Strict); @@ -649,7 +648,8 @@ public partial class WireMockAdminApiTests var api = RestClient.For(server.Urls[0]); // Act and Assert - Check.ThatCode(() => api.GetFileAsync("filename.txt", TestContext.Current.CancellationToken)).Throws(); + Func act = () => api.GetFileAsync("filename.txt", TestContext.Current.CancellationToken); + await act.Should().ThrowAsync(); // Verify filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is(p => p == "filename.txt")), Times.Once); @@ -680,7 +680,7 @@ public partial class WireMockAdminApiTests string file = await api.GetFileAsync("filename.txt", TestContext.Current.CancellationToken); // Assert - Check.That(file).Equals(data); + file.Should().Be(data); // Verify filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is(p => p == "filename.txt")), Times.Once); @@ -719,7 +719,7 @@ public partial class WireMockAdminApiTests } [Fact] - public void IWireMockAdminApi_DeleteFileAsync_NotFound() + public async Task IWireMockAdminApi_DeleteFileAsync_NotFound() { // Arrange var filesystemHandlerMock = new Mock(MockBehavior.Strict); @@ -736,7 +736,8 @@ public partial class WireMockAdminApiTests var api = RestClient.For(server.Urls[0]); // Act and Assert - Check.ThatCode(() => api.DeleteFileAsync("filename.txt", TestContext.Current.CancellationToken)).Throws(); + Func act = () => api.DeleteFileAsync("filename.txt", TestContext.Current.CancellationToken); + await act.Should().ThrowAsync(); // Verify filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is(p => p == "filename.txt")), Times.Once); @@ -746,7 +747,7 @@ public partial class WireMockAdminApiTests } [Fact] - public void IWireMockAdminApi_FileExistsAsync_NotFound() + public async Task IWireMockAdminApi_FileExistsAsync_NotFound() { // Arrange var filesystemHandlerMock = new Mock(MockBehavior.Strict); @@ -762,7 +763,8 @@ public partial class WireMockAdminApiTests var api = RestClient.For(server.Urls[0]); // Act and Assert - Check.ThatCode(() => api.FileExistsAsync("filename.txt", TestContext.Current.CancellationToken)).Throws(); + Func act = () => api.FileExistsAsync("filename.txt", TestContext.Current.CancellationToken); + await act.Should().ThrowAsync(); // Verify filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is(p => p == "filename.txt")), Times.Once); diff --git a/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs b/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs index ea31df35..17b34122 100644 --- a/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs +++ b/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using AwesomeAssertions; using WireMock.Client; using WireMock.Client.Extensions; using WireMock.Net.Tests.VerifyExtensions; diff --git a/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs b/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs index 45589d16..4a108443 100644 --- a/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs +++ b/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Collections; -using AwesomeAssertions; using WireMock.Extensions; namespace WireMock.Net.Tests.Extensions; diff --git a/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs b/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs index 7902064a..f15135eb 100644 --- a/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs +++ b/test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Extensions; namespace WireMock.Net.Tests.Extensions; diff --git a/test/WireMock.Net.Tests/FluentAssertions/WireMockAdminApiAssertionsTests.cs b/test/WireMock.Net.Tests/FluentAssertions/WireMockAdminApiAssertionsTests.cs index 7a512cc6..c8e3def2 100644 --- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAdminApiAssertionsTests.cs +++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAdminApiAssertionsTests.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Net.Http.Json; -using AwesomeAssertions; using RestEase; using WireMock.Client; using WireMock.Client.AwesomeAssertions; @@ -670,7 +669,6 @@ public class WireMockAdminApiAssertionsTests : IDisposable .WithMessage("Expected _adminApi to have been called using method \"OPTIONS\", but didn't find it among the methods {\"POST\"}."); } -#if !NET452 [Fact] public async Task HaveReceivedACall_UsingConnect_WhenACallWasMadeUsingConnect_Should_BeOK() { @@ -686,7 +684,6 @@ public class WireMockAdminApiAssertionsTests : IDisposable .HaveReceivedACall() .UsingConnect(); } -#endif [Fact] public async Task HaveReceivedACall_UsingDelete_WhenACallWasMadeUsingDelete_Should_BeOK() @@ -764,7 +761,7 @@ public class WireMockAdminApiAssertionsTests : IDisposable .RespondWith(Response.Create().WithBody("C response").WithStatusCode(HttpStatusCode.OK)); // Act - var httpClient = new HttpClient(); + using var httpClient = new HttpClient(); var tasks = new[] { @@ -902,7 +899,7 @@ public class WireMockAdminApiAssertionsTests : IDisposable .RespondWith(Response.Create().WithBody("A response")); // Act - var httpClient = new HttpClient(); + using var httpClient = new HttpClient(); await httpClient.PostAsync($"{server.Url}/a", new StringContent("x"), _ct); diff --git a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs index 598a60fd..309313ca 100644 --- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs +++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Net.Http.Json; -using AwesomeAssertions; using WireMock.AwesomeAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; @@ -407,7 +406,7 @@ public class WireMockAssertionsTests : IDisposable act.Should() .Throw() - .WithMessage("Expected _server to have been called with Header \"Accept\" and Values {\"missing-value\"}, but didn't find it among the calls with Header(s)*"); + .WithMessage("Expected _server to have been called with Header \"Accept\" and Values {\"missing-value\"}, but didn't find it among the calls with Header*"); } [Fact] @@ -653,7 +652,6 @@ public class WireMockAssertionsTests : IDisposable .WithMessage("Expected _server to have been called using method \"OPTIONS\", but didn't find it among the methods {\"POST\"}."); } -#if !NET452 [Fact] public async Task HaveReceivedACall_UsingConnect_WhenACallWasMadeUsingConnect_Should_BeOK() { @@ -669,7 +667,6 @@ public class WireMockAssertionsTests : IDisposable .HaveReceivedACall() .UsingConnect(); } -#endif [Fact] public async Task HaveReceivedACall_UsingDelete_WhenACallWasMadeUsingDelete_Should_BeOK() diff --git a/test/WireMock.Net.Tests/GlobalUsings.cs b/test/WireMock.Net.Tests/GlobalUsings.cs new file mode 100644 index 00000000..d01f1a71 --- /dev/null +++ b/test/WireMock.Net.Tests/GlobalUsings.cs @@ -0,0 +1 @@ +global using AwesomeAssertions; \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs b/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs index 23ccde4e..f1e8ce4f 100644 --- a/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs +++ b/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Grpc; diff --git a/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs b/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs index f42bcf5f..941d716f 100644 --- a/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs +++ b/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Grpc; diff --git a/test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs b/test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs index 8dbd2675..6009e8aa 100644 --- a/test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs +++ b/test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using AwesomeAssertions; using ExampleIntegrationTest.Lookup; using Google.Protobuf.WellKnownTypes; using Greet; @@ -15,7 +14,6 @@ using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; using WireMock.Settings; -using WireMock.Util; // ReSharper disable once CheckNamespace namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs b/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs index e404559a..ef5a5a3d 100644 --- a/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs +++ b/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.Handlers; namespace WireMock.Net.Tests.Handlers; @@ -16,28 +16,31 @@ public class LocalFileSystemHandlerTests string result = _sut.GetMappingFolder(); // Assert - Check.That(result).EndsWith(Path.Combine("__admin", "mappings")); + result.Should().EndWith(Path.Combine("__admin", "mappings")); } [Fact] public void LocalFileSystemHandler_CreateFolder_ThrowsArgumentNullException() { // Act - Check.ThatCode(() => _sut.CreateFolder(null)).Throws(); + Action act = () => _sut.CreateFolder(null); + act.Should().Throw(); } [Fact] public void LocalFileSystemHandler_WriteMappingFile_ThrowsArgumentNullException() { // Act - Check.ThatCode(() => _sut.WriteMappingFile(null, null)).Throws(); + Action act = () => _sut.WriteMappingFile(null, null); + act.Should().Throw(); } [Fact] public void LocalFileSystemHandler_ReadResponseBodyAsFile_ThrowsArgumentNullException() { // Act - Check.ThatCode(() => _sut.ReadResponseBodyAsFile(null)).Throws(); + Action act = () => _sut.ReadResponseBodyAsFile(null); + act.Should().Throw(); } [Fact] @@ -47,42 +50,47 @@ public class LocalFileSystemHandlerTests var result = _sut.FileExists("x.x"); // Assert - Check.That(result).IsFalse(); + result.Should().BeFalse(); } [Fact] public void LocalFileSystemHandler_FileExists_ThrowsArgumentNullException() { // Act - Check.ThatCode(() => _sut.FileExists(null)).Throws(); + Action act = () => _sut.FileExists(null); + act.Should().Throw(); } [Fact] public void LocalFileSystemHandler_ReadFile_ThrowsArgumentNullException() { // Act - Check.ThatCode(() => _sut.ReadFile(null)).Throws(); + Action act = () => _sut.ReadFile(null); + act.Should().Throw(); } [Fact] public void LocalFileSystemHandler_ReadFileAsString_ThrowsArgumentNullException() { // Act - Check.ThatCode(() => _sut.ReadFileAsString(null)).Throws(); + Action act = () => _sut.ReadFileAsString(null); + act.Should().Throw(); } [Fact] public void LocalFileSystemHandler_WriteFile_ThrowsArgumentNullException() { // Act - Check.ThatCode(() => _sut.WriteFile(null, null)).Throws(); + Action act = () => _sut.WriteFile(null, null); + act.Should().Throw(); } [Fact] public void LocalFileSystemHandler_DeleteFile_ThrowsArgumentNullException() { // Act - Check.ThatCode(() => _sut.DeleteFile(null)).Throws(); + Action act = () => _sut.DeleteFile(null); + act.Should().Throw(); } [Fact] @@ -92,13 +100,17 @@ public class LocalFileSystemHandlerTests string result = _sut.GetUnmatchedRequestsFolder(); // Assert - Check.That(result).EndsWith(Path.Combine("requests", "unmatched")); + result.Should().EndWith(Path.Combine("requests", "unmatched")); } [Fact] public void LocalFileSystemHandler_WriteUnmatchedRequest() { // Act - Check.ThatCode(() => _sut.WriteUnmatchedRequest(null, null)).Throws(); + Action act = () => _sut.WriteUnmatchedRequest(null, null); + act.Should().Throw(); } -} \ No newline at end of file +} + + + diff --git a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs index 0a9c2e6c..42ce517f 100644 --- a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs @@ -3,7 +3,6 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using AwesomeAssertions; using WireMock.Http; namespace WireMock.Net.Tests.Http; diff --git a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs index e2eab7c7..b4c726cb 100644 --- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs @@ -2,8 +2,7 @@ using System.Net.Http; using System.Text; -using AwesomeAssertions; -using NFluent; + using WireMock.Http; using WireMock.Models; using WireMock.Types; @@ -28,7 +27,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(message.Headers.GetValues("x")).ContainsExactly("value-1"); + message.Headers.GetValues("x").Should().Equal(new[] { "value-1" }); } [Fact] @@ -46,7 +45,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsByteArrayAsync(_ct)).ContainsExactly(Encoding.UTF8.GetBytes("hi")); + (await message.Content!.ReadAsByteArrayAsync(_ct)).Should().Equal(Encoding.UTF8.GetBytes("hi")); } [Fact] @@ -64,7 +63,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("0123"); + (await message.Content!.ReadAsStringAsync(_ct)).Should().Be("0123"); } [Fact] @@ -82,7 +81,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("{\"x\":42}"); + (await message.Content!.ReadAsStringAsync(_ct)).Should().Be("{\"x\":42}"); } [Fact] @@ -101,8 +100,8 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("{\"x\":42}"); - Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json"); + (await message.Content!.ReadAsStringAsync(_ct)).Should().Be("{\"x\":42}"); + message.Content.Headers.GetValues("Content-Type").Should().Equal(new[] { "application/json" }); } [Fact] @@ -121,8 +120,8 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("{\"x\":42}"); - Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8"); + (await message.Content!.ReadAsStringAsync(_ct)).Should().Be("{\"x\":42}"); + message.Content.Headers.GetValues("Content-Type").Should().Equal(new[] { "application/json; charset=utf-8" }); } [Fact] @@ -142,8 +141,8 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("{\"x\":42}"); - Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("multipart/form-data"); + (await message.Content!.ReadAsStringAsync(_ct)).Should().Be("{\"x\":42}"); + message.Content.Headers.GetValues("Content-Type").Should().Equal(new[] { "multipart/form-data" }); } @@ -163,7 +162,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(message.Content!.Headers.GetValues("Content-Type")).ContainsExactly("application/xml"); + message.Content!.Headers.GetValues("Content-Type").Should().Equal(new[] { "application/xml" }); } [Fact] @@ -182,7 +181,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(message.Content!.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=UTF-8"); + message.Content!.Headers.GetValues("Content-Type").Should().Equal(new[] { "application/xml; charset=UTF-8" }); } [Fact] @@ -201,7 +200,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(message.Content!.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=Ascii"); + message.Content!.Headers.GetValues("Content-Type").Should().Equal(new[] { "application/xml; charset=Ascii" }); } [Fact] @@ -243,7 +242,7 @@ public class HttpRequestMessageHelperTests // Assert (await message.Content!.ReadAsStringAsync(_ct)).Should().Be(body); - Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("multipart/form-data"); + message.Content.Headers.GetValues("Content-Type").Should().Equal(new[] { "multipart/form-data" }); } [Theory] @@ -270,4 +269,7 @@ public class HttpRequestMessageHelperTests // Assert message.Content?.Headers.ContentLength.Should().Be(resultShouldBe ? value : null); } -} \ No newline at end of file +} + + + diff --git a/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs b/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs index 83089352..8b6e38cf 100644 --- a/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/StringContentHelperTests.cs @@ -2,7 +2,6 @@ using System.Net.Http; using System.Net.Http.Headers; -using AwesomeAssertions; using WireMock.Http; namespace WireMock.Net.Tests.Http; diff --git a/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs index f8e0071d..98bac2af 100644 --- a/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; -using NFluent; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -79,7 +77,7 @@ public class CSharpCodeMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("CSharpCodeMatcher"); + name.Should().Be("CSharpCodeMatcher"); } [Fact] @@ -92,6 +90,6 @@ public class CSharpCodeMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("x"); + patterns.Should().ContainSingle("x"); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs index c8163e6b..0645306e 100644 --- a/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; -using NFluent; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -51,7 +49,7 @@ public class ContentTypeMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("ContentTypeMatcher"); + name.Should().Be("ContentTypeMatcher"); } [Fact] @@ -64,6 +62,6 @@ public class ContentTypeMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("x"); + patterns.Should().ContainSingle("x"); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs index e0ef755c..2d8c91e2 100644 --- a/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -17,7 +16,7 @@ public class ExactMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("ExactMatcher"); + name.Should().Be("ExactMatcher"); } [Fact] @@ -30,7 +29,7 @@ public class ExactMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("X"); + patterns.Should().ContainSingle("X"); } [Fact] @@ -43,7 +42,7 @@ public class ExactMatcherTests double result = matcher.IsMatch("X").Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -56,7 +55,7 @@ public class ExactMatcherTests double result = matcher.IsMatch("x").Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -69,7 +68,7 @@ public class ExactMatcherTests double result = matcher.IsMatch("y").Score; // Assert - Check.That(result).IsEqualTo(0.0); + result.Should().Be(0.0); } [Fact] @@ -82,7 +81,7 @@ public class ExactMatcherTests double result = matcher.IsMatch("x").Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -95,7 +94,7 @@ public class ExactMatcherTests double result = matcher.IsMatch("x").Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Theory] @@ -111,7 +110,7 @@ public class ExactMatcherTests double result = matcher.IsMatch("x").Score; // Assert - Check.That(result).IsEqualTo(score); + result.Should().Be(score); } [Fact] @@ -124,7 +123,7 @@ public class ExactMatcherTests double result = matcher.IsMatch("caR").Score; // Assert - Check.That(result).IsEqualTo(0.0); + result.Should().Be(0.0); } [Fact] @@ -137,7 +136,7 @@ public class ExactMatcherTests double result = matcher.IsMatch("cat").Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -150,6 +149,6 @@ public class ExactMatcherTests double result = matcher.IsMatch("cat").Score; // Assert - Check.That(result).IsEqualTo(0.0); + result.Should().Be(0.0); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs index 62978d77..074941dc 100644 --- a/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -18,7 +18,7 @@ public class ExactObjectMatcherTests var name = matcher.Name; // Assert - Check.That(name).Equals("ExactObjectMatcher"); + name.Should().Be("ExactObjectMatcher"); } [Fact] @@ -32,7 +32,7 @@ public class ExactObjectMatcherTests var score = matcher.IsMatch(checkValue).Score; // Assert - Check.That(score).IsEqualTo(1.0); + score.Should().Be(1.0); } [Fact] @@ -46,7 +46,7 @@ public class ExactObjectMatcherTests var score = matcher.IsMatch(new { x = 500, s = "s" }).Score; // Assert - Check.That(score).IsEqualTo(1.0); + score.Should().Be(1.0); } [Fact] @@ -60,6 +60,6 @@ public class ExactObjectMatcherTests var score = matcher.IsMatch(new { x = 500, s = "s" }).Score; // Assert - Check.That(score).IsEqualTo(0.0); + score.Should().Be(0.0); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs index 6e7c8ccb..139e7534 100644 --- a/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs @@ -2,7 +2,6 @@ using System.Net.Http; using AnyOfTypes; -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/Matchers/FuncMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/FuncMatcherTests.cs index 49c47fff..36ea3ffb 100644 --- a/test/WireMock.Net.Tests/Matchers/FuncMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/FuncMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/GraphQLMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/GraphQLMatcherTests.cs index 7e3b5798..2050b3af 100644 --- a/test/WireMock.Net.Tests/Matchers/GraphQLMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/GraphQLMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using GraphQLParser.Exceptions; using WireMock.Exceptions; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs index 96edd850..f9c73894 100644 --- a/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs @@ -1,8 +1,7 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -19,7 +18,7 @@ public class JmesPathMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("JmesPathMatcher"); + name.Should().Be("JmesPathMatcher"); } [Fact] @@ -32,7 +31,7 @@ public class JmesPathMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("X"); + patterns.Should().ContainSingle("X"); } [Fact] @@ -46,7 +45,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch(bytes).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -59,7 +58,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch(null).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -72,7 +71,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch(string.Empty).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -86,7 +85,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch(o).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -99,7 +98,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch("").Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -112,7 +111,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch("x").Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -125,7 +124,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch(new { things = new { name = "RequiredThing" } }).Score; // Assert - Check.That(match).IsEqualTo(1); + match.Should().Be(1); } [Fact] @@ -148,7 +147,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch(jobject).Score; // Assert - Check.That(match).IsEqualTo(1); + match.Should().Be(1); } [Fact] @@ -161,7 +160,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch(JObject.Parse("{ \"things\": { \"x\": \"RequiredThing\" } }")).Score; // Assert - Check.That(match).IsEqualTo(1); + match.Should().Be(1); } [Fact] @@ -174,7 +173,7 @@ public class JmesPathMatcherTests double match = matcher.IsMatch(JObject.Parse("{ \"things\": { \"x\": \"RequiredThing\" } }")).Score; // Assert - Check.That(match).IsEqualTo(0.0); + match.Should().Be(0.0); } [Fact] @@ -202,4 +201,4 @@ public class JmesPathMatcherTests // Assert score.Should().Be(1); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs index bd80ac9e..00cbfb4b 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs @@ -1,10 +1,9 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -42,7 +41,7 @@ public class JsonMatcherTests var name = matcher.Name; // Assert - Check.That(name).Equals("JsonMatcher"); + name.Should().Be("JsonMatcher"); } [Fact] @@ -55,7 +54,7 @@ public class JsonMatcherTests var value = matcher.Value; // Assert - Check.That(value).Equals("{}"); + value.Should().Be("{}"); } [Fact] @@ -105,7 +104,7 @@ public class JsonMatcherTests var match = matcher.IsMatch(bytes).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -119,7 +118,7 @@ public class JsonMatcherTests var match = matcher.IsMatch(s).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -133,7 +132,7 @@ public class JsonMatcherTests var match = matcher.IsMatch(o).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -524,4 +523,4 @@ public class JsonMatcherTests // Assert Assert.Equal(1.0, score); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs index 27685d4d..97743c7b 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPartialMatcherTests.cs @@ -1,9 +1,8 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -20,7 +19,7 @@ public class JsonPartialMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("JsonPartialMatcher"); + name.Should().Be("JsonPartialMatcher"); } [Fact] @@ -33,7 +32,7 @@ public class JsonPartialMatcherTests object value = matcher.Value; // Assert - Check.That(value).Equals("{}"); + value.Should().Be("{}"); } [Fact] @@ -83,7 +82,7 @@ public class JsonPartialMatcherTests double match = matcher.IsMatch(bytes).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -97,7 +96,7 @@ public class JsonPartialMatcherTests double match = matcher.IsMatch(s).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -111,7 +110,7 @@ public class JsonPartialMatcherTests double match = matcher.IsMatch(o).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -463,4 +462,4 @@ public class JsonPartialMatcherTests // Assert Assert.Equal(0.0, match); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs index ead88033..78f71a19 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs @@ -1,9 +1,8 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -20,7 +19,7 @@ public class JsonPartialWildcardMatcherTests var name = matcher.Name; // Assert - Check.That(name).Equals("JsonPartialWildcardMatcher"); + name.Should().Be("JsonPartialWildcardMatcher"); } [Fact] @@ -33,7 +32,7 @@ public class JsonPartialWildcardMatcherTests var value = matcher.Value; // Assert - Check.That(value).Equals("{}"); + value.Should().Be("{}"); } [Fact] @@ -83,7 +82,7 @@ public class JsonPartialWildcardMatcherTests var match = matcher.IsMatch(bytes).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -97,7 +96,7 @@ public class JsonPartialWildcardMatcherTests var match = matcher.IsMatch(s).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -111,7 +110,7 @@ public class JsonPartialWildcardMatcherTests var match = matcher.IsMatch(o).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -417,4 +416,4 @@ public class JsonPartialWildcardMatcherTests // Assert Assert.Equal(1.0, match); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs index bf4dd903..485bb181 100644 --- a/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs @@ -1,8 +1,6 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Newtonsoft.Json.Linq; -using NFluent; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -19,7 +17,7 @@ public class JsonPathMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("JsonPathMatcher"); + name.Should().Be("JsonPathMatcher"); } [Fact] @@ -32,7 +30,7 @@ public class JsonPathMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("X"); + patterns.Should().ContainSingle("X"); } [Fact] @@ -46,7 +44,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(bytes).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -59,7 +57,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(null).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -72,7 +70,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(string.Empty).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -86,7 +84,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(o).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -99,7 +97,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch("").Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -112,7 +110,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch("x").Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -125,7 +123,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(new { Id = 1, Name = "Test" }).Score; // Assert - Check.That(match).IsEqualTo(1); + match.Should().Be(1); } [Fact] @@ -138,7 +136,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(new { things = new { name = "x" } }).Score; // Assert - Check.That(match).IsEqualTo(1); + match.Should().Be(1); } [Fact] @@ -152,7 +150,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(json).Score; // Assert - Check.That(match).IsEqualTo(1); + match.Should().Be(1); } [Fact] @@ -166,7 +164,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(json).Score; // Assert - Check.That(match).IsEqualTo(0); + match.Should().Be(0); } [Fact] @@ -185,7 +183,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(jobject).Score; // Assert - Check.That(match).IsEqualTo(1); + match.Should().Be(1); } [Fact] @@ -198,7 +196,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(JObject.Parse("{\"Id\":1,\"Name\":\"Test\"}")).Score; // Assert - Check.That(match).IsEqualTo(1); + match.Should().Be(1); } [Fact] @@ -211,7 +209,7 @@ public class JsonPathMatcherTests double match = matcher.IsMatch(JObject.Parse("{\"Id\":1,\"Name\":\"Test\"}")).Score; // Assert - Check.That(match).IsEqualTo(0.0); + match.Should().Be(0.0); } [Fact] @@ -231,7 +229,7 @@ public class JsonPathMatcherTests }")).Score; // Assert - Check.That(match).IsEqualTo(1.0); + match.Should().Be(1.0); } [Fact] @@ -253,7 +251,7 @@ public class JsonPathMatcherTests }")).Score; // Assert - Check.That(match).IsEqualTo(1.0); + match.Should().Be(1.0); } [Fact] @@ -275,7 +273,7 @@ public class JsonPathMatcherTests }")).Score; // Assert - Check.That(match).IsEqualTo(0.0); + match.Should().Be(0.0); } [Fact] @@ -293,7 +291,7 @@ public class JsonPathMatcherTests }")).Score; // Assert - Check.That(match).IsEqualTo(0.0); + match.Should().Be(0.0); } [Fact] @@ -311,7 +309,7 @@ public class JsonPathMatcherTests }")).Score; // Assert - Check.That(match).IsEqualTo(0.0); + match.Should().Be(0.0); } [Fact] @@ -335,7 +333,7 @@ public class JsonPathMatcherTests }")).Score; // Assert - Check.That(match).IsEqualTo(1.0); + match.Should().Be(1.0); } [Fact] @@ -385,4 +383,4 @@ public class JsonPathMatcherTests // Assert match.Should().Be(1); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/LinqMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/LinqMatcherTests.cs index 3d283d8f..64f99d0a 100644 --- a/test/WireMock.Net.Tests/Matchers/LinqMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/LinqMatcherTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Matchers; using Xunit; @@ -99,7 +99,7 @@ public class LinqMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("LinqMatcher"); + name.Should().Be("LinqMatcher"); } [Fact] @@ -112,6 +112,6 @@ public class LinqMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("x"); + patterns.Should().ContainExactly("x"); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/MatchBehaviourHelperTests.cs b/test/WireMock.Net.Tests/Matchers/MatchBehaviourHelperTests.cs index 97705643..709b00c2 100644 --- a/test/WireMock.Net.Tests/Matchers/MatchBehaviourHelperTests.cs +++ b/test/WireMock.Net.Tests/Matchers/MatchBehaviourHelperTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -10,16 +9,16 @@ public class MatchBehaviourHelperTests [Fact] public void MatchBehaviourHelper_Convert_AcceptOnMatch() { - Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 0.0)).IsEqualTo(0.0); - Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 0.5)).IsEqualTo(0.5); - Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 1.0)).IsEqualTo(1.0); + MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 0.0).Should().Be(0.0); + MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 0.5).Should().Be(0.5); + MatchBehaviourHelper.Convert(MatchBehaviour.AcceptOnMatch, 1.0).Should().Be(1.0); } [Fact] public void MatchBehaviourHelper_Convert_RejectOnMatch() { - Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 0.0)).IsEqualTo(1.0); - Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 0.5)).IsEqualTo(0.0); - Check.That(MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 1.0)).IsEqualTo(0.0); + MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 0.0).Should().Be(1.0); + MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 0.5).Should().Be(0.0); + MatchBehaviourHelper.Convert(MatchBehaviour.RejectOnMatch, 1.0).Should().Be(0.0); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Matchers/MatcherTests.cs b/test/WireMock.Net.Tests/Matchers/MatcherTests.cs index 1df80202..a03d9215 100644 --- a/test/WireMock.Net.Tests/Matchers/MatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/MatcherTests.cs @@ -1,4 +1,3 @@ -using AwesomeAssertions; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; diff --git a/test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs index be9a6bc1..e330fa10 100644 --- a/test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Matchers/Models/WireMockCustomScalarGraphTypeTests.cs b/test/WireMock.Net.Tests/Matchers/Models/WireMockCustomScalarGraphTypeTests.cs index 8784c05c..c72e7f5f 100644 --- a/test/WireMock.Net.Tests/Matchers/Models/WireMockCustomScalarGraphTypeTests.cs +++ b/test/WireMock.Net.Tests/Matchers/Models/WireMockCustomScalarGraphTypeTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.GraphQL.Models; namespace WireMock.Net.Tests.Matchers.Models; diff --git a/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs index 03c3032d..748bd0a7 100644 --- a/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; -using NFluent; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -16,7 +14,7 @@ public class NotNullOrEmptyMatcherTests var name = matcher.Name; // Assert - Check.That(name).Equals("NotNullOrEmptyMatcher"); + name.Should().Be("NotNullOrEmptyMatcher"); } [Theory] @@ -81,4 +79,4 @@ public class NotNullOrEmptyMatcherTests // Assert patterns.Should().BeEmpty(); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs index 63d8d436..dba8a9cd 100644 --- a/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using ProtoBuf; using WireMock.Matchers; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs index 50c07cbf..d339be77 100644 --- a/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; -using NFluent; using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -18,7 +16,7 @@ public class RegexMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("RegexMatcher"); + name.Should().Be("RegexMatcher"); } [Fact] @@ -31,7 +29,7 @@ public class RegexMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("X"); + patterns.Should().ContainSingle("X"); } [Fact] @@ -42,8 +40,8 @@ public class RegexMatcherTests bool case2 = new RegexMatcher("X", true).IgnoreCase; // Assert - Check.That(case1).IsFalse(); - Check.That(case2).IsTrue(); + case1.Should().BeFalse(); + case2.Should().BeTrue(); } [Fact] @@ -56,7 +54,7 @@ public class RegexMatcherTests double result = matcher.IsMatch("Hello world!").Score; // Assert - Check.That(result).IsEqualTo(1.0d); + result.Should().Be(1.0d); } [Fact] @@ -69,7 +67,7 @@ public class RegexMatcherTests double result = matcher.IsMatch(null).Score; // Assert - Check.That(result).IsEqualTo(0.0d); + result.Should().Be(0.0d); } [Fact] @@ -108,7 +106,7 @@ public class RegexMatcherTests double result = matcher.IsMatch("hello").Score; // Assert - Check.That(result).IsEqualTo(1.0d); + result.Should().Be(1.0d); } [Fact] @@ -121,6 +119,6 @@ public class RegexMatcherTests double result = matcher.IsMatch("hello").Score; // Assert - Check.That(result).IsEqualTo(0.0); + result.Should().Be(0.0); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs b/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs index 62ea0594..0e325619 100644 --- a/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs +++ b/test/WireMock.Net.Tests/Matchers/RequestMatchResultTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/Matchers/SimMetricsMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/SimMetricsMatcherTests.cs index 50f177ad..4dc2c1bd 100644 --- a/test/WireMock.Net.Tests/Matchers/SimMetricsMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/SimMetricsMatcherTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.Matchers; namespace WireMock.Net.Tests.Matchers; @@ -17,7 +17,7 @@ public class SimMetricsMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("SimMetricsMatcher.Levenstein"); + name.Should().Be("SimMetricsMatcher.Levenstein"); } [Fact] @@ -30,7 +30,7 @@ public class SimMetricsMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("X"); + patterns.Should().ContainSingle("X"); } [Fact] @@ -43,7 +43,7 @@ public class SimMetricsMatcherTests double result = matcher.IsMatch("The car drives in the street.").Score; // Assert - Check.That(result).IsStrictlyLessThan(1.0).And.IsStrictlyGreaterThan(0.5); + result.Should().BeLessThan(1.0).And.BeGreaterThan(0.5); } [Fact] @@ -56,7 +56,7 @@ public class SimMetricsMatcherTests double result = matcher.IsMatch("Hello").Score; // Assert - Check.That(result).IsStrictlyLessThan(0.1).And.IsStrictlyGreaterThan(0.05); + result.Should().BeLessThan(0.1).And.BeGreaterThan(0.05); } [Fact] @@ -69,7 +69,7 @@ public class SimMetricsMatcherTests double result = matcher.IsMatch("test").Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -82,6 +82,6 @@ public class SimMetricsMatcherTests double result = matcher.IsMatch("test").Score; // Assert - Check.That(result).IsEqualTo(0.0); + result.Should().Be(0.0); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs b/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs index 8a1bdb15..0f53123d 100644 --- a/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs +++ b/test/WireMock.Net.Tests/Matchers/WildcardMatcherTest.cs @@ -1,8 +1,6 @@ // Copyright © WireMock.Net using AnyOfTypes; -using AwesomeAssertions; -using NFluent; using WireMock.Matchers; using WireMock.Models; @@ -123,7 +121,7 @@ public class WildcardMatcherTest var name = matcher.Name; // Assert - Check.That(name).Equals("WildcardMatcher"); + name.Should().Be("WildcardMatcher"); } [Fact] @@ -136,7 +134,7 @@ public class WildcardMatcherTest var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly(new AnyOf("x")); + patterns.Should().Equal(new[] { new AnyOf("x") }); } [Fact] @@ -148,6 +146,6 @@ public class WildcardMatcherTest // Act var result = matcher.IsMatch("m").Score; - Check.That(result).IsEqualTo(0.0); + result.Should().Be(0.0); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Matchers/XPathMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/XPathMatcherTests.cs index adb91beb..c9d3e989 100644 --- a/test/WireMock.Net.Tests/Matchers/XPathMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/XPathMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Admin.Mappings; using WireMock.Matchers; @@ -18,7 +17,7 @@ public class XPathMatcherTests string name = matcher.Name; // Assert - Check.That(name).Equals("XPathMatcher"); + name.Should().Be("XPathMatcher"); } [Fact] @@ -31,7 +30,7 @@ public class XPathMatcherTests var patterns = matcher.GetPatterns(); // Assert - Check.That(patterns).ContainsExactly("X"); + patterns.Should().ContainSingle("X"); } [Fact] @@ -48,7 +47,7 @@ public class XPathMatcherTests double result = matcher.IsMatch(xml).Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -80,7 +79,7 @@ public class XPathMatcherTests double result = matcher.IsMatch(input).Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -113,7 +112,7 @@ public class XPathMatcherTests double result = matcher.IsMatch(input).Score; // Assert - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -130,6 +129,6 @@ public class XPathMatcherTests double result = matcher.IsMatch(xml).Score; // Assert - Check.That(result).IsEqualTo(0.0); + result.Should().Be(0.0); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs index 788a00eb..ec5208dc 100644 --- a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs +++ b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs @@ -3,9 +3,8 @@ using System.Collections.Specialized; using System.Net; using System.Net.Http; -using AwesomeAssertions; using Moq; -using NFluent; + using WireMock.Logging; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; @@ -147,9 +146,9 @@ public class ObservableLogEntriesTest var countResponsesWithStatusNotOk = responses.Count(r => r.StatusCode != HttpStatusCode.OK); // Assert - Check.That(countResponsesWithStatusNotOk).Equals(0); - Check.That(count).Equals(expectedCount); + countResponsesWithStatusNotOk.Should().Be(0); + count.Should().Be(expectedCount); server.Dispose(); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs b/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs index 0bcdc1a9..3c4d3615 100644 --- a/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs +++ b/test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Net.OpenApiParser.Utils; namespace WireMock.Net.Tests.OpenApiParser; diff --git a/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs b/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs index ca59f8f8..7c41403f 100644 --- a/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs +++ b/test/WireMock.Net.Tests/OpenTelemetry/OpenTelemetryOptionsParserTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.OpenTelemetry; namespace WireMock.Net.Tests.OpenTelemetry; diff --git a/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs b/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs index 3826e3f8..9f9f6c8e 100644 --- a/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs +++ b/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs @@ -2,7 +2,6 @@ using System.Diagnostics; using System.Net.WebSockets; -using AwesomeAssertions; using Moq; using WireMock.Logging; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/Owin/GlobalExceptionMiddlewareTests.cs b/test/WireMock.Net.Tests/Owin/GlobalExceptionMiddlewareTests.cs index 76aa4c88..eacadc6a 100644 --- a/test/WireMock.Net.Tests/Owin/GlobalExceptionMiddlewareTests.cs +++ b/test/WireMock.Net.Tests/Owin/GlobalExceptionMiddlewareTests.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Http; using Moq; -using NFluent; using WireMock.Owin; using WireMock.Owin.Mappers; @@ -31,6 +30,7 @@ public class GlobalExceptionMiddlewareTests public void GlobalExceptionMiddleware_Invoke_NullAsNext_DoesNotInvokeNextAndDoesNotThrow() { // Act - Check.ThatCode(() => _sut.Invoke(null)).DoesNotThrow(); + Action act = () => _sut.Invoke(null); + act.Should().NotThrow(); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs b/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs index 2bdbdb61..5bdc9cb8 100644 --- a/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs +++ b/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using AwesomeAssertions; using WireMock.Owin; using WireMock.Types; diff --git a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs index 14b90f2c..22940adb 100644 --- a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs +++ b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs @@ -1,23 +1,14 @@ // Copyright © WireMock.Net using Moq; -using AwesomeAssertions; using WireMock.Handlers; using WireMock.Owin.Mappers; using WireMock.ResponseBuilders; using WireMock.Types; using WireMock.Util; using WireMock.Owin; -#if NET452 -using Microsoft.Owin; -using IResponse = Microsoft.Owin.IOwinResponse; -// using Response = Microsoft.Owin.OwinResponse; -#else using Microsoft.AspNetCore.Http; -using IResponse = Microsoft.AspNetCore.Http.HttpResponse; -// using Response = Microsoft.AspNetCore.Http.HttpResponse; using Microsoft.Extensions.Primitives; -#endif namespace WireMock.Net.Tests.Owin.Mappers; @@ -25,7 +16,7 @@ public class OwinResponseMapperTests { private static readonly Task CompletedTask = Task.FromResult(true); private readonly OwinResponseMapper _sut; - private readonly Mock _responseMock; + private readonly Mock _responseMock; private readonly Mock _stream; private readonly Mock _headers; private readonly Mock _fileSystemHandlerMock; @@ -52,7 +43,7 @@ public class OwinResponseMapperTests _headers.Setup(h => h.Add(It.IsAny(), It.IsAny())); #endif - _responseMock = new Mock(); + _responseMock = new Mock(); _responseMock.SetupAllProperties(); _responseMock.SetupGet(r => r.Body).Returns(_stream.Object); _responseMock.SetupGet(r => r.Headers).Returns(_headers.Object); diff --git a/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs b/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs index 2a8033a5..1e7ab6a0 100644 --- a/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs +++ b/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Collections.Concurrent; -using AwesomeAssertions; using Moq; using WireMock.Logging; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs index 57f245b7..8d8716dc 100644 --- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs +++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs @@ -3,7 +3,6 @@ using System.Collections.Concurrent; using System.Diagnostics; using System.Linq.Expressions; -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using WireMock.Admin.Mappings; diff --git a/test/WireMock.Net.Tests/Pact/PactTests.cs b/test/WireMock.Net.Tests/Pact/PactTests.cs index 8b37eb2c..e986cb87 100644 --- a/test/WireMock.Net.Tests/Pact/PactTests.cs +++ b/test/WireMock.Net.Tests/Pact/PactTests.cs @@ -2,7 +2,6 @@ using System.Net; using System.Text; -using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using WireMock.Matchers; diff --git a/test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs b/test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs index f056751f..46f5f23c 100644 --- a/test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs +++ b/test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.RegularExpressions; namespace WireMock.Net.Tests.RegularExpressions; @@ -23,10 +23,10 @@ public class RegexExtendedTests var regexLower = new RegexExtended(guidbLower); var regexUpper = new RegexExtended(guidbUpper); - Check.That(regexLower.IsMatch(inputLower)).Equals(true); - Check.That(regexLower.IsMatch(inputUpper)).Equals(false); - Check.That(regexUpper.IsMatch(inputUpper)).Equals(true); - Check.That(regexUpper.IsMatch(inputLower)).Equals(false); + regexLower.IsMatch(inputLower).Should().Be(true); + regexLower.IsMatch(inputUpper).Should().Be(false); + regexUpper.IsMatch(inputUpper).Should().Be(true); + regexUpper.IsMatch(inputLower).Should().Be(false); } [Fact] @@ -40,10 +40,10 @@ public class RegexExtendedTests var regexLower = new RegexExtended(guiddLower); var regexUpper = new RegexExtended(guiddUpper); - Check.That(regexLower.IsMatch(inputLower)).Equals(true); - Check.That(regexLower.IsMatch(inputUpper)).Equals(false); - Check.That(regexUpper.IsMatch(inputUpper)).Equals(true); - Check.That(regexUpper.IsMatch(inputLower)).Equals(false); + regexLower.IsMatch(inputLower).Should().Be(true); + regexLower.IsMatch(inputUpper).Should().Be(false); + regexUpper.IsMatch(inputUpper).Should().Be(true); + regexUpper.IsMatch(inputLower).Should().Be(false); } [Fact] @@ -57,10 +57,10 @@ public class RegexExtendedTests var regexLower = new RegexExtended(guidnLower); var regexUpper = new RegexExtended(guidnUpper); - Check.That(regexLower.IsMatch(inputLower)).Equals(true); - Check.That(regexLower.IsMatch(inputUpper)).Equals(false); - Check.That(regexUpper.IsMatch(inputUpper)).Equals(true); - Check.That(regexUpper.IsMatch(inputLower)).Equals(false); + regexLower.IsMatch(inputLower).Should().Be(true); + regexLower.IsMatch(inputUpper).Should().Be(false); + regexUpper.IsMatch(inputUpper).Should().Be(true); + regexUpper.IsMatch(inputLower).Should().Be(false); } [Fact] @@ -74,10 +74,10 @@ public class RegexExtendedTests var regexLower = new RegexExtended(guidpLower); var regexUpper = new RegexExtended(guidpUpper); - Check.That(regexLower.IsMatch(inputLower)).Equals(true); - Check.That(regexLower.IsMatch(inputUpper)).Equals(false); - Check.That(regexUpper.IsMatch(inputUpper)).Equals(true); - Check.That(regexUpper.IsMatch(inputLower)).Equals(false); + regexLower.IsMatch(inputLower).Should().Be(true); + regexLower.IsMatch(inputUpper).Should().Be(false); + regexUpper.IsMatch(inputUpper).Should().Be(true); + regexUpper.IsMatch(inputLower).Should().Be(false); } [Fact] @@ -91,9 +91,9 @@ public class RegexExtendedTests var regexLower = new RegexExtended(guidxLower); var regexUpper = new RegexExtended(guidxUpper); - Check.That(regexLower.IsMatch(inputLower)).Equals(true); - Check.That(regexLower.IsMatch(inputUpper)).Equals(false); - Check.That(regexUpper.IsMatch(inputUpper)).Equals(true); - Check.That(regexUpper.IsMatch(inputLower)).Equals(false); + regexLower.IsMatch(inputLower).Should().Be(true); + regexLower.IsMatch(inputUpper).Should().Be(false); + regexUpper.IsMatch(inputUpper).Should().Be(true); + regexUpper.IsMatch(inputLower).Should().Be(false); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs index d05fa983..66429f2e 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.Matchers.Request; using WireMock.Models; using WireMock.Owin; @@ -25,7 +25,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } [Fact] @@ -44,7 +44,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } [Fact] @@ -63,7 +63,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } [Fact] @@ -82,7 +82,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -101,7 +101,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -120,7 +120,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(0.0); } [Fact] @@ -139,7 +139,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -158,7 +158,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(0.0); } [Fact] @@ -177,7 +177,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -196,7 +196,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } [Fact] @@ -210,7 +210,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -228,7 +228,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -242,7 +242,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -256,6 +256,7 @@ public class RequestBuilderTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs index 9c80a5f8..6eb513c4 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderUsingMethodTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.Matchers.Request; using WireMock.RequestBuilders; @@ -16,8 +16,8 @@ public class RequestBuilderUsingMethodTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("CONNECT"); + matchers.Count.Should().Be(1); + ((matchers[0] as RequestMessageMethodMatcher).Methods).Should().ContainSingle("CONNECT"); } [Fact] @@ -28,8 +28,8 @@ public class RequestBuilderUsingMethodTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("OPTIONS"); + matchers.Count.Should().Be(1); + ((matchers[0] as RequestMessageMethodMatcher).Methods).Should().ContainSingle("OPTIONS"); } [Fact] @@ -40,8 +40,8 @@ public class RequestBuilderUsingMethodTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("PATCH"); + matchers.Count.Should().Be(1); + ((matchers[0] as RequestMessageMethodMatcher).Methods).Should().ContainSingle("PATCH"); } [Fact] @@ -52,8 +52,8 @@ public class RequestBuilderUsingMethodTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That((matchers[0] as RequestMessageMethodMatcher).Methods).ContainsExactly("TRACE"); + matchers.Count.Should().Be(1); + ((matchers[0] as RequestMessageMethodMatcher).Methods).Should().ContainSingle("TRACE"); } [Fact] @@ -64,14 +64,14 @@ public class RequestBuilderUsingMethodTests // Assert 1 var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageMethodMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); // Act requestBuilder.UsingAnyMethod(); // Assert 2 matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(0); + matchers.Count.Should().Be(0); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs index 6f998b6b..65348eba 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs @@ -1,10 +1,9 @@ // Copyright © WireMock.Net using System.Text; -using AwesomeAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; @@ -65,7 +64,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -86,7 +85,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Theory] @@ -109,7 +108,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(expected); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(expected); } [Fact] @@ -130,7 +129,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(0.0); } private class FuncType @@ -157,7 +156,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -176,7 +175,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -195,7 +194,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -214,7 +213,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -277,7 +276,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -301,7 +300,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } [Fact] @@ -320,7 +319,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -339,7 +338,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } [Fact] @@ -362,7 +361,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -385,7 +384,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -409,7 +408,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); double result = spec.GetMatchingScore(request, requestMatchResult); - Check.That(result).IsEqualTo(1.0); + result.Should().Be(1.0); } [Fact] @@ -430,7 +429,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -454,7 +453,7 @@ public class RequestBuilderWithBodyTests // Assert var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Theory] @@ -480,4 +479,5 @@ public class RequestBuilderWithBodyTests var requestMatchResult = new RequestMatchResult(); requestBuilder.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs index 1e5ae81b..b2e24890 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithClientIPTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; @@ -21,7 +20,7 @@ public class RequestBuilderWithClientIPTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -35,7 +34,7 @@ public class RequestBuilderWithClientIPTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(0.0); } [Fact] @@ -49,7 +48,7 @@ public class RequestBuilderWithClientIPTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -63,6 +62,6 @@ public class RequestBuilderWithClientIPTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs index 20941a56..666e6dde 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithCookieTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; @@ -17,8 +16,8 @@ public class RequestBuilderWithCookieTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -29,8 +28,8 @@ public class RequestBuilderWithCookieTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -41,7 +40,7 @@ public class RequestBuilderWithCookieTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageCookieMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs index ffc4a317..4453e175 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithGraphQLSchemaTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using GraphQL.Types; using WireMock.Matchers; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs index 202a9f03..4f9e371a 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithHeaderTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; @@ -17,8 +17,8 @@ public class RequestBuilderWithHeaderTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -29,8 +29,8 @@ public class RequestBuilderWithHeaderTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -41,8 +41,8 @@ public class RequestBuilderWithHeaderTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -53,8 +53,8 @@ public class RequestBuilderWithHeaderTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -65,8 +65,8 @@ public class RequestBuilderWithHeaderTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -77,7 +77,7 @@ public class RequestBuilderWithHeaderTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageHeaderMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithParamTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithParamTests.cs index 0f6f47ef..700ec69b 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithParamTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithParamTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; @@ -17,8 +16,8 @@ public class RequestBuilderWithParamTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -29,8 +28,8 @@ public class RequestBuilderWithParamTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -41,8 +40,8 @@ public class RequestBuilderWithParamTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -53,7 +52,7 @@ public class RequestBuilderWithParamTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageParamMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs index 14a9f47a..4ba69bf2 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithPathTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.Matchers.Request; @@ -25,7 +25,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -43,7 +43,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -57,7 +57,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -69,8 +69,8 @@ public class RequestBuilderWithPathTests var request2 = new RequestMessage(new UrlDetails("http://localhost/x2"), "blabla", ClientIp); var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.GetMatchingScore(request1, requestMatchResult)).IsEqualTo(1.0); - Check.That(requestBuilder.GetMatchingScore(request2, requestMatchResult)).IsEqualTo(1.0); + requestBuilder.GetMatchingScore(request1, requestMatchResult).Should().Be(1.0); + requestBuilder.GetMatchingScore(request2, requestMatchResult).Should().Be(1.0); } [Fact] @@ -84,7 +84,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -98,7 +98,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -112,7 +112,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } [Fact] @@ -131,7 +131,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -149,7 +149,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -163,7 +163,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -177,7 +177,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -191,7 +191,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -205,7 +205,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -219,7 +219,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().Be(1.0); } [Fact] @@ -233,6 +233,7 @@ public class RequestBuilderWithPathTests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); + spec.GetMatchingScore(request, requestMatchResult).Should().NotBe(1.0); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs index e397b7aa..fff3e841 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithProtoBufTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; diff --git a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs index 1bfb7033..8bd11b61 100644 --- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs +++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithUrlTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.RequestBuilders; @@ -17,8 +16,8 @@ public class RequestBuilderWithUrlTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -29,8 +28,8 @@ public class RequestBuilderWithUrlTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -41,8 +40,8 @@ public class RequestBuilderWithUrlTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } [Fact] @@ -53,7 +52,7 @@ public class RequestBuilderWithUrlTests // Assert var matchers = requestBuilder.GetPrivateFieldValue>("_requestMatchers"); - Check.That(matchers.Count).IsEqualTo(1); - Check.That(matchers[0]).IsInstanceOfType(typeof(RequestMessageUrlMatcher)); + matchers.Count.Should().Be(1); + matchers[0].Should().BeOfType(); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs index bb36b2ad..52064a3d 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs @@ -1,9 +1,8 @@ // Copyright © WireMock.Net using System.Text; -using AwesomeAssertions; using Moq; -using NFluent; + using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; @@ -35,7 +34,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1d); + score.Should().Be(1d); // Verify stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never); @@ -72,7 +71,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(expected); + score.Should().Be(expected); // Verify stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never); @@ -113,7 +112,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(expected); + score.Should().Be(expected); // Verify stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never); @@ -154,7 +153,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(expected); + score.Should().Be(expected); // Verify stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never); @@ -185,7 +184,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); // Verify stringMatcherMock.Verify(m => m.GetPatterns(), Times.Never); @@ -213,7 +212,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); // Verify stringMatcherMock.Verify(m => m.IsMatch(It.IsAny()), Times.Once); @@ -242,7 +241,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1d); + score.Should().Be(1d); // Verify stringMatcherMock.Verify(m => m.IsMatch(It.IsAny()), Times.Once); @@ -269,7 +268,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1d); + score.Should().Be(1d); // Verify objectMatcherMock.Verify(m => m.IsMatch(42), Times.Once); @@ -294,7 +293,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -393,7 +392,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); // Verify objectMatcherMock.Verify(m => m.IsMatch(It.IsAny()), Times.Once); @@ -421,7 +420,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -445,7 +444,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -469,7 +468,7 @@ public class RequestMessageBodyMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Theory] @@ -510,7 +509,7 @@ public class RequestMessageBodyMatcherTests var score = matcher.GetMatchingScore(requestMessage, result); // assert - Check.That(score).IsEqualTo(shouldMatch ? 1d : 0d); + score.Should().Be(shouldMatch ? 1d : 0d); } public static TheoryData MatchingScoreData diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs index e4ffd1e1..3fcaae75 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using Moq; -using NFluent; using WireMock.Matchers.Request; using WireMock.Models; @@ -28,7 +27,7 @@ public class RequestMessageCompositeMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); } [Fact] @@ -48,7 +47,7 @@ public class RequestMessageCompositeMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.9d); + score.Should().Be(0.9d); // Verify requestMatcher1Mock.Verify(rm => rm.GetMatchingScore(It.IsAny(), It.IsAny()), Times.Once); @@ -72,7 +71,7 @@ public class RequestMessageCompositeMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); // Verify requestMatcher1Mock.Verify(rm => rm.GetMatchingScore(It.IsAny(), It.IsAny()), Times.Once); diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs index bdc6e0d5..e13c230f 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; @@ -21,7 +20,7 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); } [Fact] @@ -36,7 +35,7 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -52,7 +51,7 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -68,7 +67,7 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); } [Fact] @@ -84,7 +83,7 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -100,7 +99,7 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -116,7 +115,7 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -132,7 +131,7 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -148,6 +147,6 @@ public class RequestMessageCookieMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs index 5b631069..e2577eec 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageGraphQLMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Moq; using WireMock.Matchers; using WireMock.Matchers.Request; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs index 17e860d9..21c8724e 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; @@ -21,7 +20,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); } [Fact] @@ -36,7 +35,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -52,7 +51,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); } [Fact] public void RequestMessageHeaderMatcher_GetMatchingScore_RejectOnMatch_HeaderDoesNotMatchPattern() @@ -67,7 +66,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -83,7 +82,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -99,7 +98,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); } [Fact] @@ -115,7 +114,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); } [Fact] @@ -131,7 +130,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -147,7 +146,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -163,7 +162,7 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -179,6 +178,6 @@ public class RequestMessageHeaderMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs index 6e5c305c..884f2017 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMethodMatcherTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs index 0ca8b12f..68f9c2b6 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageMultiPartMatcher.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs index dc4a182a..0ca30f13 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; -using NFluent; using WireMock.Matchers; using WireMock.Matchers.Request; using WireMock.Models; @@ -24,7 +22,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -39,7 +37,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.5d); + score.Should().Be(0.5d); } [Fact] @@ -54,7 +52,7 @@ public class RequestMessageParamMatcherTests var score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -69,7 +67,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsCloseTo(0.66d, 0.1d); + score.Should().BeApproximately(0.66d, 0.1d); } [Fact] @@ -84,7 +82,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsCloseTo(0.66d, 0.1d); + score.Should().BeApproximately(0.66d, 0.1d); } [Fact] @@ -99,7 +97,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -114,7 +112,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -129,7 +127,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.5d); + score.Should().Be(0.5d); } [Fact] @@ -144,7 +142,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(0.0d); + score.Should().Be(0.0d); } [Fact] @@ -159,7 +157,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -174,7 +172,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } [Fact] @@ -189,7 +187,7 @@ public class RequestMessageParamMatcherTests double score = matcher.GetMatchingScore(requestMessage, result); // Assert - Check.That(score).IsEqualTo(1.0d); + score.Should().Be(1.0d); } // Issue #849 @@ -211,4 +209,5 @@ public class RequestMessageParamMatcherTests // Assert score.Should().Be(1.0); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/RequestMessageTests.cs b/test/WireMock.Net.Tests/RequestMessageTests.cs index 91716a11..a406c0a2 100644 --- a/test/WireMock.Net.Tests/RequestMessageTests.cs +++ b/test/WireMock.Net.Tests/RequestMessageTests.cs @@ -1,8 +1,6 @@ // Copyright © WireMock.Net -using NFluent; using WireMock.Models; -using WireMock.Util; namespace WireMock.Net.Tests; @@ -17,7 +15,7 @@ public class RequestMessageTests var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "posT", ClientIp); // then - Check.That(request.Method).IsEqualTo("posT"); + request.Method.Should().Be("posT"); } [Fact] @@ -27,7 +25,7 @@ public class RequestMessageTests var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp); // then - Check.That(request.GetParameter("not_there")).IsNull(); + request.GetParameter("not_there").Should().BeNull(); } [Fact] @@ -37,7 +35,7 @@ public class RequestMessageTests var request = new RequestMessage(new UrlDetails("http://localhost?foo=bar"), "POST", ClientIp); // Assert - Check.That(request.GetParameter("foo")).ContainsExactly("bar"); + request.GetParameter("foo").Should().ContainSingle("bar"); } [Fact] @@ -47,7 +45,7 @@ public class RequestMessageTests var request = new RequestMessage(new UrlDetails("http://localhost?foo=bar"), "POST", ClientIp); // Assert - Check.That(request.GetParameter("FoO", true)).ContainsExactly("bar"); + request.GetParameter("FoO", true).Should().ContainSingle("bar"); } [Fact] @@ -57,8 +55,8 @@ public class RequestMessageTests var request = new RequestMessage(new UrlDetails("http://localhost?key=1&key=2"), "POST", ClientIp); // Assert - Check.That(request.GetParameter("key")).Contains("1"); - Check.That(request.GetParameter("key")).Contains("2"); + request.GetParameter("key").Should().Contain("1"); + request.GetParameter("key").Should().Contain("2"); } [Fact] @@ -68,9 +66,9 @@ public class RequestMessageTests var request = new RequestMessage(new UrlDetails("http://localhost?key=1,2,3"), "POST", ClientIp); // Assert - Check.That(request.GetParameter("key")).Contains("1"); - Check.That(request.GetParameter("key")).Contains("2"); - Check.That(request.GetParameter("key")).Contains("3"); + request.GetParameter("key").Should().Contain("1"); + request.GetParameter("key").Should().Contain("2"); + request.GetParameter("key").Should().Contain("3"); } [Fact] @@ -80,28 +78,8 @@ public class RequestMessageTests var request = new RequestMessage(new UrlDetails("http://localhost?key=1,2&foo=bar&key=3"), "POST", ClientIp); // Assert - Check.That(request.GetParameter("key")).Contains("1"); - Check.That(request.GetParameter("key")).Contains("2"); - Check.That(request.GetParameter("key")).Contains("3"); + request.GetParameter("key").Should().Contain("1"); + request.GetParameter("key").Should().Contain("2"); + request.GetParameter("key").Should().Contain("3"); } - - [Fact] - public void RequestMessage_Constructor1_PathSegments() - { - // Assign - var request = new RequestMessage(new UrlDetails("http://localhost/a/b/c"), "POST", ClientIp); - - // Assert - Check.That(request.PathSegments).ContainsExactly("a", "b", "c"); - } - - [Fact] - public void RequestMessage_Constructor2_PathSegments() - { - // Assign - var request = new RequestMessage(new UrlDetails("http://localhost/a/b/c"), "POST", ClientIp, new BodyData()); - - // Assert - Check.That(request.PathSegments).ContainsExactly("a", "b", "c"); - } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs index 78eef2fb..8a09c465 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Http; using Moq; -using NFluent; + using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; @@ -27,6 +27,6 @@ public class ResponseCreateTests var response = await responseBuilder.ProvideResponseAsync(mapping, Mock.Of(), request, _settings); // Assert - Check.That(response.Message).Equals(responseMessage); + response.Message.Should().Be(responseMessage); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs index 3f7cebf6..eb5ad343 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs @@ -2,7 +2,6 @@ using System.Net; using System.Net.Http; -using AwesomeAssertions; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs index c787b87b..9e5420c5 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs @@ -1,12 +1,11 @@ // Copyright © WireMock.Net using System.Text; -using AwesomeAssertions; using JsonConverter.Newtonsoft.Json; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -45,15 +44,15 @@ public class ResponseWithBodyTests }; var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body); - var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII); + var responseBuilder = Response.Create().WithBody([48, 49], BodyDestinationFormat.String, Encoding.ASCII); // act var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then - Check.That(response.Message.BodyData.BodyAsString).Equals("01"); - Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); - Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII); + response.Message.BodyData.BodyAsString.Should().Be("01"); + response.Message.BodyData.BodyAsBytes.Should().BeNull(); + response.Message.BodyData.Encoding.Should().Be(Encoding.ASCII); } [Fact] @@ -67,15 +66,15 @@ public class ResponseWithBodyTests }; var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body); - var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII); + var responseBuilder = Response.Create().WithBody([48, 49], BodyDestinationFormat.SameAsSource, Encoding.ASCII); // act var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then - Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 }); - Check.That(response.Message.BodyData.BodyAsString).IsNull(); - Check.That(response.Message.BodyData.Encoding).IsNull(); + response.Message.BodyData.BodyAsBytes.Should().ContainInOrder([48, 49]); + response.Message.BodyData.BodyAsString.Should().BeNull(); + response.Message.BodyData.Encoding.Should().BeNull(); } [Fact] @@ -95,8 +94,8 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then - Check.That(response.Message.BodyData.BodyAsString).Equals("test"); - Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII); + response.Message.BodyData.BodyAsString.Should().Be("test"); + response.Message.BodyData.Encoding.Should().Be(Encoding.ASCII); } [Fact] @@ -117,8 +116,8 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then - Check.That(response.Message.BodyData.BodyAsJson).Equals(x); - Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII); + response.Message.BodyData.BodyAsJson.Should().Be(x); + response.Message.BodyData.Encoding.Should().Be(Encoding.ASCII); } [Fact] @@ -133,10 +132,10 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); - Check.That(response.Message.BodyData.BodyAsJson).IsNull(); - Check.That(response.Message.BodyData.BodyAsString).Equals("r"); - Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII); + response.Message.BodyData.BodyAsBytes.Should().BeNull(); + response.Message.BodyData.BodyAsJson.Should().BeNull(); + response.Message.BodyData.BodyAsString.Should().Be("r"); + response.Message.BodyData.Encoding.Should().Be(Encoding.ASCII); } [Fact] @@ -151,10 +150,10 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).IsNull(); - Check.That(response.Message.BodyData.BodyAsJson).IsNull(); - Check.That(response.Message.BodyData.BodyAsBytes).IsNotNull(); - Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII); + response.Message.BodyData.BodyAsString.Should().BeNull(); + response.Message.BodyData.BodyAsJson.Should().BeNull(); + response.Message.BodyData.BodyAsBytes.Should().NotBeNull(); + response.Message.BodyData.Encoding.Should().Be(Encoding.ASCII); } [Fact] @@ -169,10 +168,10 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).IsNull(); - Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); - Check.That(((dynamic)response.Message.BodyData.BodyAsJson).value).Equals(42); - Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII); + response.Message.BodyData!.BodyAsString.Should().BeNull(); + response.Message.BodyData.BodyAsBytes.Should().BeNull(); + ((int)((JObject)response.Message.BodyData.BodyAsJson)["value"]!).Should().Be(42); + response.Message.BodyData.Encoding.Should().Be(Encoding.ASCII); } [Fact] @@ -193,8 +192,8 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then - Check.That(response.Message.BodyData.BodyAsJson).Equals(x); - Check.That(response.Message.BodyData.BodyAsJsonIndented).IsEqualTo(true); + response.Message.BodyData.BodyAsJson.Should().Be(x); + response.Message.BodyData.BodyAsJsonIndented.Should().Be(true); } [Fact] @@ -259,15 +258,15 @@ public class ResponseWithBodyTests var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request2, _settings); // Assert - Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value()).IsEqualTo(request1Id); - Check.That(response1.Message.BodyData.BodyAsBytes).IsNull(); - Check.That(response1.Message.BodyData.BodyAsString).IsNull(); - Check.That(response1.Message.StatusCode).IsEqualTo(200); + ((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value().Should().Be(request1Id); + response1.Message.BodyData.BodyAsBytes.Should().BeNull(); + response1.Message.BodyData.BodyAsString.Should().BeNull(); + response1.Message.StatusCode.Should().Be(200); - Check.That(((JToken)response2.Message.BodyData.BodyAsJson).SelectToken("id")?.Value()).IsEqualTo(request2Id); - Check.That(response2.Message.BodyData.BodyAsBytes).IsNull(); - Check.That(response2.Message.BodyData.BodyAsString).IsNull(); - Check.That(response2.Message.StatusCode).IsEqualTo(200); + ((JToken)response2.Message.BodyData.BodyAsJson).SelectToken("id")?.Value().Should().Be(request2Id); + response2.Message.BodyData.BodyAsBytes.Should().BeNull(); + response2.Message.BodyData.BodyAsString.Should().BeNull(); + response2.Message.StatusCode.Should().Be(200); } [Fact] @@ -282,8 +281,8 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request1, _settings); - Check.That(response.Message.StatusCode).IsEqualTo(200); - Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); + response.Message.StatusCode.Should().Be(200); + response.Message.BodyData.BodyAsString.Should().Contain(fileContents); } [Fact] @@ -298,8 +297,8 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request1, _settings); - Check.That(response.Message.StatusCode).IsEqualTo(200); - Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); + response.Message.StatusCode.Should().Be(200); + response.Message.BodyData.BodyAsString.Should().Contain(fileContents); } [Fact] @@ -314,8 +313,8 @@ public class ResponseWithBodyTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request1, _settings); - Check.That(response.Message.StatusCode).IsEqualTo(200); - Check.That(response.Message.BodyData?.BodyAsString).Contains("File deleted."); + response.Message.StatusCode.Should().Be(200); + response.Message.BodyData?.BodyAsString.Should().Contain("File deleted."); } [Fact] @@ -338,7 +337,6 @@ public class ResponseWithBodyTests response.Message.BodyData!.BodyAsString.Should().Be("""{"foo":"< > & ' 😀 👍 ❤️","n":42}"""); } -#if !(NET451 || NET452 || NET461) [Fact] public async Task Response_ProvideResponse_WithBody_SystemTextJsonConverter() { @@ -358,5 +356,4 @@ public class ResponseWithBodyTests // Assert response.Message.BodyData!.BodyAsString.Should().Be("""{"foo":"\u003C \u003E \u0026 \u0027 \uD83D\uDE00 \uD83D\uDC4D \u2764\uFE0F","n":42}"""); } -#endif } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs index 8aa7768a..231fba1a 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs @@ -2,10 +2,9 @@ using System.Net; using System.Text; -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -48,13 +47,13 @@ public class ResponseWithCallbackTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); - Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); - Check.That(response.Message.BodyData.BodyAsJson).IsNull(); - Check.That(response.Message.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage); - Check.That(response.Message.StatusCode).IsEqualTo(500); - Check.That(response.Message.Headers["H1"].ToString()).IsEqualTo("X1"); - Check.That(response.Message.Headers["H2"].ToString()).IsEqualTo("X2"); + response.Message.BodyData.BodyAsString.Should().Be("path: /test"); + response.Message.BodyData.BodyAsBytes.Should().BeNull(); + response.Message.BodyData.BodyAsJson.Should().BeNull(); + response.Message.BodyData.Encoding.CodePage.Should().Be(Encoding.UTF8.CodePage); + response.Message.StatusCode.Should().Be(500); + response.Message.Headers["H1"].ToString().Should().Be("X1"); + response.Message.Headers["H2"].ToString().Should().Be("X2"); } [Fact] @@ -131,13 +130,13 @@ public class ResponseWithCallbackTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); - Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); - Check.That(response.Message.BodyData.BodyAsJson).IsNull(); - Check.That(response.Message.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage); - Check.That(response.Message.StatusCode).IsEqualTo(500); - Check.That(response.Message.Headers["H1"].ToString()).IsEqualTo("X1"); - Check.That(response.Message.Headers["H2"].ToString()).IsEqualTo("X2"); + response.Message.BodyData.BodyAsString.Should().Be("path: /test"); + response.Message.BodyData.BodyAsBytes.Should().BeNull(); + response.Message.BodyData.BodyAsJson.Should().BeNull(); + response.Message.BodyData.Encoding.CodePage.Should().Be(Encoding.UTF8.CodePage); + response.Message.StatusCode.Should().Be(500); + response.Message.Headers["H1"].ToString().Should().Be("X1"); + response.Message.Headers["H2"].ToString().Should().Be("X2"); } [Fact] @@ -313,4 +312,5 @@ public class ResponseWithCallbackTests // Assert response.Message.Headers![headerKey].Should().Contain("extra"); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs index 450e1d2c..5e931ae3 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs index ac07892d..268d7cc1 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs index f099fe81..b617ad17 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using HandlebarsDotNet; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; -using NFluent; using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -57,7 +55,7 @@ public class ResponseWithHandlebarsFileTests // Assert var j = JObject.FromObject(response.Message.BodyData.BodyAsJson); - Check.That(j["Data"].Value()).Equals("abc"); + j["Data"].Value().Should().Be("abc"); // Verify _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once); @@ -82,7 +80,7 @@ public class ResponseWithHandlebarsFileTests // Assert var j = JObject.FromObject(response.Message.BodyData.BodyAsJson); - Check.That(j["Data"].Value()).Equals("abc"); + j["Data"].Value().Should().Be("abc"); // Verify _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once); @@ -103,7 +101,8 @@ public class ResponseWithHandlebarsFileTests .WithTransformer(); // Act - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); + Func act = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); + act.Should().ThrowAsync(); // Verify _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString(It.IsAny()), Times.Never); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs index 474c370c..d1a1913a 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Http; using Moq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -42,6 +42,6 @@ public class ResponseWithHandlebarsHelpersTests var response = await responseBuilder.ProvideResponseAsync(Mock.Of(), Mock.Of(), request, _settings); // assert - Check.That(response.Message.BodyData.BodyAsString).Equals("ABC"); + response.Message.BodyData.BodyAsString.Should().Be("ABC"); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs index 8be93b66..ae322741 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -46,6 +46,7 @@ public class ResponseWithHandlebarsHumanizerTests // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); - Check.That(j["Text"].Value()).IsEqualTo("Pascal case input string is turned into sentence"); + j["Text"].Value().Should().Be("Pascal case input string is turned into sentence"); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs index 8293b255..8251e1b7 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs @@ -1,12 +1,12 @@ // Copyright © WireMock.Net using System.Text; -using AwesomeAssertions; +using HandlebarsDotNet; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -84,8 +84,8 @@ public class ResponseWithHandlebarsJsonPathTests // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); - Check.That(j["x"]).IsNotNull(); - Check.That(j["x"]["Name"].ToString()).Equals("Acme Co"); + j["x"].Should().NotBeNull(); + j["x"]["Name"].ToString().Should().Be("Acme Co"); } [Fact] @@ -110,7 +110,7 @@ public class ResponseWithHandlebarsJsonPathTests // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson!); - Check.That(j["x"].Value()).Equals(99); + j["x"].Value().Should().Be(99); } [Fact] @@ -163,7 +163,7 @@ public class ResponseWithHandlebarsJsonPathTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine} \"Name\": \"Acme Co\",{Environment.NewLine} \"Products\": [{Environment.NewLine} {{{Environment.NewLine} \"Name\": \"Anvil\",{Environment.NewLine} \"Price\": 50{Environment.NewLine} }}{Environment.NewLine} ]{Environment.NewLine}}}"); + response.Message.BodyData.BodyAsString.Should().Be($"{{{Environment.NewLine} \"Name\": \"Acme Co\",{Environment.NewLine} \"Products\": [{Environment.NewLine} {{{Environment.NewLine} \"Name\": \"Anvil\",{Environment.NewLine} \"Price\": 50{Environment.NewLine} }}{Environment.NewLine} ]{Environment.NewLine}}}"); } [Fact] @@ -216,7 +216,7 @@ public class ResponseWithHandlebarsJsonPathTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine} \"Name\": \"Acme Co\",{Environment.NewLine} \"Products\": [{Environment.NewLine} {{{Environment.NewLine} \"Name\": \"Anvil\",{Environment.NewLine} \"Price\": 50{Environment.NewLine} }}{Environment.NewLine} ]{Environment.NewLine}}}"); + response.Message.BodyData.BodyAsString.Should().Be($"{{{Environment.NewLine} \"Name\": \"Acme Co\",{Environment.NewLine} \"Products\": [{Environment.NewLine} {{{Environment.NewLine} \"Name\": \"Anvil\",{Environment.NewLine} \"Price\": 50{Environment.NewLine} }}{Environment.NewLine} ]{Environment.NewLine}}}"); } [Fact] @@ -269,7 +269,7 @@ public class ResponseWithHandlebarsJsonPathTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); + response.Message.BodyData.BodyAsString.Should().Be("%0:Anvil%%1:Elbow Grease%"); } [Fact] @@ -322,7 +322,7 @@ public class ResponseWithHandlebarsJsonPathTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); + response.Message.BodyData.BodyAsString.Should().Be("%0:Anvil%%1:Elbow Grease%"); } [Fact] @@ -348,7 +348,8 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); + Func act = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); + act.Should().ThrowAsync(); } [Fact] diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs index c31458b7..e47a9e29 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using HandlebarsDotNet; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; -using NFluent; using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -49,8 +47,8 @@ public class ResponseWithHandlebarsLinqTests // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); - Check.That(j["x"]).IsNotNull(); - Check.That(j["x"].ToString()).Equals("/pathtest"); + j["x"].Should().NotBeNull(); + j["x"].ToString().Should().Be("/pathtest"); } [Fact(Skip = "DynamicLinq")] @@ -79,8 +77,8 @@ public class ResponseWithHandlebarsLinqTests // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); - Check.That(j["x"]).IsNotNull(); - Check.That(j["x"].ToString()).Equals("Test_123"); + j["x"].Should().NotBeNull(); + j["x"].ToString().Should().Be("Test_123"); } [Fact(Skip = "DynamicLinq")] @@ -158,7 +156,10 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); + Func act = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); + + // Assert + act.Should().ThrowAsync(); } [Fact] @@ -174,7 +175,10 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); + Func act = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); + + // Assert + act.Should().ThrowAsync(); } [Fact] @@ -225,9 +229,9 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - Func a = async () => await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); + Func act = async () => await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - a.Should().ThrowAsync(); + act.Should().ThrowAsync(); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs index dbb1df71..7292c440 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs index a68c1c15..4634f6bb 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs @@ -1,8 +1,9 @@ // Copyright © WireMock.Net +using HandlebarsDotNet; using Microsoft.AspNetCore.Http; using Moq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -45,7 +46,7 @@ public class ResponseWithHandlebarsRegexTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // assert - Check.That(response.Message.BodyData.BodyAsString).Equals("abc"); + response.Message.BodyData.BodyAsString.Should().Be("abc"); } [Fact] @@ -64,7 +65,7 @@ public class ResponseWithHandlebarsRegexTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // assert - Check.That(response.Message.BodyData.BodyAsString).Equals(""); + response.Message.BodyData.BodyAsString.Should().Be(""); } [Fact] @@ -83,7 +84,7 @@ public class ResponseWithHandlebarsRegexTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // assert - Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https"); + response.Message.BodyData.BodyAsString.Should().Be("5000-https"); } [Fact] @@ -102,7 +103,7 @@ public class ResponseWithHandlebarsRegexTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // assert - Check.That(response.Message.BodyData.BodyAsString).Equals(""); + response.Message.BodyData.BodyAsString.Should().Be(""); } [Fact] @@ -117,7 +118,10 @@ public class ResponseWithHandlebarsRegexTests .WithBody("{{#Regex.Match request.bodyAsJson \"^(?\\w+)://[^/]+?(?\\d+)/?\"}}{{/Regex.Match}}") .WithTransformer(); - // Act and Assert - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); + // Act + Func act = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); + + // Assert + act.Should().ThrowAsync(); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs index 861090cb..ff054cb4 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs @@ -1,9 +1,8 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -83,7 +82,7 @@ public class ResponseWithHandlebarsXPathTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc"); + response.Message.BodyData.BodyAsString.Should().Be("abc"); } [Fact] @@ -195,7 +194,7 @@ public class ResponseWithHandlebarsXPathTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True"); + response.Message.BodyData.BodyAsString.Should().BeEquivalentTo("True"); } [Fact] @@ -223,6 +222,7 @@ public class ResponseWithHandlebarsXPathTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1"); + response.Message.BodyData.BodyAsString.Should().Be("a1"); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs index b02b8a5e..acd527b6 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -47,8 +47,8 @@ public class ResponseWithHandlebarsXegerTests // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); - Check.That(j["Number"].Value()).IsStrictlyGreaterThan(1000).And.IsStrictlyLessThan(9999); - Check.That(j["Postcode"].Value()).IsNotEmpty(); + j["Number"].Value().Should().BeGreaterThan(1000).And.BeLessThan(9999); + j["Postcode"].Value().Should().NotBeEmpty(); } [Fact] @@ -70,7 +70,8 @@ public class ResponseWithHandlebarsXegerTests // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); - Check.That(j["Number"].Value()).IsStrictlyGreaterThan(1000).And.IsStrictlyLessThan(9999); - Check.That(j["Postcode"].Value()).IsNotEmpty(); + j["Number"].Value().Should().BeGreaterThan(1000).And.BeLessThan(9999); + j["Postcode"].Value().Should().NotBeEmpty(); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs index 854a836d..579b3c20 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Http; using Moq; -using NFluent; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; @@ -36,7 +35,7 @@ public class ResponseWithHeadersTests var response = await builder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMock, _settings); // Assert - Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue); + response.Message.Headers[headerName].ToString().Should().Be(headerValue); } [Theory] @@ -52,7 +51,7 @@ public class ResponseWithHeadersTests var response = await builder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMock, _settings); // Assert - Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues); + response.Message.Headers[headerName].ToArray().Should().Equal(headerValues); } [Fact] @@ -67,7 +66,7 @@ public class ResponseWithHeadersTests var responseMessage = await response.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x"); + responseMessage.Message.Headers["h"].Should().ContainSingle("x"); } [Fact] @@ -82,7 +81,7 @@ public class ResponseWithHeadersTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.Headers["h"]).ContainsExactly("x"); + response.Message.Headers["h"].Should().ContainSingle("x"); } [Fact] @@ -97,6 +96,6 @@ public class ResponseWithHeadersTests var response = await builder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.Headers["h"]).ContainsExactly("x"); + response.Message.Headers["h"].Should().ContainSingle("x"); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs index 26507d97..8205a5dc 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs @@ -3,7 +3,6 @@ using System.Net.Http; using Microsoft.AspNetCore.Http; using Moq; -using NFluent; using WireMock.Models; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; @@ -56,10 +55,10 @@ public class ResponseWithProxyTests : IDisposable var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(request.ProxyUrl).IsNotNull(); - Check.That(response.Message.BodyData.BodyAsString).IsEqualTo(expectedBody); - Check.That(response.Message.StatusCode).IsEqualTo(201); - Check.That(response.Message.Headers["Content-Type"].ToString()).IsEqualTo("application/json"); + request.ProxyUrl.Should().NotBeNull(); + response.Message.BodyData.BodyAsString.Should().Be(expectedBody); + response.Message.StatusCode.Should().Be(201); + response.Message.Headers["Content-Type"].ToString().Should().Be("application/json"); } [Fact] @@ -80,8 +79,10 @@ public class ResponseWithProxyTests : IDisposable // Act var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "GET", ClientIp); + Func act = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); + // Assert + act.Should().ThrowAsync(); } public void Dispose() @@ -89,4 +90,5 @@ public class ResponseWithProxyTests : IDisposable _server?.Stop(); _server?.Dispose(); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs index faffa12b..f4a64c5a 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; -using NFluent; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; @@ -9,11 +7,7 @@ using WireMock.Types; using WireMock.Util; using WireMock.Handlers; using Moq; -#if NET452 -using Microsoft.Owin; -#else using Microsoft.AspNetCore.Http; -#endif namespace WireMock.Net.Tests.ResponseBuilders; @@ -69,6 +63,7 @@ public class ResponseWithScribanTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt"); + response.Message.BodyData.BodyAsString.Should().Be("test http://localhost/foo /foo POSt"); } } + diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs index 78b3c0b6..fbcca1e4 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Net; -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using WireMock.Models; diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs index 70e6445a..ae44dd10 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs @@ -2,12 +2,11 @@ using System.Globalization; using System.Text; -using AwesomeAssertions; using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Handlers; using WireMock.Models; using WireMock.ResponseBuilders; @@ -76,7 +75,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test http://localhost/foo /foo POSt"); + response.Message.BodyData!.BodyAsString.Should().Be("test http://localhost/foo /foo POSt"); } [Theory] @@ -100,7 +99,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b"); + response.Message.BodyData!.BodyAsString.Should().Be("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b"); } [Fact] @@ -118,7 +117,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("a b wiremock"); + response.Message.BodyData!.BodyAsString.Should().Be("a b wiremock"); } [Theory] @@ -141,7 +140,7 @@ public class ResponseWithTransformerTests // Assert var json = (JObject)response.Message.BodyData!.BodyAsJson!; - Check.That(json["field"]!.Value()).Equals(expected); + json["field"]!.Value().Should().Be(expected); } [Theory(Skip = "Invalid token `OpenBracket`")] @@ -161,7 +160,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("a wiremock"); + response.Message.BodyData!.BodyAsString.Should().Be("a wiremock"); } [Fact] @@ -183,7 +182,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5"); + response.Message.BodyData!.BodyAsString.Should().Be("test keya=1,2 idx=1 idx=2 keyb=5"); } [Theory(Skip = "Invalid token `OpenBracket`")] @@ -207,7 +206,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5"); + response.Message.BodyData!.BodyAsString.Should().Be("test keya=1 idx=1 idx=2 keyb=5"); } [Fact] @@ -230,8 +229,8 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); - Check.That(response.Message.StatusCode).Equals("400"); + response.Message.BodyData!.BodyAsString.Should().Be("test"); + response.Message.StatusCode.Should().Be("400"); } [Theory(Skip = "WireMockList is not supported by Scriban")] @@ -256,8 +255,8 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); - Check.That(response.Message.StatusCode).Equals("400"); + response.Message.BodyData!.BodyAsString.Should().Be("test"); + response.Message.StatusCode.Should().Be("400"); } [Theory] @@ -282,8 +281,8 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); - Check.That(response.Message.StatusCode).Equals(null); + response.Message.BodyData!.BodyAsString.Should().Be("test"); + response.Message.StatusCode.Should().Be(null); } [Fact] @@ -303,9 +302,9 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); - Check.That(response.Message.Headers).ContainsKey("x"); - Check.That(response.Message.Headers!["x"]).ContainsExactly("text/plain"); + response.Message.BodyData!.BodyAsString.Should().Be("test"); + response.Message.Headers.Should().ContainKey("x"); + response.Message.Headers!["x"].Should().ContainSingle("text/plain"); } [Fact] @@ -329,8 +328,8 @@ public class ResponseWithTransformerTests // Assert response.Message.Headers.Should().NotBeNull(); - Check.That(response.Message.Headers).ContainsKey("x"); - Check.That(response.Message.Headers!["x"]).ContainsExactly(guid.ToString()); + response.Message.Headers.Should().ContainKey("x"); + response.Message.Headers!["x"].Should().ContainSingle(guid.ToString()); } [Fact] @@ -350,10 +349,10 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); - Check.That(response.Message.Headers).ContainsKey("x"); - Check.That(response.Message.Headers!["x"]).Contains("text/plain"); - Check.That(response.Message.Headers["x"]).Contains("http://localhost/foo"); + response.Message.BodyData!.BodyAsString.Should().Be("test"); + response.Message.Headers.Should().ContainKey("x"); + response.Message.Headers!["x"].Should().Contain("text/plain"); + response.Message.Headers["x"].Should().Contain("http://localhost/foo"); } [Theory(Skip = "WireMockList is not supported by Scriban")] @@ -375,10 +374,10 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); - Check.That(response.Message.Headers).ContainsKey("x"); - Check.That(response.Message.Headers!["x"]).Contains("text/plain"); - Check.That(response.Message.Headers["x"]).Contains("http://localhost/foo"); + response.Message.BodyData!.BodyAsString.Should().Be("test"); + response.Message.Headers.Should().ContainKey("x"); + response.Message.Headers!["x"].Should().Contain("text/plain"); + response.Message.Headers["x"].Should().Contain("http://localhost/foo"); } [Theory] @@ -403,7 +402,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsString).Equals("test http://localhost:1234 1234 http localhost"); + response.Message.BodyData!.BodyAsString.Should().Be("test http://localhost:1234 1234 http localhost"); } [Theory] @@ -430,7 +429,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}"); + JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("{\"x\":\"test /foo_object\"}"); } [CulturedTheory(["en-US"])] @@ -577,7 +576,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]"); + JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]"); } [Fact] @@ -594,7 +593,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); + response.Message.BodyData!.BodyAsFile.Should().Be(@"c:\1\test.xml"); } [Theory(Skip = @"Does not work in Scriban --> c:\\[""1""]\\test.xml")] @@ -613,7 +612,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); + response.Message.BodyData!.BodyAsFile.Should().Be(@"c:\1\test.xml"); } [Fact] @@ -637,9 +636,9 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); - Check.That(response.Message.BodyData.DetectedBodyType).Equals(BodyType.String); - Check.That(response.Message.BodyData!.BodyAsString).Equals(""); + response.Message.BodyData!.BodyAsFile.Should().Be(@"c:\1\test.xml"); + response.Message.BodyData.DetectedBodyType.Should().Be(BodyType.String); + response.Message.BodyData!.BodyAsString.Should().Be(""); } [Theory] @@ -666,7 +665,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("\"test\""); + JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("\"test\""); } [Fact] @@ -712,7 +711,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); + JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("{\"name\":\"WireMock\"}"); } [Theory(Skip = "{{{ }}} Does not work in Scriban")] @@ -738,7 +737,7 @@ public class ResponseWithTransformerTests var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert - Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); + JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("{\"name\":\"WireMock\"}"); } [Theory] @@ -847,4 +846,7 @@ AAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC // Assert response.Message.BodyData!.BodyAsString.Should().Be(expected); } -} \ No newline at end of file +} + + + diff --git a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs index 526c646f..3d00b532 100644 --- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs +++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Net.Tests.VerifyExtensions; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs index 27141817..e1dd5e42 100644 --- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs +++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Models; using WireMock.RequestBuilders; diff --git a/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs b/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs index 66942f08..1cd66b3c 100644 --- a/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs +++ b/test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using JsonConverter.Newtonsoft.Json; using WireMock.Admin.Mappings; using WireMock.Serialization; diff --git a/test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs b/test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs index 64d362bc..d32e8517 100644 --- a/test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs +++ b/test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs @@ -1,11 +1,9 @@ // Copyright © WireMock.Net using AnyOfTypes; -using AwesomeAssertions; using AwesomeAssertions.Execution; using Moq; using Newtonsoft.Json; -using NFluent; using WireMock.Admin.Mappings; using WireMock.Handlers; using WireMock.Matchers; @@ -289,8 +287,11 @@ message HelloReply { // Assign var model = new MatcherModel { Name = "test" }; - // Act and Assert - Check.ThatCode(() => _sut.Map(model)).Throws(); + // Act + Action act = () => _sut.Map(model); + + // Assert + act.Should().Throw(); } //[Fact] @@ -747,7 +748,7 @@ message HelloReply { var matcher = (ExactMatcher)_sut.Map(model)!; // Assert - Check.That(matcher.GetPatterns()).ContainsExactly("x", "y"); + matcher.GetPatterns().Should().ContainInOrder("x", "y"); } [Fact] @@ -808,7 +809,7 @@ message HelloReply { var matcher = (ExactObjectMatcher)_sut.Map(model)!; // Assert - Check.That((byte[])matcher.Value).ContainsExactly(115, 116, 101, 102); + ((byte[])matcher.Value).Should().BeEquivalentTo(new byte[] { 115, 116, 101, 102 }); } [Fact] @@ -821,8 +822,11 @@ message HelloReply { Patterns = ["_"] }; - // Act & Assert - Check.ThatCode(() => _sut.Map(model)).Throws(); + // Act + Action act = () => _sut.Map(model); + + // Assert + act.Should().Throw(); } [Theory] @@ -844,7 +848,7 @@ message HelloReply { var matcher = (RegexMatcher)_sut.Map(model)!; // Assert - Check.That(matcher.GetPatterns()).ContainsExactly("x", "y"); + matcher.GetPatterns().Should().ContainInOrder("x", "y"); var result = matcher.IsMatch("X"); result.Score.Should().Be(expected); @@ -869,7 +873,7 @@ message HelloReply { var matcher = (WildcardMatcher)_sut.Map(model)!; // Assert - Check.That(matcher.GetPatterns()).ContainsExactly("x", "y"); + matcher.GetPatterns().Should().ContainInOrder("x", "y"); var result = matcher.IsMatch("X"); result.Score.Should().Be(expected); @@ -925,7 +929,7 @@ message HelloReply { var matcher = (SimMetricsMatcher)_sut.Map(model)!; // Assert - Check.That(matcher.GetPatterns()).ContainsExactly("x"); + matcher.GetPatterns().Should().ContainSingle("x"); } [Fact] @@ -942,7 +946,7 @@ message HelloReply { var matcher = (SimMetricsMatcher)_sut.Map(model)!; // Assert - Check.That(matcher.GetPatterns()).ContainsExactly("x"); + matcher.GetPatterns().Should().ContainSingle("x"); } [Fact] @@ -956,7 +960,10 @@ message HelloReply { }; // Act - Check.ThatCode(() => _sut.Map(model)).Throws(); + Action act = () => _sut.Map(model); + + // Assert + act.Should().Throw(); } [Fact] @@ -970,7 +977,10 @@ message HelloReply { }; // Act - Check.ThatCode(() => _sut.Map(model)).Throws(); + Action act = () => _sut.Map(model); + + // Assert + act.Should().Throw(); } [Fact] diff --git a/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs b/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs index 10161564..909a6cbe 100644 --- a/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs +++ b/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using HandlebarsDotNet; using HandlebarsDotNet.Helpers.Enums; using Microsoft.AspNetCore.Http; diff --git a/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs b/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs index 32194323..2da5d56a 100644 --- a/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs +++ b/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; -using NFluent; using WireMock.Settings; using WireMock.Types; @@ -55,8 +53,8 @@ public class SimpleSettingsParserTests string? value2 = _parser.GetStringValue("test2"); // Assert - Check.That(value1).IsEqualTo("one"); - Check.That(value2).IsEqualTo("two"); + value1.Should().Be("one"); + value2.Should().Be("two"); } [Fact] @@ -71,9 +69,9 @@ public class SimpleSettingsParserTests string? value3 = _parser.GetStringValue("test3"); // Assert - Check.That(value1).IsEqualTo("one"); - Check.That(value2).IsEqualTo("two"); - Check.That(value3).IsEqualTo("three"); + value1.Should().Be("one"); + value2.Should().Be("two"); + value3.Should().Be("three"); } [Fact] @@ -88,9 +86,9 @@ public class SimpleSettingsParserTests string? value3 = _parser.GetStringValue("test3"); // Assert - Check.That(value1).IsEqualTo("one"); - Check.That(value2).IsEqualTo("two"); - Check.That(value3).IsEqualTo("three"); + value1.Should().Be("one"); + value2.Should().Be("two"); + value3.Should().Be("three"); } [Fact] @@ -105,9 +103,9 @@ public class SimpleSettingsParserTests bool value3 = _parser.GetBoolValue("test3", true); // Assert - Check.That(value1).IsEqualTo(false); - Check.That(value2).IsEqualTo(true); - Check.That(value3).IsEqualTo(true); + value1.Should().Be(false); + value2.Should().Be(true); + value3.Should().Be(true); } [Fact] @@ -122,9 +120,9 @@ public class SimpleSettingsParserTests bool value3 = _parser.GetBoolWithDefault("missing1", "missing2", defaultValue: true); // Assert - Check.That(value1).IsEqualTo(true); - Check.That(value2).IsEqualTo(false); - Check.That(value3).IsEqualTo(true); + value1.Should().Be(true); + value2.Should().Be(false); + value3.Should().Be(true); } [Fact] @@ -144,9 +142,9 @@ public class SimpleSettingsParserTests bool value3 = _parser.GetBoolValue("test3", true); // Assert - Check.That(value1).IsEqualTo(false); - Check.That(value2).IsEqualTo(true); - Check.That(value3).IsEqualTo(true); + value1.Should().Be(false); + value2.Should().Be(true); + value3.Should().Be(true); } [Fact] @@ -162,10 +160,10 @@ public class SimpleSettingsParserTests int? value4 = _parser.GetIntValue("test4"); // Assert - Check.That(value1).IsEqualTo(42); - Check.That(value2).IsEqualTo(55); - Check.That(value3).IsEqualTo(100); - Check.That(value4).IsNull(); + value1.Should().Be(42); + value2.Should().Be(55); + value3.Should().Be(100); + value4.Should().BeNull(); } [Fact] @@ -186,10 +184,10 @@ public class SimpleSettingsParserTests int? value4 = _parser.GetIntValue("test4"); // Assert - Check.That(value1).IsEqualTo(42); - Check.That(value2).IsEqualTo(55); - Check.That(value3).IsEqualTo(100); - Check.That(value4).IsNull(); + value1.Should().Be(42); + value2.Should().Be(55); + value3.Should().Be(100); + value4.Should().BeNull(); } [Fact] @@ -209,4 +207,4 @@ public class SimpleSettingsParserTests }; value.Should().BeEquivalentTo(expected); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs b/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs index 2ea8018e..4c9fdcb8 100644 --- a/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs +++ b/test/WireMock.Net.Tests/Settings/WireMockServerSettingsParserTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Settings; namespace WireMock.Net.Tests.Settings; diff --git a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs index dca170cf..536bdf05 100644 --- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs +++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs @@ -2,8 +2,7 @@ using System.Net; using System.Net.Http; -using AwesomeAssertions; -using NFluent; + using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; @@ -29,7 +28,7 @@ public class StatefulBehaviorTests var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path, TestContext.Current.CancellationToken); // then - Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound); + response.StatusCode.Should().Be(HttpStatusCode.NotFound); server.Stop(); } @@ -59,8 +58,8 @@ public class StatefulBehaviorTests var responseWithState = await new HttpClient().GetStringAsync(server.Url + path, cancellationToken); // Assert - Check.That(responseNoState).Equals("No state msg"); - Check.That(responseWithState).Equals("Test state msg"); + responseNoState.Should().Be("No state msg"); + responseWithState.Should().Be("Test state msg"); } [Theory] @@ -104,11 +103,11 @@ public class StatefulBehaviorTests var responseB = await client.GetStringAsync(server.Url + path, cancellationToken); // Assert - Check.That(response1).Equals("step 1"); - Check.That(response2).Equals("step 2"); - Check.That(response3).Equals("step 3"); - Check.That(responseA).Equals(expected1); - Check.That(responseB).Equals(expected2); + response1.Should().Be("step 1"); + response2.Should().Be("step 2"); + response3.Should().Be("step 3"); + responseA.Should().Be(expected1); + responseB.Should().Be(expected2); } [Fact] @@ -225,8 +224,8 @@ public class StatefulBehaviorTests var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path, cancellationToken); // then - Check.That(responseIntScenario).Equals("Scenario 1, Setting State 2"); - Check.That(responseWithIntState).Equals("Scenario 1, State 2"); + responseIntScenario.Should().Be("Scenario 1, Setting State 2"); + responseWithIntState.Should().Be("Scenario 1, State 2"); server.Stop(); } @@ -256,8 +255,8 @@ public class StatefulBehaviorTests var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path, cancellationToken); // then - Check.That(responseIntScenario).Equals("string state, Setting State 2"); - Check.That(responseWithIntState).Equals("string state, State 2"); + responseIntScenario.Should().Be("string state, Setting State 2"); + responseWithIntState.Should().Be("string state, State 2"); server.Stop(); } @@ -287,8 +286,8 @@ public class StatefulBehaviorTests var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path, cancellationToken); // then - Check.That(responseIntScenario).Equals("int state, Setting State 2"); - Check.That(responseWithIntState).Equals("string state, State 2"); + responseIntScenario.Should().Be("int state, Setting State 2"); + responseWithIntState.Should().Be("string state, State 2"); server.Stop(); } @@ -320,32 +319,32 @@ public class StatefulBehaviorTests .WhenStateIs("Cancel newspaper item added") .RespondWith(Response.Create().WithBody("Buy milk;Cancel newspaper subscription")); - Check.That(server.Scenarios.Any()).IsFalse(); + server.Scenarios.Any().Should().BeFalse(); // Act and Assert var getResponse1 = await client.GetStringAsync("/todo/items", cancelationToken); - Check.That(getResponse1).Equals("Buy milk"); + getResponse1.Should().Be("Buy milk"); - Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); - Check.That(server.Scenarios["To do list"].NextState).IsEqualTo("TodoList State Started"); - Check.That(server.Scenarios["To do list"].Started).IsTrue(); - Check.That(server.Scenarios["To do list"].Finished).IsFalse(); + server.Scenarios["To do list"].Name.Should().Be("To do list"); + server.Scenarios["To do list"].NextState.Should().Be("TodoList State Started"); + server.Scenarios["To do list"].Started.Should().BeTrue(); + server.Scenarios["To do list"].Finished.Should().BeFalse(); var postResponse = await client.PostAsync("/todo/items", new StringContent("Cancel newspaper subscription"), cancelationToken); - Check.That(postResponse.StatusCode).Equals(HttpStatusCode.Created); + postResponse.StatusCode.Should().Be(HttpStatusCode.Created); - Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); - Check.That(server.Scenarios["To do list"].NextState).IsEqualTo("Cancel newspaper item added"); - Check.That(server.Scenarios["To do list"].Started).IsTrue(); - Check.That(server.Scenarios["To do list"].Finished).IsFalse(); + server.Scenarios["To do list"].Name.Should().Be("To do list"); + server.Scenarios["To do list"].NextState.Should().Be("Cancel newspaper item added"); + server.Scenarios["To do list"].Started.Should().BeTrue(); + server.Scenarios["To do list"].Finished.Should().BeFalse(); string getResponse2 = await client.GetStringAsync("/todo/items", cancelationToken); - Check.That(getResponse2).Equals("Buy milk;Cancel newspaper subscription"); + getResponse2.Should().Be("Buy milk;Cancel newspaper subscription"); - Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); - Check.That(server.Scenarios["To do list"].NextState).IsNull(); - Check.That(server.Scenarios["To do list"].Started).IsTrue(); - Check.That(server.Scenarios["To do list"].Finished).IsTrue(); + server.Scenarios["To do list"].Name.Should().Be("To do list"); + server.Scenarios["To do list"].NextState.Should().BeNull(); + server.Scenarios["To do list"].Started.Should().BeTrue(); + server.Scenarios["To do list"].Finished.Should().BeTrue(); server.Stop(); } @@ -448,17 +447,18 @@ public class StatefulBehaviorTests // Act and Assert string url = "http://localhost:" + server.Ports[0]; var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1", cancelationToken); - Check.That(responseNoState1).Equals("No state msg 1"); + responseNoState1.Should().Be("No state msg 1"); var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2", cancelationToken); - Check.That(responseNoState2).Equals("No state msg 2"); + responseNoState2.Should().Be("No state msg 2"); var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X", cancelationToken); - Check.That(responseWithState1).Equals("Test state msg 1"); + responseWithState1.Should().Be("Test state msg 1"); var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X", cancelationToken); - Check.That(responseWithState2).Equals("Test state msg 2"); + responseWithState2.Should().Be("Test state msg 2"); server.Stop(); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs b/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs index 7f9e69b2..af627efc 100644 --- a/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs +++ b/test/WireMock.Net.Tests/Testcontainers/CombineUtilsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Net.Testcontainers.Utils; namespace WireMock.Net.Tests.Testcontainers; diff --git a/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs b/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs index ef6d37d9..2c88c40e 100644 --- a/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs +++ b/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Moq; using WireMock.Handlers; using WireMock.Settings; diff --git a/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs b/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs index 60dada48..23aee732 100644 --- a/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs +++ b/test/WireMock.Net.Tests/Transformers/Scriban/ScribanContextFactoryTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Moq; using WireMock.Handlers; using WireMock.Transformers.Scriban; diff --git a/test/WireMock.Net.Tests/Util/BodyParserTests.cs b/test/WireMock.Net.Tests/Util/BodyParserTests.cs index 1ba5f53b..4fa5d932 100644 --- a/test/WireMock.Net.Tests/Util/BodyParserTests.cs +++ b/test/WireMock.Net.Tests/Util/BodyParserTests.cs @@ -1,8 +1,7 @@ // Copyright © WireMock.Net using System.Text; -using AwesomeAssertions; -using NFluent; + using WireMock.Types; using WireMock.Util; @@ -30,11 +29,11 @@ public class BodyParserTests var body = await BodyParser.ParseAsync(bodyParserSettings); // Assert - Check.That(body.BodyAsBytes).IsNotNull(); - Check.That(body.BodyAsJson).IsNotNull(); - Check.That(body.BodyAsString).Equals(bodyAsJson); - Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); - Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType); + body.BodyAsBytes.Should().NotBeNull(); + body.BodyAsJson.Should().NotBeNull(); + body.BodyAsString.Should().Be(bodyAsJson); + body.DetectedBodyType.Should().Be(detectedBodyType); + body.DetectedBodyTypeFromContentType.Should().Be(detectedBodyTypeFromContentType); } [Theory] @@ -54,11 +53,11 @@ public class BodyParserTests var body = await BodyParser.ParseAsync(bodyParserSettings); // Assert - Check.That(body.BodyAsBytes).IsNotNull(); - Check.That(body.BodyAsJson).IsNull(); - Check.That(body.BodyAsString).Equals(bodyAsString); - Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); - Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType); + body.BodyAsBytes.Should().NotBeNull(); + body.BodyAsJson.Should().BeNull(); + body.BodyAsString.Should().Be(bodyAsString); + body.DetectedBodyType.Should().Be(detectedBodyType); + body.DetectedBodyTypeFromContentType.Should().Be(detectedBodyTypeFromContentType); } [Theory] @@ -79,7 +78,7 @@ public class BodyParserTests var body = await BodyParser.ParseAsync(bodyParserSettings); // assert - Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); + body.DetectedBodyType.Should().Be(detectedBodyType); } [Theory] @@ -100,7 +99,7 @@ public class BodyParserTests var body = await BodyParser.ParseAsync(bodyParserSettings); // assert - Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); + body.DetectedBodyType.Should().Be(detectedBodyType); } [Fact] @@ -141,11 +140,11 @@ public class BodyParserTests var result = await BodyParser.ParseAsync(bodyParserSettings); // Assert - Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String); - Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart); - Check.That(result.BodyAsBytes).IsNotNull(); - Check.That(result.BodyAsJson).IsNull(); - Check.That(result.BodyAsString).IsNotNull(); + result.DetectedBodyType.Should().Be(BodyType.String); + result.DetectedBodyTypeFromContentType.Should().Be(BodyType.MultiPart); + result.BodyAsBytes.Should().NotBeNull(); + result.BodyAsJson.Should().BeNull(); + result.BodyAsString.Should().NotBeNull(); } [Fact] @@ -165,11 +164,11 @@ public class BodyParserTests var result = await BodyParser.ParseAsync(bodyParserSettings); // Assert - Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes); - Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart); - Check.That(result.BodyAsBytes).IsNotNull(); - Check.That(result.BodyAsJson).IsNull(); - Check.That(result.BodyAsString).IsNull(); + result.DetectedBodyType.Should().Be(BodyType.Bytes); + result.DetectedBodyTypeFromContentType.Should().Be(BodyType.MultiPart); + result.BodyAsBytes.Should().NotBeNull(); + result.BodyAsJson.Should().BeNull(); + result.BodyAsString.Should().BeNull(); } [Theory] @@ -188,11 +187,11 @@ public class BodyParserTests var body = await BodyParser.ParseAsync(bodyParserSettings); // Assert - Check.That(body.BodyAsBytes).IsNotNull(); - Check.That(body.BodyAsJson).IsNull(); - Check.That(body.BodyAsString).Equals(bodyAsString); - Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); - Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType); + body.BodyAsBytes.Should().NotBeNull(); + body.BodyAsJson.Should().BeNull(); + body.BodyAsString.Should().Be(bodyAsString); + body.DetectedBodyType.Should().Be(detectedBodyType); + body.DetectedBodyTypeFromContentType.Should().Be(detectedBodyTypeFromContentType); } [Theory] @@ -261,7 +260,7 @@ public class BodyParserTests [InlineData("PATCH", true)] public void BodyParser_ShouldParseBodyForMethodAndAllowAllIsFalse_ExpectedResultForKnownMethods(string method, bool resultShouldBe) { - Check.That(BodyParser.ShouldParseBody(method, false)).Equals(resultShouldBe); + BodyParser.ShouldParseBody(method, false).Should().Be(resultShouldBe); } [Theory] @@ -278,7 +277,7 @@ public class BodyParserTests [InlineData("SOME-UNKNOWN-METHOD")] public void BodyParser_ShouldParseBodyForMethodAndAllowAllIsTrue_ExpectedResultShouldBeTrue(string method) { - Check.That(BodyParser.ShouldParseBody(method, true)).IsTrue(); + BodyParser.ShouldParseBody(method, true).Should().BeTrue(); } [Theory] @@ -286,6 +285,7 @@ public class BodyParserTests [InlineData("SOME-UNKNOWN-METHOD")] public void BodyParser_ShouldParseBody_DefaultIsTrueForUnknownMethods(string method) { - Check.That(BodyParser.ShouldParseBody(method, false)).IsTrue(); + BodyParser.ShouldParseBody(method, false).Should().BeTrue(); } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs b/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs index ddc13bb8..5e6886d6 100644 --- a/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/BytesEncodingUtilsTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Text; -using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs b/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs index 0f038da9..b6bed7ac 100644 --- a/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs +++ b/test/WireMock.Net.Tests/Util/CSharpFormatterTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Newtonsoft.Json.Linq; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs b/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs index 64d2f6da..a9941565 100644 --- a/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/CompressionUtilsTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Text; -using AwesomeAssertions; using RandomDataGenerator.FieldOptions; using RandomDataGenerator.Randomizers; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs b/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs index a997df26..4022d0d0 100644 --- a/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Globalization; -using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/FileHelperTests.cs b/test/WireMock.Net.Tests/Util/FileHelperTests.cs index 884122c7..8e1b544e 100644 --- a/test/WireMock.Net.Tests/Util/FileHelperTests.cs +++ b/test/WireMock.Net.Tests/Util/FileHelperTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Moq; using WireMock.Handlers; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs b/test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs index ae494cd9..73e947dc 100644 --- a/test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs @@ -1,6 +1,6 @@ // Copyright © WireMock.Net -using NFluent; + using WireMock.Util; namespace WireMock.Net.Tests.Util; @@ -16,7 +16,7 @@ public class FilePathUtilsTests var cleanPath = FilePathUtils.CleanPath(path); // Assert - Check.That(cleanPath).Equals("subdirectory" + Path.DirectorySeparatorChar + "MyXmlResponse.xml"); + cleanPath.Should().Be("subdirectory" + Path.DirectorySeparatorChar + "MyXmlResponse.xml"); } [Theory] @@ -38,6 +38,6 @@ public class FilePathUtilsTests var withoutDirectorySeparators = FilePathUtils.RemoveLeadingDirectorySeparators(cleanPath); // Assert - Check.That(withoutDirectorySeparators).Equals(expected); + withoutDirectorySeparators.Should().Be(expected); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs b/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs index 88185c94..8652f5e0 100644 --- a/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs +++ b/test/WireMock.Net.Tests/Util/HttpStatusRangeParserTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using System.Net; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs b/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs index ec06a2df..b5cdf42b 100644 --- a/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs +++ b/test/WireMock.Net.Tests/Util/HttpVersionParserTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/JsonUtilsTests.cs b/test/WireMock.Net.Tests/Util/JsonUtilsTests.cs index 801e7f3b..5dbbbfa2 100644 --- a/test/WireMock.Net.Tests/Util/JsonUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/JsonUtilsTests.cs @@ -6,7 +6,7 @@ using System.Linq.Dynamic.Core; using System.Reflection; using FluentAssertions; using Newtonsoft.Json.Linq; -using NFluent; + using WireMock.Util; using Xunit; @@ -65,9 +65,9 @@ public class JsonUtilsTests // Assert var queryable = new[] { instance }.AsQueryable().Select(line); bool result = queryable.Any("it == \"Test\""); - Check.That(result).IsTrue(); + result.Should().BeTrue(); - Check.That(line).IsEqualTo("string(it)"); + line.Should().Be("string(it)"); } [Fact] @@ -192,4 +192,4 @@ public class JsonUtilsTests "System.String get_C()" }); } -} \ No newline at end of file +} diff --git a/test/WireMock.Net.Tests/Util/PortUtilsTests.cs b/test/WireMock.Net.Tests/Util/PortUtilsTests.cs index 180b1175..5b460701 100644 --- a/test/WireMock.Net.Tests/Util/PortUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/PortUtilsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs b/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs index 4e35ea0f..9e23ec0e 100644 --- a/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs +++ b/test/WireMock.Net.Tests/Util/QueryStringParserTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Types; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs b/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs index 88da9330..d3d63576 100644 --- a/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/RegexUtilsTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Text.RegularExpressions; -using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/StringUtilsTests.cs b/test/WireMock.Net.Tests/Util/StringUtilsTests.cs index 67c8274c..bd0f426a 100644 --- a/test/WireMock.Net.Tests/Util/StringUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/StringUtilsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs b/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs index b77cfe67..032d14a5 100644 --- a/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/SystemUtilsTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Util; namespace WireMock.Net.Tests.Util; diff --git a/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs b/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs index 1786481a..5787b5ad 100644 --- a/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs +++ b/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using AnyOfTypes; -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Models; using WireMock.Util; diff --git a/test/WireMock.Net.Tests/Util/UrlUtilsTests.cs b/test/WireMock.Net.Tests/Util/UrlUtilsTests.cs index 3ba83d3d..286e9d01 100644 --- a/test/WireMock.Net.Tests/Util/UrlUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/UrlUtilsTests.cs @@ -1,11 +1,6 @@ // Copyright © WireMock.Net -#if NET452 -using Microsoft.Owin; -#else using Microsoft.AspNetCore.Http; -#endif -using NFluent; using WireMock.Util; namespace WireMock.Net.Tests.Util; @@ -22,8 +17,8 @@ public class UrlUtilsTests var result = UrlUtils.Parse(uri, new PathString("/a")); // Assert - Check.That(result.Url.ToString()).Equals("https://localhost:1234/b?x=0"); - Check.That(result.AbsoluteUrl.ToString()).Equals("https://localhost:1234/a/b?x=0"); + result.Url.ToString().Should().Be("https://localhost:1234/b?x=0"); + result.AbsoluteUrl.ToString().Should().Be("https://localhost:1234/a/b?x=0"); } [Fact] @@ -36,8 +31,8 @@ public class UrlUtilsTests var result = UrlUtils.Parse(uri, new PathString()); // Assert - Check.That(result.Url.ToString()).Equals("https://localhost:1234/a/b?x=0"); - Check.That(result.AbsoluteUrl.ToString()).Equals("https://localhost:1234/a/b?x=0"); + result.Url.ToString().Should().Be("https://localhost:1234/a/b?x=0"); + result.AbsoluteUrl.ToString().Should().Be("https://localhost:1234/a/b?x=0"); } [Fact] @@ -50,7 +45,7 @@ public class UrlUtilsTests var result = UrlUtils.Parse(uri, new PathString("/test")); // Assert - Check.That(result.Url.ToString()).Equals("https://localhost:1234/a/b?x=0"); - Check.That(result.AbsoluteUrl.ToString()).Equals("https://localhost:1234/a/b?x=0"); + result.Url.ToString().Should().Be("https://localhost:1234/a/b?x=0"); + result.AbsoluteUrl.ToString().Should().Be("https://localhost:1234/a/b?x=0"); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs b/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs index 74a26821..ec8d574d 100644 --- a/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs +++ b/test/WireMock.Net.Tests/Validators/PathValidatorTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Diagnostics.CodeAnalysis; -using AwesomeAssertions; using WireMock.Validators; namespace WireMock.Net.Tests.Validators; diff --git a/test/WireMock.Net.Tests/VerifyExtensions/VerifyNewtonsoftJson.cs b/test/WireMock.Net.Tests/VerifyExtensions/VerifyNewtonsoftJson.cs index e422d909..65dc7e6d 100644 --- a/test/WireMock.Net.Tests/VerifyExtensions/VerifyNewtonsoftJson.cs +++ b/test/WireMock.Net.Tests/VerifyExtensions/VerifyNewtonsoftJson.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -#if !(NET452 || NET461) using System.Collections.Specialized; using Newtonsoft.Json.Linq; @@ -38,5 +37,4 @@ internal class JObjectConverter : WriteOnlyJsonConverter var dictionary = value.ToObject()!; writer.Serialize(dictionary); } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs b/test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs index 4653fef4..b4d8f651 100644 --- a/test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs +++ b/test/WireMock.Net.Tests/VerifyExtensions/VerifySettingsExtensions.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -#if !(NET452 || NET461) namespace WireMock.Net.Tests.VerifyExtensions; internal static class VerifySettingsExtensions @@ -13,5 +12,4 @@ internal static class VerifySettingsExtensions VerifyNewtonsoftJson.Enable(verifySettings); } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs b/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs index b4906bbb..c01693ae 100644 --- a/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs +++ b/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Net.WebSockets; -using AwesomeAssertions; using WireMock.Matchers; using WireMock.Net.Xunit; using WireMock.RequestBuilders; @@ -742,6 +741,8 @@ public class WebSocketIntegrationTests(ITestOutputHelper output, ITestContextAcc var proxyUri = new Uri($"{sut.Url}/ws/proxy"); await client.ConnectAsync(proxyUri, _ct); + await Task.Delay(500, _ct); + var testMessages = new[] { "First", "Second", "Third" }; // Act & Assert @@ -754,8 +755,6 @@ public class WebSocketIntegrationTests(ITestOutputHelper output, ITestContextAcc } await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Test complete", _ct); - - await Task.Delay(100, _ct); } [Fact] @@ -797,6 +796,8 @@ public class WebSocketIntegrationTests(ITestOutputHelper output, ITestContextAcc var proxyUri = new Uri($"{sut.Url}/ws/proxy"); await client.ConnectAsync(proxyUri, _ct); + await Task.Delay(500, _ct); + var testData = new byte[] { 0x01, 0x02, 0x03, 0x04, 0x05 }; // Act diff --git a/test/WireMock.Net.Tests/WebSockets/WireMockServerWebSocketIntegrationTests.cs b/test/WireMock.Net.Tests/WebSockets/WireMockServerWebSocketIntegrationTests.cs index bbf3142a..357b7e04 100644 --- a/test/WireMock.Net.Tests/WebSockets/WireMockServerWebSocketIntegrationTests.cs +++ b/test/WireMock.Net.Tests/WebSockets/WireMockServerWebSocketIntegrationTests.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Net.WebSockets; -using AwesomeAssertions; using WireMock.Net.Xunit; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj index 4a6b5470..e8bc4c08 100644 --- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj +++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj @@ -1,4 +1,4 @@ - + Stef Heyenrath @@ -74,7 +74,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/test/WireMock.Net.Tests/WireMockServer.Admin.cs b/test/WireMock.Net.Tests/WireMockServer.Admin.cs index b7364ed7..19127f73 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Admin.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Admin.cs @@ -3,10 +3,9 @@ using System.Net; using System.Net.Http; using System.Text; -using AwesomeAssertions; using Moq; using Newtonsoft.Json; -using NFluent; + using RestEase; using WireMock.Client; using WireMock.Handlers; @@ -33,15 +32,15 @@ public class WireMockServerAdminTests string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings"); server.ReadStaticMappings(folder); - Check.That(server.Mappings).HasSize(Constants.NumStaticMappings); - Check.That(server.MappingModels).HasSize(Constants.NumStaticMappings); + server.Mappings.Should().HaveCount(Constants.NumStaticMappings); + server.MappingModels.Should().HaveCount(Constants.NumStaticMappings); // Act server.ResetMappings(); // Assert - Check.That(server.Mappings).HasSize(0); - Check.That(server.MappingModels).HasSize(0); + server.Mappings.Should().HaveCount(0); + server.MappingModels.Should().HaveCount(0); server.Stop(); } @@ -87,12 +86,12 @@ public class WireMockServerAdminTests server.ReadStaticMappingAndAddOrUpdate(path); var mappings = server.Mappings.ToArray(); - Check.That(mappings).HasSize(1); + mappings.Should().HaveCount(1); - Check.That(mappings.First().RequestMatcher).IsNotNull(); - Check.That(mappings.First().Provider).IsNotNull(); - Check.That(mappings.First().Guid).Equals(guid); - Check.That(mappings.First().Title).Equals(title); + mappings.First().RequestMatcher.Should().NotBeNull(); + mappings.First().Provider.Should().NotBeNull(); + mappings.First().Guid.Should().Be(guid); + mappings.First().Title.Should().Be(title); server.Stop(); } @@ -107,12 +106,12 @@ public class WireMockServerAdminTests server.ReadStaticMappingAndAddOrUpdate(path); var mappings = server.Mappings.ToArray(); - Check.That(mappings).HasSize(1); + mappings.Should().HaveCount(1); - Check.That(mappings.First().RequestMatcher).IsNotNull(); - Check.That(mappings.First().Provider).IsNotNull(); - Check.That(mappings.First().Guid).Equals(Guid.Parse(guid)); - Check.That(mappings.First().Title).IsNullOrEmpty(); + mappings.First().RequestMatcher.Should().NotBeNull(); + mappings.First().Provider.Should().NotBeNull(); + mappings.First().Guid.Should().Be(Guid.Parse(guid)); + mappings.First().Title.Should().BeNullOrEmpty(); server.Stop(); } @@ -126,7 +125,7 @@ public class WireMockServerAdminTests server.ReadStaticMappingAndAddOrUpdate(path); var mappings = server.Mappings.ToArray(); - Check.That(mappings).HasSize(2); + mappings.Should().HaveCount(2); server.Stop(); } @@ -151,12 +150,12 @@ public class WireMockServerAdminTests server.ReadStaticMappingAndAddOrUpdate(path); var mappings = server.Mappings.ToArray(); - Check.That(mappings).HasSize(1); + mappings.Should().HaveCount(1); - Check.That(mappings.First().RequestMatcher).IsNotNull(); - Check.That(mappings.First().Provider).IsNotNull(); - Check.That(mappings.First().Guid).Equals(Guid.Parse(guid)); - Check.That(mappings.First().Title).IsNullOrEmpty(); + mappings.First().RequestMatcher.Should().NotBeNull(); + mappings.First().Provider.Should().NotBeNull(); + mappings.First().Guid.Should().Be(Guid.Parse(guid)); + mappings.First().Title.Should().BeNullOrEmpty(); server.Stop(); } @@ -213,7 +212,7 @@ public class WireMockServerAdminTests server.ReadStaticMappings(folder); var mappings = server.Mappings.ToArray(); - Check.That(mappings).HasSize(Constants.NumStaticMappings); + mappings.Should().HaveCount(Constants.NumStaticMappings); server.Stop(); } @@ -234,7 +233,7 @@ public class WireMockServerAdminTests server.ReadStaticMappings(Guid.NewGuid().ToString()); // Assert - Check.That(server.Mappings).HasSize(0); + server.Mappings.Should().HaveCount(0); // Verify loggerMock.Verify(l => l.Info(It.Is(s => s.StartsWith("The Static Mapping folder")), It.IsAny()), Times.Once); @@ -286,7 +285,7 @@ public class WireMockServerAdminTests .RespondWith(Response.Create().WithStatusCode(202).WithBody("2")); var mappings = server.Mappings.ToArray(); - Check.That(mappings).HasSize(2); + mappings.Should().HaveCount(2); server.Stop(); } @@ -301,7 +300,7 @@ public class WireMockServerAdminTests .RespondWith(Response.Create().WithStatusCode(201).WithBody("1")); var mappings = server.Mappings.ToArray(); - Check.That(mappings).HasSize(1); + mappings.Should().HaveCount(1); server.Stop(); } @@ -318,8 +317,8 @@ public class WireMockServerAdminTests .RespondWith(response1); var mappings1 = server.Mappings.ToArray(); - Check.That(mappings1).HasSize(1); - Check.That(mappings1.First().Guid).Equals(guid); + mappings1.Should().HaveCount(1); + mappings1.First().Guid.Should().Be(guid); var response2 = Response.Create().WithStatusCode(400); server.Given(Request.Create().WithPath("/2").UsingGet()) @@ -327,9 +326,9 @@ public class WireMockServerAdminTests .RespondWith(response2); var mappings2 = server.Mappings.ToArray(); - Check.That(mappings2).HasSize(1); - Check.That(mappings2.First().Guid).Equals(guid); - Check.That(mappings2.First().Provider).Equals(response2); + mappings2.Should().HaveCount(1); + mappings2.First().Guid.Should().Be(guid); + mappings2.First().Provider.Should().Be(response2); server.Stop(); } @@ -349,13 +348,13 @@ public class WireMockServerAdminTests .RespondWith(Response.Create().WithStatusCode(400)); var mappings = server.Mappings.ToArray(); - Check.That(mappings).HasSize(2); + mappings.Should().HaveCount(2); // when var response = await new HttpClient().GetAsync("http://localhost:" + server.Port + "/1", TestContext.Current.CancellationToken); // then - Check.That((int)response.StatusCode).IsEqualTo(400); + ((int)response.StatusCode).Should().Be(400); server.Stop(); } @@ -370,10 +369,10 @@ public class WireMockServerAdminTests await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo", TestContext.Current.CancellationToken); // then - Check.That(server.LogEntries).HasSize(1); + server.LogEntries.Should().HaveCount(1); var requestLogged = server.LogEntries.First(); - Check.That(requestLogged.RequestMessage.Method).IsEqualTo("GET"); - Check.That(requestLogged.RequestMessage.BodyData).IsNull(); + requestLogged.RequestMessage.Method.Should().Be("GET"); + requestLogged.RequestMessage.BodyData.Should().BeNull(); server.Stop(); } @@ -393,13 +392,13 @@ public class WireMockServerAdminTests await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo3", cancellationToken); // Assert - Check.That(server.LogEntries).HasSize(2); + server.LogEntries.Should().HaveCount(2); var requestLoggedA = server.LogEntries.First(); - Check.That(requestLoggedA.RequestMessage.Path).EndsWith("/foo2"); + requestLoggedA.RequestMessage.Path.Should().EndWith("/foo2"); var requestLoggedB = server.LogEntries.Last(); - Check.That(requestLoggedB.RequestMessage.Path).EndsWith("/foo3"); + requestLoggedB.RequestMessage.Path.Should().EndWith("/foo3"); server.Stop(); } @@ -528,15 +527,15 @@ public class WireMockServerAdminTests .AtPriority(2) .RespondWith(Response.Create().WithStatusCode(200)); - Check.That(server.MappingModels.Count()).Equals(3); + server.MappingModels.Count().Should().Be(3); var guid1 = server.MappingModels.ElementAt(0).Guid; var guid2 = server.MappingModels.ElementAt(1).Guid; var guid3 = server.MappingModels.ElementAt(2).Guid; - Check.That(guid1).IsNotNull(); - Check.That(guid2).IsNotNull(); - Check.That(guid3).IsNotNull(); + guid1.Should().NotBeNull(); + guid2.Should().NotBeNull(); + guid3.Should().NotBeNull(); string guidsJsonBody = $"[" + $"{{\"Guid\": \"{guid1}\"}}," + @@ -555,11 +554,11 @@ public class WireMockServerAdminTests // Assert var guids = server.MappingModels.Select(mapping => mapping.Guid!.Value).ToArray(); - Check.That(guids.Contains(guid1.Value)).IsFalse(); - Check.That(guids.Contains(guid2.Value)).IsFalse(); - Check.That(guids.Contains(guid3.Value)).IsTrue(); - Check.That(response.StatusCode).Equals(HttpStatusCode.OK); - Check.That(await response.Content.ReadAsStringAsync(cancelationToken)).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}"); + guids.Contains(guid1.Value).Should().BeFalse(); + guids.Contains(guid2.Value).Should().BeFalse(); + guids.Contains(guid3.Value).Should().BeTrue(); + response.StatusCode.Should().Be(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync(cancelationToken)).Should().Be($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}"); } #if NET5_0_OR_GREATER @@ -576,10 +575,10 @@ public class WireMockServerAdminTests await client.GetAsync($"{server.Url}/foo", cancelationToken); // Assert - Check.That(server.LogEntries).HasSize(1); + server.LogEntries.Should().HaveCount(1); var requestLogged = server.LogEntries.First(); - Check.That(requestLogged.RequestMessage.Method).IsEqualTo("GET"); - Check.That(requestLogged.RequestMessage.BodyData).IsNull(); + requestLogged.RequestMessage.Method.Should().Be("GET"); + requestLogged.RequestMessage.BodyData.Should().BeNull(); // Cleanup server.Stop(); @@ -599,10 +598,10 @@ public class WireMockServerAdminTests await client.GetAsync($"{server.Url}/foo", cancellationToken); // Assert - Check.That(server.LogEntries).HasSize(1); + server.LogEntries.Should().HaveCount(1); var requestLogged = server.LogEntries.First(); - Check.That(requestLogged.RequestMessage.Method).IsEqualTo("GET"); - Check.That(requestLogged.RequestMessage.BodyData).IsNull(); + requestLogged.RequestMessage.Method.Should().Be("GET"); + requestLogged.RequestMessage.BodyData.Should().BeNull(); // Cleanup server.Stop(); @@ -631,4 +630,6 @@ public class WireMockServerAdminTests server.Stop(); server.Dispose(); } -} \ No newline at end of file +} + + diff --git a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs index 75c89fe2..e188609a 100644 --- a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs +++ b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using AwesomeAssertions; using Moq; using WireMock.Handlers; using WireMock.Server; diff --git a/test/WireMock.Net.Tests/WireMockServer.Authentication.cs b/test/WireMock.Net.Tests/WireMockServer.Authentication.cs index 493e30c9..6fa3bd04 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Authentication.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Authentication.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; -using NFluent; using WireMock.Matchers; using WireMock.Owin; using WireMock.Server; @@ -21,9 +19,9 @@ namespace WireMock.Net.Tests // Assert var options = server.GetPrivateFieldValue("_options"); - Check.That(options.AuthenticationMatcher.Name).IsEqualTo("BasicAuthenticationMatcher"); - Check.That(options.AuthenticationMatcher.MatchBehaviour).IsEqualTo(MatchBehaviour.AcceptOnMatch); - Check.That(options.AuthenticationMatcher.GetPatterns()).ContainsExactly("^(?i)BASIC eDp5$"); + options.AuthenticationMatcher.Name.Should().Be("BasicAuthenticationMatcher"); + options.AuthenticationMatcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch); + options.AuthenticationMatcher.GetPatterns().Should().ContainSingle("^(?i)BASIC eDp5$"); server.Stop(); } @@ -57,9 +55,10 @@ namespace WireMock.Net.Tests // Assert var options = server.GetPrivateFieldValue("_options"); - Check.That(options.AuthenticationMatcher).IsNull(); + options.AuthenticationMatcher.Should().BeNull(); server.Stop(); } } -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs b/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs index 2ebb6162..04dfb1f7 100644 --- a/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs +++ b/test/WireMock.Net.Tests/WireMockServer.ImportWireMockOrg.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Server; namespace WireMock.Net.Tests diff --git a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs index 685a29d9..df28f611 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs @@ -4,9 +4,8 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using AwesomeAssertions; using Moq; -using NFluent; + using WireMock.Constants; using WireMock.Handlers; using WireMock.Matchers; @@ -51,8 +50,8 @@ public class WireMockServerProxyTests await httpClient.SendAsync(requestMessage, TestContext.Current.CancellationToken); // Assert - Check.That(server.Mappings).HasSize(2); - Check.That(server.LogEntries).HasSize(1); + server.Mappings.Should().HaveCount(2); + server.LogEntries.Should().HaveCount(1); } [Fact] @@ -347,9 +346,9 @@ public class WireMockServerProxyTests string content = await response.Content.ReadAsStringAsync(cancellationToken); // Assert - Check.That(server.Mappings).HasSize(1); - Check.That(server.LogEntries).HasSize(1); - Check.That(content).Contains("google"); + server.Mappings.Should().HaveCount(1); + server.LogEntries.Should().HaveCount(1); + content.Should().Contain("google"); server.Stop(); } @@ -389,13 +388,13 @@ public class WireMockServerProxyTests // Assert var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; - Check.That(receivedRequest.BodyData.BodyAsString).IsEqualTo("stringContent"); - Check.That(receivedRequest.Headers).ContainsKey("Content-Type"); - Check.That(receivedRequest.Headers["Content-Type"].First()).Contains("text/plain"); - Check.That(receivedRequest.Headers).ContainsKey("bbb"); + receivedRequest.BodyData.BodyAsString.Should().Be("stringContent"); + receivedRequest.Headers.Should().ContainKey("Content-Type"); + receivedRequest.Headers["Content-Type"].First().Should().Contain("text/plain"); + receivedRequest.Headers.Should().ContainKey("bbb"); // check that new proxied mapping is added - Check.That(server.Mappings).HasSize(2); + server.Mappings.Should().HaveCount(2); } [Fact] @@ -486,10 +485,10 @@ public class WireMockServerProxyTests // Assert var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); - Check.That(mapping).IsNotNull(); + mapping.Should().NotBeNull(); var matchers = ((Request)mapping.RequestMatcher).GetRequestMessageMatchers().Select(m => m.Name).ToList(); - Check.That(matchers).Not.Contains("excluded-header-X"); - Check.That(matchers).Contains("ok"); + matchers.Should().NotContain("excluded-header-X"); + matchers.Should().Contain("ok"); } [Fact] @@ -534,12 +533,12 @@ public class WireMockServerProxyTests // Assert var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); - Check.That(mapping).IsNotNull(); + mapping.Should().NotBeNull(); var matchers = ((Request)mapping.RequestMatcher).GetRequestMessageMatchers().Select(m => m.Name).ToList(); - Check.That(matchers).Not.Contains("ASP.NET_SessionId"); - Check.That(matchers).Not.Contains("AsP.NeT_SessIonID"); - Check.That(matchers).Contains("GoodCookie"); + matchers.Should().NotContain("ASP.NET_SessionId"); + matchers.Should().NotContain("AsP.NeT_SessIonID"); + matchers.Should().Contain("GoodCookie"); } [Fact] @@ -579,10 +578,10 @@ public class WireMockServerProxyTests // Assert var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); - Check.That(mapping).IsNotNull(); + mapping.Should().NotBeNull(); var matchers = ((Request)mapping.RequestMatcher).GetRequestMessageMatchers().Select(m => m.Key).ToList(); - Check.That(matchers).Not.Contains("timestamp"); - Check.That(matchers).Contains("name"); + matchers.Should().NotContain("timestamp"); + matchers.Should().Contain("name"); } [Fact] @@ -628,7 +627,7 @@ public class WireMockServerProxyTests // Assert var mapping = serverForProxyForwarding.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); var score = mapping!.RequestMatcher.GetMatchingScore(serverForProxyForwarding.LogEntries.First().RequestMessage!, new RequestMatchResult()); - Check.That(score).IsEqualTo(1.0); + score.Should().Be(1.0); } [Fact] @@ -659,9 +658,9 @@ public class WireMockServerProxyTests // Assert var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; - Check.That(receivedRequest.BodyData.BodyAsString).IsEqualTo(""); - Check.That(receivedRequest.Headers).ContainsKey("Content-Type"); - Check.That(receivedRequest.Headers["Content-Type"].First()).Contains("text/plain"); + receivedRequest.BodyData.BodyAsString.Should().Be(""); + receivedRequest.Headers.Should().ContainKey("Content-Type"); + receivedRequest.Headers["Content-Type"].First().Should().Contain("text/plain"); } [Fact] @@ -693,9 +692,9 @@ public class WireMockServerProxyTests // Assert string content = await response.Content.ReadAsStringAsync(cancellationToken); - Check.That(content).IsEqualTo("body"); - Check.That(response.Content.Headers.Contains("Content-Type")).IsTrue(); - Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain"); + content.Should().Be("body"); + response.Content.Headers.Contains("Content-Type").Should().BeTrue(); + response.Content.Headers.GetValues("Content-Type").Should().Equal(new[] { "text/plain" }); } [Fact] @@ -728,8 +727,8 @@ public class WireMockServerProxyTests var response = await httpClient.SendAsync(requestMessage, TestContext.Current.CancellationToken); // Assert - Check.That(response.Headers.Contains("Location")).IsTrue(); - Check.That(response.Headers.GetValues("Location")).ContainsExactly("/testpath"); + response.Headers.Contains("Location").Should().BeTrue(); + response.Headers.GetValues("Location").Should().Equal(new[] { "/testpath" }); } [Fact] @@ -761,8 +760,8 @@ public class WireMockServerProxyTests // then var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; - Check.That(receivedRequest.Cookies).IsNotNull(); - Check.That(receivedRequest.Cookies).ContainsPair("name", "value"); + receivedRequest.Cookies.Should().NotBeNull(); + receivedRequest.Cookies.Should().ContainKey("name").And.ContainValue("value"); } /// @@ -799,7 +798,7 @@ public class WireMockServerProxyTests var response = await httpClient.PostAsync(server.Urls[0], new ByteArrayContent(jpegHeader), TestContext.Current.CancellationToken); // assert - Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK); + response.StatusCode.Should().Be(HttpStatusCode.OK); } [Fact] @@ -831,8 +830,8 @@ public class WireMockServerProxyTests // Assert string content = await response.Content.ReadAsStringAsync(cancellationToken); - Check.That(content).IsEqualTo("{\"i\":42}"); - Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8"); + content.Should().Be("{\"i\":42}"); + response.Content.Headers.GetValues("Content-Type").Should().Equal(new[] { "application/json; charset=utf-8" }); } [Fact] @@ -863,7 +862,7 @@ public class WireMockServerProxyTests // Assert string content = await response.Content.ReadAsStringAsync(_ct); - Check.That(content).IsEqualTo("{\"i\":42}"); + content.Should().Be("{\"i\":42}"); } [Fact] @@ -898,7 +897,7 @@ public class WireMockServerProxyTests // Assert 1 string content1 = await response1.Content.ReadAsStringAsync(_ct); - Check.That(content1).IsEqualTo("ok"); + content1.Should().Be("ok"); // Act 2 var requestMessage2 = new HttpRequestMessage @@ -910,7 +909,7 @@ public class WireMockServerProxyTests // Assert 2 string content2 = await response2.Content.ReadAsStringAsync(_ct); - Check.That(content2).IsEqualTo("[]"); + content2.Should().Be("[]"); } // On Ubuntu latest it's : "Resource temporarily unavailable" @@ -947,4 +946,6 @@ public class WireMockServerProxyTests server.LogEntries.Should().HaveCount(1); server.Stop(); } -} \ No newline at end of file +} + + diff --git a/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs b/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs index e44d2457..da27e226 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs @@ -2,7 +2,6 @@ using System.Net; using System.Net.Http; -using NFluent; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; @@ -39,11 +38,13 @@ public class WireMockServerProxy2Tests var response = await httpClient.SendAsync(request, _ct); string content = await response.Content.ReadAsStringAsync(_ct); - Check.That(content).IsEqualTo("{\"p\":42}"); - Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.Created); - Check.That(response.Content.Headers.GetValues("Content-Type").First()).IsEqualTo("application/json"); + content.Should().Be("{\"p\":42}"); + response.StatusCode.Should().Be(HttpStatusCode.Created); + response.Content.Headers.GetValues("Content-Type").First().Should().Be("application/json"); server.Dispose(); serverAsProxy.Dispose(); } -} \ No newline at end of file +} + + diff --git a/test/WireMock.Net.Tests/WireMockServer.Settings.cs b/test/WireMock.Net.Tests/WireMockServer.Settings.cs index 1ab94dad..4e34a03b 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Settings.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Settings.cs @@ -1,8 +1,7 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using Moq; -using NFluent; + using WireMock.Authentication; using WireMock.Constants; using WireMock.Logging; @@ -67,7 +66,7 @@ public class WireMockServerSettingsTests // Assert var options = server.GetPrivateFieldValue("_options"); - Check.That(options.AuthenticationMatcher).IsNull(); + options.AuthenticationMatcher.Should().BeNull(); } [Fact] @@ -120,8 +119,8 @@ public class WireMockServerSettingsTests // Assert var mappings = server.Mappings.ToArray(); - Check.That(mappings.Count()).IsEqualTo(1); - Check.That(mappings[0].Priority).IsEqualTo(0); + mappings.Count().Should().Be(1); + mappings[0].Priority.Should().Be(0); } [Fact] @@ -136,7 +135,7 @@ public class WireMockServerSettingsTests // Assert var options = server.GetPrivateFieldValue("_options"); - Check.That(options.AllowPartialMapping).Equals(true); + options.AllowPartialMapping.Should().Be(true); // Verify _loggerMock.Verify(l => l.Info(It.IsAny(), It.IsAny())); @@ -154,7 +153,7 @@ public class WireMockServerSettingsTests // Assert var options = server.GetPrivateFieldValue("_options"); - Check.That(options.AllowBodyForAllHttpMethods).Equals(true); + options.AllowBodyForAllHttpMethods.Should().Be(true); // Verify _loggerMock.Verify(l => l.Info(It.Is(s => s.Contains("AllowBodyForAllHttpMethods") && s.Contains("True")))); @@ -172,7 +171,7 @@ public class WireMockServerSettingsTests // Assert var options = server.GetPrivateFieldValue("_options"); - Check.That(options.AllowOnlyDefinedHttpStatusCodeInResponse).Equals(true); + options.AllowOnlyDefinedHttpStatusCodeInResponse.Should().Be(true); // Verify _loggerMock.Verify(l => l.Info(It.Is(s => s.Contains("AllowOnlyDefinedHttpStatusCodeInResponse") && s.Contains("True")))); @@ -190,7 +189,7 @@ public class WireMockServerSettingsTests // Assert var options = server.GetPrivateFieldValue("_options"); - Check.That(options.RequestLogExpirationDuration).IsEqualTo(1); + options.RequestLogExpirationDuration.Should().Be(1); } #if NET6_0_OR_GREATER @@ -229,4 +228,5 @@ public class WireMockServerSettingsTests options.ActivityTracingOptions.Should().BeNull(); } #endif -} \ No newline at end of file +} + diff --git a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs index 625650bb..260a5444 100644 --- a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs +++ b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs @@ -2,7 +2,6 @@ using System.Net; using System.Net.Http; -using AwesomeAssertions; using Moq; using WireMock.Logging; using WireMock.Models; @@ -139,7 +138,7 @@ public class WireMockServerWebhookTests public async Task WireMockServer_WithWebhook_When_WebhookEndPointReturnsError_Should_LogWarning() { // Arrange - var serverReceivingTheWebhook = WireMockServer.Start(); + using var serverReceivingTheWebhook = WireMockServer.Start(); serverReceivingTheWebhook.Given(Request.Create().WithPath("/x").UsingPost()).RespondWith(Response.Create().WithBody("!Server Error!").WithStatusCode(500)); var loggerMock = new Mock(); @@ -150,7 +149,7 @@ public class WireMockServerWebhookTests // Act var guid = "942cb963-c9a3-4e9c-8e71-c1b26d2a4a05"; - var server = WireMockServer.Start(settings); + using var server = WireMockServer.Start(settings); server.Given(Request.Create().UsingPost()) .WithWebhook(new Webhook { @@ -188,9 +187,6 @@ public class WireMockServerWebhookTests serverReceivingTheWebhook.LogEntries.Should().HaveCount(1); serverReceivingTheWebhook.LogEntries.First().MappingGuid.Should().NotBeNull(); - - server.Dispose(); - serverReceivingTheWebhook.Dispose(); } [Fact] diff --git a/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs b/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs index f26d2d45..5f51a4b5 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs @@ -3,7 +3,6 @@ using System.Net; using System.Net.Http; using System.Security.Cryptography.X509Certificates; -using AwesomeAssertions; using WireMock.Net.Tests.Facts; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs index 867557e3..b6043d00 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Json; using System.Text; -using AwesomeAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs index a10fc4ea..e11d2717 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs @@ -2,7 +2,6 @@ using System.Net; using System.Net.Http; -using AwesomeAssertions; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Server; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithMultiPart.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithMultiPart.cs index cefee324..6bd26014 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithMultiPart.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithMultiPart.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using AwesomeAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs index c9c03b77..dce6f73d 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Net; -using AwesomeAssertions; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.Server; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs index 58504480..6d5d7b1b 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System.Net.Http; -using AwesomeAssertions; using WireMock.Server; namespace WireMock.Net.Tests; diff --git a/test/WireMock.Net.Tests/WireMockServerTests.cs b/test/WireMock.Net.Tests/WireMockServerTests.cs index 8be40b16..c6b863ae 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.cs @@ -7,9 +7,7 @@ using System.Net.Http.Headers; using System.Net.NetworkInformation; using System.Net.Sockets; using System.Text; -using AwesomeAssertions; using Newtonsoft.Json; -using NFluent; using WireMock.Admin.Mappings; using WireMock.Http; using WireMock.Matchers; @@ -76,7 +74,7 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) { // given string path = $"/foo_{Guid.NewGuid()}"; - var server = WireMockServer.Start(); + using var server = WireMockServer.Start(); server .Given(Request.Create() @@ -89,10 +87,9 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) server.ResetMappings(); // then - Check.That(server.Mappings).IsEmpty(); - Check.ThatCode(() => new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path)).ThrowsAny(); - - server.Stop(); + server.Mappings.Should().BeEmpty(); + Func action = () => new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); + action.Should().ThrowAsync(); } #if NET461_OR_GREATER || NET6_0_OR_GREATER @@ -280,7 +277,7 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) var response = await new HttpClient().GetStringAsync($"http://localhost:{server.Ports[0]}{path}", _ct); // Assert - Check.That(response).IsEqualTo("REDIRECT SUCCESSFUL"); + response.Should().Be("REDIRECT SUCCESSFUL"); server.Stop(); } @@ -401,7 +398,7 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) // var result = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/someurl?someQuery=someValue"); // // then - // Check.That(result).Contains("google"); + // result.Should().Contain("google"); //} [Fact] @@ -419,8 +416,8 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path, _ct); // Assert - Check.That(response.Headers.Contains("test")).IsTrue(); - Check.That(response.Headers.Contains("Transfer-Encoding")).IsFalse(); + response.Headers.Contains("test").Should().BeTrue(); + response.Headers.Contains("Transfer-Encoding").Should().BeFalse(); server.Stop(); } @@ -445,7 +442,6 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) response.Content.Headers.GetValues(HttpKnownHeaderNames.ContentLength).Should().Contain(length); } -#if !NET452 && !NET461 [Theory] [InlineData("TRACE")] [InlineData("GET")] @@ -470,11 +466,10 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) var response = await new HttpClient().SendAsync(request, _ct); // Assert - Check.That(response.StatusCode).Equals(HttpStatusCode.OK); + response.StatusCode.Should().Be(HttpStatusCode.OK); server.Stop(); } -#endif [Theory] [InlineData("POST")] @@ -504,7 +499,7 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) var response = await new HttpClient().SendAsync(request, _ct); // Assert - Check.That(response.StatusCode).Equals(HttpStatusCode.OK); + response.StatusCode.Should().Be(HttpStatusCode.OK); server.Stop(); } @@ -538,8 +533,8 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) var response = await new HttpClient().PostAsync($"{server.Url}/__admin/mappings", stringContent, _ct); // Assert - Check.That(response.StatusCode).Equals(HttpStatusCode.Created); - Check.That(await response.Content.ReadAsStringAsync(_ct)).Contains("Mapping added"); + response.StatusCode.Should().Be(HttpStatusCode.Created); + (await response.Content.ReadAsStringAsync(_ct)).Should().Contain("Mapping added"); server.Stop(); } @@ -571,12 +566,11 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) var response = await new HttpClient().PostAsync($"{server.Urls[0]}/foo", content, _ct); // Assert - Check.That(await response.Content.ReadAsStringAsync(_ct)).Contains("OK"); + (await response.Content.ReadAsStringAsync(_ct)).Should().Contain("OK"); server.Stop(); } -#if !NET452 [Fact] public async Task WireMockServer_Should_respond_to_ipv4_loopback() { @@ -594,7 +588,7 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) var response = await new HttpClient().GetStringAsync($"http://127.0.0.1:{server.Ports[0]}/foo", _ct); // Assert - Check.That(response).IsEqualTo("from ipv4 loopback"); + response.Should().Be("from ipv4 loopback"); server.Stop(); } @@ -616,7 +610,7 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) var response = await new HttpClient().GetStringAsync($"http://[::1]:{server.Ports[0]}/foo", _ct); // Assert - Check.That(response).IsEqualTo("from ipv6 loopback"); + response.Should().Be("from ipv6 loopback"); server.Stop(); } @@ -672,10 +666,12 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) public async Task WireMockServer_Using_JsonMapping_And_CustomMatcher_WithIncorrectParams_ShouldNotMatch() { // Arrange - var settings = new WireMockServerSettings(); - settings.WatchStaticMappings = true; - settings.WatchStaticMappingsInSubdirectories = true; - settings.CustomMatcherMappings = new Dictionary>(); + var settings = new WireMockServerSettings + { + WatchStaticMappings = true, + WatchStaticMappingsInSubdirectories = true, + CustomMatcherMappings = new Dictionary>() + }; settings.CustomMatcherMappings[nameof(CustomPathParamMatcher)] = matcherModel => { var matcherParams = JsonConvert.DeserializeObject((string)matcherModel.Pattern!)!; @@ -685,7 +681,7 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) ); }; - var server = WireMockServer.Start(settings); + using var server = WireMockServer.Start(settings); server.WithMapping(@"{ ""Request"": { ""Path"": { @@ -711,8 +707,5 @@ public partial class WireMockServerTests(ITestOutputHelper testOutputHelper) // Assert response.StatusCode.Should().Be(HttpStatusCode.NotFound); - - server.Stop(); } -#endif -} +} \ No newline at end of file diff --git a/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs b/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs index f0a00544..17b0ca1e 100644 --- a/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs +++ b/test/WireMock.Net.Tests/WithMapping/WireMockServerWithMappingTests.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using AwesomeAssertions; using WireMock.Admin.Mappings; using WireMock.Server;