Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,8 @@ public async Task SendFileAsync_FirstWrite_CompressesAndFlushes()

var response = await client.SendAsync(request);

CheckResponseCompressed(response, expectedBodyLength: 34, expectedEncoding: "gzip");
var expectedBody = File.ReadAllBytes("testfile1kb.txt");
await CheckGzipResponseCompressed(response, expectedBody);

Assert.False(fakeSendFile.SendFileInvoked);
}
Expand Down Expand Up @@ -1164,7 +1165,11 @@ public async Task SendFileAsync_AfterFirstWrite_CompressesAndFlushes()

var response = await client.SendAsync(request);

CheckResponseCompressed(response, expectedBodyLength: 46, expectedEncoding: "gzip");
var fileBody = File.ReadAllBytes("testfile1kb.txt");
var expectedBody = new byte[100 + fileBody.Length];
Array.Fill(expectedBody, (byte)'a', 0, 100);
fileBody.CopyTo(expectedBody, 100);
await CheckGzipResponseCompressed(response, expectedBody);

Assert.False(fakeSendFile.SendFileInvoked);
}
Expand Down Expand Up @@ -1287,6 +1292,24 @@ public async Task Dispose_SyncWriteOrFlushNotCalled(string encoding)
}

private static void CheckResponseCompressed(HttpResponseMessage response, long? expectedBodyLength, string expectedEncoding)
{
CheckResponseCompressedHeaders(response, expectedEncoding);
Assert.Equal(expectedBodyLength, response.Content.Headers.ContentLength);
}

private static async Task CheckGzipResponseCompressed(HttpResponseMessage response, byte[] expectedBody)
{
CheckResponseCompressedHeaders(response, "gzip");

using var compressedBody = await response.Content.ReadAsStreamAsync();
using var gzipBody = new GZipStream(compressedBody, CompressionMode.Decompress);
using var decompressedBody = new MemoryStream();
await gzipBody.CopyToAsync(decompressedBody);

Assert.Equal(expectedBody, decompressedBody.ToArray());
}

private static void CheckResponseCompressedHeaders(HttpResponseMessage response, string expectedEncoding)
{
var containsVaryAcceptEncoding = false;
foreach (var value in response.Headers.GetValues(HeaderNames.Vary))
Expand All @@ -1300,7 +1323,6 @@ private static void CheckResponseCompressed(HttpResponseMessage response, long?
Assert.True(containsVaryAcceptEncoding);
Assert.False(response.Content.Headers.TryGetValues(HeaderNames.ContentMD5, out _));
Assert.Single(response.Content.Headers.ContentEncoding, expectedEncoding);
Assert.Equal(expectedBodyLength, response.Content.Headers.ContentLength);
}

private static void CheckResponseNotCompressed(HttpResponseMessage response, long? expectedBodyLength, bool sendVaryHeader)
Expand Down
Loading