Updated unit test due to changes in rendering fonts.

dlemstra · Mar 22, 2020 · dd02dfb · dd02dfb
1 parent 8f6c872
commit dd02dfb
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/tests/Magick.NET.Tests/Framework/Coders/TheCaptionCoder.cs b/tests/Magick.NET.Tests/Framework/Coders/TheCaptionCoder.cs
@@ -57,8 +57,8 @@ public void ShouldAddCorrectLineBreaks2()
                 ColorAssert.AreEqual(MagickColors.Green, image, 170, 67);
                 ColorAssert.AreEqual(MagickColors.Red, image, 444, 26);
                 ColorAssert.AreEqual(MagickColors.Red, image, 395, 55);
-                ColorAssert.AreEqual(MagickColors.Red, image, 230, 116);
-                ColorAssert.AreEqual(new MagickColor("#0000"), image, 170, 94);
+                ColorAssert.AreEqual(MagickColors.Red, image, 231, 116);
+                ColorAssert.AreEqual(new MagickColor("#0000"), image, 171, 93);
             }
         }
 
@@ -75,10 +75,10 @@ public void ShouldAddCorrectLineBreaks3()
 
             using (IMagickImage image = new MagickImage(caption, readSettings))
             {
-                ColorAssert.AreEqual(MagickColors.Black, image, 439, 23);
-                ColorAssert.AreEqual(MagickColors.Black, image, 265, 42);
-                ColorAssert.AreEqual(MagickColors.Black, image, 229, 68);
-                ColorAssert.AreEqual(MagickColors.White, image, 151, 77);
+                ColorAssert.AreEqual(MagickColors.Black, image, 419, 27);
+                ColorAssert.AreEqual(MagickColors.Black, image, 426, 58);
+                ColorAssert.AreEqual(MagickColors.Black, image, 450, 90);
+                ColorAssert.AreEqual(MagickColors.White, image, 153, 60);
             }
         }
 

diff --git a/tests/Magick.NET.Tests/Framework/Coders/TheLabelCoder.cs b/tests/Magick.NET.Tests/Framework/Coders/TheLabelCoder.cs
@@ -34,7 +34,7 @@ public void ShouldUseTheDensity()
 
             using (IMagickImage image = new MagickImage($"label:Masai Mara", readSettings))
             {
-                Assert.AreEqual(91, image.Width);
+                Assert.AreEqual(90, image.Width);
                 Assert.AreEqual(21, image.Height);
             }
         }

diff --git a/tests/Magick.NET.Tests/Shared/Coders/TheLabelCoder.cs b/tests/Magick.NET.Tests/Shared/Coders/TheLabelCoder.cs
@@ -29,7 +29,7 @@ public void ShouldUseTheCorrectFontSize()
 
             using (IMagickImage image = new MagickImage("label:asf", settings))
             {
-                ColorAssert.AreEqual(MagickColors.Black, image, 296, 67);
+                ColorAssert.AreEqual(MagickColors.Black, image, 293, 68);
                 ColorAssert.AreEqual(MagickColors.Black, image, 17, 200);
             }
         }

diff --git a/tests/Magick.NET.Tests/Shared/Drawables/DrawablesTests/TheFontTypeMetricsMethod.cs b/tests/Magick.NET.Tests/Shared/Drawables/DrawablesTests/TheFontTypeMetricsMethod.cs
@@ -53,7 +53,7 @@ public void ShouldUseTheFontSize()
                 Assert.AreEqual(-32, typeMetric.Descent);
                 Assert.AreEqual(300, typeMetric.MaxHorizontalAdvance);
                 Assert.AreEqual(168, typeMetric.TextHeight);
-                Assert.AreEqual(816, typeMetric.TextWidth);
+                Assert.AreEqual(813, typeMetric.TextWidth);
                 Assert.AreEqual(-21.38671875, typeMetric.UnderlinePosition);
                 Assert.AreEqual(10.986328125, typeMetric.UnderlineThickness);
             }

