Builds and tests pass

Author: JimBobSquarePants

tests/ImageSharp.Drawing.Tests/ConfigurationTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using Moq;
+using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.IO;
 
@@ -84,7 +85,7 @@ public void MaxDegreeOfParallelism_CompatibleWith_ParallelOptions(int maxDegreeO
     [Fact]
     public void ConstructorCallConfigureOnFormatProvider()
     {
-        var provider = new Mock<IConfigurationModule>();
+        var provider = new Mock<IImageFormatConfigurationModule>();
         var config = new Configuration(provider.Object);
 
         provider.Verify(x => x.Configure(config));
@@ -93,7 +94,7 @@ public void ConstructorCallConfigureOnFormatProvider()
     [Fact]
     public void AddFormatCallsConfig()
     {
-        var provider = new Mock<IConfigurationModule>();
+        var provider = new Mock<IImageFormatConfigurationModule>();
         var config = new Configuration();
         config.Configure(provider.Object);
 

tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs

@@ -761,7 +761,7 @@ public void PathAndTextDrawingMatch<TPixel>(TestImageProvider<TPixel> provider)
                       };
 
                       FontRectangle bounds = TextMeasurer.MeasureBounds(text, to);
-                      float x = (img.Size().Width - bounds.Width) / 2;
+                      float x = (img.Size.Width - bounds.Width) / 2;
                       PointF[] pathLine = new[]
                       {
                           new PointF(x, 500),

tests/ImageSharp.Drawing.Tests/Processing/BaseImageOperationsExtensionTest.cs

@@ -17,7 +17,7 @@ public abstract class BaseImageOperationsExtensionTest
     protected readonly ShapeOptions shapeOptions;
     private readonly Image<Rgba32> source;
 
-    public Rectangle SourceBounds() => this.source.Bounds();
+    public Rectangle SourceBounds() => this.source.Bounds;
 
     public BaseImageOperationsExtensionTest()
     {

tests/ImageSharp.Drawing.Tests/Processing/FakeImageOperationsProvider.cs

@@ -51,7 +51,7 @@ public FakeImageOperations(Configuration configuration, Image<TPixel> source, bo
 
         public Image<TPixel> GetResultImage() => this.Source;
 
-        public Size GetCurrentSize() => this.Source.Size();
+        public Size GetCurrentSize() => this.Source.Size;
 
         public IImageProcessingContext ApplyProcessor(IImageProcessor processor, Rectangle rectangle)
         {

tests/ImageSharp.Drawing.Tests/Shapes/ArcLineSegmentTest.cs

@@ -8,12 +8,12 @@ public class ArcLineSegmentTest
     [Fact]
     public void ContainsStartAndEnd()
     {
-        var segment = new ArcLineSegment(new(10, 10), new(10, 20), 0, 0, 90);
+        ArcLineSegment segment = new(new(10, 10), new(10, 20), 0, 0, 90);
         ReadOnlySpan<PointF> points = segment.Flatten().Span;
-        Assert.Equal(20, points[0].X, 5);
-        Assert.Equal(10, points[0].Y, 5);
-        Assert.Equal(10, segment.EndPoint.X, 5);
-        Assert.Equal(30, segment.EndPoint.Y, 5);
+        Assert.Equal(20, points[0].X, 5F);
+        Assert.Equal(10, points[0].Y, 5F);
+        Assert.Equal(10, segment.EndPoint.X, 5F);
+        Assert.Equal(30, segment.EndPoint.Y, 5F);
     }
 
     [Fact]

tests/ImageSharp.Drawing.Tests/Shapes/InternalPathTests.cs

@@ -95,8 +95,8 @@ public void PointOnPath(float distance, float expectedX, float expectedY, float
     {
         InternalPath shape = Create(new PointF(50, 50), new Size(200, 60));
         SegmentInfo point = shape.PointAlongPath(distance);
-        Assert.Equal(expectedX, point.Point.X, 4);
-        Assert.Equal(expectedY, point.Point.Y, 4);
-        Assert.Equal(expectedAngle, point.Angle, 4);
+        Assert.Equal(expectedX, point.Point.X, 4F);
+        Assert.Equal(expectedY, point.Point.Y, 4F);
+        Assert.Equal(expectedAngle, point.Angle, 4F);
     }
 }

tests/ImageSharp.Drawing.Tests/Shapes/RegularPolygonTests.cs

@@ -71,8 +71,8 @@ public void GeneratesCorrectPath()
             }
 
             float actual = Vector2.Distance(points[i], points[j]);
-            Assert.Equal(baseline, actual, 3);
-            Assert.Equal(Radius, Vector2.Distance(Vector2.Zero, points[i]), 3);
+            Assert.Equal(baseline, actual, 3F);
+            Assert.Equal(Radius, Vector2.Distance(Vector2.Zero, points[i]), 3F);
         }
     }
 

tests/ImageSharp.Drawing.Tests/Shapes/StarTests.cs

@@ -75,14 +75,14 @@ public void GeneratesCorrectPath()
             }
 
             float actual = Vector2.Distance(points[i], points[j]);
-            Assert.Equal(baseline, actual, 3);
+            Assert.Equal(baseline, actual, 3F);
             if (i % 2 == 1)
             {
-                Assert.Equal(Radius, Vector2.Distance(Vector2.Zero, points[i]), 3);
+                Assert.Equal(Radius, Vector2.Distance(Vector2.Zero, points[i]), 3F);
             }
             else
             {
-                Assert.Equal(Radius2, Vector2.Distance(Vector2.Zero, points[i]), 3);
+                Assert.Equal(Radius2, Vector2.Distance(Vector2.Zero, points[i]), 3F);
             }
         }
     }

