From c62e12248a8b49e932a8ada16cce711a48b7da57 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Fri, 23 Dec 2016 03:34:50 +0100 Subject: [PATCH] renamed TestImageFactory --to--> TestImageProvider --- .../ImageSharp.Tests/Formats/Jpg/JpegTests.cs | 12 ++-- .../Image/PixelAccessorTests.cs | 12 ++-- .../TestUtilities/ImageDataAttributeBase.cs | 4 +- .../TestUtilities/ImagingTestCaseUtility.cs | 4 +- .../TestUtilities/PixelTypes.cs | 4 +- ...stImageFactory.cs => TestImageProvider.cs} | 57 +++++++++---------- .../{ => Tests}/TestImageFactoryTests.cs | 55 +++++++++--------- .../{ => Tests}/TestUtilityExtensionsTests.cs | 14 ++--- .../TestUtilities/WithBlankImageAttribute.cs | 6 +- .../TestUtilities/WithFileAttribute.cs | 8 +-- .../WithFileCollectionAttribute.cs | 8 +-- .../WithMemberFactoryAttribute.cs | 8 +-- .../WithSolidFilledImagesAttribute.cs | 12 ++-- 13 files changed, 101 insertions(+), 103 deletions(-) rename tests/ImageSharp.Tests/TestUtilities/{TestImageFactory.cs => TestImageProvider.cs} (63%) rename tests/ImageSharp.Tests/TestUtilities/{ => Tests}/TestImageFactoryTests.cs (76%) rename tests/ImageSharp.Tests/TestUtilities/{ => Tests}/TestUtilityExtensionsTests.cs (89%) diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegTests.cs index 6e0977541d..d02c2d76ed 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegTests.cs @@ -27,12 +27,12 @@ namespace ImageSharp.Tests.Formats.Jpg [Theory] //[WithFileCollection(nameof(AllJpegFiles), PixelTypes.All)] [WithFileCollection(nameof(AllJpegFiles), PixelTypes.Color | PixelTypes.Argb)] - public void OpenJpeg_SaveBmp(TestImageFactory factory) + public void OpenJpeg_SaveBmp(TestImageProvider provider) where TColor : struct, IPackedPixel, IEquatable { - var image = factory.Create(); + var image = provider.GetImage(); - factory.Utility.SaveTestOutputFile(image, "bmp"); + provider.Utility.SaveTestOutputFile(image, "bmp"); } @@ -41,12 +41,12 @@ namespace ImageSharp.Tests.Formats.Jpg [Theory] [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Color | PixelTypes.Argb, JpegSubsample.Ratio420, 75)] [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Color | PixelTypes.Argb, JpegSubsample.Ratio444, 75)] - public void OpenBmp_SaveJpeg(TestImageFactory factory, JpegSubsample subSample, int quality) + public void OpenBmp_SaveJpeg(TestImageProvider provider, JpegSubsample subSample, int quality) where TColor : struct, IPackedPixel, IEquatable { - var image = factory.Create(); + var image = provider.GetImage(); - var utility = factory.Utility; + var utility = provider.Utility; utility.TestName += "_" + subSample + "_Q" + quality; using (var outputStream = File.OpenWrite(utility.GetTestOutputFileName("jpg"))) diff --git a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs b/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs index 39503d1dae..4091843039 100644 --- a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs +++ b/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs @@ -46,10 +46,10 @@ namespace ImageSharp.Tests [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.ZYX)] [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.XYZW)] [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.ZYXW)] - public void CopyTo_Then_CopyFrom_OnFullImageRect(TestImageFactory factory, ComponentOrder order) + public void CopyTo_Then_CopyFrom_OnFullImageRect(TestImageProvider provider, ComponentOrder order) where TColor : struct, IPackedPixel, IEquatable { - var src = factory.Create(); + var src = provider.GetImage(); var dest = new Image(src.Width, src.Height); @@ -90,11 +90,11 @@ namespace ImageSharp.Tests [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.ZYX)] [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.XYZW)] [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.ZYXW)] - public void CopyTo_Then_CopyFrom_WithOffset(TestImageFactory factory, ComponentOrder order) + public void CopyTo_Then_CopyFrom_WithOffset(TestImageProvider provider, ComponentOrder order) where TColor : struct, IPackedPixel, IEquatable { - var srcImage = factory.Create(); + var srcImage = provider.GetImage(); var color = default(TColor); color.PackFromBytes(255, 0, 0, 255); @@ -116,8 +116,8 @@ namespace ImageSharp.Tests } } - factory.Utility.SourceFileOrDescription = order.ToString(); - factory.Utility.SaveTestOutputFile(destImage, "bmp"); + provider.Utility.SourceFileOrDescription = order.ToString(); + provider.Utility.SaveTestOutputFile(destImage, "bmp"); var expectedImage = new Image(8, 8).Fill(color); diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageDataAttributeBase.cs b/tests/ImageSharp.Tests/TestUtilities/ImageDataAttributeBase.cs index 494e3bd171..fc27f32a04 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageDataAttributeBase.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageDataAttributeBase.cs @@ -12,7 +12,7 @@ namespace ImageSharp.Tests.TestUtilities using Xunit.Sdk; /// - /// Base class for Theory Data attributes which pass an instance of to the test cases. + /// Base class for Theory Data attributes which pass an instance of to the test cases. /// public abstract class ImageDataAttributeBase : DataAttribute { @@ -37,7 +37,7 @@ namespace ImageSharp.Tests.TestUtilities { foreach (var pixelType in this.PixelTypes.ToTypes()) { - var factoryType = typeof(TestImageFactory<>).MakeGenericType(pixelType); + var factoryType = typeof(TestImageProvider<>).MakeGenericType(pixelType); foreach (object[] originalFacoryMethodArgs in this.GetAllFactoryMethodArgs(testMethod, factoryType)) { diff --git a/tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs b/tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs index 5c41ca2482..8225e08efd 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs @@ -18,12 +18,12 @@ namespace ImageSharp.Tests.TestUtilities public class ImagingTestCaseUtility { /// - /// Name of the TColor in the owner + /// Name of the TColor in the owner /// public string PixelTypeName { get; set; } = string.Empty; /// - /// The name of the file which is provided by + /// The name of the file which is provided by /// Or a short string describing the image in the case of a non-file based image provider. /// public string SourceFileOrDescription { get; set; } = string.Empty; diff --git a/tests/ImageSharp.Tests/TestUtilities/PixelTypes.cs b/tests/ImageSharp.Tests/TestUtilities/PixelTypes.cs index ad224564a4..6277156795 100644 --- a/tests/ImageSharp.Tests/TestUtilities/PixelTypes.cs +++ b/tests/ImageSharp.Tests/TestUtilities/PixelTypes.cs @@ -8,7 +8,7 @@ namespace ImageSharp.Tests.TestUtilities /// /// Flags that are mapped to PackedPixel types. - /// They trigger the desired parametrization for . + /// They trigger the desired parametrization for . /// [Flags] public enum PixelTypes : uint @@ -48,7 +48,7 @@ namespace ImageSharp.Tests.TestUtilities Short2 = 1 << 15, Short4 = 1 << 16, - + // TODO: Add multi-flag entries by rules defined in PackedPixelConverterHelper // "All" is handled as a separate, individual case instead of using bitwise OR diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageFactory.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageProvider.cs similarity index 63% rename from tests/ImageSharp.Tests/TestUtilities/TestImageFactory.cs rename to tests/ImageSharp.Tests/TestUtilities/TestImageProvider.cs index 49e8cc5287..5664c75953 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestImageFactory.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestImageProvider.cs @@ -1,4 +1,4 @@ -// +// // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // @@ -13,10 +13,13 @@ namespace ImageSharp.Tests.TestUtilities /// Provides instances for parametric unit tests. /// /// The pixel format of the image - public abstract class TestImageFactory : ITestImageFactory + public abstract class TestImageProvider : ITestImageFactory where TColor : struct, IPackedPixel, IEquatable { - public abstract Image Create(); + /// + /// Returns an instance to the test case with the necessary traits. + /// + public abstract Image GetImage(); public virtual string SourceFileOrDescription => ""; @@ -25,11 +28,7 @@ namespace ImageSharp.Tests.TestUtilities /// public ImagingTestCaseUtility Utility { get; private set; } - protected TestImageFactory() - { - } - - protected virtual TestImageFactory InitUtility(MethodInfo testMethod) + protected virtual TestImageProvider InitUtility(MethodInfo testMethod) { this.Utility = new ImagingTestCaseUtility() { @@ -45,13 +44,13 @@ namespace ImageSharp.Tests.TestUtilities return this; } - private class BlankFactory : TestImageFactory + private class BlankProvider : TestImageProvider { protected int Width { get; } protected int Height { get; } - public BlankFactory(int width, int height) + public BlankProvider(int width, int height) { this.Width = width; this.Height = height; @@ -59,43 +58,43 @@ namespace ImageSharp.Tests.TestUtilities public override string SourceFileOrDescription => $"Blank{this.Width}x{this.Height}"; - public override Image Create() => new Image(this.Width, this.Height); + public override Image GetImage() => new Image(this.Width, this.Height); } - public static TestImageFactory Blank(int width, int height, MethodInfo testMethod = null) - => new BlankFactory(width, height).InitUtility(testMethod); + public static TestImageProvider Blank(int width, int height, MethodInfo testMethod = null) + => new BlankProvider(width, height).InitUtility(testMethod); - private class LambdaFactory : TestImageFactory + private class LambdaProvider : TestImageProvider { private readonly Func> creator; - public LambdaFactory(Func> creator) + public LambdaProvider(Func> creator) { this.creator = creator; } - public override Image Create() => this.creator(); + public override Image GetImage() => this.creator(); } - public static TestImageFactory Lambda( + public static TestImageProvider Lambda( Func> func, - MethodInfo testMethod = null) => new LambdaFactory(func).InitUtility(testMethod); + MethodInfo testMethod = null) => new LambdaProvider(func).InitUtility(testMethod); - private class FileFactory : TestImageFactory + private class FileProvider : TestImageProvider { private static ConcurrentDictionary> cache = new ConcurrentDictionary>(); private string filePath; - public FileFactory(string filePath) + public FileProvider(string filePath) { this.filePath = filePath; } public override string SourceFileOrDescription => this.filePath; - public override Image Create() + public override Image GetImage() { var cachedImage = cache.GetOrAdd( this.filePath, @@ -109,12 +108,12 @@ namespace ImageSharp.Tests.TestUtilities } } - public static TestImageFactory File(string filePath, MethodInfo testMethod = null) + public static TestImageProvider File(string filePath, MethodInfo testMethod = null) { - return new FileFactory(filePath).InitUtility(testMethod); + return new FileProvider(filePath).InitUtility(testMethod); } - private class SolidFactory : BlankFactory + private class SolidProvider : BlankProvider { private readonly byte r; @@ -124,16 +123,16 @@ namespace ImageSharp.Tests.TestUtilities private readonly byte a; - public override Image Create() + public override Image GetImage() { - var image = base.Create(); + var image = base.GetImage(); TColor color = default(TColor); color.PackFromBytes(this.r, this.g, this.b, this.a); return image.Fill(color); } - public SolidFactory(int width, int height, byte r, byte g, byte b, byte a) + public SolidProvider(int width, int height, byte r, byte g, byte b, byte a) : base(width, height) { this.r = r; @@ -143,7 +142,7 @@ namespace ImageSharp.Tests.TestUtilities } } - public static TestImageFactory Solid( + public static TestImageProvider Solid( int width, int height, byte r, @@ -152,7 +151,7 @@ namespace ImageSharp.Tests.TestUtilities byte a = 255, MethodInfo testMethod = null) { - return new SolidFactory(width, height, r, g, b, a).InitUtility(testMethod); + return new SolidProvider(width, height, r, g, b, a).InitUtility(testMethod); } } diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageFactoryTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageFactoryTests.cs similarity index 76% rename from tests/ImageSharp.Tests/TestUtilities/TestImageFactoryTests.cs rename to tests/ImageSharp.Tests/TestUtilities/Tests/TestImageFactoryTests.cs index 9ced0bb78b..1cc8ac35b0 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestImageFactoryTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageFactoryTests.cs @@ -4,10 +4,9 @@ // // ReSharper disable InconsistentNaming -namespace ImageSharp.Tests.TestUtilities +namespace ImageSharp.Tests.TestUtilities.Tests { using System; - using System.IO; using Xunit; using Xunit.Abstractions; @@ -26,11 +25,11 @@ namespace ImageSharp.Tests.TestUtilities [Theory] [WithBlankImages(42, 666, PixelTypes.Color | PixelTypes.Argb | PixelTypes.HalfSingle, "hello")] public void Use_WithEmptyImageAttribute( - TestImageFactory factory, + TestImageProvider provider, string message) where TColor : struct, IPackedPixel, IEquatable { - var img = factory.Create(); + var img = provider.GetImage(); Assert.Equal(42, img.Width); Assert.Equal(666, img.Height); @@ -40,11 +39,11 @@ namespace ImageSharp.Tests.TestUtilities [Theory] [WithBlankImages(42, 666, PixelTypes.All, "hello")] public void Use_WithBlankImagesAttribute_WithAllPixelTypes( - TestImageFactory factory, + TestImageProvider provider, string message) where TColor : struct, IPackedPixel, IEquatable { - var img = factory.Create(); + var img = provider.GetImage(); Assert.Equal(42, img.Width); Assert.Equal(666, img.Height); @@ -55,16 +54,16 @@ namespace ImageSharp.Tests.TestUtilities [Theory] [WithFile(TestImages.Bmp.Car, PixelTypes.All, 88)] [WithFile(TestImages.Bmp.F, PixelTypes.All, 88)] - public void Use_WithFileAttribute(TestImageFactory factory, int yo) + public void Use_WithFileAttribute(TestImageProvider provider, int yo) where TColor : struct, IPackedPixel, IEquatable { - Assert.NotNull(factory.Utility.SourceFileOrDescription); - var img = factory.Create(); + Assert.NotNull(provider.Utility.SourceFileOrDescription); + var img = provider.GetImage(); Assert.True(img.Width * img.Height > 0); Assert.Equal(88, yo); - string fn = factory.Utility.GetTestOutputFileName("jpg"); + string fn = provider.Utility.GetTestOutputFileName("jpg"); this.Output.WriteLine(fn); } @@ -72,20 +71,20 @@ namespace ImageSharp.Tests.TestUtilities [Theory] [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Color | PixelTypes.Argb)] - public void Use_WithFileCollection(TestImageFactory factory) + public void Use_WithFileCollection(TestImageProvider provider) where TColor : struct, IPackedPixel, IEquatable { - Assert.NotNull(factory.Utility.SourceFileOrDescription); - var image = factory.Create(); - factory.Utility.SaveTestOutputFile(image, "png"); + Assert.NotNull(provider.Utility.SourceFileOrDescription); + var image = provider.GetImage(); + provider.Utility.SaveTestOutputFile(image, "png"); } [Theory] [WithSolidFilledImages(10, 20, 255, 100, 50, 200, PixelTypes.Color | PixelTypes.Argb)] - public void Use_WithSolidFilledImagesAttribute(TestImageFactory factory) + public void Use_WithSolidFilledImagesAttribute(TestImageProvider provider) where TColor : struct, IPackedPixel, IEquatable { - var img = factory.Create(); + var img = provider.GetImage(); Assert.Equal(img.Width, 10); Assert.Equal(img.Height, 20); @@ -116,18 +115,18 @@ namespace ImageSharp.Tests.TestUtilities [Theory] [WithMemberFactory(nameof(TestMemberFactory), PixelTypes.All)] - public void Use_WithMemberFactoryAttribute(TestImageFactory factory) + public void Use_WithMemberFactoryAttribute(TestImageProvider provider) where TColor : struct, IPackedPixel, IEquatable { - var img = factory.Create(); + var img = provider.GetImage(); Assert.Equal(img.Width, 3); } public static readonly TheoryData BasicData = new TheoryData() { - TestImageFactory.Blank(10, 20), - TestImageFactory.Blank( + TestImageProvider.Blank(10, 20), + TestImageProvider.Blank( 10, 20) }; @@ -135,31 +134,31 @@ namespace ImageSharp.Tests.TestUtilities [Theory] [MemberData(nameof(BasicData))] - public void Blank_MemberData(TestImageFactory factory) + public void Blank_MemberData(TestImageProvider provider) where TColor : struct, IPackedPixel, IEquatable { - var img = factory.Create(); + var img = provider.GetImage(); Assert.True(img.Width * img.Height > 0); } public static readonly TheoryData FileData = new TheoryData() { - TestImageFactory.File( + TestImageProvider.File( TestImages.Bmp.Car), - TestImageFactory.File( + TestImageProvider.File( TestImages.Bmp.F) }; [Theory] [MemberData(nameof(FileData))] - public void File_MemberData(TestImageFactory factory) + public void File_MemberData(TestImageProvider provider) where TColor : struct, IPackedPixel, IEquatable { - this.Output.WriteLine("SRC: " + factory.Utility.SourceFileOrDescription); - this.Output.WriteLine("OUT: " + factory.Utility.GetTestOutputFileName()); + this.Output.WriteLine("SRC: " + provider.Utility.SourceFileOrDescription); + this.Output.WriteLine("OUT: " + provider.Utility.GetTestOutputFileName()); - var img = factory.Create(); + var img = provider.GetImage(); Assert.True(img.Width * img.Height > 0); } diff --git a/tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensionsTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs similarity index 89% rename from tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensionsTests.cs rename to tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs index ddb8e549b2..948479d7aa 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensionsTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs @@ -4,7 +4,7 @@ // // ReSharper disable InconsistentNaming -namespace ImageSharp.Tests.TestUtilities +namespace ImageSharp.Tests.TestUtilities.Tests { using System; using System.Linq; @@ -68,11 +68,11 @@ namespace ImageSharp.Tests.TestUtilities [Theory] [WithFile(TestImages.Bmp.Car, PixelTypes.Color)] - public void IsEquivalentTo_WhenFalse(TestImageFactory factory) + public void IsEquivalentTo_WhenFalse(TestImageProvider provider) where TColor : struct, IPackedPixel, IEquatable { - var a = factory.Create(); - var b = factory.Create(); + var a = provider.GetImage(); + var b = provider.GetImage(); b = b.OilPaint(3, 2); Assert.False(a.IsEquivalentTo(b)); @@ -80,11 +80,11 @@ namespace ImageSharp.Tests.TestUtilities [Theory] [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Color | PixelTypes.Bgr565)] - public void IsEquivalentTo_WhenTrue(TestImageFactory factory) + public void IsEquivalentTo_WhenTrue(TestImageProvider provider) where TColor : struct, IPackedPixel, IEquatable { - var a = factory.Create(); - var b = factory.Create(); + var a = provider.GetImage(); + var b = provider.GetImage(); Assert.True(a.IsEquivalentTo(b)); } diff --git a/tests/ImageSharp.Tests/TestUtilities/WithBlankImageAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/WithBlankImageAttribute.cs index a7266a6155..9a4b03636c 100644 --- a/tests/ImageSharp.Tests/TestUtilities/WithBlankImageAttribute.cs +++ b/tests/ImageSharp.Tests/TestUtilities/WithBlankImageAttribute.cs @@ -9,13 +9,13 @@ namespace ImageSharp.Tests.TestUtilities using System.Reflection; /// - /// Triggers passing instances which produce a blank image of size width * height. - /// One instance will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which produce a blank image of size width * height. + /// One instance will be passed for each the pixel format defined by the pixelTypes parameter /// public class WithBlankImagesAttribute : ImageDataAttributeBase { /// - /// Triggers passing an that produces a blank image of size width * height + /// Triggers passing an that produces a blank image of size width * height /// /// The required width /// The required height diff --git a/tests/ImageSharp.Tests/TestUtilities/WithFileAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/WithFileAttribute.cs index ff8a7a30d9..49cbeab5e4 100644 --- a/tests/ImageSharp.Tests/TestUtilities/WithFileAttribute.cs +++ b/tests/ImageSharp.Tests/TestUtilities/WithFileAttribute.cs @@ -9,16 +9,16 @@ namespace ImageSharp.Tests.TestUtilities using System.Reflection; /// - /// Triggers passing instances which read an image from the given file - /// One instance will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which read an image from the given file + /// One instance will be passed for each the pixel format defined by the pixelTypes parameter /// public class WithFileAttribute : ImageDataAttributeBase { private readonly string fileName; /// - /// Triggers passing instances which read an image from the given file - /// One instance will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which read an image from the given file + /// One instance will be passed for each the pixel format defined by the pixelTypes parameter /// /// The name of the file /// The requested pixel types diff --git a/tests/ImageSharp.Tests/TestUtilities/WithFileCollectionAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/WithFileCollectionAttribute.cs index 7ac19007ba..bd80ae66b6 100644 --- a/tests/ImageSharp.Tests/TestUtilities/WithFileCollectionAttribute.cs +++ b/tests/ImageSharp.Tests/TestUtilities/WithFileCollectionAttribute.cs @@ -10,16 +10,16 @@ namespace ImageSharp.Tests.TestUtilities using System.Reflection; /// - /// Triggers passing instances which read an image for each file being enumerated by the (static) test class field/property defined by enumeratorMemberName - /// instances will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which read an image for each file being enumerated by the (static) test class field/property defined by enumeratorMemberName + /// instances will be passed for each the pixel format defined by the pixelTypes parameter /// public class WithFileCollectionAttribute : ImageDataAttributeBase { private readonly string enumeratorMemberName; /// - /// Triggers passing instances which read an image for each file being enumerated by the (static) test class field/property defined by enumeratorMemberName - /// instances will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which read an image for each file being enumerated by the (static) test class field/property defined by enumeratorMemberName + /// instances will be passed for each the pixel format defined by the pixelTypes parameter /// /// The name of the static test class field/property enumerating the files /// The requested pixel types diff --git a/tests/ImageSharp.Tests/TestUtilities/WithMemberFactoryAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/WithMemberFactoryAttribute.cs index b71db5198c..3860880c3f 100644 --- a/tests/ImageSharp.Tests/TestUtilities/WithMemberFactoryAttribute.cs +++ b/tests/ImageSharp.Tests/TestUtilities/WithMemberFactoryAttribute.cs @@ -9,16 +9,16 @@ namespace ImageSharp.Tests.TestUtilities using System.Reflection; /// - /// Triggers passing instances which return the image produced by the given test class member method - /// instances will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which return the image produced by the given test class member method + /// instances will be passed for each the pixel format defined by the pixelTypes parameter /// public class WithMemberFactoryAttribute : ImageDataAttributeBase { private readonly string memberMethodName; /// - /// Triggers passing instances which return the image produced by the given test class member method - /// instances will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which return the image produced by the given test class member method + /// instances will be passed for each the pixel format defined by the pixelTypes parameter /// /// The name of the static test class which returns the image /// The requested pixel types diff --git a/tests/ImageSharp.Tests/TestUtilities/WithSolidFilledImagesAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/WithSolidFilledImagesAttribute.cs index bd8abe1f2f..864ac80b3f 100644 --- a/tests/ImageSharp.Tests/TestUtilities/WithSolidFilledImagesAttribute.cs +++ b/tests/ImageSharp.Tests/TestUtilities/WithSolidFilledImagesAttribute.cs @@ -8,14 +8,14 @@ namespace ImageSharp.Tests.TestUtilities using System.Reflection; /// - /// Triggers passing instances which produce an image of size width * height filled with the requested color. - /// One instance will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which produce an image of size width * height filled with the requested color. + /// One instance will be passed for each the pixel format defined by the pixelTypes parameter /// public class WithSolidFilledImagesAttribute : WithBlankImagesAttribute { /// - /// Triggers passing instances which produce an image of size width * height filled with the requested color. - /// One instance will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which produce an image of size width * height filled with the requested color. + /// One instance will be passed for each the pixel format defined by the pixelTypes parameter /// /// The width of the requested image /// The height of the requested image @@ -37,8 +37,8 @@ namespace ImageSharp.Tests.TestUtilities } /// - /// Triggers passing instances which produce an image of size width * height filled with the requested color. - /// One instance will be passed for each the pixel format defined by the pixelTypes parameter + /// Triggers passing instances which produce an image of size width * height filled with the requested color. + /// One instance will be passed for each the pixel format defined by the pixelTypes parameter /// /// The width of the requested image /// The height of the requested image