From 1ec84116277b3d7940ce83362646307cb8084d02 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Mon, 9 Oct 2017 20:55:41 +1100 Subject: [PATCH] More lightweight tests --- .../ImageSharp.Tests/Drawing/DrawImageTest.cs | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs index 53986e6d51..2e3a730fcc 100644 --- a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs +++ b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs @@ -46,19 +46,21 @@ namespace SixLabors.ImageSharp.Tests } [Theory] - [WithFile(TestImages.Bmp.Car, PixelTypes.Rgba32, TestImages.Png.Splash)] - public void ImageShouldHandleNegativeLocation(TestImageProvider provider, string backgroundPath) + [WithSolidFilledImages(100, 100, 255, 255, 255, PixelTypes.Rgba32)] + public void ImageShouldHandleNegativeLocation(TestImageProvider provider) { - using (Image background = TestFile.Create(backgroundPath).CreateImage()) - using (Image overlay = provider.GetImage()) + using (Image background = provider.GetImage()) + using (var overlay = new Image(50, 50)) { + overlay.Mutate(x => x.Fill(Rgba32.Black)); + int xy = -25; Rgba32 backgroundPixel = background[0, 0]; Rgba32 overlayPixel = overlay[Math.Abs(xy) + 1, Math.Abs(xy) + 1]; background.Mutate(x => x.DrawImage(overlay, PixelBlenderMode.Normal, 1F, new Size(overlay.Width, overlay.Height), new Point(xy, xy))); - Assert.Equal(default(Rgba32), backgroundPixel); + Assert.Equal(Rgba32.White, backgroundPixel); Assert.Equal(overlayPixel, background[0, 0]); background.DebugSave(provider, new[] { "Negative" }); @@ -66,19 +68,21 @@ namespace SixLabors.ImageSharp.Tests } [Theory] - [WithFile(TestImages.Bmp.Car, PixelTypes.Rgba32, TestImages.Png.Splash)] - public void ImageShouldHandlePositiveLocation(TestImageProvider provider, string backgroundPath) + [WithSolidFilledImages(100, 100, 255, 255, 255, PixelTypes.Rgba32)] + public void ImageShouldHandlePositiveLocation(TestImageProvider provider) { - using (Image background = TestFile.Create(backgroundPath).CreateImage()) - using (Image overlay = provider.GetImage()) + using (Image background = provider.GetImage()) + using (var overlay = new Image(50, 50)) { + overlay.Mutate(x => x.Fill(Rgba32.Black)); + int xy = 25; Rgba32 backgroundPixel = background[xy - 1, xy - 1]; Rgba32 overlayPixel = overlay[0, 0]; background.Mutate(x => x.DrawImage(overlay, PixelBlenderMode.Normal, 1F, new Size(overlay.Width, overlay.Height), new Point(xy, xy))); - Assert.Equal(default(Rgba32), backgroundPixel); + Assert.Equal(Rgba32.White, backgroundPixel); Assert.Equal(overlayPixel, background[xy, xy]); background.DebugSave(provider, new[] { "Positive" });