From 880e35f313b4493de777b2aa2e8d02a2f7544308 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Sat, 15 Apr 2017 12:16:23 +1000 Subject: [PATCH] Use the floatcomparer --- .../Colorspaces/CieXyzAndCieLabConversionTest.cs | 16 ++++++++-------- .../Colorspaces/RgbAndCieXyzConversionTest.cs | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs b/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs index 55aec4db5..105e06b28 100644 --- a/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs +++ b/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using ImageSharp.Colors.Spaces; using ImageSharp.Colors.Spaces.Conversion; + using ImageSharp.Tests.TestUtilities; using Xunit; @@ -15,8 +16,7 @@ /// public class CieXyzAndCieLabConversionTest { - private static readonly IEqualityComparer FloatComparerLabPrecision = new ApproximateFloatComparer(4); - private static readonly IEqualityComparer FloatComparerXyzPrecision = new ApproximateFloatComparer(6); + private static readonly IEqualityComparer FloatRoundingComparer = new FloatRoundingComparer(4); /// /// Tests conversion from to (). @@ -40,9 +40,9 @@ CieXyz output = converter.ToCieXyz(input); // Assert - Assert.Equal(output.X, x, FloatComparerXyzPrecision); - Assert.Equal(output.Y, y, FloatComparerXyzPrecision); - Assert.Equal(output.Z, z, FloatComparerXyzPrecision); + Assert.Equal(output.X, x, FloatRoundingComparer); + Assert.Equal(output.Y, y, FloatRoundingComparer); + Assert.Equal(output.Z, z, FloatRoundingComparer); } /// @@ -65,9 +65,9 @@ CieLab output = converter.ToCieLab(input); // Assert - Assert.Equal(output.L, l, FloatComparerLabPrecision); - Assert.Equal(output.A, a, FloatComparerLabPrecision); - Assert.Equal(output.B, b, FloatComparerLabPrecision); + Assert.Equal(output.L, l, FloatRoundingComparer); + Assert.Equal(output.A, a, FloatRoundingComparer); + Assert.Equal(output.B, b, FloatRoundingComparer); } } } \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Colors/Colorspaces/RgbAndCieXyzConversionTest.cs b/tests/ImageSharp.Tests/Colors/Colorspaces/RgbAndCieXyzConversionTest.cs index b078c0a33..9042eaa46 100644 --- a/tests/ImageSharp.Tests/Colors/Colorspaces/RgbAndCieXyzConversionTest.cs +++ b/tests/ImageSharp.Tests/Colors/Colorspaces/RgbAndCieXyzConversionTest.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using ImageSharp.Colors.Spaces; using ImageSharp.Colors.Spaces.Conversion; + using ImageSharp.Tests.TestUtilities; using Xunit; @@ -15,7 +16,7 @@ /// public class RgbAndCieXyzConversionTest { - private static readonly IEqualityComparer FloatComparerPrecision = new ApproximateFloatComparer(6); + private static readonly IEqualityComparer FloatComparerPrecision = new FloatRoundingComparer(6); /// /// Tests conversion from ()