diff --git a/tests/ImageProcessorCore.Tests/FileTestBase.cs b/tests/ImageProcessorCore.Tests/FileTestBase.cs index 668ee5caec..2fd6b87088 100644 --- a/tests/ImageProcessorCore.Tests/FileTestBase.cs +++ b/tests/ImageProcessorCore.Tests/FileTestBase.cs @@ -7,8 +7,6 @@ namespace ImageProcessorCore.Tests { using System.Collections.Generic; - using Xunit; - /// /// The test base class for reading and writing to files. /// @@ -17,24 +15,24 @@ namespace ImageProcessorCore.Tests /// /// The collection of image files to test against. /// - protected static readonly List Files = new List + protected static readonly List Files = new List { - //TestImages.Png.P1, - //TestImages.Png.Pd, - TestImages.Jpg.Floorplan, // Perf: Enable for local testing only - TestImages.Jpg.Calliphora, - //TestImages.Jpg.Cmyk, // Perf: Enable for local testing only - //TestImages.Jpg.Turtle, - //TestImages.Jpg.Fb, // Perf: Enable for local testing only - //TestImages.Jpg.Progress, // Perf: Enable for local testing only - //TestImages.Jpg.Gamma_dalai_lama_gray. // Perf: Enable for local testing only - TestImages.Bmp.Car, - //TestImages.Bmp.Neg_height, // Perf: Enable for local testing only - //TestImages.Png.Blur, // Perf: Enable for local testing only - //TestImages.Png.Indexed, // Perf: Enable for local testing only - TestImages.Png.Splash, - TestImages.Gif.Rings, - //TestImages.Gif.Giphy // Perf: Enable for local testing only + //new TestFile(TestImages.Png.P1), + //new TestFile(TestImages.Png.Pd), + new TestFile(TestImages.Jpg.Floorplan), // Perf: Enable for local testing only + new TestFile(TestImages.Jpg.Calliphora), + //new TestFile(TestImages.Jpg.Cmyk), // Perf: Enable for local testing only + //new TestFile(TestImages.Jpg.Turtle), + //new TestFile(TestImages.Jpg.Fb), // Perf: Enable for local testing only + //new TestFile(TestImages.Jpg.Progress), // Perf: Enable for local testing only + //new TestFile(TestImages.Jpg.Gamma_dalai_lama_gray). // Perf: Enable for local testing only + new TestFile(TestImages.Bmp.Car), + //new TestFile(TestImages.Bmp.Neg_height), // Perf: Enable for local testing only + //new TestFile(TestImages.Png.Blur), // Perf: Enable for local testing only + //new TestFile(TestImages.Png.Indexed), // Perf: Enable for local testing only + new TestFile(TestImages.Png.Splash), + new TestFile(TestImages.Gif.Rings), + //new TestFile(TestImages.Gif.Giphy) // Perf: Enable for local testing only }; } } \ No newline at end of file diff --git a/tests/ImageProcessorCore.Tests/Formats/Bmp/BitmapTests.cs b/tests/ImageProcessorCore.Tests/Formats/Bmp/BitmapTests.cs index 23884e9ed6..92c9956691 100644 --- a/tests/ImageProcessorCore.Tests/Formats/Bmp/BitmapTests.cs +++ b/tests/ImageProcessorCore.Tests/Formats/Bmp/BitmapTests.cs @@ -13,8 +13,16 @@ namespace ImageProcessorCore.Tests public class BitmapTests : FileTestBase { - [Fact] - public void BitmapCanEncodeDifferentBitRates() + public static readonly TheoryData BitsPerPixel + = new TheoryData + { + BmpBitsPerPixel.Pixel24 , + BmpBitsPerPixel.Pixel32 + }; + + [Theory] + [MemberData("BitsPerPixel")] + public void BitmapCanEncodeDifferentBitRates(BmpBitsPerPixel bitsPerPixel) { const string path = "TestOutput/Bmp"; if (!Directory.Exists(path)) @@ -22,24 +30,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - Image image = new Image(stream); - string encodeFilename = path + "/24-" + Path.GetFileNameWithoutExtension(file) + ".bmp"; + string filename = file.GetFileNameWithoutExtension(bitsPerPixel); + Image image = file.CreateImage(); - using (FileStream output = File.OpenWrite(encodeFilename)) - { - image.Save(output, new BmpEncoder { BitsPerPixel = BmpBitsPerPixel.Pixel24 }); - } - - encodeFilename = path + "/32-" + Path.GetFileNameWithoutExtension(file) + ".bmp"; - - using (FileStream output = File.OpenWrite(encodeFilename)) - { - image.Save(output, new BmpEncoder { BitsPerPixel = BmpBitsPerPixel.Pixel32 }); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}.bmp")) + { + image.Save(output, new BmpEncoder { BitsPerPixel = bitsPerPixel }); } } } diff --git a/tests/ImageProcessorCore.Tests/Formats/GeneralFormatTests.cs b/tests/ImageProcessorCore.Tests/Formats/GeneralFormatTests.cs index 462a39cebc..5989b923d1 100644 --- a/tests/ImageProcessorCore.Tests/Formats/GeneralFormatTests.cs +++ b/tests/ImageProcessorCore.Tests/Formats/GeneralFormatTests.cs @@ -21,19 +21,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileName(file); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.VerticalResolution = 150; - image.HorizontalResolution = 150; - image.Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) + { + image.VerticalResolution = 150; + image.HorizontalResolution = 150; + image.Save(output); } } } @@ -47,14 +43,12 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - Image image = new Image(stream); - string filename = path + "/" + Path.GetFileNameWithoutExtension(file) + ".txt"; - File.WriteAllText(filename, image.ToString()); - } + Image image = file.CreateImage(); + + string filename = path + "/" + file.FileNameWithoutExtension + ".txt"; + File.WriteAllText(filename, image.ToString()); } } @@ -67,17 +61,13 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - Image image = new Image(stream); - string encodeFilename = path + "/" + Path.GetFileName(file); + Image image = file.CreateImage(); - using (FileStream output = File.OpenWrite(encodeFilename)) - { - image.Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) + { + image.Save(output); } } } @@ -91,36 +81,33 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - Image image = new Image(stream); + Image image = file.CreateImage(); - // Copy the original pixels to save decoding time. - Color[] pixels = new Color[image.Width * image.Height]; - Array.Copy(image.Pixels, pixels, image.Pixels.Length); + // Copy the original pixels to save decoding time. + Color[] pixels = new Color[image.Width * image.Height]; + Array.Copy(image.Pixels, pixels, image.Pixels.Length); - using (FileStream output = File.OpenWrite($"{path}/Octree-{Path.GetFileName(file)}")) - { - image.Quantize(Quantization.Octree) - .Save(output, image.CurrentImageFormat); + using (FileStream output = File.OpenWrite($"{path}/Octree-{file.FileName}")) + { + image.Quantize(Quantization.Octree) + .Save(output, image.CurrentImageFormat); - } + } - image.SetPixels(image.Width, image.Height, pixels); - using (FileStream output = File.OpenWrite($"{path}/Wu-{Path.GetFileName(file)}")) - { - image.Quantize(Quantization.Wu) - .Save(output, image.CurrentImageFormat); - } + image.SetPixels(image.Width, image.Height, pixels); + using (FileStream output = File.OpenWrite($"{path}/Wu-{file.FileName}")) + { + image.Quantize(Quantization.Wu) + .Save(output, image.CurrentImageFormat); + } - image.SetPixels(image.Width, image.Height, pixels); - using (FileStream output = File.OpenWrite($"{path}/Palette-{Path.GetFileName(file)}")) - { - image.Quantize(Quantization.Palette) - .Save(output, image.CurrentImageFormat); - } + image.SetPixels(image.Width, image.Height, pixels); + using (FileStream output = File.OpenWrite($"{path}/Palette-{file.FileName}")) + { + image.Quantize(Quantization.Palette) + .Save(output, image.CurrentImageFormat); } } } @@ -134,30 +121,28 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.gif")) { - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{Path.GetFileNameWithoutExtension(file)}.gif")) - { - image.SaveAsGif(output); - } + image.SaveAsGif(output); + } - using (FileStream output = File.OpenWrite($"{path}/{Path.GetFileNameWithoutExtension(file)}.bmp")) - { - image.SaveAsBmp(output); - } + using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.bmp")) + { + image.SaveAsBmp(output); + } - using (FileStream output = File.OpenWrite($"{path}/{Path.GetFileNameWithoutExtension(file)}.jpg")) - { - image.SaveAsJpeg(output); - } + using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.jpg")) + { + image.SaveAsJpeg(output); + } - using (FileStream output = File.OpenWrite($"{path}/{Path.GetFileNameWithoutExtension(file)}.png")) - { - image.SaveAsPng(output); - } + using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.png")) + { + image.SaveAsPng(output); } } } @@ -171,26 +156,24 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + byte[] serialized; + using (MemoryStream memoryStream = new MemoryStream()) { - Image image = new Image(stream); - byte[] serialized; - using (MemoryStream memoryStream = new MemoryStream()) - { - image.Save(memoryStream); - memoryStream.Flush(); - serialized = memoryStream.ToArray(); - } + image.Save(memoryStream); + memoryStream.Flush(); + serialized = memoryStream.ToArray(); + } - using (MemoryStream memoryStream = new MemoryStream(serialized)) + using (MemoryStream memoryStream = new MemoryStream(serialized)) + { + Image image2 = new Image(memoryStream); + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - Image image2 = new Image(memoryStream); - using (FileStream output = File.OpenWrite($"{path}/{Path.GetFileName(file)}")) - { - image2.Save(output); - } + image2.Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Formats/Png/PngTests.cs b/tests/ImageProcessorCore.Tests/Formats/Png/PngTests.cs index c86238cbac..3d4baf36d8 100644 --- a/tests/ImageProcessorCore.Tests/Formats/Png/PngTests.cs +++ b/tests/ImageProcessorCore.Tests/Formats/Png/PngTests.cs @@ -22,16 +22,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.png")) { - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{Path.GetFileNameWithoutExtension(file)}.png")) - { - image.Quality = 256; - image.Save(output, new PngFormat()); - } + image.Quality = 256; + image.Save(output, new PngFormat()); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/AlphaTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/AlphaTest.cs index 4389c49862..9059b0a182 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/AlphaTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/AlphaTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Alpha(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Alpha(value) + .Save(output); } } } @@ -54,18 +51,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + "-InBox" + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Alpha(value, new Rectangle(10, 10, image.Width / 2, image.Height / 2)) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Alpha(value, new Rectangle(10, 10, image.Width / 2, image.Height / 2)) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/BackgroundColorTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/BackgroundColorTest.cs index 220d0f3840..7b0f8ac9cd 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/BackgroundColorTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/BackgroundColorTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.BackgroundColor(Color.HotPink) - .Save(output); - } + image.BackgroundColor(Color.HotPink) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/BinaryThreshold.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/BinaryThreshold.cs index 1dcc28d70c..039d20a49e 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/BinaryThreshold.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/BinaryThreshold.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.BinaryThreshold(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.BinaryThreshold(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/BlackWhiteTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/BlackWhiteTest.cs index c40224ef76..e6891ede47 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/BlackWhiteTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/BlackWhiteTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.BlackWhite() - .Save(output); - } + image.BlackWhite() + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/BlendTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/BlendTest.cs index 2aa6ce0444..495a49f39b 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/BlendTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/BlendTest.cs @@ -26,17 +26,14 @@ namespace ImageProcessorCore.Tests blend = new Image(stream); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Blend(blend) - .Save(output); - } + image.Blend(blend) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/BoxBlurTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/BoxBlurTest.cs index 9c48752af0..cf31d8e9b6 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/BoxBlurTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/BoxBlurTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.BoxBlur(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.BoxBlur(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/BrightnessTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/BrightnessTest.cs index 9c0d840df7..6160143ec7 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/BrightnessTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/BrightnessTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Brightness(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Brightness(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/ColorBlindnessTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/ColorBlindnessTest.cs index 9e6c9c1cb7..b75e26b002 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/ColorBlindnessTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/ColorBlindnessTest.cs @@ -34,17 +34,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName(colorBlindness); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + colorBlindness + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.ColorBlindness(colorBlindness) - .Save(output); - } + image.ColorBlindness(colorBlindness) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/ContrastTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/ContrastTest.cs index 589fa8a6eb..dc9d452dbc 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/ContrastTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/ContrastTest.cs @@ -28,18 +28,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Contrast(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) + { + image.Contrast(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/GlowTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/GlowTest.cs index 0237cab6b3..551b777ac7 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/GlowTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/GlowTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Glow() - .Save(output); - } + image.Glow() + .Save(output); } } } @@ -44,17 +41,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName("Color"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-Color" + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Glow(Color.HotPink) - .Save(output); - } + image.Glow(Color.HotPink) + .Save(output); } } } @@ -68,17 +63,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName("Radius"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-Radius" + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Glow(image.Width / 4) - .Save(output); - } + image.Glow(image.Width / 4) + .Save(output); } } } @@ -92,17 +85,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName("InBox"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-InBox" + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Glow(new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2)) - .Save(output); - } + image.Glow(new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2)) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/GrayscaleTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/GrayscaleTest.cs index da60c06d39..e74797fff0 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/GrayscaleTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/GrayscaleTest.cs @@ -29,18 +29,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Grayscale(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Grayscale(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/HueTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/HueTest.cs index 7ece88159b..08d7f2d224 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/HueTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/HueTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Hue(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Hue(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/InvertTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/InvertTest.cs index f2dc58603e..4c516d7f18 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/InvertTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/InvertTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Invert() - .Save(output); - } + image.Invert() + .Save(output); } } } @@ -44,17 +41,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName("InBox"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}-InBox{Path.GetExtension(file)}")) - { - image.Invert(new Rectangle(10, 10, image.Width / 2, image.Height / 2)) - .Save(output); - } + image.Invert(new Rectangle(10, 10, image.Width / 2, image.Height / 2)) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/KodachromeTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/KodachromeTest.cs index fa53bf5f35..584dac56c2 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/KodachromeTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/KodachromeTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Kodachrome() - .Save(output); - } + image.Kodachrome() + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/LomographTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/LomographTest.cs index 71fc4a161f..e9e4b183bb 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/LomographTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/LomographTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Lomograph() - .Save(output); - } + image.Lomograph() + .Save(output); } } } @@ -43,18 +40,15 @@ namespace ImageProcessorCore.Tests { Directory.CreateDirectory(path); } - - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName("InBox"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-InBox" + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Lomograph(new Rectangle(image.Width / 4, image.Width / 4, image.Width / 2, image.Height / 2)) - .Save(output); - } + image.Lomograph(new Rectangle(image.Width / 4, image.Width / 4, image.Width / 2, image.Height / 2)) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/PolaroidTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/PolaroidTest.cs index b44cbd6d5d..21714ae244 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/PolaroidTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/PolaroidTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Polaroid() - .Save(output); - } + image.Polaroid() + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/SaturationTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/SaturationTest.cs index 2dbfadb686..d2faa233f2 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/SaturationTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/SaturationTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Saturation(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Saturation(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/SepiaTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/SepiaTest.cs index f8017d4b4f..742cf95f25 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/SepiaTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/SepiaTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Sepia() - .Save(output); - } + image.Sepia() + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Filters/VignetteTest.cs b/tests/ImageProcessorCore.Tests/Processors/Filters/VignetteTest.cs index 11e2f32f0e..dbe0e9a460 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Filters/VignetteTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Filters/VignetteTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Vignette() - .Save(output); - } + image.Vignette() + .Save(output); } } } @@ -44,17 +41,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName("Color"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-Color" + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Vignette(Color.HotPink) - .Save(output); - } + image.Vignette(Color.HotPink) + .Save(output); } } } @@ -68,17 +63,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName("Radius"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-Radius" + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Vignette(image.Width / 4, image.Height / 4) - .Save(output); - } + image.Vignette(image.Width / 4, image.Height / 4) + .Save(output); } } } @@ -92,17 +85,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName("InBox"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-InBox" + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Vignette(new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2)) - .Save(output); - } + image.Vignette(new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2)) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/CropTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/CropTest.cs index b92b7c1964..b0601251a0 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/CropTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/CropTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Crop(image.Width / 2, image.Height / 2) - .Save(output); - } + image.Crop(image.Width / 2, image.Height / 2) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/DetectEdgesTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/DetectEdgesTest.cs index 71896b6ef8..1aaca4f083 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/DetectEdgesTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/DetectEdgesTest.cs @@ -36,17 +36,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName(detector); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + detector + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.DetectEdges(detector) - .Save(output); - } + image.DetectEdges(detector) + .Save(output); } } } @@ -61,17 +59,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + string filename = file.GetFileName(detector + "-InBox"); + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{filename}")) { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + detector + "-InBox" + Path.GetExtension(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.DetectEdges(detector, new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2)) - .Save(output); - } + image.DetectEdges(detector, new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2)) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/EntropyCropTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/EntropyCropTest.cs index a1de089906..482e4459e6 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/EntropyCropTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/EntropyCropTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.EntropyCrop(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.EntropyCrop(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/FlipTests.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/FlipTests.cs index 5f4a0ae96f..427b5b6349 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/FlipTests.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/FlipTests.cs @@ -29,18 +29,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + flipType + Path.GetExtension(file); + string filename = file.GetFileName(flipType); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Flip(flipType) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Flip(flipType) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/GuassianBlurTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/GuassianBlurTest.cs index 667fac55c5..dc13968be0 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/GuassianBlurTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/GuassianBlurTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.GuassianBlur(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.GuassianBlur(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/GuassianSharpenTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/GuassianSharpenTest.cs index 47316e59e9..341f97ac4c 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/GuassianSharpenTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/GuassianSharpenTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.GuassianSharpen(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.GuassianSharpen(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/OilPaintTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/OilPaintTest.cs index de43faf4d6..1d07945d2b 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/OilPaintTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/OilPaintTest.cs @@ -29,18 +29,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.OilPaint(value.Item1, value.Item2) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.OilPaint(value.Item1, value.Item2) + .Save(output); } } } @@ -55,18 +52,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + "-InBox" + Path.GetExtension(file); + string filename = file.GetFileName(value + "-InBox"); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.OilPaint(value.Item1, value.Item2, new Rectangle(10, 10, image.Width / 2, image.Height / 2)) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.OilPaint(value.Item1, value.Item2, new Rectangle(10, 10, image.Width / 2, image.Height / 2)) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/PadTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/PadTest.cs index e65ab4e333..4cafac33ce 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/PadTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/PadTest.cs @@ -20,17 +20,14 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) + Image image = file.CreateImage(); + + using (FileStream output = File.OpenWrite($"{path}/{file.FileName}")) { - string filename = Path.GetFileName(file); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Pad(image.Width + 50, image.Height + 50) - .Save(output); - } + image.Pad(image.Width + 50, image.Height + 50) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/PixelateTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/PixelateTest.cs index fecd587215..71a9941990 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/PixelateTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/PixelateTest.cs @@ -28,18 +28,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Pixelate(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Pixelate(value) + .Save(output); } } } @@ -54,18 +51,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + "-InBox" + Path.GetExtension(file); + string filename = file.GetFileName(value + "-InBox"); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Pixelate(value, new Rectangle(10, 10, image.Width / 2, image.Height / 2)) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Pixelate(value, new Rectangle(10, 10, image.Width / 2, image.Height / 2)) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/ResizeTests.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/ResizeTests.cs index c149dd1b29..b1870abca0 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/ResizeTests.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/ResizeTests.cs @@ -42,19 +42,16 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Resize(image.Width / 2, image.Height / 2, sampler, true) - //image.Resize(555, 275, sampler, false) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Resize(image.Width / 2, image.Height / 2, sampler, true) + //image.Resize(555, 275, sampler, false) + .Save(output); } } } @@ -70,18 +67,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Resize(image.Width / 3, 0, sampler, false) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Resize(image.Width / 3, 0, sampler, false) + .Save(output); } } } @@ -97,18 +91,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Resize(0, image.Height / 3, sampler, false) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Resize(0, image.Height / 3, sampler, false) + .Save(output); } } } @@ -124,24 +115,21 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + ResizeOptions options = new ResizeOptions() { - ResizeOptions options = new ResizeOptions() - { - Sampler = sampler, - Size = new Size(image.Width / 2, image.Height) - }; - - image.Resize(options) - .Save(output); - } + Sampler = sampler, + Size = new Size(image.Width / 2, image.Height) + }; + + image.Resize(options) + .Save(output); } } } @@ -157,24 +145,21 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + ResizeOptions options = new ResizeOptions() { - ResizeOptions options = new ResizeOptions() - { - Sampler = sampler, - Size = new Size(image.Width, image.Height / 2) - }; - - image.Resize(options) - .Save(output); - } + Sampler = sampler, + Size = new Size(image.Width, image.Height / 2) + }; + + image.Resize(options) + .Save(output); } } } @@ -190,24 +175,21 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + ResizeOptions options = new ResizeOptions() { - ResizeOptions options = new ResizeOptions() - { - Size = new Size(image.Width + 200, image.Height), - Mode = ResizeMode.Pad - }; - - image.Resize(options) - .Save(output); - } + Size = new Size(image.Width + 200, image.Height), + Mode = ResizeMode.Pad + }; + + image.Resize(options) + .Save(output); } } } @@ -223,25 +205,22 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + ResizeOptions options = new ResizeOptions() { - ResizeOptions options = new ResizeOptions() - { - Sampler = sampler, - Size = new Size(image.Width + 200, image.Height + 200), - Mode = ResizeMode.BoxPad - }; - - image.Resize(options) - .Save(output); - } + Sampler = sampler, + Size = new Size(image.Width + 200, image.Height + 200), + Mode = ResizeMode.BoxPad + }; + + image.Resize(options) + .Save(output); } } } @@ -257,25 +236,22 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + ResizeOptions options = new ResizeOptions() { - ResizeOptions options = new ResizeOptions() - { - Sampler = sampler, - Size = new Size(300, 300), - Mode = ResizeMode.Max - }; - - image.Resize(options) - .Save(output); - } + Sampler = sampler, + Size = new Size(300, 300), + Mode = ResizeMode.Max + }; + + image.Resize(options) + .Save(output); } } } @@ -291,25 +267,22 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + ResizeOptions options = new ResizeOptions() { - ResizeOptions options = new ResizeOptions() - { - Sampler = sampler, - Size = new Size(image.Width - 50, image.Height - 25), - Mode = ResizeMode.Min - }; - - image.Resize(options) - .Save(output); - } + Sampler = sampler, + Size = new Size(image.Width - 50, image.Height - 25), + Mode = ResizeMode.Min + }; + + image.Resize(options) + .Save(output); } } } @@ -325,25 +298,22 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + name + Path.GetExtension(file); + string filename = file.GetFileName(name); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + ResizeOptions options = new ResizeOptions() { - ResizeOptions options = new ResizeOptions() - { - Sampler = sampler, - Size = new Size(image.Width - 200, image.Height), - Mode = ResizeMode.Stretch - }; - - image.Resize(options) - .Save(output); - } + Sampler = sampler, + Size = new Size(image.Width - 200, image.Height), + Mode = ResizeMode.Stretch + }; + + image.Resize(options) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/RotateFlipTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/RotateFlipTest.cs index ea0199e0a2..e3cdeb9982 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/RotateFlipTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/RotateFlipTest.cs @@ -31,18 +31,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + rotateType + flipType + Path.GetExtension(file); + string filename = file.GetFileName(rotateType + "-" + flipType); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.RotateFlip(rotateType, flipType) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.RotateFlip(rotateType, flipType) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/RotateTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/RotateTest.cs index c96bf867eb..1ff24919f9 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/RotateTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/RotateTest.cs @@ -37,18 +37,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Rotate(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Rotate(value) + .Save(output); } } } @@ -63,18 +60,15 @@ namespace ImageProcessorCore.Tests Directory.CreateDirectory(path); } - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + value + Path.GetExtension(file); + string filename = file.GetFileName(value); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Rotate(value) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Rotate(value) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/SkewTest.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/SkewTest.cs index 4a0c77cfe0..3410ef1cfd 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/SkewTest.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/SkewTest.cs @@ -30,18 +30,15 @@ namespace ImageProcessorCore.Tests // Matches live example // http://www.w3schools.com/css/tryit.asp?filename=trycss3_transform_skew - foreach (string file in Files) + foreach (TestFile file in Files) { - using (FileStream stream = File.OpenRead(file)) - { - string filename = Path.GetFileNameWithoutExtension(file) + "-" + x + "-" + y + Path.GetExtension(file); + string filename = file.GetFileName(x + "-" + y); + Image image = file.CreateImage(); - Image image = new Image(stream); - using (FileStream output = File.OpenWrite($"{path}/{filename}")) - { - image.Skew(x, y) - .Save(output); - } + using (FileStream output = File.OpenWrite($"{path}/{filename}")) + { + image.Skew(x, y) + .Save(output); } } } diff --git a/tests/ImageProcessorCore.Tests/TestFile.cs b/tests/ImageProcessorCore.Tests/TestFile.cs new file mode 100644 index 0000000000..c1ca682f74 --- /dev/null +++ b/tests/ImageProcessorCore.Tests/TestFile.cs @@ -0,0 +1,56 @@ +// +// Copyright (c) James Jackson-South and contributors. +// Licensed under the Apache License, Version 2.0. +// + +using System.IO; + +namespace ImageProcessorCore.Tests +{ + public class TestFile + { + private readonly Image image; + private readonly string file; + + public TestFile(string file) + { + this.file = file; + + using (FileStream stream = File.OpenRead(file)) + { + this.image = new Image(stream); + } + } + + public string FileName + { + get + { + return Path.GetFileName(this.file); + } + } + + public string FileNameWithoutExtension + { + get + { + return Path.GetFileNameWithoutExtension(this.file); + } + } + + public string GetFileName(object value) + { + return this.FileNameWithoutExtension + "-" + value + Path.GetExtension(this.file); + } + + public string GetFileNameWithoutExtension(object value) + { + return this.FileNameWithoutExtension + "-" + value; + } + + public Image CreateImage() + { + return new Image(this.image); + } + } +}