tests/ImageSharp.Drawing.Tests/TestFile.cs

@@ -2,7 +2,6 @@
 // Licensed under the Six Labors Split License.
 
 using System.Collections.Concurrent;
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.PixelFormats;
 using IOPath = System.IO.Path;
@@ -12,23 +11,18 @@ namespace SixLabors.ImageSharp.Drawing.Tests;
 /// <summary>
 /// A test image file.
 /// </summary>
-public class TestFile
+public sealed class TestFile
 {
     /// <summary>
     /// The test file cache.
     /// </summary>
-    private static readonly ConcurrentDictionary<string, TestFile> Cache = new ConcurrentDictionary<string, TestFile>();
+    private static readonly ConcurrentDictionary<string, TestFile> Cache = new();
 
     /// <summary>
     /// The "Formats" directory, as lazy value
     /// </summary>
     // ReSharper disable once InconsistentNaming
-    private static readonly Lazy<string> LazyInputImagesDirectory = new Lazy<string>(() => TestEnvironment.InputImagesDirectoryFullPath);
-
-    /// <summary>
-    /// The image (lazy initialized value)
-    /// </summary>
-    private Image<Rgba32> image;
+    private static readonly Lazy<string> InputImagesDirectoryValue = new(() => TestEnvironment.InputImagesDirectoryFullPath);
 
     /// <summary>
     /// The image bytes
@@ -39,8 +33,7 @@ public class TestFile
     /// Initializes a new instance of the <see cref="TestFile"/> class.
     /// </summary>
     /// <param name="file">The file.</param>
-    private TestFile(string file)
-        => this.FullPath = file;
+    private TestFile(string file) => this.FullPath = file;
 
     /// <summary>
     /// Gets the image bytes.
@@ -62,20 +55,17 @@ private TestFile(string file)
     /// </summary>
     public string FileNameWithoutExtension => IOPath.GetFileNameWithoutExtension(this.FullPath);
 
-    /// <summary>
-    /// Gets the image with lazy initialization.
-    /// </summary>
-    private Image<Rgba32> Image => this.image ??= ImageSharp.Image.Load<Rgba32>(this.Bytes);
-
     /// <summary>
     /// Gets the input image directory.
     /// </summary>
-    private static string InputImagesDirectory => LazyInputImagesDirectory.Value;
+    private static string InputImagesDirectory => InputImagesDirectoryValue.Value;
 
     /// <summary>
     /// Gets the full qualified path to the input test file.
     /// </summary>
-    /// <param name="file">The file path.</param>
+    /// <param name="file">
+    /// The file path.
+    /// </param>
     /// <returns>
     /// The <see cref="string"/>.
     /// </returns>
@@ -90,7 +80,7 @@ public static string GetInputFileFullPath(string file)
     /// The <see cref="TestFile"/>.
     /// </returns>
     public static TestFile Create(string file)
-        => Cache.GetOrAdd(file, (string fileName) => new TestFile(GetInputFileFullPath(file)));
+        => Cache.GetOrAdd(file, (string fileName) => new TestFile(GetInputFileFullPath(fileName)));
 
     /// <summary>
     /// Gets the file name.
@@ -113,19 +103,34 @@ public string GetFileNameWithoutExtension(object value)
         => this.FileNameWithoutExtension + "-" + value;
 
     /// <summary>
-    /// Creates a new image.
+    /// Creates a new <see cref="Rgba32"/> image.
     /// </summary>
     /// <returns>
-    /// The <see cref="ImageSharp.Image"/>.
+    /// The <see cref="Image{Rgba32}"/>.
     /// </returns>
-    public Image<Rgba32> CreateRgba32Image() => this.Image.Clone();
+    public Image<Rgba32> CreateRgba32Image() => Image.Load<Rgba32>(this.Bytes);
 
     /// <summary>
-    /// Creates a new image.
+    /// Creates a new <see cref="Rgba32"/> image.
     /// </summary>
+    /// <param name="decoder">The image decoder.</param>
     /// <returns>
-    /// The <see cref="ImageSharp.Image"/>.
+    /// The <see cref="Image{Rgba32}"/>.
     /// </returns>
     public Image<Rgba32> CreateRgba32Image(IImageDecoder decoder)
-        => ImageSharp.Image.Load<Rgba32>(this.Image.GetConfiguration(), this.Bytes, decoder);
+        => this.CreateRgba32Image(decoder, new());
+
+    /// <summary>
+    /// Creates a new <see cref="Rgba32"/> image.
+    /// </summary>
+    /// <param name="decoder">The image decoder.</param>
+    /// <param name="options">The general decoder options.</param>
+    /// <returns>
+    /// The <see cref="Image{Rgba32}"/>.
+    /// </returns>
+    public Image<Rgba32> CreateRgba32Image(IImageDecoder decoder, DecoderOptions options)
+    {
+        using MemoryStream stream = new(this.Bytes);
+        return decoder.Decode<Rgba32>(options, stream);
+    }
 }