From fc1228e1089fffc95d1c446d85a2781e719979b7 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Fri, 9 May 2025 14:05:44 +1000 Subject: [PATCH] Clean up tests --- .../Icc/ColorProfileConverterTests.Icc.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/ImageSharp.Tests/ColorProfiles/Icc/ColorProfileConverterTests.Icc.cs b/tests/ImageSharp.Tests/ColorProfiles/Icc/ColorProfileConverterTests.Icc.cs index 282bc5ba73..7e01a629bc 100644 --- a/tests/ImageSharp.Tests/ColorProfiles/Icc/ColorProfileConverterTests.Icc.cs +++ b/tests/ImageSharp.Tests/ColorProfiles/Icc/ColorProfileConverterTests.Icc.cs @@ -44,7 +44,7 @@ public class ColorProfileConverterTests(ITestOutputHelper testOutputHelper) [InlineData(TestIccProfiles.StandardRgbV2, TestIccProfiles.Fogra39)] // RGB -> XYZ -> LAB -> CMYK (different LUT tags, TRC vs A2B) public void CanConvertIccProfiles(string sourceProfile, string targetProfile, double tolerance = 0.00005) { - List actual = Inputs.Select(input => GetActualTargetValues(input, sourceProfile, targetProfile)).ToList(); + List actual = Inputs.ConvertAll(input => GetActualTargetValues(input, sourceProfile, targetProfile)); AssertConversion(sourceProfile, targetProfile, actual, tolerance, testOutputHelper); } @@ -70,7 +70,7 @@ public class ColorProfileConverterTests(ITestOutputHelper testOutputHelper) private static void AssertConversion(string sourceProfile, string targetProfile, List actual, double tolerance, ITestOutputHelper testOutputHelper) { - List expected = Inputs.Select(input => GetExpectedTargetValues(sourceProfile, targetProfile, input, testOutputHelper)).ToList(); + List expected = Inputs.ConvertAll(input => GetExpectedTargetValues(sourceProfile, targetProfile, input, testOutputHelper)); Assert.Equal(expected.Count, actual.Count); for (int i = 0; i < expected.Count; i++) @@ -115,7 +115,7 @@ public class ColorProfileConverterTests(ITestOutputHelper testOutputHelper) targetConfig = GetUnicolourConfigAsV4Header(targetConfig); } - Channels channels = new(input.Select(value => (double)value).ToArray()); + Channels channels = new([.. input.Select(value => (double)value)]); Unicolour source = new(sourceConfig, channels); Unicolour target = source.ConvertToConfiguration(targetConfig); if (target.Icc.Error != null) @@ -196,14 +196,14 @@ public class ColorProfileConverterTests(ITestOutputHelper testOutputHelper) { Span outputSpan = stackalloc Cmyk[inputs.Count]; converter.Convert(inputSpan, outputSpan); - return outputSpan.ToArray().Select(x => x.ToScaledVector4()).ToList(); + return [.. outputSpan.ToArray().Select(x => x.ToScaledVector4())]; } case IccColorSpaceType.Rgb: { Span outputSpan = stackalloc Rgb[inputs.Count]; converter.Convert(inputSpan, outputSpan); - return outputSpan.ToArray().Select(x => x.ToScaledVector4()).ToList(); + return [.. outputSpan.ToArray().Select(x => x.ToScaledVector4())]; } default: @@ -221,14 +221,14 @@ public class ColorProfileConverterTests(ITestOutputHelper testOutputHelper) { Span outputSpan = stackalloc Cmyk[inputs.Count]; converter.Convert(inputSpan, outputSpan); - return outputSpan.ToArray().Select(x => x.ToScaledVector4()).ToList(); + return [.. outputSpan.ToArray().Select(x => x.ToScaledVector4())]; } case IccColorSpaceType.Rgb: { Span outputSpan = stackalloc Rgb[inputs.Count]; converter.Convert(inputSpan, outputSpan); - return outputSpan.ToArray().Select(x => x.ToScaledVector4()).ToList(); + return [.. outputSpan.ToArray().Select(x => x.ToScaledVector4())]; } default: