Cleanup and update tests

Author: JimBobSquarePants

src/ImageSharp.Drawing/Processing/Brushes.cs

@@ -93,130 +93,131 @@ public static class Brushes
         /// </summary>
         /// <param name="color">The color.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static SolidBrush Solid(Color color) => new SolidBrush(color);
+        public static SolidBrush Solid(Color color) => new(color);
 
         /// <summary>
         /// Create as brush that will paint a Percent10 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Percent10(Color foreColor) =>
-            new PatternBrush(foreColor, Color.Transparent, Percent10Pattern);
+        public static PatternBrush Percent10(Color foreColor)
+            => new(foreColor, Color.Transparent, Percent10Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent10 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Percent10(Color foreColor, Color backColor) =>
-            new PatternBrush(foreColor, backColor, Percent10Pattern);
+        public static PatternBrush Percent10(Color foreColor, Color backColor)
+            => new(foreColor, backColor, Percent10Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Percent20(Color foreColor) =>
-            new PatternBrush(foreColor, Color.Transparent, Percent20Pattern);
+        public static PatternBrush Percent20(Color foreColor)
+            => new(foreColor, Color.Transparent, Percent20Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Percent20(Color foreColor, Color backColor) =>
-            new PatternBrush(foreColor, backColor, Percent20Pattern);
+        public static PatternBrush Percent20(Color foreColor, Color backColor)
+            => new(foreColor, backColor, Percent20Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Horizontal(Color foreColor) =>
-            new PatternBrush(foreColor, Color.Transparent, HorizontalPattern);
+        public static PatternBrush Horizontal(Color foreColor)
+            => new(foreColor, Color.Transparent, HorizontalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Horizontal(Color foreColor, Color backColor) =>
-            new PatternBrush(foreColor, backColor, HorizontalPattern);
+        public static PatternBrush Horizontal(Color foreColor, Color backColor)
+            => new(foreColor, backColor, HorizontalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Min(Color foreColor) => new PatternBrush(foreColor, Color.Transparent, MinPattern);
+        public static PatternBrush Min(Color foreColor)
+            => new(foreColor, Color.Transparent, MinPattern);
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Min(Color foreColor, Color backColor) =>
-            new PatternBrush(foreColor, backColor, MinPattern);
+        public static PatternBrush Min(Color foreColor, Color backColor)
+            => new(foreColor, backColor, MinPattern);
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Vertical(Color foreColor) =>
-            new PatternBrush(foreColor, Color.Transparent, VerticalPattern);
+        public static PatternBrush Vertical(Color foreColor)
+            => new(foreColor, Color.Transparent, VerticalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush Vertical(Color foreColor, Color backColor) =>
-            new PatternBrush(foreColor, backColor, VerticalPattern);
+        public static PatternBrush Vertical(Color foreColor, Color backColor)
+            => new(foreColor, backColor, VerticalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush ForwardDiagonal(Color foreColor) =>
-            new PatternBrush(foreColor, Color.Transparent, ForwardDiagonalPattern);
+        public static PatternBrush ForwardDiagonal(Color foreColor)
+            => new(foreColor, Color.Transparent, ForwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush ForwardDiagonal(Color foreColor, Color backColor) =>
-            new PatternBrush(foreColor, backColor, ForwardDiagonalPattern);
+        public static PatternBrush ForwardDiagonal(Color foreColor, Color backColor)
+            => new(foreColor, backColor, ForwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush BackwardDiagonal(Color foreColor) =>
-            new PatternBrush(foreColor, Color.Transparent, BackwardDiagonalPattern);
+        public static PatternBrush BackwardDiagonal(Color foreColor)
+            => new(foreColor, Color.Transparent, BackwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A New <see cref="PatternBrush"/></returns>
-        public static PatternBrush BackwardDiagonal(Color foreColor, Color backColor) =>
-            new PatternBrush(foreColor, backColor, BackwardDiagonalPattern);
+        public static PatternBrush BackwardDiagonal(Color foreColor, Color backColor)
+            => new(foreColor, backColor, BackwardDiagonalPattern);
     }
 }

src/ImageSharp.Drawing/Processing/PatternPen.cs

@@ -7,8 +7,11 @@ namespace SixLabors.ImageSharp.Drawing.Processing
     /// Defines a pen that can apply a pattern to a line with a set brush and thickness
     /// </summary>
     /// <remarks>
-    /// The pattern will be in to the form of <code>new float[]{ 1f, 2f, 0.5f}</code> this will be
-    /// converted into a pattern that is 3.5 times longer that the width with 3 sections.
+    /// The pattern will be in to the form of
+    /// <code>
+    /// new float[]{ 1f, 2f, 0.5f}
+    /// </code>
+    /// this will be converted into a pattern that is 3.5 times longer that the width with 3 sections.
     /// <list type="bullet">
     /// <item>Section 1 will be width long (making a square) and will be filled by the brush.</item>
     /// <item>Section 2 will be width * 2 long and will be empty.</item>

src/ImageSharp.Drawing/Processing/Pen.cs

@@ -6,15 +6,20 @@
 namespace SixLabors.ImageSharp.Drawing.Processing
 {
     /// <summary>
-    /// Provides a pen that can apply a pattern to a line with a set brush and thickness
+    /// The base class for pens that can apply a pattern to a line with a set brush and thickness
     /// </summary>
     /// <remarks>
-    /// The pattern will be in to the form of new float[]{ 1f, 2f, 0.5f} this will be
-    /// converted into a pattern that is 3.5 times longer that the width with 3 sections
-    /// section 1 will be width long (making a square) and will be filled by the brush
-    /// section 2 will be width * 2 long and will be empty
-    /// section 3 will be width/2 long and will be filled
-    /// the pattern will immediately repeat without gap.
+    /// The pattern will be in to the form of
+    /// <code>
+    /// new float[]{ 1f, 2f, 0.5f}
+    /// </code>
+    /// this will be converted into a pattern that is 3.5 times longer that the width with 3 sections.
+    /// <list type="bullet">
+    /// <item>Section 1 will be width long (making a square) and will be filled by the brush.</item>
+    /// <item>Section 2 will be width * 2 long and will be empty.</item>
+    /// <item>ection 3 will be width/2 long and will be filled.</item>
+    /// </list>
+    /// The pattern will immediately repeat without gap.
     /// </remarks>
     public abstract class Pen : IEquatable<Pen>
     {

src/ImageSharp.Drawing/Processing/Processors/Text/ImageProcessorExtensions.cs

@@ -2,15 +2,12 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 using SixLabors.ImageSharp.Drawing.Tests.TestUtilities.ImageComparison;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.Shapes.Scan

tests/ImageSharp.Drawing.Tests/Shapes/Scan/RasterizerExtensionsTests.cs

@@ -3,7 +3,6 @@
 
 using System.Numerics;
 using SixLabors.Fonts;
-using SixLabors.ImageSharp.Drawing.Processing;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
@@ -14,12 +13,12 @@ public class TextBuilderTests
         public void TextBuilder_Bounds_AreCorrect()
         {
             Vector2 position = new(5, 5);
-            var options = new RichTextOptions(TestFontUtilities.GetFont(TestFonts.OpenSans, 16))
+            var options = new TextOptions(TestFontUtilities.GetFont(TestFonts.OpenSans, 16))
             {
                 Origin = position
             };
 
-            const string text = "Hello World";
+            const string text = "The quick brown fox jumps over the lazy fox";
 
             IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, options);
 
@@ -30,7 +29,11 @@ public void TextBuilder_Bounds_AreCorrect()
             Assert.Equal(measuredBounds.X, builderBounds.X);
             Assert.Equal(measuredBounds.Y, builderBounds.Y);
             Assert.Equal(measuredBounds.Width, builderBounds.Width);
-            Assert.Equal(measuredBounds.Height, builderBounds.Height);
+
+            // TextMeasurer will measure the full lineheight of the string.
+            // TextBuilder does not include line gaps following the descender since there
+            // is no path to include.
+            Assert.True(measuredBounds.Height >= builderBounds.Height);
         }
     }
 }