diff --git a/src/ImageSharp/Processing/Processors/Filters/BlackWhiteProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/BlackWhiteProcessor.cs
index 30fcfab4f..141dc493a 100644
--- a/src/ImageSharp/Processing/Processors/Filters/BlackWhiteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/BlackWhiteProcessor.cs
@@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
/// Applies a black and white filter matrix to the image
///
/// The pixel format.
- internal class BlackWhiteProcessor : FilterProcessor
+ internal class BlackWhiteProcessor : FilterProcessor
where TPixel : struct, IPixel
{
///
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs
index 601f30a79..2b9620ed5 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs
@@ -9,11 +9,11 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class BlackWhiteTest : FileTestBase
+ public class BlackWhiteTest
{
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyBlackWhiteFilter(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyBlackWhiteFilter(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyBlackWhiteFilterInBox(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyBlackWhiteFilterInBox(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/BrightnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/BrightnessTest.cs
index b0a830b9d..00bc60547 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/BrightnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/BrightnessTest.cs
@@ -9,7 +9,7 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
{
- public class BrightnessTest : FileTestBase
+ public class BrightnessTest
{
public static readonly TheoryData BrightnessValues
= new TheoryData
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
};
[Theory]
- [WithTestPatternImages(nameof(BrightnessValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyBrightnessFilter(TestImageProvider provider, float value)
+ [WithTestPatternImages(nameof(BrightnessValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyBrightnessFilter(TestImageProvider provider, float value)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -31,8 +31,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
}
[Theory]
- [WithTestPatternImages(nameof(BrightnessValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyBrightnessFilterInBox(TestImageProvider provider, float value)
+ [WithTestPatternImages(nameof(BrightnessValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyBrightnessFilterInBox(TestImageProvider provider, float value)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
index 2342fe932..36f4a3140 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
@@ -27,7 +27,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
[Theory]
[WithTestPatternImages(nameof(ColorBlindnessFilters), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyColorBlindnessFilter(TestImageProvider provider, ColorBlindness colorBlindness)
+ public void ApplyColorBlindnessFilter(TestImageProvider provider, ColorBlindness colorBlindness)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
[Theory]
[WithTestPatternImages(nameof(ColorBlindnessFilters), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyColorBlindnessFilterInBox(TestImageProvider provider, ColorBlindness colorBlindness)
+ public void ApplyColorBlindnessFilterInBox(TestImageProvider provider, ColorBlindness colorBlindness)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/ContrastTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/ContrastTest.cs
index 67b86788a..caa09c579 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/ContrastTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/ContrastTest.cs
@@ -9,7 +9,7 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
{
- public class ContrastTest : FileTestBase
+ public class ContrastTest
{
public static readonly TheoryData ContrastValues
= new TheoryData
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
};
[Theory]
- [WithTestPatternImages(nameof(ContrastValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyContrastFilter(TestImageProvider provider, float value)
+ [WithTestPatternImages(nameof(ContrastValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyContrastFilter(TestImageProvider provider, float value)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -31,8 +31,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
}
[Theory]
- [WithTestPatternImages(nameof(ContrastValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyContrastFilterInBox(TestImageProvider provider, float value)
+ [WithTestPatternImages(nameof(ContrastValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyContrastFilterInBox(TestImageProvider provider, float value)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
index 905330868..59d888c14 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
@@ -11,11 +11,13 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class FilterTest : FileTestBase
+ public class FilterTest
{
+ // Testing the generic FilterProcessor with more than one pixel type intentionally.
+ // There is no need to do this with the specialized ones.
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyFilter(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32 | PixelTypes.Bgra32)]
+ public void ApplyFilter(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -29,8 +31,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyFilterInBox(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyFilterInBox(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/GrayscaleTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/GrayscaleTest.cs
index 23d514f35..9e8b9c029 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/GrayscaleTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/GrayscaleTest.cs
@@ -11,7 +11,7 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class GrayscaleTest : FileTestBase
+ public class GrayscaleTest
{
public static readonly TheoryData GrayscaleModeTypes
= new TheoryData
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
/// Use test patterns over loaded images to save decode time.
///
[Theory]
- [WithTestPatternImages(nameof(GrayscaleModeTypes), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyGrayscaleFilter(TestImageProvider provider, GrayscaleMode value)
+ [WithTestPatternImages(nameof(GrayscaleModeTypes), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyGrayscaleFilter(TestImageProvider provider, GrayscaleMode value)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -45,8 +45,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(nameof(GrayscaleModeTypes), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyGrayscaleFilterInBox(TestImageProvider provider, GrayscaleMode value)
+ [WithTestPatternImages(nameof(GrayscaleModeTypes), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyGrayscaleFilterInBox(TestImageProvider provider, GrayscaleMode value)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/HueTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/HueTest.cs
index 5a34595a6..317dce1c0 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/HueTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/HueTest.cs
@@ -9,7 +9,7 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class HueTest : FileTestBase
+ public class HueTest
{
public static readonly TheoryData HueValues
= new TheoryData
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
};
[Theory]
- [WithTestPatternImages(nameof(HueValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyHueFilter(TestImageProvider provider, int value)
+ [WithTestPatternImages(nameof(HueValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyHueFilter(TestImageProvider provider, int value)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -31,8 +31,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(nameof(HueValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyHueFilterInBox(TestImageProvider provider, int value)
+ [WithTestPatternImages(nameof(HueValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyHueFilterInBox(TestImageProvider provider, int value)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/InvertTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/InvertTest.cs
index 2199e691f..cac1e94ed 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/InvertTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/InvertTest.cs
@@ -9,11 +9,11 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
{
- public class InvertTest : FileTestBase
+ public class InvertTest
{
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyInvertFilter(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyInvertFilter(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
}
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyInvertFilterInBox(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyInvertFilterInBox(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/KodachromeTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/KodachromeTest.cs
index 6d95baaef..1ae6fc8ad 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/KodachromeTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/KodachromeTest.cs
@@ -9,11 +9,11 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class KodachromeTest : FileTestBase
+ public class KodachromeTest
{
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyKodachromeFilter(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyKodachromeFilter(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyKodachromeFilterInBox(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyKodachromeFilterInBox(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/LomographTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/LomographTest.cs
index 2f9cd4319..ed16e3e0e 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/LomographTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/LomographTest.cs
@@ -9,11 +9,11 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class LomographTest : FileTestBase
+ public class LomographTest
{
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyLomographFilter(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyLomographFilter(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyLomographFilterInBox(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyLomographFilterInBox(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/OpacityTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/OpacityTest.cs
index 12bf93299..4b1345bf0 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/OpacityTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/OpacityTest.cs
@@ -9,7 +9,7 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
{
- public class OpacityTest : FileTestBase
+ public class OpacityTest
{
public static readonly TheoryData AlphaValues
= new TheoryData
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
};
[Theory]
- [WithTestPatternImages(nameof(AlphaValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyAlphaFilter(TestImageProvider provider, float value)
+ [WithTestPatternImages(nameof(AlphaValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyAlphaFilter(TestImageProvider provider, float value)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -31,8 +31,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
}
[Theory]
- [WithTestPatternImages(nameof(AlphaValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplyAlphaFilterInBox(TestImageProvider provider, float value)
+ [WithTestPatternImages(nameof(AlphaValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplyAlphaFilterInBox(TestImageProvider provider, float value)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/PolaroidTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/PolaroidTest.cs
index 44e69c09e..2d3cdf6d4 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/PolaroidTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/PolaroidTest.cs
@@ -9,11 +9,11 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class PolaroidTest : FileTestBase
+ public class PolaroidTest
{
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyPolaroidFilter(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyPolaroidFilter(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplyPolaroidFilterInBox(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplyPolaroidFilterInBox(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/SaturateTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/SaturateTest.cs
index 8553cad4c..a7fc332bd 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/SaturateTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/SaturateTest.cs
@@ -9,7 +9,7 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class SaturateTest : FileTestBase
+ public class SaturateTest
{
public static readonly TheoryData SaturationValues
= new TheoryData
@@ -19,8 +19,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
};
[Theory]
- [WithTestPatternImages(nameof(SaturationValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplySaturationFilter(TestImageProvider provider, float value)
+ [WithTestPatternImages(nameof(SaturationValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplySaturationFilter(TestImageProvider provider, float value)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -31,8 +31,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(nameof(SaturationValues), 100, 100, DefaultPixelType)]
- public void ImageShouldApplySaturationFilterInBox(TestImageProvider provider, float value)
+ [WithTestPatternImages(nameof(SaturationValues), 48, 48, PixelTypes.Rgba32)]
+ public void ApplySaturationFilterInBox(TestImageProvider provider, float value)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/SepiaTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/SepiaTest.cs
index 499567ae8..0cc4a0520 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/SepiaTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/SepiaTest.cs
@@ -9,11 +9,11 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
{
- public class SepiaTest : FileTestBase
+ public class SepiaTest
{
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplySepiaFilter(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplySepiaFilter(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image image = provider.GetImage())
@@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
}
[Theory]
- [WithTestPatternImages(100, 100, DefaultPixelType)]
- public void ImageShouldApplySepiaFilterInBox(TestImageProvider provider)
+ [WithTestPatternImages(48, 48, PixelTypes.Rgba32)]
+ public void ApplySepiaFilterInBox(TestImageProvider provider)
where TPixel : struct, IPixel
{
using (Image source = provider.GetImage())