From 60e0b7f04b976a9f99328ac7b884fa1369402dd1 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Mon, 14 Aug 2017 03:48:33 +0200 Subject: [PATCH] moving images again --- .gitignore | 4 ++-- .../Processors/Transforms/ResizeTests.cs | 22 +++++-------------- .../TestUtilities/TestEnvironment.cs | 12 +++++----- .../{TestImages => Images}/Input/Bmp/Car.bmp | 0 tests/{TestImages => Images}/Input/Bmp/F.bmp | 0 .../Input/Bmp/neg_height.bmp | 0 .../Input/Gif/cheers.gif | 0 .../Input/Gif/giphy.gif | 0 .../Input/Gif/rings.gif | 0 .../Input/Gif/trans.gif | 0 .../Input/Jpg/baseline/Calliphora.jpg | 0 .../Input/Jpg/baseline/ExifUndefType.jpg | 0 .../Input/Jpg/baseline/Floorplan.jpg | 0 .../Input/Jpg/baseline/Hiyamugi.jpg | 0 .../Input/Jpg/baseline/Lake.jpg | 0 .../Input/Jpg/baseline/Snake.jpg | 0 .../Input/Jpg/baseline/badeof.jpg | 0 .../Input/Jpg/baseline/cmyk.jpg | 0 .../Input/Jpg/baseline/exif.jpg | 0 .../Jpg/baseline/gamma_dalai_lama_gray.jpg | 0 .../Input/Jpg/baseline/jpeg400jfif.jpg | 0 .../Input/Jpg/baseline/jpeg420exif.jpg | 0 .../Input/Jpg/baseline/jpeg444.jpg | 0 .../Input/Jpg/baseline/testimgint.jpg | 0 .../Input/Jpg/baseline/testorig.jpg | 0 .../Input/Jpg/baseline/turtle.jpg | 0 .../Input/Jpg/baseline/ycck.jpg | 0 .../Jpg/progressive/BadEofProgressive.jpg | 0 .../Input/Jpg/progressive/Festzug.jpg | 0 .../Input/Jpg/progressive/fb.jpg | 0 .../Input/Jpg/progressive/progress.jpg | 0 .../Input/Png/CalliphoraPartial.png | 0 .../{TestImages => Images}/Input/Png/blur.png | 0 .../Input/Png/chunklength1.png | 0 .../Input/Png/chunklength2.png | 0 .../Input/Png/cross.png | 0 .../Input/Png/filter0.png | 0 .../Input/Png/filter1.png | 0 .../Input/Png/filter2.png | 0 .../Input/Png/filter3.png | 0 .../Input/Png/filter4.png | 0 .../Input/Png/filterVar.png | 0 .../Input/Png/indexed.png | 0 .../Input/Png/interlaced.png | 0 tests/{TestImages => Images}/Input/Png/pd.png | 0 tests/{TestImages => Images}/Input/Png/pl.png | 0 tests/{TestImages => Images}/Input/Png/pp.png | 0 .../Input/Png/rgb-48bpp-interlaced.png | 0 .../Input/Png/rgb-48bpp.png | 0 .../Input/Png/splash-interlaced.png | 0 .../Input/Png/splash.png | 0 .../Input/Png/versioning-1_1.png | 0 .../Input/Png/versioning-1_2.png | 0 .../Input/Png/vim16x16_1.png | 0 .../Input/Png/vim16x16_2.png | 0 55 files changed, 14 insertions(+), 24 deletions(-) rename tests/{TestImages => Images}/Input/Bmp/Car.bmp (100%) rename tests/{TestImages => Images}/Input/Bmp/F.bmp (100%) rename tests/{TestImages => Images}/Input/Bmp/neg_height.bmp (100%) rename tests/{TestImages => Images}/Input/Gif/cheers.gif (100%) rename tests/{TestImages => Images}/Input/Gif/giphy.gif (100%) rename tests/{TestImages => Images}/Input/Gif/rings.gif (100%) rename tests/{TestImages => Images}/Input/Gif/trans.gif (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/Calliphora.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/ExifUndefType.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/Floorplan.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/Hiyamugi.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/Lake.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/Snake.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/badeof.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/cmyk.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/exif.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/gamma_dalai_lama_gray.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/jpeg400jfif.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/jpeg420exif.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/jpeg444.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/testimgint.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/testorig.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/turtle.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/baseline/ycck.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/progressive/BadEofProgressive.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/progressive/Festzug.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/progressive/fb.jpg (100%) rename tests/{TestImages => Images}/Input/Jpg/progressive/progress.jpg (100%) rename tests/{TestImages => Images}/Input/Png/CalliphoraPartial.png (100%) rename tests/{TestImages => Images}/Input/Png/blur.png (100%) rename tests/{TestImages => Images}/Input/Png/chunklength1.png (100%) rename tests/{TestImages => Images}/Input/Png/chunklength2.png (100%) rename tests/{TestImages => Images}/Input/Png/cross.png (100%) rename tests/{TestImages => Images}/Input/Png/filter0.png (100%) rename tests/{TestImages => Images}/Input/Png/filter1.png (100%) rename tests/{TestImages => Images}/Input/Png/filter2.png (100%) rename tests/{TestImages => Images}/Input/Png/filter3.png (100%) rename tests/{TestImages => Images}/Input/Png/filter4.png (100%) rename tests/{TestImages => Images}/Input/Png/filterVar.png (100%) rename tests/{TestImages => Images}/Input/Png/indexed.png (100%) rename tests/{TestImages => Images}/Input/Png/interlaced.png (100%) rename tests/{TestImages => Images}/Input/Png/pd.png (100%) rename tests/{TestImages => Images}/Input/Png/pl.png (100%) rename tests/{TestImages => Images}/Input/Png/pp.png (100%) rename tests/{TestImages => Images}/Input/Png/rgb-48bpp-interlaced.png (100%) rename tests/{TestImages => Images}/Input/Png/rgb-48bpp.png (100%) rename tests/{TestImages => Images}/Input/Png/splash-interlaced.png (100%) rename tests/{TestImages => Images}/Input/Png/splash.png (100%) rename tests/{TestImages => Images}/Input/Png/versioning-1_1.png (100%) rename tests/{TestImages => Images}/Input/Png/versioning-1_2.png (100%) rename tests/{TestImages => Images}/Input/Png/vim16x16_1.png (100%) rename tests/{TestImages => Images}/Input/Png/vim16x16_2.png (100%) diff --git a/.gitignore b/.gitignore index c100810602..d86aa024d3 100644 --- a/.gitignore +++ b/.gitignore @@ -202,8 +202,8 @@ FakesAssemblies/ **/node_modules **/node_modules/* -**/TestImages/ActualOutput -**/TestImages/ReferenceOutput +**/Images/ActualOutput +**/Images/ReferenceOutput # ASP.NET 5 project.lock.json diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs index 0fc4242958..79e3521bcd 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs @@ -31,13 +31,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms { "RobidouxSharp", new RobidouxSharpResampler() }, { "Welch", new WelchResampler() } }; - - public static readonly TheoryData JustBicubicResampler = - new TheoryData - { - { "Bicubic", new BicubicResampler() }, - }; - + [Theory] [WithFile(TestImages.Gif.Giphy, DefaultPixelType)] public void ResizeShouldApplyToAllFrames(TestImageProvider provider) @@ -51,20 +45,17 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms } [Theory] - [WithTestPatternImages(nameof(AllReSamplers), 100, 100, DefaultPixelType, 50)] - [WithFileCollection(nameof(ResizeFiles), nameof(AllReSamplers), DefaultPixelType, 50)] - [WithFileCollection(nameof(ResizeFiles), nameof(AllReSamplers), DefaultPixelType, 30)] - public void ResizeFullImage(TestImageProvider provider, string name, IResampler sampler, int percents) + [WithTestPatternImages(nameof(AllReSamplers), 100, 100, DefaultPixelType, 0.5f)] + [WithFileCollection(nameof(ResizeFiles), nameof(AllReSamplers), DefaultPixelType, 0.5f)] + [WithFileCollection(nameof(ResizeFiles), nameof(AllReSamplers), DefaultPixelType, 0.3f)] + public void ResizeFullImage(TestImageProvider provider, string name, IResampler sampler, float ratio) where TPixel : struct, IPixel { using (Image image = provider.GetImage()) { - float ratio = (float)percents / 100.0F; SizeF newSize = image.Size() * ratio; image.Mutate(x => x.Resize((Size)newSize, sampler, false)); - - string details = $"{name}-{percents}%"; - + string details = $"{name}-{ratio}"; image.DebugSave(provider, details); } } @@ -77,7 +68,6 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(image.Size() / 2, true)); - image.DebugSave(provider); } } diff --git a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs index 4c14489fd5..ce61172e2f 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs @@ -9,13 +9,13 @@ namespace ImageSharp.Tests public static class TestEnvironment { - public const string ImageSharpSolution = "ImageSharp.sln"; + private const string ImageSharpSolutionFileName = "ImageSharp.sln"; - private const string InputImagesRelativePath = @"tests\TestImages\Input"; + private const string InputImagesRelativePath = @"tests\Images\Input"; - private const string ActualOutputDirectoryRelativePath = @"tests\TestImages\ActualOutput"; + private const string ActualOutputDirectoryRelativePath = @"tests\Images\ActualOutput"; - private const string ReferenceOutputDirectoryRelativePath = @"tests\TestImages\ReferenceOutput"; + private const string ReferenceOutputDirectoryRelativePath = @"tests\Images\ReferenceOutput"; private static Lazy solutionDirectoryFullPath = new Lazy(GetSolutionDirectoryFullPathImpl); @@ -42,7 +42,7 @@ namespace ImageSharp.Tests DirectoryInfo directory = assemblyFile.Directory; - while (!directory.EnumerateFiles(ImageSharpSolution).Any()) + while (!directory.EnumerateFiles(ImageSharpSolutionFileName).Any()) { try { @@ -79,6 +79,6 @@ namespace ImageSharp.Tests internal static string ReferenceOutputDirectoryFullPath => Path.Combine(SolutionDirectoryFullPath, ReferenceOutputDirectoryRelativePath); internal static string GetReferenceOutputFileName(string actualOutputFileName) => - actualOutputFileName.Replace("ActualOutput", "ExpectedOutput"); + actualOutputFileName.Replace("ActualOutput", "ReferenceOutput"); } } \ No newline at end of file diff --git a/tests/TestImages/Input/Bmp/Car.bmp b/tests/Images/Input/Bmp/Car.bmp similarity index 100% rename from tests/TestImages/Input/Bmp/Car.bmp rename to tests/Images/Input/Bmp/Car.bmp diff --git a/tests/TestImages/Input/Bmp/F.bmp b/tests/Images/Input/Bmp/F.bmp similarity index 100% rename from tests/TestImages/Input/Bmp/F.bmp rename to tests/Images/Input/Bmp/F.bmp diff --git a/tests/TestImages/Input/Bmp/neg_height.bmp b/tests/Images/Input/Bmp/neg_height.bmp similarity index 100% rename from tests/TestImages/Input/Bmp/neg_height.bmp rename to tests/Images/Input/Bmp/neg_height.bmp diff --git a/tests/TestImages/Input/Gif/cheers.gif b/tests/Images/Input/Gif/cheers.gif similarity index 100% rename from tests/TestImages/Input/Gif/cheers.gif rename to tests/Images/Input/Gif/cheers.gif diff --git a/tests/TestImages/Input/Gif/giphy.gif b/tests/Images/Input/Gif/giphy.gif similarity index 100% rename from tests/TestImages/Input/Gif/giphy.gif rename to tests/Images/Input/Gif/giphy.gif diff --git a/tests/TestImages/Input/Gif/rings.gif b/tests/Images/Input/Gif/rings.gif similarity index 100% rename from tests/TestImages/Input/Gif/rings.gif rename to tests/Images/Input/Gif/rings.gif diff --git a/tests/TestImages/Input/Gif/trans.gif b/tests/Images/Input/Gif/trans.gif similarity index 100% rename from tests/TestImages/Input/Gif/trans.gif rename to tests/Images/Input/Gif/trans.gif diff --git a/tests/TestImages/Input/Jpg/baseline/Calliphora.jpg b/tests/Images/Input/Jpg/baseline/Calliphora.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/Calliphora.jpg rename to tests/Images/Input/Jpg/baseline/Calliphora.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/ExifUndefType.jpg b/tests/Images/Input/Jpg/baseline/ExifUndefType.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/ExifUndefType.jpg rename to tests/Images/Input/Jpg/baseline/ExifUndefType.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/Floorplan.jpg b/tests/Images/Input/Jpg/baseline/Floorplan.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/Floorplan.jpg rename to tests/Images/Input/Jpg/baseline/Floorplan.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/Hiyamugi.jpg b/tests/Images/Input/Jpg/baseline/Hiyamugi.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/Hiyamugi.jpg rename to tests/Images/Input/Jpg/baseline/Hiyamugi.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/Lake.jpg b/tests/Images/Input/Jpg/baseline/Lake.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/Lake.jpg rename to tests/Images/Input/Jpg/baseline/Lake.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/Snake.jpg b/tests/Images/Input/Jpg/baseline/Snake.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/Snake.jpg rename to tests/Images/Input/Jpg/baseline/Snake.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/badeof.jpg b/tests/Images/Input/Jpg/baseline/badeof.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/badeof.jpg rename to tests/Images/Input/Jpg/baseline/badeof.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/cmyk.jpg b/tests/Images/Input/Jpg/baseline/cmyk.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/cmyk.jpg rename to tests/Images/Input/Jpg/baseline/cmyk.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/exif.jpg b/tests/Images/Input/Jpg/baseline/exif.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/exif.jpg rename to tests/Images/Input/Jpg/baseline/exif.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/gamma_dalai_lama_gray.jpg b/tests/Images/Input/Jpg/baseline/gamma_dalai_lama_gray.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/gamma_dalai_lama_gray.jpg rename to tests/Images/Input/Jpg/baseline/gamma_dalai_lama_gray.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/jpeg400jfif.jpg b/tests/Images/Input/Jpg/baseline/jpeg400jfif.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/jpeg400jfif.jpg rename to tests/Images/Input/Jpg/baseline/jpeg400jfif.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/jpeg420exif.jpg b/tests/Images/Input/Jpg/baseline/jpeg420exif.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/jpeg420exif.jpg rename to tests/Images/Input/Jpg/baseline/jpeg420exif.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/jpeg444.jpg b/tests/Images/Input/Jpg/baseline/jpeg444.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/jpeg444.jpg rename to tests/Images/Input/Jpg/baseline/jpeg444.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/testimgint.jpg b/tests/Images/Input/Jpg/baseline/testimgint.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/testimgint.jpg rename to tests/Images/Input/Jpg/baseline/testimgint.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/testorig.jpg b/tests/Images/Input/Jpg/baseline/testorig.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/testorig.jpg rename to tests/Images/Input/Jpg/baseline/testorig.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/turtle.jpg b/tests/Images/Input/Jpg/baseline/turtle.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/turtle.jpg rename to tests/Images/Input/Jpg/baseline/turtle.jpg diff --git a/tests/TestImages/Input/Jpg/baseline/ycck.jpg b/tests/Images/Input/Jpg/baseline/ycck.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/baseline/ycck.jpg rename to tests/Images/Input/Jpg/baseline/ycck.jpg diff --git a/tests/TestImages/Input/Jpg/progressive/BadEofProgressive.jpg b/tests/Images/Input/Jpg/progressive/BadEofProgressive.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/progressive/BadEofProgressive.jpg rename to tests/Images/Input/Jpg/progressive/BadEofProgressive.jpg diff --git a/tests/TestImages/Input/Jpg/progressive/Festzug.jpg b/tests/Images/Input/Jpg/progressive/Festzug.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/progressive/Festzug.jpg rename to tests/Images/Input/Jpg/progressive/Festzug.jpg diff --git a/tests/TestImages/Input/Jpg/progressive/fb.jpg b/tests/Images/Input/Jpg/progressive/fb.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/progressive/fb.jpg rename to tests/Images/Input/Jpg/progressive/fb.jpg diff --git a/tests/TestImages/Input/Jpg/progressive/progress.jpg b/tests/Images/Input/Jpg/progressive/progress.jpg similarity index 100% rename from tests/TestImages/Input/Jpg/progressive/progress.jpg rename to tests/Images/Input/Jpg/progressive/progress.jpg diff --git a/tests/TestImages/Input/Png/CalliphoraPartial.png b/tests/Images/Input/Png/CalliphoraPartial.png similarity index 100% rename from tests/TestImages/Input/Png/CalliphoraPartial.png rename to tests/Images/Input/Png/CalliphoraPartial.png diff --git a/tests/TestImages/Input/Png/blur.png b/tests/Images/Input/Png/blur.png similarity index 100% rename from tests/TestImages/Input/Png/blur.png rename to tests/Images/Input/Png/blur.png diff --git a/tests/TestImages/Input/Png/chunklength1.png b/tests/Images/Input/Png/chunklength1.png similarity index 100% rename from tests/TestImages/Input/Png/chunklength1.png rename to tests/Images/Input/Png/chunklength1.png diff --git a/tests/TestImages/Input/Png/chunklength2.png b/tests/Images/Input/Png/chunklength2.png similarity index 100% rename from tests/TestImages/Input/Png/chunklength2.png rename to tests/Images/Input/Png/chunklength2.png diff --git a/tests/TestImages/Input/Png/cross.png b/tests/Images/Input/Png/cross.png similarity index 100% rename from tests/TestImages/Input/Png/cross.png rename to tests/Images/Input/Png/cross.png diff --git a/tests/TestImages/Input/Png/filter0.png b/tests/Images/Input/Png/filter0.png similarity index 100% rename from tests/TestImages/Input/Png/filter0.png rename to tests/Images/Input/Png/filter0.png diff --git a/tests/TestImages/Input/Png/filter1.png b/tests/Images/Input/Png/filter1.png similarity index 100% rename from tests/TestImages/Input/Png/filter1.png rename to tests/Images/Input/Png/filter1.png diff --git a/tests/TestImages/Input/Png/filter2.png b/tests/Images/Input/Png/filter2.png similarity index 100% rename from tests/TestImages/Input/Png/filter2.png rename to tests/Images/Input/Png/filter2.png diff --git a/tests/TestImages/Input/Png/filter3.png b/tests/Images/Input/Png/filter3.png similarity index 100% rename from tests/TestImages/Input/Png/filter3.png rename to tests/Images/Input/Png/filter3.png diff --git a/tests/TestImages/Input/Png/filter4.png b/tests/Images/Input/Png/filter4.png similarity index 100% rename from tests/TestImages/Input/Png/filter4.png rename to tests/Images/Input/Png/filter4.png diff --git a/tests/TestImages/Input/Png/filterVar.png b/tests/Images/Input/Png/filterVar.png similarity index 100% rename from tests/TestImages/Input/Png/filterVar.png rename to tests/Images/Input/Png/filterVar.png diff --git a/tests/TestImages/Input/Png/indexed.png b/tests/Images/Input/Png/indexed.png similarity index 100% rename from tests/TestImages/Input/Png/indexed.png rename to tests/Images/Input/Png/indexed.png diff --git a/tests/TestImages/Input/Png/interlaced.png b/tests/Images/Input/Png/interlaced.png similarity index 100% rename from tests/TestImages/Input/Png/interlaced.png rename to tests/Images/Input/Png/interlaced.png diff --git a/tests/TestImages/Input/Png/pd.png b/tests/Images/Input/Png/pd.png similarity index 100% rename from tests/TestImages/Input/Png/pd.png rename to tests/Images/Input/Png/pd.png diff --git a/tests/TestImages/Input/Png/pl.png b/tests/Images/Input/Png/pl.png similarity index 100% rename from tests/TestImages/Input/Png/pl.png rename to tests/Images/Input/Png/pl.png diff --git a/tests/TestImages/Input/Png/pp.png b/tests/Images/Input/Png/pp.png similarity index 100% rename from tests/TestImages/Input/Png/pp.png rename to tests/Images/Input/Png/pp.png diff --git a/tests/TestImages/Input/Png/rgb-48bpp-interlaced.png b/tests/Images/Input/Png/rgb-48bpp-interlaced.png similarity index 100% rename from tests/TestImages/Input/Png/rgb-48bpp-interlaced.png rename to tests/Images/Input/Png/rgb-48bpp-interlaced.png diff --git a/tests/TestImages/Input/Png/rgb-48bpp.png b/tests/Images/Input/Png/rgb-48bpp.png similarity index 100% rename from tests/TestImages/Input/Png/rgb-48bpp.png rename to tests/Images/Input/Png/rgb-48bpp.png diff --git a/tests/TestImages/Input/Png/splash-interlaced.png b/tests/Images/Input/Png/splash-interlaced.png similarity index 100% rename from tests/TestImages/Input/Png/splash-interlaced.png rename to tests/Images/Input/Png/splash-interlaced.png diff --git a/tests/TestImages/Input/Png/splash.png b/tests/Images/Input/Png/splash.png similarity index 100% rename from tests/TestImages/Input/Png/splash.png rename to tests/Images/Input/Png/splash.png diff --git a/tests/TestImages/Input/Png/versioning-1_1.png b/tests/Images/Input/Png/versioning-1_1.png similarity index 100% rename from tests/TestImages/Input/Png/versioning-1_1.png rename to tests/Images/Input/Png/versioning-1_1.png diff --git a/tests/TestImages/Input/Png/versioning-1_2.png b/tests/Images/Input/Png/versioning-1_2.png similarity index 100% rename from tests/TestImages/Input/Png/versioning-1_2.png rename to tests/Images/Input/Png/versioning-1_2.png diff --git a/tests/TestImages/Input/Png/vim16x16_1.png b/tests/Images/Input/Png/vim16x16_1.png similarity index 100% rename from tests/TestImages/Input/Png/vim16x16_1.png rename to tests/Images/Input/Png/vim16x16_1.png diff --git a/tests/TestImages/Input/Png/vim16x16_2.png b/tests/Images/Input/Png/vim16x16_2.png similarity index 100% rename from tests/TestImages/Input/Png/vim16x16_2.png rename to tests/Images/Input/Png/vim16x16_2.png