Browse Source

Use the floatcomparer

pull/181/head
James Jackson-South 9 years ago
parent
commit
4ff49c12e2
  1. 16
      tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs
  2. 3
      tests/ImageSharp.Tests/Colors/Colorspaces/RgbAndCieXyzConversionTest.cs

16
tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs

@ -3,6 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using ImageSharp.Colors.Spaces; using ImageSharp.Colors.Spaces;
using ImageSharp.Colors.Spaces.Conversion; using ImageSharp.Colors.Spaces.Conversion;
using ImageSharp.Tests.TestUtilities;
using Xunit; using Xunit;
@ -15,8 +16,7 @@
/// </remarks> /// </remarks>
public class CieXyzAndCieLabConversionTest public class CieXyzAndCieLabConversionTest
{ {
private static readonly IEqualityComparer<float> FloatComparerLabPrecision = new ApproximateFloatComparer(4); private static readonly IEqualityComparer<float> FloatRoundingComparer = new FloatRoundingComparer(4);
private static readonly IEqualityComparer<float> FloatComparerXyzPrecision = new ApproximateFloatComparer(6);
/// <summary> /// <summary>
/// Tests conversion from <see cref="CieLab"/> to <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>). /// Tests conversion from <see cref="CieLab"/> to <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>).
@ -40,9 +40,9 @@
CieXyz output = converter.ToCieXyz(input); CieXyz output = converter.ToCieXyz(input);
// Assert // Assert
Assert.Equal(output.X, x, FloatComparerXyzPrecision); Assert.Equal(output.X, x, FloatRoundingComparer);
Assert.Equal(output.Y, y, FloatComparerXyzPrecision); Assert.Equal(output.Y, y, FloatRoundingComparer);
Assert.Equal(output.Z, z, FloatComparerXyzPrecision); Assert.Equal(output.Z, z, FloatRoundingComparer);
} }
/// <summary> /// <summary>
@ -65,9 +65,9 @@
CieLab output = converter.ToCieLab(input); CieLab output = converter.ToCieLab(input);
// Assert // Assert
Assert.Equal(output.L, l, FloatComparerLabPrecision); Assert.Equal(output.L, l, FloatRoundingComparer);
Assert.Equal(output.A, a, FloatComparerLabPrecision); Assert.Equal(output.A, a, FloatRoundingComparer);
Assert.Equal(output.B, b, FloatComparerLabPrecision); Assert.Equal(output.B, b, FloatRoundingComparer);
} }
} }
} }

3
tests/ImageSharp.Tests/Colors/Colorspaces/RgbAndCieXyzConversionTest.cs

@ -3,6 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using ImageSharp.Colors.Spaces; using ImageSharp.Colors.Spaces;
using ImageSharp.Colors.Spaces.Conversion; using ImageSharp.Colors.Spaces.Conversion;
using ImageSharp.Tests.TestUtilities;
using Xunit; using Xunit;
@ -15,7 +16,7 @@
/// </remarks> /// </remarks>
public class RgbAndCieXyzConversionTest public class RgbAndCieXyzConversionTest
{ {
private static readonly IEqualityComparer<float> FloatComparerPrecision = new ApproximateFloatComparer(6); private static readonly IEqualityComparer<float> FloatComparerPrecision = new FloatRoundingComparer(6);
/// <summary> /// <summary>
/// Tests conversion from <see cref="CieXyz"/> (<see cref="Illuminants.D50"/>) /// Tests conversion from <see cref="CieXyz"/> (<see cref="Illuminants.D50"/>)

Loading…
Cancel
Save