diff --git a/tests/Magick.NET.Tests/Shared/MagickImageTests.cs b/tests/Magick.NET.Tests/Shared/MagickImageTests.cs
@@ -1266,7 +1266,7 @@ public void Test_FontTypeMetrics()
                 Assert.AreEqual(-32, typeMetric.Descent);
                 Assert.AreEqual(300, typeMetric.MaxHorizontalAdvance);
                 Assert.AreEqual(168, typeMetric.TextHeight);
-                Assert.AreEqual(816, typeMetric.TextWidth);
+                Assert.AreEqual(813, typeMetric.TextWidth);
                 Assert.AreEqual(-21.38671875, typeMetric.UnderlinePosition);
                 Assert.AreEqual(10.986328125, typeMetric.UnderlineThickness);
             }

diff --git a/tests/Magick.NET.Tests/Shared/Settings/MagickSettingsTests.cs b/tests/Magick.NET.Tests/Shared/Settings/MagickSettingsTests.cs
@@ -426,13 +426,13 @@ public void Test_TextInterlineSpacing()
                 image.Settings.TextInterlineSpacing = 10;
                 image.Read("label:First\nSecond");
 
-                Assert.AreEqual(43, image.Width);
+                Assert.AreEqual(42, image.Width);
                 Assert.AreEqual(39, image.Height);
 
                 image.Settings.TextInterlineSpacing = 20;
                 image.Read("label:First\nSecond");
 
-                Assert.AreEqual(43, image.Width);
+                Assert.AreEqual(42, image.Width);
                 Assert.AreEqual(49, image.Height);
             }
         }
@@ -447,13 +447,13 @@ public void Test_TextInterwordSpacing()
                 image.Settings.TextInterwordSpacing = 10;
                 image.Read("label:First second");
 
-                Assert.AreEqual(74, image.Width);
+                Assert.AreEqual(73, image.Width);
                 Assert.AreEqual(15, image.Height);
 
                 image.Settings.TextInterwordSpacing = 20;
                 image.Read("label:First second");
 
-                Assert.AreEqual(84, image.Width);
+                Assert.AreEqual(83, image.Width);
                 Assert.AreEqual(15, image.Height);
             }
         }
@@ -468,13 +468,13 @@ public void Test_TextKerning()
                 image.Settings.TextKerning = 10;
                 image.Read("label:First");
 
-                Assert.AreEqual(64, image.Width);
+                Assert.AreEqual(65, image.Width);
                 Assert.AreEqual(15, image.Height);
 
                 image.Settings.TextKerning = 20;
                 image.Read("label:First");
 
-                Assert.AreEqual(104, image.Width);
+                Assert.AreEqual(105, image.Width);
                 Assert.AreEqual(15, image.Height);
             }
         }
@@ -489,7 +489,7 @@ public void Test_TextUnderColor()
                 image.Settings.TextUnderColor = MagickColors.Purple;
                 image.Read("label:First");
 
-                Assert.AreEqual(24, image.Width);
+                Assert.AreEqual(25, image.Width);
                 Assert.AreEqual(15, image.Height);
 
                 ColorAssert.AreEqual(MagickColors.Purple, image, 0, 0);
@@ -498,7 +498,7 @@ public void Test_TextUnderColor()
                 image.Settings.TextUnderColor = null;
                 image.Read("label:First");
 
-                Assert.AreEqual(24, image.Width);
+                Assert.AreEqual(25, image.Width);
                 Assert.AreEqual(15, image.Height);
 
                 ColorAssert.AreEqual(MagickColors.White, image, 0, 0);

diff --git a/tests/Magick.NET.Tests/Windows/MagickSettingsTests/TheFontFamilyProperty.cs b/tests/Magick.NET.Tests/Windows/MagickSettingsTests/TheFontFamilyProperty.cs
@@ -38,7 +38,7 @@ public void ShouldChangeTheFont()
                     image.Settings.FontWeight = FontWeight.ExtraBold;
                     image.Read("label:Test");
 
-                    Assert.AreEqual(97, image.Width);
+                    Assert.AreEqual(98, image.Width);
                     Assert.AreEqual(48, image.Height);
                     ColorAssert.AreEqual(MagickColors.Black, image, 16, 16);
                 }