Browse Source

Fix unit tests

pull/2006/head
Dan Kroymann 4 years ago
parent
commit
2ee0c6e421
  1. 19
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
  2. 4
      tests/ImageSharp.Tests/Image/ImageTests.ImageLoadTestBase.cs

19
tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

@ -139,27 +139,16 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
Assert.IsType<InvalidMemoryOperationException>(ex.InnerException);
}
[Theory]
[InlineData(0)]
[InlineData(0.5)]
[InlineData(0.9)]
public async Task DecodeAsync_IsCancellable(int percentageOfStreamReadToCancel)
[Fact]
public async Task DecodeAsync_IsCancellable()
{
var cts = new CancellationTokenSource();
string file = Path.Combine(TestEnvironment.InputImagesDirectoryFullPath, TestImages.Jpeg.Baseline.Jpeg420Small);
using var pausedStream = new PausedStream(file);
pausedStream.OnWaiting(s =>
{
if (s.Position >= s.Length * percentageOfStreamReadToCancel)
{
cts.Cancel();
pausedStream.Release();
}
else
{
// allows this/next wait to unblock
pausedStream.Next();
}
cts.Cancel();
pausedStream.Release();
});
var config = Configuration.CreateDefaultInstance();

4
tests/ImageSharp.Tests/Image/ImageTests.ImageLoadTestBase.cs

@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.Tests
this.localDecoder = detector.As<IImageDecoder>();
this.localDecoder.Setup(x => x.Decode<Rgba32>(It.IsAny<Configuration>(), It.IsAny<Stream>(), It.IsAny<CancellationToken>()))
.Callback<Configuration, Stream>((c, s) =>
.Callback<Configuration, Stream, CancellationToken>((c, s, ct) =>
{
using (var ms = new MemoryStream())
{
@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Tests
.Returns(this.localStreamReturnImageRgba32);
this.localDecoder.Setup(x => x.Decode(It.IsAny<Configuration>(), It.IsAny<Stream>(), It.IsAny<CancellationToken>()))
.Callback<Configuration, Stream>((c, s) =>
.Callback<Configuration, Stream, CancellationToken>((c, s, ct) =>
{
using (var ms = new MemoryStream())
{

Loading…
Cancel
Save