Browse Source

Filter xunit references so testrunner does not throw.

af/octree-no-pixelmap
James Jackson-South 6 years ago
parent
commit
9b57a30fd9
  1. 2
      .github/workflows/build-and-test.yml
  2. 2
      tests/Directory.Build.props
  3. 2
      tests/Directory.Build.targets
  4. 23
      tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHslConversionTest.cs

2
.github/workflows/build-and-test.yml

@ -80,7 +80,7 @@ jobs:
- name: Test
shell: pwsh
run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}" Debug
run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
env:
CI: True
XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit

2
tests/Directory.Build.props

@ -24,7 +24,7 @@
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
<ItemGroup>
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<PackageReference Include="Microsoft.NET.Test.Sdk" IsImplicitlyDefined="true" />
<PackageReference Include="xunit" IsImplicitlyDefined="true" />
<PackageReference Include="xunit.runner.visualstudio" IsImplicitlyDefined="true" />

2
tests/Directory.Build.targets

@ -17,7 +17,7 @@
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
<!-- Tool versions for tool references across all projects -->
<ItemGroup>
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<!--dotnet tools does not have an x86 runner. You have to use separate SDKs-->
<!--https://github.com/actions/setup-dotnet/issues/72-->
<DotNetCliToolReference Update="dotnet-xunit" Version="2.3.1" />

23
tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHslConversionTest.cs

@ -5,6 +5,7 @@ using System;
using SixLabors.ImageSharp.ColorSpaces;
using SixLabors.ImageSharp.ColorSpaces.Conversion;
using Xunit;
using Xunit.Abstractions;
namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
{
@ -21,6 +22,24 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
public static TheoryData<float, float, float, float, float, float> Hsl_To_Rgb
= new TheoryData<float, float, float, float, float, float>
{
{ 0, 0, 0, 0, 0, 0 },
{ 0, 1, 1, 1, 1, 1 },
{ 360, 1, 1, 1, 1, 1 },
{ 0, 1, .5F, 1, 0, 0 },
{ 120, 1, .5F, 0, 1, 0 },
{ 240, 1, .5F, 0, 0, 1 }
};
private readonly ITestOutputHelper output;
public RgbAndHslConversionTest(ITestOutputHelper output)
{
this.output = output;
}
/// <summary>
/// Tests conversion from <see cref="Hsl"/> to <see cref="Rgb"/>.
/// </summary>
@ -31,6 +50,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
[InlineData(0, 1, .5F, 1, 0, 0)]
[InlineData(120, 1, .5F, 0, 1, 0)]
[InlineData(240, 1, .5F, 0, 0, 1)]
//[Theory]
//[MemberData(nameof(Hsl_To_Rgb))]
public void Convert_Hsl_To_Rgb(float h, float s, float l, float r, float g, float b)
{
// Arrange
@ -54,6 +75,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
{
Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
}
this.output.WriteLine("Verifying Convert_Hsl_To_Rgb is run");
}
/// <summary>

Loading…
Cancel
Save