From b6fc55be0b847cfefb573b755d53033c139b0a21 Mon Sep 17 00:00:00 2001
From: Anton Firszov <anton.firszov@sapagroup.com>
Date: Sat, 19 Aug 2017 18:24:47 +0200
Subject: [PATCH] Moved @devedse-s test cases from ImageEqualTests to
 PngDecoderTests.

---
 .../Formats/Png/PngDecoderTests.cs            |  7 ++-
 .../ImageSharp.Tests/Image/ImageEqualTests.cs | 60 -------------------
 2 files changed, 5 insertions(+), 62 deletions(-)
 delete mode 100644 tests/ImageSharp.Tests/Image/ImageEqualTests.cs

diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
index 7a8de31a51..b61442317c 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
@@ -24,6 +24,10 @@ namespace SixLabors.ImageSharp.Tests
                 TestImages.Png.FilterVar,
                 TestImages.Png.Bad.ChunkLength1,
                 TestImages.Png.Bad.ChunkLength2,
+                TestImages.Png.VimImage1,
+                TestImages.Png.VimImage2,
+                TestImages.Png.VersioningImage1,
+                TestImages.Png.VersioningImage2,
 
                 // BUG !!! Should work. TODO: Fix it !!!!
                 // TestImages.Png.SnakeGame
@@ -38,8 +42,7 @@ namespace SixLabors.ImageSharp.Tests
                 // TODO: Re enable, when Decode_Interlaced is fixed!!!!
                 // TestImages.Png.Rgb48BppInterlaced
             };
-
-
+        
         [Theory]
         [WithFileCollection(nameof(CommonTestImages), PixelTypes.Rgba32)]
         public void Decode<TPixel>(TestImageProvider<TPixel> provider)
diff --git a/tests/ImageSharp.Tests/Image/ImageEqualTests.cs b/tests/ImageSharp.Tests/Image/ImageEqualTests.cs
deleted file mode 100644
index ac6ea888f5..0000000000
--- a/tests/ImageSharp.Tests/Image/ImageEqualTests.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests
-{
-    public class ImageEqualTests
-    {
-        [Fact]
-        public void TestsThatVimImagesAreEqual()
-        {
-            var image1Provider = TestImageProvider<Rgba32>.File(TestImages.Png.VimImage1);
-            var image2Provider = TestImageProvider<Rgba32>.File(TestImages.Png.VimImage2);
-
-            using (Image<Rgba32> img1 = image1Provider.GetImage())
-            using (Image<Rgba32> img2 = image2Provider.GetImage())
-            {
-                bool imagesEqual = AreImagesEqual(img1, img2);
-                Assert.True(imagesEqual);
-            }
-        }
-
-        [Fact]
-        public void TestsThatVersioningImagesAreEqual()
-        {
-            var image1Provider = TestImageProvider<Rgba32>.File(TestImages.Png.VersioningImage1);
-            var image2Provider = TestImageProvider<Rgba32>.File(TestImages.Png.VersioningImage2);
-
-            using (Image<Rgba32> img1 = image1Provider.GetImage())
-            using (Image<Rgba32> img2 = image2Provider.GetImage())
-            {
-                bool imagesEqual = AreImagesEqual(img1, img2);
-                Assert.True(imagesEqual);
-            }
-        }
-
-        private bool AreImagesEqual(Image<Rgba32> img1, Image<Rgba32> img2)
-        {
-            Assert.Equal(img1.Width, img2.Width);
-            Assert.Equal(img1.Height, img2.Height);
-
-            for (int y = 0; y < img1.Height; y++)
-            {
-                for (int x = 0; x < img1.Width; x++)
-                {
-                    Rgba32 pixel1 = img1[x, y];
-                    Rgba32 pixel2 = img2[x, y];
-
-                    if (pixel1 != pixel2)
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        }
-    }
-}