Skip to content

Fix non-seekable stream reading. #1316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimBobSquarePants merged 11 commits into from
Aug 21, 2020
Merged

Fix non-seekable stream reading. #1316

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9207bab
Fix non-seekable stream reading.
JimBobSquarePants Aug 16, 2020
a971304
Update ChunkedMemoryStream.cs
JimBobSquarePants Aug 16, 2020
822637b
More tests and remove old stream
JimBobSquarePants Aug 17, 2020
9097a0a
Add WriteByteTests
JimBobSquarePants Aug 17, 2020
399cfc2
Add optimized Read(Span) API
JimBobSquarePants Aug 19, 2020
cd32a60
Optimize Write(Span)
JimBobSquarePants Aug 19, 2020
24780c5
Increase chunk size, add benchmarks and write span tests
JimBobSquarePants Aug 19, 2020
5aa9158
Add lightweight integration tests.
JimBobSquarePants Aug 19, 2020
6f40e43
heavyweight integration test
antonfirsov Aug 19, 2020
a4f63d7
Fix read count.
JimBobSquarePants Aug 19, 2020
582000d
Use TestProvider to load images
JimBobSquarePants Aug 21, 2020
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
Prev Previous commit
Next Next commit
heavyweight integration test
  • Loading branch information
@antonfirsov
antonfirsov committed Aug 19, 2020
commit 6f40e43837e38da06a3bccd344c4166c66453ec0
39 changes: 39 additions & 0 deletions tests/ImageSharp.Tests/IO/ChunkedMemoryStreamTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using SixLabors.ImageSharp.IO;
using SixLabors.ImageSharp.Memory;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
using Xunit;

namespace SixLabors.ImageSharp.Tests.IO
Expand Down Expand Up @@ -294,6 +297,42 @@ public void CopyTo(Stream source, byte[] expected)
Assert.Equal(expected, destination.ToArray());
}

public static TheoryData<string> GetAllTestImages()
{
IEnumerable<string> allImageFiles = Directory.EnumerateFiles(TestEnvironment.InputImagesDirectoryFullPath, "*.*", SearchOption.AllDirectories)
.Where(s => !s.ToLower().EndsWith("txt"));
var result = new TheoryData<string>();
foreach (string path in allImageFiles)
{
result.Add(path);
}

return result;
}

[Theory]
[MemberData(nameof(GetAllTestImages))]
public void DecoderIntegrationTest(string testFileFullPath)
{
Image<Rgba32> expected = null;
try
{
expected = Image.Load<Rgba32>(testFileFullPath);

@antonfirsov antonfirsov Aug 20, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it's my code, but if we leave all tests, on this line I would really like to replace Image.Load with TestFile stuff now to make the tests at least a bit faster by utilizing it's caching mechanism. Would do it, but I'm on a train now, may try later, if you also lack time.

@JimBobSquarePants JimBobSquarePants Aug 21, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated it to use the provider.

}
catch
{
// The image is invalid
return;
}

using FileStream fs = File.OpenRead(testFileFullPath);
using NonSeekableStream nonSeekableStream = new NonSeekableStream(fs);

var actual = Image.Load<Rgba32>(nonSeekableStream);

ImageComparer.Exact.VerifySimilarity(expected, actual);
}

public static IEnumerable<object[]> CopyToData()
{
// Stream is positioned @ beginning of data
Expand Down