Browse Source

Fixed existing tests, added grayscale vector test and fixed tests naming

pull/1864/head
Dmitry Pentin 5 years ago
parent
commit
5605de5b19
  1. 65
      tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs

65
tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs

@ -54,16 +54,19 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[Theory] [Theory]
[MemberData(nameof(CommonConversionData))] [MemberData(nameof(CommonConversionData))]
public void FromYCbCrVector8(int inputBufferLength, int resultBufferLength, int seed) public void FromYCbCrVector(int inputBufferLength, int resultBufferLength, int seed)
{ {
if (!SimdUtils.HasVector8) var converter = new JpegColorConverterBase.FromYCbCrVector(8);
if (!converter.IsAvailable)
{ {
this.Output.WriteLine("No AVX2 present, skipping test!"); this.Output.WriteLine(
$"Skipping test - {converter.GetType().Name} is not supported on current hardware.");
return; return;
} }
ValidateConversion( ValidateConversion(
new JpegColorConverterBase.FromYCbCrVector(8), converter,
3, 3,
inputBufferLength, inputBufferLength,
resultBufferLength, resultBufferLength,
@ -119,16 +122,19 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[Theory] [Theory]
[MemberData(nameof(CommonConversionData))] [MemberData(nameof(CommonConversionData))]
public void FromCmykVector8(int inputBufferLength, int resultBufferLength, int seed) public void FromCmykVector(int inputBufferLength, int resultBufferLength, int seed)
{ {
if (!SimdUtils.HasVector8) var converter = new JpegColorConverterBase.FromCmykVector(8);
if (!converter.IsAvailable)
{ {
this.Output.WriteLine("No AVX2 present, skipping test!"); this.Output.WriteLine(
$"Skipping test - {converter.GetType().Name} is not supported on current hardware.");
return; return;
} }
ValidateConversion( ValidateConversion(
new JpegColorConverterBase.FromCmykVector(8), converter,
4, 4,
inputBufferLength, inputBufferLength,
resultBufferLength, resultBufferLength,
@ -182,6 +188,27 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
seed); seed);
} }
[Theory]
[MemberData(nameof(CommonConversionData))]
public void FromGrayscaleVector(int inputBufferLength, int resultBufferLength, int seed)
{
var converter = new JpegColorConverterBase.FromGrayScaleVector(8);
if (!converter.IsAvailable)
{
this.Output.WriteLine(
$"Skipping test - {converter.GetType().Name} is not supported on current hardware.");
return;
}
ValidateConversion(
converter,
1,
inputBufferLength,
resultBufferLength,
seed);
}
#if SUPPORTS_RUNTIME_INTRINSICS #if SUPPORTS_RUNTIME_INTRINSICS
[Theory] [Theory]
[MemberData(nameof(CommonConversionData))] [MemberData(nameof(CommonConversionData))]
@ -231,16 +258,19 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[Theory] [Theory]
[MemberData(nameof(CommonConversionData))] [MemberData(nameof(CommonConversionData))]
public void FromRgbVector8(int inputBufferLength, int resultBufferLength, int seed) public void FromRgbVector(int inputBufferLength, int resultBufferLength, int seed)
{ {
if (!SimdUtils.HasVector8) var converter = new JpegColorConverterBase.FromRgbVector(8);
if (!converter.IsAvailable)
{ {
this.Output.WriteLine("No AVX2 present, skipping test!"); this.Output.WriteLine(
$"Skipping test - {converter.GetType().Name} is not supported on current hardware.");
return; return;
} }
ValidateConversion( ValidateConversion(
new JpegColorConverterBase.FromRgbVector(8), converter,
3, 3,
inputBufferLength, inputBufferLength,
resultBufferLength, resultBufferLength,
@ -296,16 +326,19 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[Theory] [Theory]
[MemberData(nameof(CommonConversionData))] [MemberData(nameof(CommonConversionData))]
public void FromYccKVector8(int inputBufferLength, int resultBufferLength, int seed) public void FromYccKVector(int inputBufferLength, int resultBufferLength, int seed)
{ {
if (!SimdUtils.HasVector8) var converter = new JpegColorConverterBase.FromYccKVector(8);
if (!converter.IsAvailable)
{ {
this.Output.WriteLine("No AVX2 present, skipping test!"); this.Output.WriteLine(
$"Skipping test - {converter.GetType().Name} is not supported on current hardware.");
return; return;
} }
ValidateConversion( ValidateConversion(
new JpegColorConverterBase.FromYccKVector(8), converter,
4, 4,
inputBufferLength, inputBufferLength,
resultBufferLength, resultBufferLength,

Loading…
Cancel
Save