This commit is contained in:
Stef Heyenrath
2026-02-21 17:21:18 +01:00
parent 43a26ec4bc
commit 43be85a88a
27 changed files with 306 additions and 281 deletions

View File

@@ -1,5 +1,6 @@
// Copyright © WireMock.Net
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using AwesomeAssertions;
@@ -9,6 +10,8 @@ namespace WireMock.Net.Tests.Http;
public class ByteArrayContentHelperTests
{
private readonly CancellationToken _ct = TestContext.Current.CancellationToken;
[Fact]
public async Task ByteArrayContentHelperTests_Create_WithNullContentType()
{
@@ -20,7 +23,7 @@ public class ByteArrayContentHelperTests
// Assert
result.Headers.ContentType.Should().BeNull();
(await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content);
(await result.ReadAsByteArrayAsync(_ct)).Should().BeEquivalentTo(content);
}
[Theory]
@@ -37,7 +40,7 @@ public class ByteArrayContentHelperTests
var result = ByteArrayContentHelper.Create(content, contentType);
// Assert
result.Headers.ContentType.ToString().Should().Be(expected);
(await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content);
result.Headers.ContentType?.ToString().Should().Be(expected);
(await result.ReadAsByteArrayAsync(_ct)).Should().BeEquivalentTo(content);
}
}

View File

@@ -1,5 +1,6 @@
// Copyright © WireMock.Net
using System.Net.Http;
using System.Text;
using AwesomeAssertions;
using NFluent;
@@ -14,6 +15,8 @@ public class HttpRequestMessageHelperTests
{
private const string ClientIp = "::1";
private readonly CancellationToken _ct = TestContext.Current.CancellationToken;
[Fact]
public void HttpRequestMessageHelper_Create()
{
@@ -43,7 +46,7 @@ public class HttpRequestMessageHelperTests
var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert
Check.That(await message.Content!.ReadAsByteArrayAsync()).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
Check.That(await message.Content!.ReadAsByteArrayAsync(_ct)).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
}
[Fact]
@@ -61,7 +64,7 @@ public class HttpRequestMessageHelperTests
var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert
Check.That(await message.Content!.ReadAsStringAsync()).Equals("0123");
Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("0123");
}
[Fact]
@@ -79,7 +82,7 @@ public class HttpRequestMessageHelperTests
var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert
Check.That(await message.Content!.ReadAsStringAsync()).Equals("{\"x\":42}");
Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("{\"x\":42}");
}
[Fact]
@@ -98,7 +101,7 @@ public class HttpRequestMessageHelperTests
var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert
Check.That(await message.Content!.ReadAsStringAsync()).Equals("{\"x\":42}");
Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("{\"x\":42}");
Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json");
}
@@ -118,7 +121,7 @@ public class HttpRequestMessageHelperTests
var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert
Check.That(await message.Content!.ReadAsStringAsync()).Equals("{\"x\":42}");
Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("{\"x\":42}");
Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
}
@@ -139,7 +142,7 @@ public class HttpRequestMessageHelperTests
var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert
Check.That(await message.Content!.ReadAsStringAsync()).Equals("{\"x\":42}");
Check.That(await message.Content!.ReadAsStringAsync(_ct)).Equals("{\"x\":42}");
Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("multipart/form-data");
}
@@ -239,7 +242,7 @@ public class HttpRequestMessageHelperTests
var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert
Check.That(await message.Content!.ReadAsStringAsync()).Equals(body);
(await message.Content!.ReadAsStringAsync(_ct)).Should().Be(body);
Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("multipart/form-data");
}

View File

@@ -1,5 +1,6 @@
// Copyright © WireMock.Net
using System.Net.Http;
using System.Net.Http.Headers;
using AwesomeAssertions;
using WireMock.Http;
@@ -8,15 +9,17 @@ namespace WireMock.Net.Tests.Http;
public class StringContentHelperTests
{
private readonly CancellationToken _ct = TestContext.Current.CancellationToken;
[Fact]
public void StringContentHelper_Create_WithNullContentType()
public async Task StringContentHelper_Create_WithNullContentType()
{
// Act
var result = StringContentHelper.Create("test", null);
// Assert
result.Headers.ContentType.Should().BeNull();
result.ReadAsStringAsync().Result.Should().Be("test");
(await result.ReadAsStringAsync(_ct)).Should().Be("test");
}
[Theory]
@@ -24,7 +27,7 @@ public class StringContentHelperTests
[InlineData("application/soap+xml", "application/soap+xml")]
[InlineData("application/soap+xml;charset=UTF-8", "application/soap+xml; charset=UTF-8")]
[InlineData("application/soap+xml;charset=UTF-8;action=\"http://myCompany.Customer.Contract/ICustomerService/GetSomeConfiguration\"", "application/soap+xml; charset=UTF-8; action=\"http://myCompany.Customer.Contract/ICustomerService/GetSomeConfiguration\"")]
public void StringContentHelper_Create(string test, string expected)
public async Task StringContentHelper_Create(string test, string expected)
{
// Arrange
var contentType = MediaTypeHeaderValue.Parse(test);
@@ -33,7 +36,7 @@ public class StringContentHelperTests
var result = StringContentHelper.Create("test", contentType);
// Assert
result.Headers.ContentType.ToString().Should().Be(expected);
result.ReadAsStringAsync().Result.Should().Be("test");
result.Headers.ContentType?.ToString().Should().Be(expected);
(await result.ReadAsStringAsync(_ct)).Should().Be("test");
}
}