Make Save test encoding independent

ed-cooper · Oct 29, 2018 · 0828ba8 · 0828ba8
1 parent c48a098
commit 0828ba8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/StenographyTests/StenographyTests.csproj b/StenographyTests/StenographyTests.csproj
@@ -44,6 +44,7 @@
       <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">

diff --git a/StenographyTests/Storage/LsbStorageProviderTests.cs b/StenographyTests/Storage/LsbStorageProviderTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Drawing;
 using System.IO;
 using NUnit.Framework;
 using Stenography.Noise;
@@ -34,12 +35,35 @@ public void SaveTest()
             Console.WriteLine(System.Text.Encoding.UTF8.GetString(File.ReadAllBytes(outputFile)));
             Console.WriteLine(System.Text.Encoding.UTF8.GetString(File.ReadAllBytes(expectedFile)));
 
+            // Load images
+            Bitmap expected = new Bitmap(expectedFile);
+            Bitmap actual = new Bitmap(outputFile);
+
             try
             {
-                FileAssert.AreEqual(expectedFile, outputFile);
+                bool fail = (expected.Width != actual.Width) || (expected.Height != actual.Height);
+
+                if (!fail)
+                {
+                    // Compare pixel by pixel (due to encoding differences on Mono)
+                    for (int i = 0; i < expected.Width; i++)
+                    {
+                        for (int j = 0; j < expected.Height; j++)
+                        {
+                            if (expected.GetPixel(i, j) != actual.GetPixel(i, j))
+                            {
+                                fail = true;
+                            }
+                        }
+                    }
+                }
+
+                Assert.AreEqual(false, fail);
             }
             finally
             {
+                expected.Dispose();
+                actual.Dispose();
                 File.Delete(outputFile);
             }
         }