diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
index ae17f3698d..b9124afc6a 100644
--- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
+++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
@@ -18,7 +18,7 @@
-
+
diff --git a/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs b/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
index 2a5462b40f..da58ddcda8 100644
--- a/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
@@ -3,6 +3,7 @@
// Licensed under the Apache License, Version 2.0.
//
+// ReSharper disable InconsistentNaming
namespace ImageSharp.Tests.Colorspaces
{
using System;
@@ -141,7 +142,7 @@ namespace ImageSharp.Tests.Colorspaces
[Theory]
[MemberData(nameof(EmptyData))]
- public void Equality(IColorVector color)
+ public void Vector_Equals_WhenTrue(IColorVector color)
{
// Act
bool equal = color.Vector.Equals(Vector3.Zero);
@@ -152,7 +153,7 @@ namespace ImageSharp.Tests.Colorspaces
[Theory]
[MemberData(nameof(EqualityData))]
- public void Equality(object first, object second, Type type)
+ public void Equals_WhenTrue(object first, object second, Type type)
{
// Act
bool equal = first.Equals(second);
@@ -165,7 +166,7 @@ namespace ImageSharp.Tests.Colorspaces
[MemberData(nameof(NotEqualityDataNulls))]
[MemberData(nameof(NotEqualityDataDifferentObjects))]
[MemberData(nameof(NotEqualityData))]
- public void NotEquality(object first, object second, Type type)
+ public void Equals_WhenFalse(object first, object second, Type type)
{
// Act
bool equal = first.Equals(second);
@@ -176,7 +177,7 @@ namespace ImageSharp.Tests.Colorspaces
[Theory]
[MemberData(nameof(EqualityData))]
- public void HashCodeEqual(object first, object second, Type type)
+ public void GetHashCode_WhenEqual(object first, object second, Type type)
{
// Act
bool equal = first.GetHashCode() == second.GetHashCode();
@@ -187,7 +188,7 @@ namespace ImageSharp.Tests.Colorspaces
[Theory]
[MemberData(nameof(NotEqualityDataDifferentObjects))]
- public void HashCodeNotEqual(object first, object second, Type type)
+ public void GetHashCode_WhenNotEqual(object first, object second, Type type)
{
// Act
bool equal = first.GetHashCode() == second.GetHashCode();
@@ -198,7 +199,7 @@ namespace ImageSharp.Tests.Colorspaces
[Theory]
[MemberData(nameof(EqualityData))]
- public void EqualityObject(object first, object second, Type type)
+ public void GenericEquals_WhenTrue(object first, object second, Type type)
{
// Arrange
// Cast to the known object types, this is so that we can hit the
@@ -216,7 +217,7 @@ namespace ImageSharp.Tests.Colorspaces
[Theory]
[MemberData(nameof(NotEqualityData))]
- public void NotEqualityObject(object first, object second, Type type)
+ public void GenericEquals_WhenFalse(object first, object second, Type type)
{
// Arrange
// Cast to the known object types, this is so that we can hit the
@@ -253,7 +254,7 @@ namespace ImageSharp.Tests.Colorspaces
[Theory]
[MemberData(nameof(NotEqualityData))]
- public void NotEqualityOperator(object first, object second, Type type)
+ public void Operator_WhenTrue(object first, object second, Type type)
{
// Arrange
// Cast to the known object types, this is so that we can hit the
diff --git a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs b/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs
index b59023340b..0eeb468f03 100644
--- a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs
+++ b/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs
@@ -113,7 +113,7 @@ namespace ImageSharp.Tests
{
using (Image image = new Image(1, 1))
{
- CopyFromZYX(image);
+ CopyFromZYXImpl(image);
}
}
@@ -122,7 +122,7 @@ namespace ImageSharp.Tests
{
using (Image image = new Image(1, 1))
{
- CopyFromZYXW(image);
+ CopyFromZYXWImpl(image);
}
}
@@ -131,7 +131,7 @@ namespace ImageSharp.Tests
{
using (Image image = new Image(1, 1))
{
- CopyToZYX(image);
+ CopyToZYXImpl(image);
}
}
@@ -140,11 +140,11 @@ namespace ImageSharp.Tests
{
using (Image image = new Image(1, 1))
{
- CopyToZYXW(image);
+ CopyToZYXWImpl(image);
}
}
- private static void CopyFromZYX(Image image)
+ private static void CopyFromZYXImpl(Image image)
where TPixel : struct, IPixel
{
using (PixelAccessor pixels = image.Lock())
@@ -171,7 +171,7 @@ namespace ImageSharp.Tests
}
}
- private static void CopyFromZYXW(Image image)
+ private static void CopyFromZYXWImpl(Image image)
where TPixel : struct, IPixel
{
using (PixelAccessor pixels = image.Lock())
@@ -199,7 +199,7 @@ namespace ImageSharp.Tests
}
}
- private static void CopyToZYX(Image image)
+ private static void CopyToZYXImpl(Image image)
where TPixel : struct, IPixel
{
using (PixelAccessor pixels = image.Lock())
@@ -221,7 +221,7 @@ namespace ImageSharp.Tests
}
}
- private static void CopyToZYXW(Image image)
+ private static void CopyToZYXWImpl(Image image)
where TPixel : struct, IPixel
{
using (PixelAccessor pixels = image.Lock())
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index 9f3beb9e81..b0429d9ede 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/tests/ImageSharp.Tests/PixelFormats/ColorDefinitionTests.cs b/tests/ImageSharp.Tests/PixelFormats/ColorDefinitionTests.cs
index 7e5af92972..db5b4a4c91 100644
--- a/tests/ImageSharp.Tests/PixelFormats/ColorDefinitionTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/ColorDefinitionTests.cs
@@ -15,7 +15,18 @@ namespace ImageSharp.Tests
public class ColorDefinitionTests
{
- public static IEnumerable ColorNames => typeof(NamedColors).GetTypeInfo().GetFields().Select(x => new[] { x.Name });
+ public static TheoryData ColorNames
+ {
+ get
+ {
+ var result = new TheoryData();
+ foreach (string name in typeof(NamedColors).GetTypeInfo().GetFields().Select(x => x.Name ))
+ {
+ result.Add(name);
+ }
+ return result;
+ }
+ }
[Theory]
[MemberData(nameof(ColorNames))]