From 53045ff35751b7ac052908e12f040b86cebd3264 Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Thu, 19 Apr 2018 14:25:25 -0700 Subject: [PATCH] Format tests --- .../Advanced/AdvancedImageExtensionsTests.cs | 10 +- .../BaseImageOperationsExtensionTest.cs | 4 - .../CieLabAndCieLchConversionTests.cs | 8 +- .../CieLuvAndCieLchuvConversionTests.cs | 4 +- .../CieXyzAndCieLabConversionTest.cs | 10 +- .../CieXyzAndCieLuvConversionTest.cs | 8 +- .../CieXyzAndCieXyyConversionTest.cs | 6 +- .../CieXyzAndHunterLabConversionTest.cs | 12 +- .../Colorspaces/CieXyzAndLmsConversionTest.cs | 8 +- .../Colorspaces/ColorConverterAdaptTest.cs | 30 +-- .../Colorspaces/RgbAndCieXyzConversionTest.cs | 14 +- .../Colorspaces/RgbAndCmykConversionTest.cs | 4 +- .../Colorspaces/RgbAndHslConversionTest.cs | 4 +- .../Colorspaces/RgbAndHsvConversionTest.cs | 4 +- .../Colorspaces/RgbAndYCbCrConversionTest.cs | 4 +- .../ImageSharp.Tests/Common/ConstantsTests.cs | 2 +- .../ImageSharp.Tests/Common/SimdUtilsTests.cs | 18 +- .../ComplexIntegrationTests.cs | 15 +- tests/ImageSharp.Tests/ConfigurationTests.cs | 184 +++++++++--------- .../ImageSharp.Tests/Drawing/BeziersTests.cs | 8 +- .../ImageSharp.Tests/Drawing/DrawImageTest.cs | 2 +- .../ImageSharp.Tests/Drawing/DrawPathTests.cs | 1 - .../Drawing/FillPatternTests.cs | 12 +- .../Drawing/FillRegionProcessorTests.cs | 4 +- .../Drawing/FillSolidBrushTests.cs | 5 +- .../Drawing/LineComplexPolygonTests.cs | 23 +-- tests/ImageSharp.Tests/Drawing/LineTests.cs | 28 +-- .../Drawing/Paths/FillPolygon.cs | 1 - .../Drawing/RecolorImageTest.cs | 3 +- .../Drawing/SolidBezierTests.cs | 5 +- .../Drawing/SolidComplexPolygonTests.cs | 29 +-- .../Drawing/SolidPolygonTests.cs | 9 +- .../Drawing/Text/DrawText.Path.cs | 4 +- .../ImageSharp.Tests/Drawing/Text/DrawText.cs | 2 +- .../Drawing/Text/OutputText.cs | 2 +- .../Formats/Bmp/BmpEncoderTests.cs | 9 +- tests/ImageSharp.Tests/IO/LocalFileSystem.cs | 8 +- tests/ImageSharp.Tests/ImageOperationTests.cs | 4 +- .../Numerics/RationalTests.cs | 24 +-- .../Numerics/SignedRationalTests.cs | 25 ++- .../Binarization/BinaryDitherTest.cs | 12 +- .../Binarization/BinaryThresholdTest.cs | 9 +- .../Binarization/OrderedDitherFactoryTests.cs | 6 +- .../Processing/Dithering/DitherTest.cs | 9 +- .../Processing/Effects/BackgroundColorTest.cs | 5 +- .../Processing/Effects/OilPaintTest.cs | 7 +- .../Processing/Effects/PixelateTest.cs | 7 +- .../Processing/Filters/BlackWhiteTest.cs | 8 +- .../Processing/Filters/BrightnessTest.cs | 7 +- .../Processing/Filters/ColorBlindnessTest.cs | 11 +- .../Processing/Filters/GrayscaleTest.cs | 8 +- .../Processing/Filters/HueTest.cs | 8 +- .../Processing/Filters/InvertTest.cs | 7 +- .../Processing/Filters/KodachromeTest.cs | 7 +- .../Processing/Filters/OpacityTest.cs | 6 +- .../Processing/Filters/PolaroidTest.cs | 8 +- .../Processing/Filters/SaturateTest.cs | 7 +- .../Processing/Filters/SepiaTest.cs | 7 +- .../Binarization/BinaryDitherTests.cs | 13 +- .../Processors/Convolution/DetectEdgesTest.cs | 7 +- .../Convolution/GaussianBlurTest.cs | 7 +- .../Convolution/GaussianSharpenTest.cs | 6 +- .../Processors/Dithering/DitherTests.cs | 3 - .../Processors/Transforms/AutoOrientTests.cs | 2 +- .../Processors/Transforms/CropTest.cs | 6 +- .../Processors/Transforms/EntropyCropTest.cs | 6 +- .../Processors/Transforms/FlipTests.cs | 1 + .../Transforms/ResizeProfilingBenchmarks.cs | 7 +- .../Processors/Transforms/ResizeTests.cs | 9 +- .../Processors/Transforms/RotateTests.cs | 8 +- .../Transforms/AffineTransformTests.cs | 7 +- .../Processing/Transforms/RotateTests.cs | 6 +- .../Processing/Transforms/SkewTest.cs | 6 +- .../Transforms/TransformsHelpersTest.cs | 4 +- .../Quantization/QuantizedImageTests.cs | 13 +- .../TestDataIcc/IccTestDataArray.cs | 2 +- tests/ImageSharp.Tests/TestFileSystem.cs | 7 +- tests/ImageSharp.Tests/TestFont.cs | 8 +- tests/ImageSharp.Tests/TestFormat.cs | 2 +- .../TestUtilities/ArrayHelper.cs | 10 +- .../ImageComparison/ExactImageComparer.cs | 18 +- ...ImageDifferenceIsOverThresholdException.cs | 13 +- .../ImageComparison/ImageSimilarityReport.cs | 14 +- .../ImageComparison/PixelDifference.cs | 5 +- .../ImageComparison/TolerantImageComparer.cs | 26 +-- .../ImageProviders/FileProvider.cs | 2 +- .../ImageProviders/SolidProvider.cs | 4 +- .../ImageProviders/TestImageProvider.cs | 9 +- .../ImageProviders/TestPatternProvider.cs | 5 +- .../TestUtilities/MeasureFixture.cs | 2 +- .../SystemDrawingReferenceDecoder.cs | 3 +- .../SystemDrawingReferenceEncoder.cs | 5 +- .../TestUtilities/TestImageExtensions.cs | 52 +++-- .../TestUtilities/TestPixel.cs | 1 + .../TestUtilities/TestType.cs | 2 +- .../TestUtilities/TestUtils.cs | 8 +- .../TestUtilities/TestVector4.cs | 8 +- .../TestUtilities/Tests/GroupOutputTests.cs | 15 +- .../TestUtilities/Tests/ImageComparerTests.cs | 36 ++-- .../Tests/ReferenceCodecTests.cs | 21 +- .../Tests/TestEnvironmentTests.cs | 7 +- .../Tests/TestImageExtensionsTests.cs | 33 ++-- .../Tests/TestImageProviderTests.cs | 76 ++++---- .../Tests/TestUtilityExtensionsTests.cs | 1 + 104 files changed, 541 insertions(+), 661 deletions(-) diff --git a/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs b/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs index 4291e775d..302b90e30 100644 --- a/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs +++ b/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs @@ -1,15 +1,13 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using Xunit; -using SixLabors.ImageSharp.Advanced; using System.Runtime.CompilerServices; -// ReSharper disable InconsistentNaming +using SixLabors.ImageSharp.Advanced; +using SixLabors.ImageSharp.PixelFormats; +using Xunit; namespace SixLabors.ImageSharp.Tests.Advanced { - using SixLabors.ImageSharp.PixelFormats; - public class AdvancedImageExtensionsTests { [Theory] @@ -19,7 +17,7 @@ namespace SixLabors.ImageSharp.Tests.Advanced { using (Image image = provider.GetImage()) { - TPixel[] targetBuffer = new TPixel[image.Width * image.Height]; + var targetBuffer = new TPixel[image.Width * image.Height]; ref byte source = ref Unsafe.As(ref targetBuffer[0]); ref byte dest = ref Unsafe.As(ref image.DangerousGetPinnableReferenceToPixelBuffer()); diff --git a/tests/ImageSharp.Tests/BaseImageOperationsExtensionTest.cs b/tests/ImageSharp.Tests/BaseImageOperationsExtensionTest.cs index 121d93dac..34b2f718e 100644 --- a/tests/ImageSharp.Tests/BaseImageOperationsExtensionTest.cs +++ b/tests/ImageSharp.Tests/BaseImageOperationsExtensionTest.cs @@ -1,10 +1,6 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using System; -using System.Collections.Generic; -using System.Text; - using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.Primitives; diff --git a/tests/ImageSharp.Tests/Colorspaces/CieLabAndCieLchConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieLabAndCieLchConversionTests.cs index 426945989..299b9e9e5 100644 --- a/tests/ImageSharp.Tests/Colorspaces/CieLabAndCieLchConversionTests.cs +++ b/tests/ImageSharp.Tests/Colorspaces/CieLabAndCieLchConversionTests.cs @@ -36,10 +36,10 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Lch_to_Lab(float l, float c, float h, float l2, float a, float b) { // Arrange - CieLch input = new CieLch(l, c, h); + var input = new CieLch(l, c, h); // Act - CieLab output = Converter.ToCieLab(input); + var output = Converter.ToCieLab(input); // Assert Assert.Equal(l2, output.L, FloatRoundingComparer); @@ -62,10 +62,10 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Lab_to_LCHab(float l, float a, float b, float l2, float c, float h) { // Arrange - CieLab input = new CieLab(l, a, b); + var input = new CieLab(l, a, b); // Act - CieLch output = Converter.ToCieLch(input); + var output = Converter.ToCieLch(input); // Assert Assert.Equal(l2, output.L, FloatRoundingComparer); diff --git a/tests/ImageSharp.Tests/Colorspaces/CieLuvAndCieLchuvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieLuvAndCieLchuvConversionTests.cs index 17fd1db50..cbcddcfe5 100644 --- a/tests/ImageSharp.Tests/Colorspaces/CieLuvAndCieLchuvConversionTests.cs +++ b/tests/ImageSharp.Tests/Colorspaces/CieLuvAndCieLchuvConversionTests.cs @@ -36,7 +36,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Lchuv_to_Luv(float l, float c, float h, float l2, float u, float v) { // Arrange - CieLchuv input = new CieLchuv(l, c, h); + var input = new CieLchuv(l, c, h); // Act CieLuv output = Converter.ToCieLuv(input); @@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Luv_to_LCHuv(float l, float u, float v, float l2, float c, float h) { // Arrange - CieLuv input = new CieLuv(l, u, v); + var input = new CieLuv(l, u, v); // Act CieLchuv output = Converter.ToCieLchuv(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLabConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLabConversionTest.cs index 76d76f236..186f97618 100644 --- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLabConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLabConversionTest.cs @@ -34,8 +34,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Lab_to_Xyz(float l, float a, float b, float x, float y, float z) { // Arrange - CieLab input = new CieLab(l, a, b, Illuminants.D65); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 }; + var input = new CieLab(l, a, b, Illuminants.D65); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 }; // Act CieXyz output = converter.ToCieXyz(input); @@ -59,11 +59,11 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Xyz_to_Lab(float x, float y, float z, float l, float a, float b) { // Arrange - CieXyz input = new CieXyz(x, y, z); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 }; + var input = new CieXyz(x, y, z); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 }; // Act - CieLab output = converter.ToCieLab(input); + var output = converter.ToCieLab(input); // Assert Assert.Equal(l, output.L, FloatRoundingComparer); diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLuvConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLuvConversionTest.cs index b18bd56dc..46f4f15b8 100644 --- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLuvConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLuvConversionTest.cs @@ -33,8 +33,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Luv_to_Xyz(float l, float u, float v, float x, float y, float z) { // Arrange - CieLuv input = new CieLuv(l, u, v, Illuminants.D65); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 }; + var input = new CieLuv(l, u, v, Illuminants.D65); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 }; // Act CieXyz output = converter.ToCieXyz(input); @@ -58,8 +58,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Xyz_to_Luv(float x, float y, float z, float l, float u, float v) { // Arrange - CieXyz input = new CieXyz(x, y, z); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 }; + var input = new CieXyz(x, y, z); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 }; // Act CieLuv output = converter.ToCieLuv(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieXyyConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieXyyConversionTest.cs index 1652c5392..d461acd56 100644 --- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieXyyConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieXyyConversionTest.cs @@ -28,8 +28,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces [InlineData(0, 0, 0, 0.538842, 0.000000, 0.000000)] public void Convert_xyY_to_XYZ(float xyzX, float xyzY, float xyzZ, float x, float y, float yl) { - // Arrange - CieXyy input = new CieXyy(x, y, yl); + var input = new CieXyy(x, y, yl); // Act CieXyz output = Converter.ToCieXyz(input); @@ -47,8 +46,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces [InlineData(0.231809, 0, 0.077528, 0.749374, 0.000000, 0.000000)] public void Convert_XYZ_to_xyY(float xyzX, float xyzY, float xyzZ, float x, float y, float yl) { - // Arrange - CieXyz input = new CieXyz(xyzX, xyzY, xyzZ); + var input = new CieXyz(xyzX, xyzY, xyzZ); // Act CieXyy output = Converter.ToCieXyy(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndHunterLabConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndHunterLabConversionTest.cs index 1c48d00ff..bea392c16 100644 --- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndHunterLabConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndHunterLabConversionTest.cs @@ -28,8 +28,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_HunterLab_to_Xyz(float l, float a, float b, float x, float y, float z) { // Arrange - HunterLab input = new HunterLab(l, a, b); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.C }; + var input = new HunterLab(l, a, b); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.C }; // Act CieXyz output = converter.ToCieXyz(input); @@ -49,8 +49,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_HunterLab_to_Xyz_D65(float l, float a, float b, float x, float y, float z) { // Arrange - HunterLab input = new HunterLab(l, a, b); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65 }; + var input = new HunterLab(l, a, b); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65 }; // Act CieXyz output = converter.ToCieXyz(input); @@ -70,8 +70,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Xyz_D65_to_HunterLab(float x, float y, float z, float l, float a, float b) { // Arrange - CieXyz input = new CieXyz(x, y, z); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65 }; + var input = new CieXyz(x, y, z); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65 }; // Act HunterLab output = converter.ToHunterLab(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndLmsConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndLmsConversionTest.cs index f63c54212..45ca9049a 100644 --- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndLmsConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/CieXyzAndLmsConversionTest.cs @@ -31,8 +31,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Lms_to_CieXyz(float l, float m, float s, float x, float y, float z) { // Arrange - Lms input = new Lms(l, m, s); - ColorSpaceConverter converter = new ColorSpaceConverter(); + var input = new Lms(l, m, s); + var converter = new ColorSpaceConverter(); // Act CieXyz output = converter.ToCieXyz(input); @@ -56,8 +56,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_CieXyz_to_Lms(float x, float y, float z, float l, float m, float s) { // Arrange - CieXyz input = new CieXyz(x, y, z); - ColorSpaceConverter converter = new ColorSpaceConverter(); + var input = new CieXyz(x, y, z); + var converter = new ColorSpaceConverter(); // Act Lms output = converter.ToLms(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/ColorConverterAdaptTest.cs b/tests/ImageSharp.Tests/Colorspaces/ColorConverterAdaptTest.cs index 6cb32be47..b393c51b7 100644 --- a/tests/ImageSharp.Tests/Colorspaces/ColorConverterAdaptTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/ColorConverterAdaptTest.cs @@ -28,9 +28,9 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Adapt_RGB_WideGamutRGB_To_sRGB(float r1, float g1, float b1, float r2, float g2, float b2) { // Arrange - Rgb input = new Rgb(r1, g1, b1, RgbWorkingSpaces.WideGamutRgb); - Rgb expectedOutput = new Rgb(r2, g2, b2, RgbWorkingSpaces.SRgb); - ColorSpaceConverter converter = new ColorSpaceConverter { TargetRgbWorkingSpace = RgbWorkingSpaces.SRgb }; + var input = new Rgb(r1, g1, b1, RgbWorkingSpaces.WideGamutRgb); + var expectedOutput = new Rgb(r2, g2, b2, RgbWorkingSpaces.SRgb); + var converter = new ColorSpaceConverter { TargetRgbWorkingSpace = RgbWorkingSpaces.SRgb }; // Action Rgb output = converter.Adapt(input); @@ -49,9 +49,9 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Adapt_RGB_SRGB_To_WideGamutRGB(float r1, float g1, float b1, float r2, float g2, float b2) { // Arrange - Rgb input = new Rgb(r1, g1, b1, RgbWorkingSpaces.SRgb); - Rgb expectedOutput = new Rgb(r2, g2, b2, RgbWorkingSpaces.WideGamutRgb); - ColorSpaceConverter converter = new ColorSpaceConverter { TargetRgbWorkingSpace = RgbWorkingSpaces.WideGamutRgb }; + var input = new Rgb(r1, g1, b1, RgbWorkingSpaces.SRgb); + var expectedOutput = new Rgb(r2, g2, b2, RgbWorkingSpaces.WideGamutRgb); + var converter = new ColorSpaceConverter { TargetRgbWorkingSpace = RgbWorkingSpaces.WideGamutRgb }; // Action Rgb output = converter.Adapt(input); @@ -69,9 +69,9 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Adapt_Lab_D50_To_D65(float l1, float a1, float b1, float l2, float a2, float b2) { // Arrange - CieLab input = new CieLab(l1, a1, b1, Illuminants.D65); - CieLab expectedOutput = new CieLab(l2, a2, b2); - ColorSpaceConverter converter = new ColorSpaceConverter { TargetLabWhitePoint = Illuminants.D50 }; + var input = new CieLab(l1, a1, b1, Illuminants.D65); + var expectedOutput = new CieLab(l2, a2, b2); + var converter = new ColorSpaceConverter { TargetLabWhitePoint = Illuminants.D50 }; // Action CieLab output = converter.Adapt(input); @@ -110,9 +110,9 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Adapt_CieXyz_D65_To_D50_XyzScaling(float x1, float y1, float z1, float x2, float y2, float z2) { // Arrange - CieXyz input = new CieXyz(x1, y1, z1); - CieXyz expectedOutput = new CieXyz(x2, y2, z2); - ColorSpaceConverter converter = new ColorSpaceConverter + var input = new CieXyz(x1, y1, z1); + var expectedOutput = new CieXyz(x2, y2, z2); + var converter = new ColorSpaceConverter { ChromaticAdaptation = new VonKriesChromaticAdaptation(LmsAdaptationMatrix.XyzScaling), WhitePoint = Illuminants.D50 @@ -133,9 +133,9 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Adapt_Xyz_D65_To_D50_XyzScaling(float x1, float y1, float z1, float x2, float y2, float z2) { // Arrange - CieXyz input = new CieXyz(x1, y1, z1); - CieXyz expectedOutput = new CieXyz(x2, y2, z2); - ColorSpaceConverter converter = new ColorSpaceConverter + var input = new CieXyz(x1, y1, z1); + var expectedOutput = new CieXyz(x2, y2, z2); + var converter = new ColorSpaceConverter { ChromaticAdaptation = new VonKriesChromaticAdaptation(LmsAdaptationMatrix.XyzScaling), WhitePoint = Illuminants.D50 diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs index e7f197878..929c35ee9 100644 --- a/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs @@ -35,8 +35,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_XYZ_D50_to_SRGB(float x, float y, float z, float r, float g, float b) { // Arrange - CieXyz input = new CieXyz(x, y, z); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D50, TargetRgbWorkingSpace = RgbWorkingSpaces.SRgb }; + var input = new CieXyz(x, y, z); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D50, TargetRgbWorkingSpace = RgbWorkingSpaces.SRgb }; // Act Rgb output = converter.ToRgb(input); @@ -92,12 +92,12 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_SRGB_to_XYZ_D50(float r, float g, float b, float x, float y, float z) { // Arrange - Rgb input = new Rgb(r, g, b); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D50 }; + var input = new Rgb(r, g, b); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D50 }; // Act CieXyz output = converter.ToCieXyz(input); - + // Assert IEqualityComparer comparer = new ApproximateFloatComparer(0.001f); Assert.Equal(x, output.X, comparer); @@ -119,8 +119,8 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_SRGB_to_XYZ_D65(float r, float g, float b, float x, float y, float z) { // Arrange - Rgb input = new Rgb(r, g, b); - ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65 }; + var input = new Rgb(r, g, b); + var converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65 }; // Act CieXyz output = converter.ToCieXyz(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs index aa1f9c574..9a6ff7b49 100644 --- a/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs @@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Cmyk_To_Rgb(float c, float m, float y, float k, float r, float g, float b) { // Arrange - Cmyk input = new Cmyk(c, m, y, k); + var input = new Cmyk(c, m, y, k); // Act Rgb output = Converter.ToRgb(input); @@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Rgb_To_Cmyk(float r, float g, float b, float c, float m, float y, float k) { // Arrange - Rgb input = new Rgb(r, g, b); + var input = new Rgb(r, g, b); // Act Cmyk output = Converter.ToCmyk(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs index f658ddaae..4f1537932 100644 --- a/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs @@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Hsl_To_Rgb(float h, float s, float l, float r, float g, float b) { // Arrange - Hsl input = new Hsl(h, s, l); + var input = new Hsl(h, s, l); // Act Rgb output = Converter.ToRgb(input); @@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Rgb_To_Hsl(float r, float g, float b, float h, float s, float l) { // Arrange - Rgb input = new Rgb(r, g, b); + var input = new Rgb(r, g, b); // Act Hsl output = Converter.ToHsl(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs index 63b3d9b74..7f46ff1fc 100644 --- a/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs @@ -36,7 +36,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Hsv_To_Rgb(float h, float s, float v, float r, float g, float b) { // Arrange - Hsv input = new Hsv(h, s, v); + var input = new Hsv(h, s, v); // Act Rgb output = Converter.ToRgb(input); @@ -60,7 +60,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Rgb_To_Hsv(float r, float g, float b, float h, float s, float v) { // Arrange - Rgb input = new Rgb(r, g, b); + var input = new Rgb(r, g, b); // Act Hsv output = Converter.ToHsv(input); diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs index 96c302e25..46c12e3a5 100644 --- a/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs +++ b/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs @@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_YCbCr_To_Rgb(float y, float cb, float cr, float r, float g, float b) { // Arrange - YCbCr input = new YCbCr(y, cb, cr); + var input = new YCbCr(y, cb, cr); // Act Rgb output = Converter.ToRgb(input); @@ -55,7 +55,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces public void Convert_Rgb_To_YCbCr(float r, float g, float b, float y, float cb, float cr) { // Arrange - Rgb input = new Rgb(r, g, b); + var input = new Rgb(r, g, b); // Act YCbCr output = Converter.ToYCbCr(input); diff --git a/tests/ImageSharp.Tests/Common/ConstantsTests.cs b/tests/ImageSharp.Tests/Common/ConstantsTests.cs index 48ecbbbc9..38d754d60 100644 --- a/tests/ImageSharp.Tests/Common/ConstantsTests.cs +++ b/tests/ImageSharp.Tests/Common/ConstantsTests.cs @@ -13,4 +13,4 @@ namespace SixLabors.ImageSharp.Tests.Common Assert.Equal(0.001f, Constants.Epsilon); } } -} +} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs b/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs index d16c053cd..49a13b733 100644 --- a/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs +++ b/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs @@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Tests.Common Random rnd = new Random(); for (int i = 0; i < Vector.Count; i++) { - float v = (float)rnd.NextDouble() * (max-min) + min; + float v = (float)rnd.NextDouble() * (max - min) + min; data[i] = v; } return new Vector(data); @@ -102,7 +102,7 @@ namespace SixLabors.ImageSharp.Tests.Common [InlineData(42, 1000f)] public void FastRound_RandomValues(int seed, float scale) { - Vector v = CreateRandomTestVector(seed, -scale*0.5f, scale*0.5f); + Vector v = CreateRandomTestVector(seed, -scale * 0.5f, scale * 0.5f); Vector r = v.FastRound(); this.Output.WriteLine(v.ToString()); @@ -133,7 +133,7 @@ namespace SixLabors.ImageSharp.Tests.Common return; } - float[] orig = new Random(seed).GenerateRandomRoundedFloatArray(count, 0, 256); + float[] orig = new Random(seed).GenerateRandomRoundedFloatArray(count, 0, 256); float[] normalized = orig.Select(f => f / 255f).ToArray(); byte[] dest = new byte[count]; @@ -158,12 +158,12 @@ namespace SixLabors.ImageSharp.Tests.Common } float[] source = new Random(seed).GenerateRandomFloatArray(count, 0, 1f); - + byte[] dest = new byte[count]; - + SimdUtils.BulkConvertNormalizedFloatToByte(source, dest); - byte[] expected = source.Select(f => (byte)Math.Round(f*255f)).ToArray(); + byte[] expected = source.Select(f => (byte)Math.Round(f * 255f)).ToArray(); Assert.Equal(expected, dest); } @@ -217,7 +217,7 @@ namespace SixLabors.ImageSharp.Tests.Common return; } - float[] source = {0, 7, 42, 255, 0.5f, 1.1f, 2.6f, 16f}; + float[] source = { 0, 7, 42, 255, 0.5f, 1.1f, 2.6f, 16f }; byte[] expected = source.Select(f => (byte)Math.Round(f)).ToArray(); source = source.Select(f => f / 255f).ToArray(); @@ -242,7 +242,7 @@ namespace SixLabors.ImageSharp.Tests.Common Vector scale = new Vector(255f) / new Vector(256f); Vector x = MemoryMarshal.Cast>(source)[0]; - + x = (x * scale) + magick; Tuple8.OfUInt32 ii = default; @@ -252,7 +252,7 @@ namespace SixLabors.ImageSharp.Tests.Common iiRef = x; //Tuple8.OfUInt32 ii = Unsafe.As, Tuple8.OfUInt32>(ref x); - + ref Tuple8.OfByte d = ref MemoryMarshal.Cast(dest)[0]; d.LoadFrom(ref ii); diff --git a/tests/ImageSharp.Tests/ComplexIntegrationTests.cs b/tests/ImageSharp.Tests/ComplexIntegrationTests.cs index 86703959a..ed4bb6104 100644 --- a/tests/ImageSharp.Tests/ComplexIntegrationTests.cs +++ b/tests/ImageSharp.Tests/ComplexIntegrationTests.cs @@ -1,13 +1,12 @@ -namespace SixLabors.ImageSharp.Tests -{ - using SixLabors.ImageSharp.Formats.Jpeg; - using SixLabors.ImageSharp.PixelFormats; - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Transforms; - using SixLabors.Primitives; +using SixLabors.ImageSharp.Formats.Jpeg; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing.Transforms; +using SixLabors.Primitives; - using Xunit; +using Xunit; +namespace SixLabors.ImageSharp.Tests +{ /// /// Might be useful to catch complex bugs /// diff --git a/tests/ImageSharp.Tests/ConfigurationTests.cs b/tests/ImageSharp.Tests/ConfigurationTests.cs index cf348569c..88aabfe33 100644 --- a/tests/ImageSharp.Tests/ConfigurationTests.cs +++ b/tests/ImageSharp.Tests/ConfigurationTests.cs @@ -1,95 +1,95 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the Apache License, Version 2.0. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using SixLabors.ImageSharp.Formats; -using SixLabors.ImageSharp.IO; -using SixLabors.ImageSharp.PixelFormats; -using Moq; -using Xunit; - -namespace SixLabors.ImageSharp.Tests -{ - /// - /// Tests the configuration class. - /// - public class ConfigurationTests - { - public Configuration ConfigurationEmpty { get; private set; } - public Configuration DefaultConfiguration { get; private set; } - - public ConfigurationTests() +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.IO; +using SixLabors.ImageSharp.PixelFormats; +using Moq; +using Xunit; + +namespace SixLabors.ImageSharp.Tests +{ + /// + /// Tests the configuration class. + /// + public class ConfigurationTests + { + public Configuration ConfigurationEmpty { get; private set; } + public Configuration DefaultConfiguration { get; private set; } + + public ConfigurationTests() { // the shallow copy of configuration should behave exactly like the default configuration, - // so by using the copy, we test both the default and the copy. - this.DefaultConfiguration = Configuration.CreateDefaultInstance().ShallowCopy(); - this.ConfigurationEmpty = new Configuration(); - } - - [Fact] - public void DefaultsToLocalFileSystem() - { - Assert.IsType(this.DefaultConfiguration.FileSystem); - Assert.IsType(this.ConfigurationEmpty.FileSystem); - } - - /// - /// Test that the default configuration is not null. - /// - [Fact] - public void TestDefultConfigurationIsNotNull() - { - Assert.True(Configuration.Default != null); - } - - /// - /// Test that the default configuration parallel options is not null. - /// - [Fact] - public void TestDefultConfigurationParallelOptionsIsNotNull() - { - Assert.True(Configuration.Default.ParallelOptions != null); - } - - /// - /// Test that the default configuration read origin options is set to begin. - /// - [Fact] - public void TestDefultConfigurationReadOriginIsCurrent() - { - Assert.True(Configuration.Default.ReadOrigin == ReadOrigin.Current); - } - - /// - /// Test that the default configuration parallel options max degrees of parallelism matches the - /// environment processor count. - /// - [Fact] - public void TestDefultConfigurationMaxDegreeOfParallelism() - { - Assert.True(Configuration.Default.ParallelOptions.MaxDegreeOfParallelism == Environment.ProcessorCount); - } - - [Fact] - public void ConstructorCallConfigureOnFormatProvider() - { - var provider = new Mock(); - var config = new Configuration(provider.Object); - - provider.Verify(x => x.Configure(config)); - } - - [Fact] - public void AddFormatCallsConfig() - { - var provider = new Mock(); - var config = new Configuration(); - config.Configure(provider.Object); - - provider.Verify(x => x.Configure(config)); - } - } + // so by using the copy, we test both the default and the copy. + this.DefaultConfiguration = Configuration.CreateDefaultInstance().ShallowCopy(); + this.ConfigurationEmpty = new Configuration(); + } + + [Fact] + public void DefaultsToLocalFileSystem() + { + Assert.IsType(this.DefaultConfiguration.FileSystem); + Assert.IsType(this.ConfigurationEmpty.FileSystem); + } + + /// + /// Test that the default configuration is not null. + /// + [Fact] + public void TestDefultConfigurationIsNotNull() + { + Assert.True(Configuration.Default != null); + } + + /// + /// Test that the default configuration parallel options is not null. + /// + [Fact] + public void TestDefultConfigurationParallelOptionsIsNotNull() + { + Assert.True(Configuration.Default.ParallelOptions != null); + } + + /// + /// Test that the default configuration read origin options is set to begin. + /// + [Fact] + public void TestDefultConfigurationReadOriginIsCurrent() + { + Assert.True(Configuration.Default.ReadOrigin == ReadOrigin.Current); + } + + /// + /// Test that the default configuration parallel options max degrees of parallelism matches the + /// environment processor count. + /// + [Fact] + public void TestDefultConfigurationMaxDegreeOfParallelism() + { + Assert.True(Configuration.Default.ParallelOptions.MaxDegreeOfParallelism == Environment.ProcessorCount); + } + + [Fact] + public void ConstructorCallConfigureOnFormatProvider() + { + var provider = new Mock(); + var config = new Configuration(provider.Object); + + provider.Verify(x => x.Configure(config)); + } + + [Fact] + public void AddFormatCallsConfig() + { + var provider = new Mock(); + var config = new Configuration(); + config.Configure(provider.Object); + + provider.Verify(x => x.Configure(config)); + } + } } \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Drawing/BeziersTests.cs b/tests/ImageSharp.Tests/Drawing/BeziersTests.cs index a0f62c4e7..daa640a0b 100644 --- a/tests/ImageSharp.Tests/Drawing/BeziersTests.cs +++ b/tests/ImageSharp.Tests/Drawing/BeziersTests.cs @@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing public void ImageShouldBeOverlayedByBezierLine() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "BezierLine"); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x.BackgroundColor(Rgba32.Blue) .DrawBeziers(Rgba32.HotPink, 5, @@ -54,9 +54,9 @@ namespace SixLabors.ImageSharp.Tests.Drawing { string path = TestEnvironment.CreateOutputDirectory("Drawing", "BezierLine"); - Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150); + var color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x.BackgroundColor(Rgba32.Blue) .DrawBeziers(color, @@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing image.Save($"{path}/Opacity.png"); //shift background color towards foreground color by the opacity amount - Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f)); + var mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f)); using (PixelAccessor sourcePixels = image.Lock()) { diff --git a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs index 0ff0b8557..075bb3885 100644 --- a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs +++ b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs @@ -3,8 +3,8 @@ using System; using System.Numerics; -using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; using SixLabors.Primitives; using Xunit; diff --git a/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs b/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs index dbf0e6ce9..7e75f52b2 100644 --- a/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs +++ b/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs @@ -90,7 +90,6 @@ namespace SixLabors.ImageSharp.Tests.Drawing } } - [Fact] public void PathExtendingOffEdgeOfImageShouldNotBeCropped() { diff --git a/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs b/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs index 7db88e959..5b47e7835 100644 --- a/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs +++ b/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs @@ -3,17 +3,15 @@ using System; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Primitives; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; using SixLabors.ImageSharp.Processing.Drawing.Brushes; - +using SixLabors.ImageSharp.Processing.Transforms; using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing { - using SixLabors.ImageSharp.Primitives; - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Transforms; - public class FillPatternBrushTests : FileTestBase { private void Test(string name, Rgba32 background, IBrush brush, Rgba32[,] expectedPattern) @@ -36,9 +34,9 @@ namespace SixLabors.ImageSharp.Tests.Drawing int yStride = expectedPatternFast.Rows; int offsetX = r.Next(image.Width / xStride) * xStride; int offsetY = r.Next(image.Height / yStride) * yStride; - for (var x = 0; x < xStride; x++) + for (int x = 0; x < xStride; x++) { - for (var y = 0; y < yStride; y++) + for (int y = 0; y < yStride; y++) { int actualX = x + offsetX; int actualY = y + offsetY; diff --git a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs index c995dd31b..8c619c817 100644 --- a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs +++ b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs @@ -4,7 +4,7 @@ using System.Numerics; using Moq; -using Xunit; + using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; using SixLabors.ImageSharp.Processing; @@ -14,6 +14,8 @@ using SixLabors.ImageSharp.Processing.Drawing.Pens; using SixLabors.ImageSharp.Processing.Drawing.Processors; using SixLabors.Primitives; +using Xunit; + namespace SixLabors.ImageSharp.Tests.Drawing { public class FillRegionProcessorTests diff --git a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs index aa360c893..02e34092e 100644 --- a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs +++ b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs @@ -3,14 +3,13 @@ using System.Numerics; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; +using SixLabors.ImageSharp.Processing.Overlays; using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Overlays; - public class FillSolidBrushTests : FileTestBase { [Fact] diff --git a/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs index 0e0df6844..09ed46908 100644 --- a/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs +++ b/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs @@ -3,16 +3,16 @@ using System.Numerics; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; using SixLabors.ImageSharp.Processing.Drawing.Pens; +using SixLabors.ImageSharp.Processing.Overlays; using SixLabors.Shapes; + using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Overlays; - public class LineComplexPolygonTests : FileTestBase { [Fact] @@ -87,9 +87,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing using (PixelAccessor sourcePixels = image.Lock()) { Assert.Equal(Rgba32.HotPink, sourcePixels[10, 10]); - Assert.Equal(Rgba32.HotPink, sourcePixels[200, 150]); - Assert.Equal(Rgba32.HotPink, sourcePixels[50, 300]); @@ -110,7 +108,6 @@ namespace SixLabors.ImageSharp.Tests.Drawing } } - [Fact] public void ImageShouldBeOverlayedByPolygonOutlineOverlapping() { @@ -135,13 +132,9 @@ namespace SixLabors.ImageSharp.Tests.Drawing using (PixelAccessor sourcePixels = image.Lock()) { Assert.Equal(Rgba32.HotPink, sourcePixels[10, 10]); - Assert.Equal(Rgba32.HotPink, sourcePixels[200, 150]); - Assert.Equal(Rgba32.HotPink, sourcePixels[50, 300]); - Assert.Equal(Rgba32.Blue, sourcePixels[130, 41]); - Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]); //inside hole @@ -153,7 +146,6 @@ namespace SixLabors.ImageSharp.Tests.Drawing } } - [Fact] public void ImageShouldBeOverlayedByPolygonOutlineDashed() { @@ -177,7 +169,6 @@ namespace SixLabors.ImageSharp.Tests.Drawing } } - [Fact] public void ImageShouldBeOverlayedPolygonOutlineWithOpacity() { @@ -206,24 +197,16 @@ namespace SixLabors.ImageSharp.Tests.Drawing using (PixelAccessor sourcePixels = image.Lock()) { Assert.Equal(mergedColor, sourcePixels[10, 10]); - Assert.Equal(mergedColor, sourcePixels[200, 150]); - Assert.Equal(mergedColor, sourcePixels[50, 300]); - - Assert.Equal(mergedColor, sourcePixels[37, 85]); - Assert.Equal(mergedColor, sourcePixels[93, 85]); - Assert.Equal(mergedColor, sourcePixels[65, 137]); - Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]); //inside hole Assert.Equal(Rgba32.Blue, sourcePixels[57, 99]); - //inside shape Assert.Equal(Rgba32.Blue, sourcePixels[100, 192]); } diff --git a/tests/ImageSharp.Tests/Drawing/LineTests.cs b/tests/ImageSharp.Tests/Drawing/LineTests.cs index e23616b1e..6128756c5 100644 --- a/tests/ImageSharp.Tests/Drawing/LineTests.cs +++ b/tests/ImageSharp.Tests/Drawing/LineTests.cs @@ -2,24 +2,24 @@ // Licensed under the Apache License, Version 2.0. using System.Numerics; + using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; using SixLabors.ImageSharp.Processing.Drawing.Pens; +using SixLabors.ImageSharp.Processing.Overlays; using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Overlays; - public class LineTests : FileTestBase { [Fact] public void ImageShouldBeOverlayedByPath() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "Lines"); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -46,13 +46,13 @@ namespace SixLabors.ImageSharp.Tests.Drawing public void ImageShouldBeOverlayedByPath_NoAntialias() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "Lines"); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x .BackgroundColor(Rgba32.Blue) .DrawLines( new GraphicsOptions(false), - Rgba32.HotPink, + Rgba32.HotPink, 5, new SixLabors.Primitives.PointF[] { new Vector2(10, 10), @@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing public void ImageShouldBeOverlayedByPathDashed() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "Lines"); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -94,7 +94,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing public void ImageShouldBeOverlayedByPathDotted() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "Lines"); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -112,7 +112,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing public void ImageShouldBeOverlayedByPathDashDot() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "Lines"); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -130,7 +130,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing public void ImageShouldBeOverlayedByPathDashDotDot() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "Lines"); - Image image = new Image(500, 500); + var image = new Image(500, 500); image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -147,9 +147,9 @@ namespace SixLabors.ImageSharp.Tests.Drawing { string path = TestEnvironment.CreateOutputDirectory("Drawing", "Lines"); - Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150); + var color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150); - Image image = new Image(500, 500); + var image = new Image(500, 500); image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -161,7 +161,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing image.Save($"{path}/Opacity.png"); //shift background color towards forground color by the opacity amount - Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f)); + var mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f)); using (PixelAccessor sourcePixels = image.Lock()) { @@ -178,7 +178,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing { string path = TestEnvironment.CreateOutputDirectory("Drawing", "Lines"); - Image image = new Image(500, 500); + var image = new Image(500, 500); image.Mutate(x => x .BackgroundColor(Rgba32.Blue) diff --git a/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs b/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs index 717feafa8..0c0fb58fa 100644 --- a/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs +++ b/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs @@ -79,7 +79,6 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Paths this.operations.FillPolygon(this.noneDefault, this.color, this.path); FillRegionProcessor processor = this.Verify>(); - Assert.Equal(this.noneDefault, processor.Options); ShapeRegion region = Assert.IsType(processor.Region); diff --git a/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs b/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs index 4a87ad189..6ce1e2da3 100644 --- a/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs +++ b/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; using SixLabors.ImageSharp.Processing.Drawing.Brushes; using SixLabors.Primitives; @@ -9,8 +10,6 @@ using Xunit; namespace SixLabors.ImageSharp.Tests { - using SixLabors.ImageSharp.Processing; - public class RecolorImageTest : FileTestBase { [Fact] diff --git a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs index 7c75c2c44..7175e7a65 100644 --- a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs +++ b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs @@ -3,15 +3,14 @@ using System.Numerics; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; +using SixLabors.ImageSharp.Processing.Overlays; using SixLabors.Shapes; using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Overlays; - [GroupOutput("Drawing")] public class SolidBezierTests { diff --git a/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs index 39a7bac53..8ff27fd72 100644 --- a/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs +++ b/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs @@ -4,33 +4,33 @@ using System.Numerics; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; +using SixLabors.ImageSharp.Processing.Overlays; using SixLabors.Shapes; + using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Overlays; - public class SolidComplexPolygonTests : FileTestBase { [Fact] public void ImageShouldBeOverlayedByPolygonOutline() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "ComplexPolygon"); - Polygon simplePath = new Polygon(new LinearLineSegment( + var simplePath = new Polygon(new LinearLineSegment( new Vector2(10, 10), new Vector2(200, 150), new Vector2(50, 300))); - Polygon hole1 = new Polygon(new LinearLineSegment( + var hole1 = new Polygon(new LinearLineSegment( new Vector2(37, 85), new Vector2(93, 85), new Vector2(65, 137))); IPath clipped = simplePath.Clip(hole1); // var clipped = new Rectangle(10, 10, 100, 100).Clip(new Rectangle(20, 0, 20, 20)); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -52,17 +52,17 @@ namespace SixLabors.ImageSharp.Tests.Drawing public void ImageShouldBeOverlayedPolygonOutlineWithOverlap() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "ComplexPolygon"); - Polygon simplePath = new Polygon(new LinearLineSegment( + var simplePath = new Polygon(new LinearLineSegment( new Vector2(10, 10), new Vector2(200, 150), new Vector2(50, 300))); - Polygon hole1 = new Polygon(new LinearLineSegment( + var hole1 = new Polygon(new LinearLineSegment( new Vector2(37, 85), new Vector2(130, 40), new Vector2(65, 137))); - using (Image image = new Image(500, 500)) + using (var image = new Image(500, 500)) { image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -83,18 +83,19 @@ namespace SixLabors.ImageSharp.Tests.Drawing public void ImageShouldBeOverlayedPolygonOutlineWithOpacity() { string path = TestEnvironment.CreateOutputDirectory("Drawing", "ComplexPolygon"); - Polygon simplePath = new Polygon(new LinearLineSegment( + var simplePath = new Polygon(new LinearLineSegment( new Vector2(10, 10), new Vector2(200, 150), new Vector2(50, 300))); - Polygon hole1 = new Polygon(new LinearLineSegment( + var hole1 = new Polygon(new LinearLineSegment( new Vector2(37, 85), new Vector2(93, 85), new Vector2(65, 137))); - Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150); - using (Image image = new Image(500, 500)) + var color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150); + + using (var image = new Image(500, 500)) { image.Mutate(x => x .BackgroundColor(Rgba32.Blue) @@ -102,7 +103,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing image.Save($"{path}/Opacity.png"); //shift background color towards forground color by the opacity amount - Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f)); + var mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f)); using (PixelAccessor sourcePixels = image.Lock()) { diff --git a/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs index 57ce93dea..4d6281a3c 100644 --- a/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs +++ b/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs @@ -3,17 +3,18 @@ using System; using System.Numerics; + using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; +using SixLabors.ImageSharp.Processing.Drawing.Brushes; +using SixLabors.ImageSharp.Processing.Overlays; using SixLabors.Shapes; + using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Drawing.Brushes; - using SixLabors.ImageSharp.Processing.Overlays; - public class SolidPolygonTests : FileTestBase { [Fact] diff --git a/tests/ImageSharp.Tests/Drawing/Text/DrawText.Path.cs b/tests/ImageSharp.Tests/Drawing/Text/DrawText.Path.cs index 30d47ab5d..4649bee6b 100644 --- a/tests/ImageSharp.Tests/Drawing/Text/DrawText.Path.cs +++ b/tests/ImageSharp.Tests/Drawing/Text/DrawText.Path.cs @@ -2,14 +2,14 @@ // Licensed under the Apache License, Version 2.0. using System.Numerics; -using SixLabors.ImageSharp.PixelFormats; using SixLabors.Fonts; +using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Drawing.Brushes; +using SixLabors.ImageSharp.Processing.Drawing.Pens; using SixLabors.ImageSharp.Processing.Drawing.Processors; using SixLabors.ImageSharp.Processing.Text; using SixLabors.Shapes; using Xunit; -using SixLabors.ImageSharp.Processing.Drawing.Pens; namespace SixLabors.ImageSharp.Tests.Drawing.Text { diff --git a/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs b/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs index 9c929d1c7..88b650a3e 100644 --- a/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs +++ b/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. using System.Numerics; -using SixLabors.ImageSharp.PixelFormats; using SixLabors.Fonts; +using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Drawing.Brushes; using SixLabors.ImageSharp.Processing.Drawing.Pens; using SixLabors.ImageSharp.Processing.Drawing.Processors; diff --git a/tests/ImageSharp.Tests/Drawing/Text/OutputText.cs b/tests/ImageSharp.Tests/Drawing/Text/OutputText.cs index ec05b64ab..9e0cd62b6 100644 --- a/tests/ImageSharp.Tests/Drawing/Text/OutputText.cs +++ b/tests/ImageSharp.Tests/Drawing/Text/OutputText.cs @@ -3,9 +3,9 @@ using System.Numerics; +using SixLabors.Fonts; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; -using SixLabors.Fonts; using SixLabors.ImageSharp.Processing.Drawing; using SixLabors.ImageSharp.Processing.Text; diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs index aed68f76b..8d29536b2 100644 --- a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs @@ -1,19 +1,14 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Formats.Bmp; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using Xunit; -// ReSharper disable InconsistentNaming +using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - - using Xunit.Abstractions; - public class BmpEncoderTests : FileTestBase { public static readonly TheoryData BitsPerPixel = diff --git a/tests/ImageSharp.Tests/IO/LocalFileSystem.cs b/tests/ImageSharp.Tests/IO/LocalFileSystem.cs index 3fa94d671..07f1b5cd0 100644 --- a/tests/ImageSharp.Tests/IO/LocalFileSystem.cs +++ b/tests/ImageSharp.Tests/IO/LocalFileSystem.cs @@ -17,9 +17,9 @@ namespace SixLabors.ImageSharp.Tests.IO string testData = Guid.NewGuid().ToString(); File.WriteAllText(path, testData); - LocalFileSystem fs = new LocalFileSystem(); + var fs = new LocalFileSystem(); - using (StreamReader r = new StreamReader(fs.OpenRead(path))) + using (var r = new StreamReader(fs.OpenRead(path))) { string data = r.ReadToEnd(); @@ -34,9 +34,9 @@ namespace SixLabors.ImageSharp.Tests.IO { string path = Path.GetTempFileName(); string testData = Guid.NewGuid().ToString(); - LocalFileSystem fs = new LocalFileSystem(); + var fs = new LocalFileSystem(); - using (StreamWriter r = new StreamWriter(fs.Create(path))) + using (var r = new StreamWriter(fs.Create(path))) { r.Write(testData); } diff --git a/tests/ImageSharp.Tests/ImageOperationTests.cs b/tests/ImageSharp.Tests/ImageOperationTests.cs index 61705fe4e..d73eea687 100644 --- a/tests/ImageSharp.Tests/ImageOperationTests.cs +++ b/tests/ImageSharp.Tests/ImageOperationTests.cs @@ -4,11 +4,11 @@ using System; using System.Linq; -using SixLabors.ImageSharp.Processing; -using SixLabors.ImageSharp.Processing.Processors; using Moq; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Processors; using Xunit; diff --git a/tests/ImageSharp.Tests/Numerics/RationalTests.cs b/tests/ImageSharp.Tests/Numerics/RationalTests.cs index 71bf71fa0..a9b9106c5 100644 --- a/tests/ImageSharp.Tests/Numerics/RationalTests.cs +++ b/tests/ImageSharp.Tests/Numerics/RationalTests.cs @@ -19,15 +19,15 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void AreEqual() { - Rational r1 = new Rational(3, 2); - Rational r2 = new Rational(3, 2); + var r1 = new Rational(3, 2); + var r2 = new Rational(3, 2); Assert.Equal(r1, r2); Assert.True(r1 == r2); - Rational r3 = new Rational(7.55); - Rational r4 = new Rational(755, 100); - Rational r5 = new Rational(151, 20); + var r3 = new Rational(7.55); + var r4 = new Rational(755, 100); + var r5 = new Rational(151, 20); Assert.Equal(r3, r4); Assert.Equal(r4, r5); @@ -39,8 +39,8 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void AreNotEqual() { - Rational first = new Rational(0, 100); - Rational second = new Rational(100, 100); + var first = new Rational(0, 100); + var second = new Rational(100, 100); Assert.NotEqual(first, second); Assert.True(first != second); @@ -52,7 +52,7 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void ConstructorAssignsProperties() { - Rational rational = new Rational(7, 55); + var rational = new Rational(7, 55); Assert.Equal(7U, rational.Numerator); Assert.Equal(55U, rational.Denominator); @@ -76,15 +76,15 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void Fraction() { - Rational first = new Rational(1.0 / 1600); - Rational second = new Rational(1.0 / 1600, true); + var first = new Rational(1.0 / 1600); + var second = new Rational(1.0 / 1600, true); Assert.False(first.Equals(second)); } [Fact] public void ToDouble() { - Rational rational = new Rational(0, 0); + var rational = new Rational(0, 0); Assert.Equal(double.NaN, rational.ToDouble()); rational = new Rational(2, 0); @@ -94,7 +94,7 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void ToStringRepresention() { - Rational rational = new Rational(0, 0); + var rational = new Rational(0, 0); Assert.Equal("[ Indeterminate ]", rational.ToString()); rational = new Rational(double.PositiveInfinity); diff --git a/tests/ImageSharp.Tests/Numerics/SignedRationalTests.cs b/tests/ImageSharp.Tests/Numerics/SignedRationalTests.cs index b22e84f3c..77920ba2f 100644 --- a/tests/ImageSharp.Tests/Numerics/SignedRationalTests.cs +++ b/tests/ImageSharp.Tests/Numerics/SignedRationalTests.cs @@ -1,7 +1,6 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp.MetaData.Profiles.Exif; using SixLabors.ImageSharp.Primitives; using Xunit; @@ -19,15 +18,15 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void AreEqual() { - SignedRational r1 = new SignedRational(3, 2); - SignedRational r2 = new SignedRational(3, 2); + var r1 = new SignedRational(3, 2); + var r2 = new SignedRational(3, 2); Assert.Equal(r1, r2); Assert.True(r1 == r2); - SignedRational r3 = new SignedRational(7.55); - SignedRational r4 = new SignedRational(755, 100); - SignedRational r5 = new SignedRational(151, 20); + var r3 = new SignedRational(7.55); + var r4 = new SignedRational(755, 100); + var r5 = new SignedRational(151, 20); Assert.Equal(r3, r4); Assert.Equal(r4, r5); @@ -39,8 +38,8 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void AreNotEqual() { - SignedRational first = new SignedRational(0, 100); - SignedRational second = new SignedRational(100, 100); + var first = new SignedRational(0, 100); + var second = new SignedRational(100, 100); Assert.NotEqual(first, second); Assert.True(first != second); @@ -52,7 +51,7 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void ConstructorAssignsProperties() { - SignedRational rational = new SignedRational(7, -55); + var rational = new SignedRational(7, -55); Assert.Equal(7, rational.Numerator); Assert.Equal(-55, rational.Denominator); @@ -80,15 +79,15 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void Fraction() { - SignedRational first = new SignedRational(1.0 / 1600); - SignedRational second = new SignedRational(1.0 / 1600, true); + var first = new SignedRational(1.0 / 1600); + var second = new SignedRational(1.0 / 1600, true); Assert.False(first.Equals(second)); } [Fact] public void ToDouble() { - SignedRational rational = new SignedRational(0, 0); + var rational = new SignedRational(0, 0); Assert.Equal(double.NaN, rational.ToDouble()); rational = new SignedRational(2, 0); @@ -101,7 +100,7 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void ToStringRepresention() { - SignedRational rational = new SignedRational(0, 0); + var rational = new SignedRational(0, 0); Assert.Equal("[ Indeterminate ]", rational.ToString()); rational = new SignedRational(double.PositiveInfinity); diff --git a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs index 324225a06..46198991a 100644 --- a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs +++ b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs @@ -3,16 +3,16 @@ using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing.Binarization; +using SixLabors.ImageSharp.Processing.Binarization.Processors; +using SixLabors.ImageSharp.Processing.Dithering; +using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion; +using SixLabors.ImageSharp.Processing.Dithering.Ordered; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Binarization { - using SixLabors.ImageSharp.Processing.Binarization; - using SixLabors.ImageSharp.Processing.Binarization.Processors; - using SixLabors.ImageSharp.Processing.Dithering; - using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion; - using SixLabors.ImageSharp.Processing.Dithering.Ordered; - public class BinaryDitherTest : BaseImageOperationsExtensionTest { private readonly IOrderedDither orderedDither; diff --git a/tests/ImageSharp.Tests/Processing/Binarization/BinaryThresholdTest.cs b/tests/ImageSharp.Tests/Processing/Binarization/BinaryThresholdTest.cs index 6029b0d5f..bf15db366 100644 --- a/tests/ImageSharp.Tests/Processing/Binarization/BinaryThresholdTest.cs +++ b/tests/ImageSharp.Tests/Processing/Binarization/BinaryThresholdTest.cs @@ -2,18 +2,15 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Binarization; +using SixLabors.ImageSharp.Processing.Binarization.Processors; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Binarization { - using SixLabors.ImageSharp.Processing.Binarization; - using SixLabors.ImageSharp.Processing.Binarization.Processors; - public class BinaryThresholdTest : BaseImageOperationsExtensionTest { - [Fact] public void BinaryThreshold_CorrectProcessor() { diff --git a/tests/ImageSharp.Tests/Processing/Binarization/OrderedDitherFactoryTests.cs b/tests/ImageSharp.Tests/Processing/Binarization/OrderedDitherFactoryTests.cs index 89e48cfa3..3e1a7acc0 100644 --- a/tests/ImageSharp.Tests/Processing/Binarization/OrderedDitherFactoryTests.cs +++ b/tests/ImageSharp.Tests/Processing/Binarization/OrderedDitherFactoryTests.cs @@ -1,13 +1,13 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. +using SixLabors.ImageSharp.Primitives; +using SixLabors.ImageSharp.Processing.Dithering.Ordered; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Binarization { - using SixLabors.ImageSharp.Primitives; - using SixLabors.ImageSharp.Processing.Dithering.Ordered; - public class OrderedDitherFactoryTests { private static readonly DenseMatrix Expected2x2Matrix = new DenseMatrix( diff --git a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs index a29fc28c9..e53de85fe 100644 --- a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs +++ b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs @@ -2,16 +2,15 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing.Dithering; +using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion; +using SixLabors.ImageSharp.Processing.Dithering.Ordered; +using SixLabors.ImageSharp.Processing.Dithering.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Binarization { - using SixLabors.ImageSharp.Processing.Dithering; - using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion; - using SixLabors.ImageSharp.Processing.Dithering.Ordered; - using SixLabors.ImageSharp.Processing.Dithering.Processors; - public class DitherTest : BaseImageOperationsExtensionTest { private readonly IOrderedDither orderedDither; diff --git a/tests/ImageSharp.Tests/Processing/Effects/BackgroundColorTest.cs b/tests/ImageSharp.Tests/Processing/Effects/BackgroundColorTest.cs index 7aa1720e2..6aa8fbba6 100644 --- a/tests/ImageSharp.Tests/Processing/Effects/BackgroundColorTest.cs +++ b/tests/ImageSharp.Tests/Processing/Effects/BackgroundColorTest.cs @@ -2,14 +2,13 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing.Overlays; +using SixLabors.ImageSharp.Processing.Overlays.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Effects { - using SixLabors.ImageSharp.Processing.Overlays; - using SixLabors.ImageSharp.Processing.Overlays.Processors; - public class BackgroundColorTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Effects/OilPaintTest.cs b/tests/ImageSharp.Tests/Processing/Effects/OilPaintTest.cs index f40cc250b..2f4ba0516 100644 --- a/tests/ImageSharp.Tests/Processing/Effects/OilPaintTest.cs +++ b/tests/ImageSharp.Tests/Processing/Effects/OilPaintTest.cs @@ -2,15 +2,12 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Effects; +using SixLabors.ImageSharp.Processing.Effects.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Effects { - using SixLabors.ImageSharp.Processing.Effects; - using SixLabors.ImageSharp.Processing.Effects.Processors; - public class OilPaintTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Effects/PixelateTest.cs b/tests/ImageSharp.Tests/Processing/Effects/PixelateTest.cs index 1cc69bcb6..245e104f9 100644 --- a/tests/ImageSharp.Tests/Processing/Effects/PixelateTest.cs +++ b/tests/ImageSharp.Tests/Processing/Effects/PixelateTest.cs @@ -2,15 +2,12 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Effects; +using SixLabors.ImageSharp.Processing.Effects.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Effects { - using SixLabors.ImageSharp.Processing.Effects; - using SixLabors.ImageSharp.Processing.Effects.Processors; - public class PixelateTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs b/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs index db10c16b1..7e06e67d7 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs @@ -2,14 +2,12 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Filters { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class BlackWhiteTest : BaseImageOperationsExtensionTest { [Fact] @@ -22,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters [Fact] public void BlackWhite_rect_CorrectProcessor() { - this.operations.BlackWhite( this.rect); + this.operations.BlackWhite(this.rect); BlackWhiteProcessor p = this.Verify>(this.rect); } } diff --git a/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs b/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs index dc3281a63..e47430efa 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs @@ -2,15 +2,12 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Effects { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class BrightnessTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs index 04b916b6e..ee99938bb 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs @@ -4,16 +4,15 @@ using System.Collections.Generic; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; +using SixLabors.ImageSharp.Processing.Processors; using SixLabors.ImageSharp.Tests.TestUtilities; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Filters { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - using SixLabors.ImageSharp.Processing.Processors; - public class ColorBlindnessTest : BaseImageOperationsExtensionTest { public static IEnumerable TheoryData = new[] { @@ -33,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters where T : IImageProcessor { this.operations.ColorBlindness(colorBlindness); - var p = this.Verify(); + T p = this.Verify(); } [Theory] [MemberData(nameof(TheoryData))] @@ -41,7 +40,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters where T : IImageProcessor { this.operations.ColorBlindness(colorBlindness, this.rect); - var p = this.Verify(this.rect); + T p = this.Verify(this.rect); } } } \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs b/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs index ad12d07a8..667354b28 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs @@ -4,16 +4,15 @@ using System.Collections.Generic; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; +using SixLabors.ImageSharp.Processing.Processors; using SixLabors.ImageSharp.Tests.TestUtilities; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Filters { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - using SixLabors.ImageSharp.Processing.Processors; - public class GrayscaleTest : BaseImageOperationsExtensionTest { public static IEnumerable ModeTheoryData = new[] { @@ -27,7 +26,6 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters { this.operations.Grayscale(mode); var p = this.Verify(); - } [Theory] diff --git a/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs b/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs index e9f79ff1d..61220d59f 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs @@ -2,15 +2,13 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Filters { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class HueTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs b/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs index 24d33e9f7..61fd206db 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs @@ -2,15 +2,12 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Effects { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class InvertTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs b/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs index d776a9c8a..a0a551d09 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs @@ -2,15 +2,12 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Filters { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class KodachromeTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs b/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs index f40f92718..96811544c 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs @@ -2,14 +2,12 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Effects { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class OpacityTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs b/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs index 5e43245af..4f7c410f0 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs @@ -2,15 +2,13 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Filters { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class PolaroidTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs b/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs index 72ab0fe70..830580fc2 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs @@ -2,17 +2,14 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Filters { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class SaturateTest : BaseImageOperationsExtensionTest { - [Fact] public void Saturation_amount_SaturationProcessorDefaultsSet() { diff --git a/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs b/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs index b8a77c9f0..5e01e26f4 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs @@ -2,15 +2,12 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Filters; +using SixLabors.ImageSharp.Processing.Filters.Processors; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Filters { - using SixLabors.ImageSharp.Processing.Filters; - using SixLabors.ImageSharp.Processing.Filters.Processors; - public class SepiaTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs index f99fe0c2a..eb5785919 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs @@ -2,20 +2,19 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Binarization; +using SixLabors.ImageSharp.Processing.Dithering; +using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion; +using SixLabors.ImageSharp.Processing.Dithering.Ordered; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - using SixLabors.Primitives; + using Xunit; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Binarization; - using SixLabors.ImageSharp.Processing.Dithering; - using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion; - using SixLabors.ImageSharp.Processing.Dithering.Ordered; - public class BinaryDitherTests : FileTestBase { public static readonly string[] CommonTestImages = diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs index b58ace935..e83d7009b 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs @@ -3,16 +3,13 @@ using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; - +using SixLabors.ImageSharp.Processing.Convolution; +using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; using SixLabors.Primitives; using Xunit; -// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution { - using SixLabors.ImageSharp.Processing.Convolution; - using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - public class DetectEdgesTest : FileTestBase { private static readonly ImageComparer ValidatorComparer = ImageComparer.TolerantPercentage(0.001f); diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs index 69a635e9d..3b6a52bb1 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs @@ -2,16 +2,15 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Convolution; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - using SixLabors.Primitives; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Convolution; - public class GaussianBlurTest : FileTestBase { public static readonly TheoryData GaussianBlurValues = new TheoryData { 3, 5 }; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs index 468aa277c..3d97cf0d0 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs @@ -2,16 +2,14 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Convolution; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - using SixLabors.Primitives; using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Convolution; - public class GaussianSharpenTest : FileTestBase { public static readonly TheoryData GaussianSharpenValues diff --git a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs index a82ca225c..24cb87c7f 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs @@ -9,12 +9,9 @@ using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion; using SixLabors.ImageSharp.Processing.Dithering.Ordered; using SixLabors.Primitives; using Xunit; -// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization { - - public class DitherTests : FileTestBase { public static readonly string[] CommonTestImages = diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs index d421a5936..bae22e7a9 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs @@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.MetaData.ExifProfile = new ExifProfile(bytes); - image.Mutate(x=>x.AutoOrient()); + image.Mutate(x => x.AutoOrient()); } } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs index e9fd50b7f..0936bf477 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Transforms; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Transforms; - public class CropTest : FileTestBase { [Theory] diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs index da3ba6be6..86b37365d 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Transforms; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Transforms; - public class EntropyCropTest : FileTestBase { public static readonly TheoryData EntropyCropValues diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs index b1ce7ae1f..3f028259c 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs @@ -3,6 +3,7 @@ using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs index cf070ccbb..1160e496c 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs @@ -8,15 +8,14 @@ using System.Text; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors; -using SixLabors.Primitives; +using SixLabors.ImageSharp.Processing.Transforms; +using SixLabors.ImageSharp.Processing.Transforms.Processors; +using SixLabors.Primitives; using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms { - using SixLabors.ImageSharp.Processing.Transforms; - using SixLabors.ImageSharp.Processing.Transforms.Processors; - public class ResizeProfilingBenchmarks : MeasureFixture { public ResizeProfilingBenchmarks(ITestOutputHelper output) diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs index 92ccbacff..7214fa5e5 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs @@ -2,18 +2,17 @@ // Licensed under the Apache License, Version 2.0. using System; + using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Transforms; using SixLabors.ImageSharp.Processing.Transforms.Resamplers; +using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; using SixLabors.Primitives; -using Xunit; -// ReSharper disable InconsistentNaming +using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms { - using SixLabors.ImageSharp.Processing.Transforms; - using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - public class ResizeTests : FileTestBase { public static readonly string[] CommonTestImages = { TestImages.Png.CalliphoraPartial }; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs index f9c2d83c8..2163f5fc9 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs @@ -3,16 +3,12 @@ using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Transforms; + using Xunit; -// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms { - using System; - using System.Reflection; - - using SixLabors.ImageSharp.Processing.Transforms; - public class RotateTests : FileTestBase { public static readonly TheoryData RotateAngles diff --git a/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs index c4a8c9b2d..c9354049d 100644 --- a/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs +++ b/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs @@ -1,18 +1,19 @@ using System; using System.Numerics; using System.Reflection; + using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Transforms; using SixLabors.ImageSharp.Processing.Transforms.Resamplers; +using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; using SixLabors.Primitives; + using Xunit; using Xunit.Abstractions; -// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Processing.Transforms { - using SixLabors.ImageSharp.Processing.Transforms; - using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; public class AffineTransformTests { diff --git a/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs index e81cf8305..2bf7cded8 100644 --- a/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs +++ b/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs @@ -4,13 +4,13 @@ using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.ImageSharp.Processing.Transforms; +using SixLabors.ImageSharp.Processing.Transforms.Processors; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Transforms { - using SixLabors.ImageSharp.Processing.Transforms; - using SixLabors.ImageSharp.Processing.Transforms.Processors; - public class RotateTests : BaseImageOperationsExtensionTest { [Theory] diff --git a/tests/ImageSharp.Tests/Processing/Transforms/SkewTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/SkewTest.cs index bd0dfacd9..9df8e267c 100644 --- a/tests/ImageSharp.Tests/Processing/Transforms/SkewTest.cs +++ b/tests/ImageSharp.Tests/Processing/Transforms/SkewTest.cs @@ -3,13 +3,13 @@ using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.ImageSharp.Processing.Transforms; +using SixLabors.ImageSharp.Processing.Transforms.Processors; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Transforms { - using SixLabors.ImageSharp.Processing.Transforms; - using SixLabors.ImageSharp.Processing.Transforms.Processors; - public class SkewTest : BaseImageOperationsExtensionTest { [Fact] diff --git a/tests/ImageSharp.Tests/Processing/Transforms/TransformsHelpersTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/TransformsHelpersTest.cs index 3e92f0e1c..5de92a40b 100644 --- a/tests/ImageSharp.Tests/Processing/Transforms/TransformsHelpersTest.cs +++ b/tests/ImageSharp.Tests/Processing/Transforms/TransformsHelpersTest.cs @@ -3,12 +3,12 @@ using SixLabors.ImageSharp.MetaData.Profiles.Exif; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing.Transforms; + using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Transforms { - using SixLabors.ImageSharp.Processing.Transforms; - public class TransformsHelpersTest { [Fact] diff --git a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs index 8965904a5..91ba160ab 100644 --- a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs +++ b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs @@ -1,10 +1,13 @@ -namespace SixLabors.ImageSharp.Tests -{ - using SixLabors.ImageSharp.PixelFormats; - using SixLabors.ImageSharp.Processing.Quantization; +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing.Quantization; - using Xunit; +using Xunit; +namespace SixLabors.ImageSharp.Tests +{ public class QuantizedImageTests { [Fact] diff --git a/tests/ImageSharp.Tests/TestDataIcc/IccTestDataArray.cs b/tests/ImageSharp.Tests/TestDataIcc/IccTestDataArray.cs index 4fd798f34..771e33038 100644 --- a/tests/ImageSharp.Tests/TestDataIcc/IccTestDataArray.cs +++ b/tests/ImageSharp.Tests/TestDataIcc/IccTestDataArray.cs @@ -141,4 +141,4 @@ namespace SixLabors.ImageSharp.Tests #endregion } -} +} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/TestFileSystem.cs b/tests/ImageSharp.Tests/TestFileSystem.cs index e388b35d4..21ad4d2c1 100644 --- a/tests/ImageSharp.Tests/TestFileSystem.cs +++ b/tests/ImageSharp.Tests/TestFileSystem.cs @@ -2,13 +2,8 @@ // Licensed under the Apache License, Version 2.0. using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Reflection; -using SixLabors.ImageSharp.Formats; -using Xunit; namespace SixLabors.ImageSharp.Tests { @@ -56,7 +51,7 @@ namespace SixLabors.ImageSharp.Tests { if (fileSystem.ContainsKey(path)) { - Stream stream = fileSystem[path]; + Stream stream = fileSystem[path]; stream.Position = 0; return stream; } diff --git a/tests/ImageSharp.Tests/TestFont.cs b/tests/ImageSharp.Tests/TestFont.cs index 6f805e367..ee65402f5 100644 --- a/tests/ImageSharp.Tests/TestFont.cs +++ b/tests/ImageSharp.Tests/TestFont.cs @@ -1,8 +1,6 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using System.Linq; @@ -33,7 +31,7 @@ namespace SixLabors.ImageSharp.Tests { return Path.Combine(FormatsDirectory, file); } - + /// /// Gets the correct path to the formats directory. /// @@ -42,7 +40,7 @@ namespace SixLabors.ImageSharp.Tests /// private static string GetFontsDirectory() { - List directories = new List< string > { + List directories = new List { "TestFonts/", // Here for code coverage tests. "tests/ImageSharp.Tests/TestFonts/", // from travis/build script "../../../../../ImageSharp.Tests/TestFonts/", // from Sandbox46 @@ -58,7 +56,7 @@ namespace SixLabors.ImageSharp.Tests string directory = directories.FirstOrDefault(x => Directory.Exists(x)); - if(directory != null) + if (directory != null) { return directory; } diff --git a/tests/ImageSharp.Tests/TestFormat.cs b/tests/ImageSharp.Tests/TestFormat.cs index 445ace981..70e6c498a 100644 --- a/tests/ImageSharp.Tests/TestFormat.cs +++ b/tests/ImageSharp.Tests/TestFormat.cs @@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.Tests public MemoryStream CreateStream(byte[] marker = null) { - MemoryStream ms = new MemoryStream(); + var ms = new MemoryStream(); byte[] data = this.header; ms.Write(data, 0, data.Length); if (marker != null) diff --git a/tests/ImageSharp.Tests/TestUtilities/ArrayHelper.cs b/tests/ImageSharp.Tests/TestUtilities/ArrayHelper.cs index e342f7029..e35cbfa42 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ArrayHelper.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ArrayHelper.cs @@ -8,14 +8,14 @@ namespace SixLabors.ImageSharp.Tests public static class ArrayHelper { /// - /// Concatenates multiple arrays of the same type into one + /// Concatenates multiple arrays of the same type into one. /// /// The array type /// The arrays to concatenate. The order is kept /// The concatenated array public static T[] Concat(params T[][] arrs) { - T[] result = new T[arrs.Sum(t => t.Length)]; + var result = new T[arrs.Sum(t => t.Length)]; int offset = 0; for (int i = 0; i < arrs.Length; i++) { @@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Tests } /// - /// Creates an array filled with the given value + /// Creates an array filled with the given value. /// /// The array type /// The value to fill the array with @@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp.Tests /// The created array filled with the given value public static T[] Fill(T value, int length) { - T[] result = new T[length]; + var result = new T[length]; for (int i = 0; i < length; i++) { result[i] = value; @@ -43,7 +43,7 @@ namespace SixLabors.ImageSharp.Tests } /// - /// Creates a string from a character with a given length + /// Creates a string from a character with a given length. /// /// The character to fill the string with /// The wanted length of the string diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/ExactImageComparer.cs b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/ExactImageComparer.cs index 32ff87be6..5ed69f43d 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/ExactImageComparer.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/ExactImageComparer.cs @@ -1,12 +1,12 @@ -namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison -{ - using System; - using System.Collections.Generic; - using SixLabors.ImageSharp.Advanced; - using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using SixLabors.ImageSharp.Advanced; +using SixLabors.ImageSharp.PixelFormats; - using SixLabors.Primitives; +using SixLabors.Primitives; +namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison +{ public class ExactImageComparer : ImageComparer { public static ExactImageComparer Instance { get; } = new ExactImageComparer(); @@ -24,8 +24,8 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison // TODO: Comparing through Rgba32 is not robust enough because of the existance of super high precision pixel types. - Rgba32[] aBuffer = new Rgba32[width]; - Rgba32[] bBuffer = new Rgba32[width]; + var aBuffer = new Rgba32[width]; + var bBuffer = new Rgba32[width]; var differences = new List(); diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs index e5f031b50..8b0c3969c 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs @@ -1,10 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison { - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - public class ImageDifferenceIsOverThresholdException : ImagesSimilarityException { public ImageSimilarityReport[] Reports { get; } @@ -17,7 +17,8 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison private static string StringifyReports(IEnumerable reports) { - StringBuilder sb = new StringBuilder(); + var sb = new StringBuilder(); + sb.Append(Environment.NewLine); int i = 0; diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/ImageSimilarityReport.cs b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/ImageSimilarityReport.cs index 9501a6c88..7465d61b8 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/ImageSimilarityReport.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/ImageSimilarityReport.cs @@ -1,11 +1,11 @@ -namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using SixLabors.ImageSharp.PixelFormats; +namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison +{ public class ImageSimilarityReport { protected ImageSimilarityReport( diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/PixelDifference.cs b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/PixelDifference.cs index 97886fdec..c1f79c619 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/PixelDifference.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/PixelDifference.cs @@ -1,10 +1,9 @@ using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Primitives; namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison { - using SixLabors.Primitives; - - public struct PixelDifference + public readonly struct PixelDifference { public PixelDifference( Point position, diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs index 52ea7e45d..667e90cfb 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs @@ -1,14 +1,14 @@ -namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison -{ - using System; - using System.Collections.Generic; - using System.Runtime.CompilerServices; +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; - using SixLabors.ImageSharp.Advanced; - using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Advanced; +using SixLabors.ImageSharp.PixelFormats; - using SixLabors.Primitives; +using SixLabors.Primitives; +namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison +{ public class TolerantImageComparer : ImageComparer { // 1% of all pixels in a 100*100 pixel area are allowed to have a difference of 1 unit @@ -50,20 +50,20 @@ /// /// public int PerPixelManhattanThreshold { get; } - + public override ImageSimilarityReport CompareImagesOrFrames(ImageFrame expected, ImageFrame actual) { if (expected.Size() != actual.Size()) { throw new InvalidOperationException("Calling ImageComparer is invalid when dimensions mismatch!"); } - + int width = actual.Width; // TODO: Comparing through Rgba32 is not robust enough because of the existance of super high precision pixel types. - Rgba32[] aBuffer = new Rgba32[width]; - Rgba32[] bBuffer = new Rgba32[width]; + var aBuffer = new Rgba32[width]; + var bBuffer = new Rgba32[width]; float totalDifference = 0.0f; @@ -93,7 +93,7 @@ float normalizedDifference = totalDifference / ((float)actual.Width * (float)actual.Height); normalizedDifference /= 4.0f * 255.0f; - + if (normalizedDifference > this.ImageThreshold) { return new ImageSimilarityReport(expected, actual, differences, normalizedDifference); diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs index 4993273fa..2dbddcc8f 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs @@ -115,7 +115,7 @@ namespace SixLabors.ImageSharp.Tests { this.FilePath = filePath; } - + /// /// Gets the file path relative to the "~/tests/images" folder /// diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs index 30902b4b0..df5b424a2 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs @@ -1,17 +1,15 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using System; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Drawing; -using SixLabors.ImageSharp.Processing.Overlays; using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests { - using SixLabors.ImageSharp.Processing; /// /// Provides instances for parametric unit tests. diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs index d4f936cd4..ab0cc42f9 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs @@ -3,19 +3,16 @@ using System; using System.Reflection; +using Castle.Core.Internal; using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests { - using Castle.Core.Internal; - - using SixLabors.ImageSharp.Memory; - using SixLabors.ImageSharp.Processing; - public interface ITestImageProvider { PixelTypes PixelType { get; } @@ -103,7 +100,7 @@ namespace SixLabors.ImageSharp.Tests /// public Image GetImage(Action> operationsToApply) { - var img = GetImage(); + Image img = GetImage(); img.Mutate(operationsToApply); return img; } diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs index 7fc9e58d4..0b25991ff 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs @@ -7,14 +7,11 @@ using System.Numerics; using SixLabors.ImageSharp.PixelFormats; -using Xunit.Abstractions; - namespace SixLabors.ImageSharp.Tests { public abstract partial class TestImageProvider where TPixel : struct, IPixel { - /// /// A test image provider that produces test patterns. /// @@ -199,7 +196,7 @@ namespace SixLabors.ImageSharp.Tests int pixelCount = left * top; uint stepsPerPixel = (uint)(uint.MaxValue / pixelCount); - TPixel c = default(TPixel); + TPixel c = default; Rgba32 t = new Rgba32(0); for (int x = left; x < right; x++) diff --git a/tests/ImageSharp.Tests/TestUtilities/MeasureFixture.cs b/tests/ImageSharp.Tests/TestUtilities/MeasureFixture.cs index c892c09de..6d06ec5e9 100644 --- a/tests/ImageSharp.Tests/TestUtilities/MeasureFixture.cs +++ b/tests/ImageSharp.Tests/TestUtilities/MeasureFixture.cs @@ -72,7 +72,7 @@ namespace SixLabors.ImageSharp.Tests } private ITestOutputHelper Output { get; } - + public void Dispose() { this.stopwatch.Stop(); diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingReferenceDecoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingReferenceDecoder.cs index 0e967e927..b1e53cb6a 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingReferenceDecoder.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingReferenceDecoder.cs @@ -1,7 +1,6 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. - using System.IO; using SixLabors.ImageSharp.Formats; @@ -23,7 +22,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs { return SystemDrawingBridge.FromFromArgb32SystemDrawingBitmap(sourceBitmap); } - + using (var convertedBitmap = new System.Drawing.Bitmap( sourceBitmap.Width, sourceBitmap.Height, diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingReferenceEncoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingReferenceEncoder.cs index e1ef68fa6..ca6f32f5b 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingReferenceEncoder.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingReferenceEncoder.cs @@ -1,9 +1,6 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using System.Collections.Generic; -using System.Text; - using System.Drawing.Imaging; using System.IO; @@ -21,7 +18,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs this.imageFormat = imageFormat; } - public static SystemDrawingReferenceEncoder Png { get; } = new SystemDrawingReferenceEncoder(System.Drawing.Imaging.ImageFormat.Png); + public static SystemDrawingReferenceEncoder Png { get; } = new SystemDrawingReferenceEncoder(ImageFormat.Png); public void Encode(Image image, Stream stream) where TPixel : struct, IPixel diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs index 7616f89ea..ee0382dbe 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs @@ -4,23 +4,19 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; +using System.Numerics; +using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; -using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; + +using Xunit; namespace SixLabors.ImageSharp.Tests { - using System.Numerics; - using SixLabors.ImageSharp.Advanced; - using SixLabors.ImageSharp.Memory; - using SixLabors.ImageSharp.MetaData; - using SixLabors.ImageSharp.Processing; - - using Xunit; - public static class TestImageExtensions { /// @@ -32,28 +28,28 @@ namespace SixLabors.ImageSharp.Tests where TPixel : struct, IPixel { MemoryManager memoryManager = ctx.MemoryManager; - ctx.Apply( - img => - { - using (Buffer2D temp = memoryManager.Allocate2D(img.Width, img.Height)) - { - Span tempSpan = temp.Span; - foreach (ImageFrame frame in img.Frames) - { - Span pixelSpan = frame.GetPixelSpan(); - PixelOperations.Instance.ToVector4(pixelSpan, tempSpan, pixelSpan.Length); + ctx.Apply(img => + { + using (Buffer2D temp = memoryManager.Allocate2D(img.Width, img.Height)) + { + Span tempSpan = temp.Span; + foreach (ImageFrame frame in img.Frames) + { + Span pixelSpan = frame.GetPixelSpan(); - for (int i = 0; i < tempSpan.Length; i++) - { - ref Vector4 v = ref tempSpan[i]; - v.W = 1.0f; - } + PixelOperations.Instance.ToVector4(pixelSpan, tempSpan, pixelSpan.Length); - PixelOperations.Instance.PackFromVector4(tempSpan, pixelSpan, pixelSpan.Length); - } + for (int i = 0; i < tempSpan.Length; i++) + { + ref Vector4 v = ref tempSpan[i]; + v.W = 1.0f; } - }); + + PixelOperations.Instance.PackFromVector4(tempSpan, pixelSpan, pixelSpan.Length); + } + } + }); } /// diff --git a/tests/ImageSharp.Tests/TestUtilities/TestPixel.cs b/tests/ImageSharp.Tests/TestUtilities/TestPixel.cs index 1eb0aafff..7ce892edb 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestPixel.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestPixel.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Text; using SixLabors.ImageSharp.PixelFormats; + using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.TestUtilities diff --git a/tests/ImageSharp.Tests/TestUtilities/TestType.cs b/tests/ImageSharp.Tests/TestUtilities/TestType.cs index 788a0543a..852aaf2d4 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestType.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestType.cs @@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities public TestType() { } - + public void Deserialize(IXunitSerializationInfo info) { } diff --git a/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs b/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs index 9af3ce39c..4f9a558d4 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs @@ -6,14 +6,14 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Reflection; + using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; +using SixLabors.Primitives; namespace SixLabors.ImageSharp.Tests { - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - using SixLabors.Primitives; - /// /// Various utility and extension methods. /// diff --git a/tests/ImageSharp.Tests/TestUtilities/TestVector4.cs b/tests/ImageSharp.Tests/TestUtilities/TestVector4.cs index 3916f189c..990258e0c 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestVector4.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestVector4.cs @@ -1,11 +1,7 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using System; -using System.Collections.Generic; using System.Numerics; -using System.Text; -using SixLabors.ImageSharp.PixelFormats; using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.TestUtilities @@ -43,8 +39,8 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities { this.X = info.GetValue("x"); this.Y = info.GetValue("y"); - this.Z= info.GetValue("z"); - this.W= info.GetValue("w"); + this.Z = info.GetValue("z"); + this.W = info.GetValue("w"); } public void Serialize(IXunitSerializationInfo info) diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/GroupOutputTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/GroupOutputTests.cs index be12678c8..061d42b0a 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/GroupOutputTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/GroupOutputTests.cs @@ -1,12 +1,11 @@ -// ReSharper disable InconsistentNaming -namespace SixLabors.ImageSharp.Tests -{ - using System.IO; +using System.IO; - using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.PixelFormats; - using Xunit; +using Xunit; +namespace SixLabors.ImageSharp.Tests +{ [GroupOutput("Foo")] public class GroupOutputTests { @@ -17,9 +16,9 @@ namespace SixLabors.ImageSharp.Tests { Assert.Equal("Foo", provider.Utility.OutputSubfolderName); } - + [Theory] - [WithBlankImages(1,1, PixelTypes.Rgba32)] + [WithBlankImages(1, 1, PixelTypes.Rgba32)] public void GetTestOutputDir_ShouldDefineSubfolder(TestImageProvider provider) where TPixel : struct, IPixel { diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs index 1e768637e..48c1b391a 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs @@ -1,21 +1,19 @@ -// ReSharper disable InconsistentNaming -namespace SixLabors.ImageSharp.Tests -{ - using System.Collections.Generic; - using System.Linq; - - using SixLabors.ImageSharp.PixelFormats; - using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; +using System.Collections.Generic; +using System.Linq; - using Moq; +using Moq; - using SixLabors.Primitives; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Transforms; +using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; +using SixLabors.Primitives; - using Xunit; - using Xunit.Abstractions; - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Processing.Transforms; +using Xunit; +using Xunit.Abstractions; +namespace SixLabors.ImageSharp.Tests +{ public class ImageComparerTests { public ImageComparerTests(ITestOutputHelper output) @@ -24,9 +22,9 @@ namespace SixLabors.ImageSharp.Tests } private ITestOutputHelper Output { get; } - + [Theory] - [WithTestPatternImages(100,100,PixelTypes.Rgba32, 0.0001f, 1)] + [WithTestPatternImages(100, 100, PixelTypes.Rgba32, 0.0001f, 1)] [WithTestPatternImages(100, 100, PixelTypes.Rgba32, 0, 0)] public void TolerantImageComparer_ApprovesPerfectSimilarity( TestImageProvider provider, @@ -85,7 +83,7 @@ namespace SixLabors.ImageSharp.Tests } } } - + [Theory] [WithTestPatternImages(100, 100, PixelTypes.Rgba32)] public void TolerantImageComparer_TestPerPixelThreshold(TestImageProvider provider) @@ -160,7 +158,7 @@ namespace SixLabors.ImageSharp.Tests } } } - + [Theory] [WithTestPatternImages(100, 100, PixelTypes.Rgba32)] public void ExactComparer_DoesNotTolerateAnyPixelDifference(TestImageProvider provider) @@ -174,7 +172,7 @@ namespace SixLabors.ImageSharp.Tests ImagingTestCaseUtility.ModifyPixel(clone, 7, 93, 1); IEnumerable reports = ExactImageComparer.Instance.CompareImages(image, clone); - + this.Output.WriteLine(reports.Single().ToString()); PixelDifference[] differences = reports.Single().Differences; Assert.Equal(2, differences.Length); diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs index 6ff935b54..d8ec2d1be 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs @@ -1,15 +1,14 @@ -namespace SixLabors.ImageSharp.Tests -{ - using SixLabors.ImageSharp.Formats; - using SixLabors.ImageSharp.Formats.Png; - using SixLabors.ImageSharp.PixelFormats; - using SixLabors.ImageSharp.Processing; - using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; +using SixLabors.ImageSharp.Formats.Png; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; +using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; - using Xunit; - using Xunit.Abstractions; +using Xunit; +using Xunit.Abstractions; +namespace SixLabors.ImageSharp.Tests +{ public class ReferenceCodecTests { private ITestOutputHelper Output { get; } @@ -73,7 +72,7 @@ namespace SixLabors.ImageSharp.Tests if (TestEnvironment.IsLinux) return; string path = SavePng(provider, PngColorType.RgbWithAlpha); - + using (var sdBitmap = new System.Drawing.Bitmap(path)) { using (Image original = provider.GetImage()) diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs index 25584727a..9db55281e 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs @@ -5,18 +5,17 @@ using System; using System.IO; using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.Formats.Bmp; using SixLabors.ImageSharp.Formats.Gif; using SixLabors.ImageSharp.Formats.Jpeg; +using SixLabors.ImageSharp.Formats.Png; using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; + using Xunit; using Xunit.Abstractions; -// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests { - using SixLabors.ImageSharp.Formats.Bmp; - using SixLabors.ImageSharp.Formats.Png; - public class TestEnvironmentTests { public TestEnvironmentTests(ITestOutputHelper output) diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageExtensionsTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageExtensionsTests.cs index 45ac2d6cc..6a1582828 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageExtensionsTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageExtensionsTests.cs @@ -1,15 +1,14 @@ -// ReSharper disable InconsistentNaming -namespace SixLabors.ImageSharp.Tests -{ - using System; +using System; - using SixLabors.ImageSharp.PixelFormats; - using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; +using Moq; - using Moq; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; - using Xunit; +using Xunit; +namespace SixLabors.ImageSharp.Tests +{ public class TestImageExtensionsTests { [Theory] @@ -83,11 +82,10 @@ namespace SixLabors.ImageSharp.Tests { ImagingTestCaseUtility.ModifyPixel(image, 3, 1, 1); - Assert.ThrowsAny( - () => - { - image.CompareToOriginal(provider, ImageComparer.Exact); - }); + Assert.ThrowsAny(() => + { + image.CompareToOriginal(provider, ImageComparer.Exact); + }); } } @@ -98,11 +96,10 @@ namespace SixLabors.ImageSharp.Tests { using (Image image = provider.GetImage()) { - Assert.ThrowsAny( - () => - { - image.CompareToOriginal(provider, Mock.Of()); - }); + Assert.ThrowsAny(() => + { + image.CompareToOriginal(provider, Mock.Of()); + }); } } } diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs index 2f306e949..494c56dea 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs @@ -116,7 +116,6 @@ namespace SixLabors.ImageSharp.Tests } } - [Theory] [WithFile(TestImages.Bmp.F, PixelTypes.Rgba32)] public void GetImage_WithCustomParameterlessDecoder_ShouldUtilizeCache(TestImageProvider provider) @@ -124,20 +123,19 @@ namespace SixLabors.ImageSharp.Tests { Assert.NotNull(provider.Utility.SourceFileOrDescription); - TestDecoder.DoTestThreadSafe( - () => - { - string testName = nameof(this.GetImage_WithCustomParameterlessDecoder_ShouldUtilizeCache); + TestDecoder.DoTestThreadSafe(() => + { + string testName = nameof(this.GetImage_WithCustomParameterlessDecoder_ShouldUtilizeCache); - var decoder = new TestDecoder(); - decoder.InitCaller(testName); + var decoder = new TestDecoder(); + decoder.InitCaller(testName); - provider.GetImage(decoder); - Assert.Equal(1, TestDecoder.GetInvocationCount(testName)); + provider.GetImage(decoder); + Assert.Equal(1, TestDecoder.GetInvocationCount(testName)); - provider.GetImage(decoder); - Assert.Equal(1, TestDecoder.GetInvocationCount(testName)); - }); + provider.GetImage(decoder); + Assert.Equal(1, TestDecoder.GetInvocationCount(testName)); + }); } private class TestDecoderWithParameters : IImageDecoder @@ -183,24 +181,23 @@ namespace SixLabors.ImageSharp.Tests { Assert.NotNull(provider.Utility.SourceFileOrDescription); - TestDecoderWithParameters.DoTestThreadSafe( - () => - { - string testName = - nameof(this.GetImage_WithCustomParametricDecoder_ShouldUtilizeCache_WhenParametersAreEqual); + TestDecoderWithParameters.DoTestThreadSafe(() => + { + string testName = + nameof(this.GetImage_WithCustomParametricDecoder_ShouldUtilizeCache_WhenParametersAreEqual); - var decoder1 = new TestDecoderWithParameters() { Param1 = "Lol", Param2 = 666 }; - decoder1.InitCaller(testName); + var decoder1 = new TestDecoderWithParameters() { Param1 = "Lol", Param2 = 666 }; + decoder1.InitCaller(testName); - var decoder2 = new TestDecoderWithParameters() { Param1 = "Lol", Param2 = 666 }; - decoder2.InitCaller(testName); + var decoder2 = new TestDecoderWithParameters() { Param1 = "Lol", Param2 = 666 }; + decoder2.InitCaller(testName); - provider.GetImage(decoder1); - Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); + provider.GetImage(decoder1); + Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); - provider.GetImage(decoder2); - Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); - }); + provider.GetImage(decoder2); + Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); + }); } [Theory] @@ -210,24 +207,23 @@ namespace SixLabors.ImageSharp.Tests { Assert.NotNull(provider.Utility.SourceFileOrDescription); - TestDecoderWithParameters.DoTestThreadSafe( - () => - { - string testName = - nameof(this.GetImage_WithCustomParametricDecoder_ShouldNotUtilizeCache_WhenParametersAreNotEqual); + TestDecoderWithParameters.DoTestThreadSafe(() => + { + string testName = + nameof(this.GetImage_WithCustomParametricDecoder_ShouldNotUtilizeCache_WhenParametersAreNotEqual); - var decoder1 = new TestDecoderWithParameters() { Param1 = "Lol", Param2 = 42 }; - decoder1.InitCaller(testName); + var decoder1 = new TestDecoderWithParameters() { Param1 = "Lol", Param2 = 42 }; + decoder1.InitCaller(testName); - var decoder2 = new TestDecoderWithParameters() { Param1 = "LoL", Param2 = 42 }; - decoder2.InitCaller(testName); + var decoder2 = new TestDecoderWithParameters() { Param1 = "LoL", Param2 = 42 }; + decoder2.InitCaller(testName); - provider.GetImage(decoder1); - Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); + provider.GetImage(decoder1); + Assert.Equal(1, TestDecoderWithParameters.GetInvocationCount(testName)); - provider.GetImage(decoder2); - Assert.Equal(2, TestDecoderWithParameters.GetInvocationCount(testName)); - }); + provider.GetImage(decoder2); + Assert.Equal(2, TestDecoderWithParameters.GetInvocationCount(testName)); + }); } diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs index 1e58b7097..a451402c2 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Numerics; using SixLabors.ImageSharp.PixelFormats; + using Xunit; using Xunit.Abstractions;