diff --git a/build/dependencies.props b/build/dependencies.props index 953d1cc1aa..97d1862813 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,24 +4,24 @@ 2.1.0-preview2-15728 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 2.0.0 - 2.1.0-preview2-26225-03 - 2.1.0-preview2-30272 + 2.1.0-preview2-26308-01 + 2.1.0-preview2-30281 15.6.0 4.7.49 0.8.0 diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs index 46c7fb46d3..4ffd70b745 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs @@ -65,47 +65,29 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests public async Task WriteAsync_IsPassedToUnderlyingStream_WhenDisableResponseBuffering(bool flushable) { var buffer = new byte[] { 1 }; - byte[] written = null; - var mock = new Mock(); - mock.SetupGet(s => s.CanWrite).Returns(true); - mock.Setup(s => s.WriteAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Callback((b, o, c, t) => - { - written = new ArraySegment(b, 0, c).ToArray(); - }) - .Returns(Task.FromResult(0)); - - var stream = new BodyWrapperStream(new DefaultHttpContext(), mock.Object, new MockResponseCompressionProvider(flushable), null, null); + var memoryStream = new MemoryStream(); + var stream = new BodyWrapperStream(new DefaultHttpContext(), memoryStream, new MockResponseCompressionProvider(flushable), null, null); stream.DisableResponseBuffering(); await stream.WriteAsync(buffer, 0, buffer.Length); - Assert.Equal(buffer, written); + Assert.Equal(buffer, memoryStream.ToArray()); } [Fact] public async Task SendFileAsync_IsPassedToUnderlyingStream_WhenDisableResponseBuffering() { - byte[] written = null; + var memoryStream = new MemoryStream(); - var mock = new Mock(); - mock.SetupGet(s => s.CanWrite).Returns(true); - mock.Setup(s => s.WriteAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Callback((b, o, c, t) => - { - written = new ArraySegment(b, 0, c).ToArray(); - }) - .Returns(Task.FromResult(0)); - - var stream = new BodyWrapperStream(new DefaultHttpContext(), mock.Object, new MockResponseCompressionProvider(true), null, null); + var stream = new BodyWrapperStream(new DefaultHttpContext(), memoryStream, new MockResponseCompressionProvider(true), null, null); stream.DisableResponseBuffering(); var path = "testfile1kb.txt"; await stream.SendFileAsync(path, 0, null, CancellationToken.None); - Assert.Equal(File.ReadAllBytes(path), written); + Assert.Equal(File.ReadAllBytes(path), memoryStream.ToArray()); } [Theory] @@ -114,23 +96,15 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests public void BeginWrite_IsPassedToUnderlyingStream_WhenDisableResponseBuffering(bool flushable) { var buffer = new byte[] { 1 }; - byte[] written = null; - var mock = new Mock(); - mock.SetupGet(s => s.CanWrite).Returns(true); - mock.Setup(s => s.WriteAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Callback((b, o, c, t) => - { - written = new ArraySegment(b, 0, c).ToArray(); - }) - .Returns(Task.FromResult(0)); + var memoryStream = new MemoryStream(); - var stream = new BodyWrapperStream(new DefaultHttpContext(), mock.Object, new MockResponseCompressionProvider(flushable), null, null); + var stream = new BodyWrapperStream(new DefaultHttpContext(), memoryStream, new MockResponseCompressionProvider(flushable), null, null); stream.DisableResponseBuffering(); stream.BeginWrite(buffer, 0, buffer.Length, (o) => {}, null); - Assert.Equal(buffer, written); + Assert.Equal(buffer, memoryStream.ToArray()); } private class MockResponseCompressionProvider: IResponseCompressionProvider