tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Attempt to fix equality match in identify tests

pull/2317/head
James Jackson-South 4 years ago
parent
250d73a9f5
commit
ff4731abea
2 changed files with 16 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      tests/ImageSharp.Tests/Image/ImageTests.Identify.cs
  2. 18
      tests/ImageSharp.Tests/Image/ImageTests.ImageLoadTestBase.cs

22
tests/ImageSharp.Tests/Image/ImageTests.Identify.cs
View File

@ -21,12 +21,6 @@ public partial class ImageTests
private static byte[] ActualImageBytes => TestFile.Create(TestImages.Bmp.F).Bytes; private static byte[] ActualImageBytes => TestFile.Create(TestImages.Bmp.F).Bytes;
private ImageInfo LocalImageInfo => new(
this.localImageInfoMock.Object.PixelType,
this.localImageInfoMock.Object.Width,
this.localImageInfoMock.Object.Height,
this.localImageInfoMock.Object.Metadata);
private IImageFormat LocalImageFormat => this.localImageFormatMock.Object; private IImageFormat LocalImageFormat => this.localImageFormatMock.Object;
private static IImageFormat ExpectedGlobalFormat private static IImageFormat ExpectedGlobalFormat
@ -61,7 +55,7 @@ public partial class ImageTests
[Fact] [Fact]
public void FromFileSystemPath_GlobalConfiguration() public void FromFileSystemPath_GlobalConfiguration()
{ {
ImageInfo info = Image.Identify(ActualImagePath, out IImageFormat type); ImageInfo info = Image.TryIdentify(ActualImagePath, out IImageFormat type);
Assert.NotNull(info); Assert.NotNull(info);
Assert.Equal(ExpectedGlobalFormat, type); Assert.Equal(ExpectedGlobalFormat, type);
@ -136,7 +130,7 @@ public partial class ImageTests
{ {
DecoderOptions options = new() { Configuration = this.LocalConfiguration }; DecoderOptions options = new() { Configuration = this.LocalConfiguration };
ImageInfo info = Image.Identify(options, this.DataStream); ImageInfo info = Image.TryIdentify(options, this.DataStream);
Assert.Equal(this.LocalImageInfo, info); Assert.Equal(this.LocalImageInfo, info);
} }
@ -190,7 +184,7 @@ public partial class ImageTests
{ {
using var stream = new MemoryStream(ActualImageBytes); using var stream = new MemoryStream(ActualImageBytes);
var asyncStream = new AsyncStreamWrapper(stream, () => false); var asyncStream = new AsyncStreamWrapper(stream, () => false);
(ImageInfo ImageInfo, IImageFormat Format) res = await Image.IdentifyWithFormatAsync(asyncStream); (ImageInfo ImageInfo, IImageFormat Format) res = await Image.TryIdentifyAsync(asyncStream);
Assert.Equal(ExpectedImageSize, res.ImageInfo.Size()); Assert.Equal(ExpectedImageSize, res.ImageInfo.Size());
Assert.Equal(ExpectedGlobalFormat, res.Format); Assert.Equal(ExpectedGlobalFormat, res.Format);
@ -215,7 +209,7 @@ public partial class ImageTests
using var nonSeekableStream = new NonSeekableStream(stream); using var nonSeekableStream = new NonSeekableStream(stream);
var asyncStream = new AsyncStreamWrapper(nonSeekableStream, () => false); var asyncStream = new AsyncStreamWrapper(nonSeekableStream, () => false);
(ImageInfo ImageInfo, IImageFormat Format) res = await Image.IdentifyWithFormatAsync(asyncStream); (ImageInfo ImageInfo, IImageFormat Format) res = await Image.TryIdentifyAsync(asyncStream);
Assert.Equal(ExpectedImageSize, res.ImageInfo.Size()); Assert.Equal(ExpectedImageSize, res.ImageInfo.Size());
Assert.Equal(ExpectedGlobalFormat, res.Format); Assert.Equal(ExpectedGlobalFormat, res.Format);
@ -259,7 +253,7 @@ public partial class ImageTests
DecoderOptions options = new() { Configuration = this.LocalConfiguration }; DecoderOptions options = new() { Configuration = this.LocalConfiguration };
(ImageInfo ImageInfo, IImageFormat Format) info = (ImageInfo ImageInfo, IImageFormat Format) info =
await Image.IdentifyWithFormatAsync(options, this.MockFilePath); await Image.TryIdentifyAsync(options, this.MockFilePath);
Assert.NotNull(info.ImageInfo); Assert.NotNull(info.ImageInfo);
Assert.Equal(this.LocalImageFormat, info.Format); Assert.Equal(this.LocalImageFormat, info.Format);
} }
@ -267,7 +261,7 @@ public partial class ImageTests
[Fact] [Fact]
public async Task IdentifyWithFormatAsync_FromPath_GlobalConfiguration() public async Task IdentifyWithFormatAsync_FromPath_GlobalConfiguration()
{ {
(ImageInfo ImageInfo, IImageFormat Format) res = await Image.IdentifyWithFormatAsync(ActualImagePath); (ImageInfo ImageInfo, IImageFormat Format) res = await Image.TryIdentifyAsync(ActualImagePath);
Assert.Equal(ExpectedImageSize, res.ImageInfo.Size()); Assert.Equal(ExpectedImageSize, res.ImageInfo.Size());
Assert.Equal(ExpectedGlobalFormat, res.Format); Assert.Equal(ExpectedGlobalFormat, res.Format);
@ -288,7 +282,7 @@ public partial class ImageTests
var asyncStream = new AsyncStreamWrapper(this.DataStream, () => false); var asyncStream = new AsyncStreamWrapper(this.DataStream, () => false);
(ImageInfo ImageInfo, IImageFormat Format) (ImageInfo ImageInfo, IImageFormat Format)
info = await Image.IdentifyWithFormatAsync(options, asyncStream); info = await Image.TryIdentifyAsync(options, asyncStream);
Assert.Equal(this.LocalImageInfo, info.ImageInfo); Assert.Equal(this.LocalImageInfo, info.ImageInfo);
Assert.Equal(this.LocalImageFormat, info.Format); Assert.Equal(this.LocalImageFormat, info.Format);
@ -301,7 +295,7 @@ public partial class ImageTests
var asyncStream = new AsyncStreamWrapper(this.DataStream, () => false); var asyncStream = new AsyncStreamWrapper(this.DataStream, () => false);
(ImageInfo ImageInfo, IImageFormat Format) (ImageInfo ImageInfo, IImageFormat Format)
info = await Image.IdentifyWithFormatAsync(options, asyncStream); info = await Image.TryIdentifyAsync(options, asyncStream);
Assert.Null(info.ImageInfo); Assert.Null(info.ImageInfo);
} }

18
tests/ImageSharp.Tests/Image/ImageTests.ImageLoadTestBase.cs
View File

@ -51,6 +51,12 @@ public partial class ImageTests
protected byte[] ByteArray => ((MemoryStream)this.DataStream).ToArray(); protected byte[] ByteArray => ((MemoryStream)this.DataStream).ToArray();
protected ImageInfo LocalImageInfo => new(
this.localImageInfoMock.Object.PixelType,
this.localImageInfoMock.Object.Width,
this.localImageInfoMock.Object.Height,
this.localImageInfoMock.Object.Metadata);
protected ImageLoadTestBase() protected ImageLoadTestBase()
{ {
this.localStreamReturnImageRgba32 = new Image<Rgba32>(1, 1); this.localStreamReturnImageRgba32 = new Image<Rgba32>(1, 1);
@ -61,18 +67,10 @@ public partial class ImageTests
this.localDecoder = new Mock<IImageDecoder>(); this.localDecoder = new Mock<IImageDecoder>();
this.localDecoder.Setup(x => x.Identify(It.IsAny<DecoderOptions>(), It.IsAny<Stream>())) this.localDecoder.Setup(x => x.Identify(It.IsAny<DecoderOptions>(), It.IsAny<Stream>()))
.Returns(() => .Returns(this.LocalImageInfo);
{
IImageInfo info = this.localImageInfoMock.Object;
return new ImageInfo(info.PixelType, info.Width, info.Height, info.Metadata);
});
this.localDecoder.Setup(x => x.IdentifyAsync(It.IsAny<DecoderOptions>(), It.IsAny<Stream>(), It.IsAny<CancellationToken>())) this.localDecoder.Setup(x => x.IdentifyAsync(It.IsAny<DecoderOptions>(), It.IsAny<Stream>(), It.IsAny<CancellationToken>()))
.Returns(() => .Returns(Task.FromResult(this.LocalImageInfo));
{
IImageInfo info = this.localImageInfoMock.Object;
return Task.FromResult(new ImageInfo(info.PixelType, info.Width, info.Height, info.Metadata));
});
this.localDecoder this.localDecoder
.Setup(x => x.Decode<Rgba32>(It.IsAny<DecoderOptions>(), It.IsAny<Stream>())) .Setup(x => x.Decode<Rgba32>(It.IsAny<DecoderOptions>(), It.IsAny<Stream>()))

Write Preview
Loading…
Cancel
Save