Browse Source

Add Xyy and HSV/HSL tests

pull/2739/head
James Jackson-South 2 years ago
parent
commit
cc49c7a9d7
  1. 2
      src/ImageSharp/ColorProfiles/Hsv.cs
  2. 70
      tests/ImageSharp.Tests/ColorProfiles/CieXyyAndHslConversionTests.cs
  3. 70
      tests/ImageSharp.Tests/ColorProfiles/CieXyyAndHsvConversionTests.cs

2
src/ImageSharp/ColorProfiles/Hsv.cs

@ -112,7 +112,7 @@ public readonly struct Hsv : IColorProfile<Hsv, Rgb>
}
h *= 60;
if (h < 0.0)
if (h < 0f)
{
h += 360;
}

70
tests/ImageSharp.Tests/ColorProfiles/CieXyyAndHslConversionTests.cs

@ -0,0 +1,70 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
using SixLabors.ImageSharp.ColorProfiles;
namespace SixLabors.ImageSharp.Tests.ColorProfiles;
/// <summary>
/// Tests <see cref="CieXyy"/>-<see cref="Hsl"/> conversions.
/// </summary>
public class CieXyyAndHslConversionTests
{
private static readonly ApproximateColorProfileComparer Comparer = new(.0002F);
[Theory]
[InlineData(0, 0, 0, 0, 0, 0)]
[InlineData(0.360555, 0.936901, 0.1001514, 120, 1, 0.2138507)]
public void Convert_CieXyy_to_Hsl(float x, float y, float yl, float h, float s, float l)
{
// Arrange
CieXyy input = new(x, y, yl);
Hsl expected = new(h, s, l);
ColorProfileConverter converter = new();
Span<CieXyy> inputSpan = new CieXyy[5];
inputSpan.Fill(input);
Span<Hsl> actualSpan = new Hsl[5];
// Act
Hsl actual = converter.Convert<CieXyy, Hsl>(input);
converter.Convert<CieXyy, Hsl>(inputSpan, actualSpan);
// Assert
Assert.Equal(expected, actual, Comparer);
for (int i = 0; i < actualSpan.Length; i++)
{
Assert.Equal(expected, actualSpan[i], Comparer);
}
}
[Theory]
[InlineData(0, 0, 0, 0, 0, 0)]
[InlineData(120, 1, 0.2138507, 0.32114, 0.59787, 0.10976)]
public void Convert_Hsl_to_CieXyy(float h, float s, float l, float x, float y, float yl)
{
// Arrange
Hsl input = new(h, s, l);
CieXyy expected = new(x, y, yl);
ColorProfileConverter converter = new();
Span<Hsl> inputSpan = new Hsl[5];
inputSpan.Fill(input);
Span<CieXyy> actualSpan = new CieXyy[5];
// Act
CieXyy actual = converter.Convert<Hsl, CieXyy>(input);
converter.Convert<Hsl, CieXyy>(inputSpan, actualSpan);
// Assert
Assert.Equal(expected, actual, Comparer);
for (int i = 0; i < actualSpan.Length; i++)
{
Assert.Equal(expected, actualSpan[i], Comparer);
}
}
}

70
tests/ImageSharp.Tests/ColorProfiles/CieXyyAndHsvConversionTests.cs

@ -0,0 +1,70 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
using SixLabors.ImageSharp.ColorProfiles;
namespace SixLabors.ImageSharp.Tests.ColorProfiles;
/// <summary>
/// Tests <see cref="CieXyy"/>-<see cref="Hsv"/> conversions.
/// </summary>
public class CieXyyAndHsvConversionTests
{
private static readonly ApproximateColorProfileComparer Comparer = new(.0002F);
[Theory]
[InlineData(0, 0, 0, 0, 0, 0)]
[InlineData(0.360555, 0.936901, 0.1001514, 120, 1, 0.42770)]
public void Convert_CieXyy_to_Hsv(float x, float y, float yl, float h, float s, float v)
{
// Arrange
CieXyy input = new(x, y, yl);
Hsv expected = new(h, s, v);
ColorProfileConverter converter = new();
Span<CieXyy> inputSpan = new CieXyy[5];
inputSpan.Fill(input);
Span<Hsv> actualSpan = new Hsv[5];
// Act
Hsv actual = converter.Convert<CieXyy, Hsv>(input);
converter.Convert<CieXyy, Hsv>(inputSpan, actualSpan);
// Assert
Assert.Equal(expected, actual, Comparer);
for (int i = 0; i < actualSpan.Length; i++)
{
Assert.Equal(expected, actualSpan[i], Comparer);
}
}
[Theory]
[InlineData(0, 0, 0, 0, 0, 0)]
[InlineData(120, 1, 0.42770, 0.32114, 0.59787, 0.10976)]
public void Convert_Hsv_to_CieXyy(float h, float s, float v, float x, float y, float yl)
{
// Arrange
Hsv input = new(h, s, v);
CieXyy expected = new(x, y, yl);
ColorProfileConverter converter = new();
Span<Hsv> inputSpan = new Hsv[5];
inputSpan.Fill(input);
Span<CieXyy> actualSpan = new CieXyy[5];
// Act
CieXyy actual = converter.Convert<Hsv, CieXyy>(input);
converter.Convert<Hsv, CieXyy>(inputSpan, actualSpan);
// Assert
Assert.Equal(expected, actual, Comparer);
for (int i = 0; i < actualSpan.Length; i++)
{
Assert.Equal(expected, actualSpan[i], Comparer);
}
}
}
Loading…
Cancel
Save