tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update skipped tests

pull/1299/head
James Jackson-South 6 years ago
parent
0a2cf17c1e
commit
be42b525c2
2 changed files with 49 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs
  2. 2
      tests/Images/External

78
tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs
View File

@ -21,29 +21,29 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.RgbaVector; public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.RgbaVector;
public static readonly TheoryData<EdgeDetectorKernel> DetectEdgesFilters public static readonly TheoryData<EdgeDetectorKernel, string> DetectEdgesFilters
= new TheoryData<EdgeDetectorKernel> = new TheoryData<EdgeDetectorKernel, string>
{ {
KnownEdgeDetectorKernels.Laplacian3x3, { KnownEdgeDetectorKernels.Laplacian3x3, nameof(KnownEdgeDetectorKernels.Laplacian3x3) },
KnownEdgeDetectorKernels.Laplacian5x5, { KnownEdgeDetectorKernels.Laplacian5x5, nameof(KnownEdgeDetectorKernels.Laplacian5x5) },
KnownEdgeDetectorKernels.LaplacianOfGaussian, { KnownEdgeDetectorKernels.LaplacianOfGaussian, nameof(KnownEdgeDetectorKernels.LaplacianOfGaussian) },
}; };
public static readonly TheoryData<EdgeDetector2DKernel> DetectEdges2DFilters public static readonly TheoryData<EdgeDetector2DKernel, string> DetectEdges2DFilters
= new TheoryData<EdgeDetector2DKernel> = new TheoryData<EdgeDetector2DKernel, string>
{ {
KnownEdgeDetectorKernels.Kayyali, { KnownEdgeDetectorKernels.Kayyali, nameof(KnownEdgeDetectorKernels.Kayyali) },
KnownEdgeDetectorKernels.Prewitt, { KnownEdgeDetectorKernels.Prewitt, nameof(KnownEdgeDetectorKernels.Prewitt) },
KnownEdgeDetectorKernels.RobertsCross, { KnownEdgeDetectorKernels.RobertsCross, nameof(KnownEdgeDetectorKernels.RobertsCross) },
KnownEdgeDetectorKernels.Scharr, { KnownEdgeDetectorKernels.Scharr, nameof(KnownEdgeDetectorKernels.Scharr) },
KnownEdgeDetectorKernels.Sobel { KnownEdgeDetectorKernels.Sobel, nameof(KnownEdgeDetectorKernels.Sobel) },
}; };
public static readonly TheoryData<EdgeDetectorCompassKernel> DetectEdgesCompassFilters public static readonly TheoryData<EdgeDetectorCompassKernel, string> DetectEdgesCompassFilters
= new TheoryData<EdgeDetectorCompassKernel> = new TheoryData<EdgeDetectorCompassKernel, string>
{ {
KnownEdgeDetectorKernels.Kirsch, { KnownEdgeDetectorKernels.Kirsch, nameof(KnownEdgeDetectorKernels.Kirsch) },
KnownEdgeDetectorKernels.Robinson, { KnownEdgeDetectorKernels.Robinson, nameof(KnownEdgeDetectorKernels.Robinson) },
}; };
[Theory] [Theory]
@ -65,7 +65,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
[Theory] [Theory]
[WithTestPatternImages(nameof(DetectEdgesFilters), 100, 100, PixelTypes.Rgba32)] [WithTestPatternImages(nameof(DetectEdgesFilters), 100, 100, PixelTypes.Rgba32)]
[WithFileCollection(nameof(TestImages), nameof(DetectEdgesFilters), PixelTypes.Rgba32)] [WithFileCollection(nameof(TestImages), nameof(DetectEdgesFilters), PixelTypes.Rgba32)]
public void DetectEdges_WorksWithAllFilters<TPixel>(TestImageProvider<TPixel> provider, EdgeDetectorKernel detector) public void DetectEdges_WorksWithAllFilters<TPixel>(
TestImageProvider<TPixel> provider,
EdgeDetectorKernel detector,
string name)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
bool hasAlpha = provider.SourceFileOrDescription.Contains("TestPattern"); bool hasAlpha = provider.SourceFileOrDescription.Contains("TestPattern");
@ -73,15 +76,18 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
using (Image<TPixel> image = provider.GetImage()) using (Image<TPixel> image = provider.GetImage())
{ {
image.Mutate(x => x.DetectEdges(detector)); image.Mutate(x => x.DetectEdges(detector));
image.DebugSave(provider, detector.ToString()); image.DebugSave(provider, name);
image.CompareToReferenceOutput(comparer, provider, detector.ToString()); image.CompareToReferenceOutput(comparer, provider, name);
} }
} }
[Theory] [Theory]
[WithTestPatternImages(nameof(DetectEdgesFilters), 100, 100, PixelTypes.Rgba32)] [WithTestPatternImages(nameof(DetectEdges2DFilters), 100, 100, PixelTypes.Rgba32)]
[WithFileCollection(nameof(TestImages), nameof(DetectEdges2DFilters), PixelTypes.Rgba32)] [WithFileCollection(nameof(TestImages), nameof(DetectEdges2DFilters), PixelTypes.Rgba32)]
public void DetectEdges2D_WorksWithAllFilters<TPixel>(TestImageProvider<TPixel> provider, EdgeDetector2DKernel detector) public void DetectEdges2D_WorksWithAllFilters<TPixel>(
TestImageProvider<TPixel> provider,
EdgeDetector2DKernel detector,
string name)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
bool hasAlpha = provider.SourceFileOrDescription.Contains("TestPattern"); bool hasAlpha = provider.SourceFileOrDescription.Contains("TestPattern");
@ -89,15 +95,18 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
using (Image<TPixel> image = provider.GetImage()) using (Image<TPixel> image = provider.GetImage())
{ {
image.Mutate(x => x.DetectEdges(detector)); image.Mutate(x => x.DetectEdges(detector));
image.DebugSave(provider, detector.ToString()); image.DebugSave(provider, name);
image.CompareToReferenceOutput(comparer, provider, detector.ToString()); image.CompareToReferenceOutput(comparer, provider, name);
} }
} }
[Theory] [Theory]
[WithTestPatternImages(nameof(DetectEdgesCompassFilters), 100, 100, PixelTypes.Rgba32)] [WithTestPatternImages(nameof(DetectEdgesCompassFilters), 100, 100, PixelTypes.Rgba32)]
[WithFileCollection(nameof(TestImages), nameof(DetectEdgesFilters), PixelTypes.Rgba32)] [WithFileCollection(nameof(TestImages), nameof(DetectEdgesCompassFilters), PixelTypes.Rgba32)]
public void DetectEdgesCompass_WorksWithAllFilters<TPixel>(TestImageProvider<TPixel> provider, EdgeDetectorCompassKernel detector) public void DetectEdgesCompass_WorksWithAllFilters<TPixel>(
TestImageProvider<TPixel> provider,
EdgeDetectorCompassKernel detector,
string name)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
bool hasAlpha = provider.SourceFileOrDescription.Contains("TestPattern"); bool hasAlpha = provider.SourceFileOrDescription.Contains("TestPattern");
@ -105,8 +114,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
using (Image<TPixel> image = provider.GetImage()) using (Image<TPixel> image = provider.GetImage())
{ {
image.Mutate(x => x.DetectEdges(detector)); image.Mutate(x => x.DetectEdges(detector));
image.DebugSave(provider, detector.ToString()); image.DebugSave(provider, name);
image.CompareToReferenceOutput(comparer, provider, detector.ToString()); image.CompareToReferenceOutput(comparer, provider, name);
} }
} }
@ -159,7 +168,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
[Theory] [Theory]
[WithFile(Tests.TestImages.Png.Bike, nameof(DetectEdgesFilters), PixelTypes.Rgba32)] [WithFile(Tests.TestImages.Png.Bike, nameof(DetectEdgesFilters), PixelTypes.Rgba32)]
public void WorksWithDiscoBuffers<TPixel>(TestImageProvider<TPixel> provider, EdgeDetectorKernel detector) public void WorksWithDiscoBuffers<TPixel>(
TestImageProvider<TPixel> provider,
EdgeDetectorKernel detector,
string _)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
provider.RunBufferCapacityLimitProcessorTest( provider.RunBufferCapacityLimitProcessorTest(
@ -170,7 +182,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
[Theory] [Theory]
[WithFile(Tests.TestImages.Png.Bike, nameof(DetectEdges2DFilters), PixelTypes.Rgba32)] [WithFile(Tests.TestImages.Png.Bike, nameof(DetectEdges2DFilters), PixelTypes.Rgba32)]
public void WorksWithDiscoBuffers2D<TPixel>(TestImageProvider<TPixel> provider, EdgeDetector2DKernel detector) public void WorksWithDiscoBuffers2D<TPixel>(
TestImageProvider<TPixel> provider,
EdgeDetector2DKernel detector,
string _)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
provider.RunBufferCapacityLimitProcessorTest( provider.RunBufferCapacityLimitProcessorTest(
@ -181,7 +196,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
[Theory] [Theory]
[WithFile(Tests.TestImages.Png.Bike, nameof(DetectEdgesCompassFilters), PixelTypes.Rgba32)] [WithFile(Tests.TestImages.Png.Bike, nameof(DetectEdgesCompassFilters), PixelTypes.Rgba32)]
public void WorksWithDiscoBuffersCompass<TPixel>(TestImageProvider<TPixel> provider, EdgeDetectorCompassKernel detector) public void WorksWithDiscoBuffersCompass<TPixel>(
TestImageProvider<TPixel> provider,
EdgeDetectorCompassKernel detector,
string _)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
provider.RunBufferCapacityLimitProcessorTest( provider.RunBufferCapacityLimitProcessorTest(

2
tests/Images/External

@ -1 +1 @@
Subproject commit 0d1f91e2fe1491f6dc2c137a8ea20460fde4404c Subproject commit 6a003080674d1fedc66292c13ce5a357b2a33083
Write Preview
Loading…
Cancel
Save