Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addressed review feedback.

Browse Source 
Renamed ColorName to ColorName16 to make it clear it's purpose.
Added related TODOs.
This commit is contained in:
Tig
2024-09-23 09:53:52 -06:00
parent 0684c86b77
commit 05ae84382d
35 changed files with 292 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
UnitTests/Drawing/AttributeTests.cs
View File

@@ -16,7 +16,7 @@ public class AttributeTests
{
// Arrange & Act
var foregroundColor = new Color (0, 0, 255);
var backgroundColorName = ColorName.Black;
var backgroundColorName = ColorName16.Black;
var attribute = new Attribute (foregroundColor, backgroundColorName);
// Assert
@@ -41,7 +41,7 @@ public class AttributeTests
public void ColorNamesAndColorConstructor ()
{
// Arrange & Act
var foregroundColorName = ColorName.BrightYellow;
var foregroundColorName = ColorName16.BrightYellow;
var backgroundColor = new Color (128, 128, 128);
var attribute = new Attribute (foregroundColorName, backgroundColor);
@@ -54,7 +54,7 @@ public class AttributeTests
public void ColorNamesConstructor ()
{
// Arrange & Act
var attribute = new Attribute (ColorName.Blue);
var attribute = new Attribute (ColorName16.Blue);
// Assert
Assert.Equal (new Color (Color.Blue), attribute.Foreground);
@@ -278,7 +278,7 @@ public class AttributeTests
{
// Arrange
var foregroundColor = new Color (255, 0);
var backgroundColorName = ColorName.White;
var backgroundColorName = ColorName16.White;
// Act
var attribute = new Attribute (foregroundColor, backgroundColorName);
@@ -292,7 +292,7 @@ public class AttributeTests
public void MakeColorNamesAndColor_ForegroundAndBackgroundShouldMatchInput ()
{
// Arrange
var foregroundColorName = ColorName.Green;
var foregroundColorName = ColorName16.Green;
var backgroundColor = new Color (128, 128, 128);
// Act
@@ -307,8 +307,8 @@ public class AttributeTests
public void MakeColorNamesAndColorNames_ForegroundAndBackgroundShouldMatchInput ()
{
// Arrange
var foregroundColorName = ColorName.BrightYellow;
var backgroundColorName = ColorName.Black;
var foregroundColorName = ColorName16.BrightYellow;
var backgroundColorName = ColorName16.Black;
// Act
var attribute = new Attribute (foregroundColorName, backgroundColorName);

38
UnitTests/Drawing/ColorTests.Constructors.cs
View File

@@ -72,7 +72,7 @@ public partial class ColorTests
MemberType = typeof (ColorTestsTheoryDataGenerators)
)]
public void Constructor_WithColorName_AllChannelsCorrect (
ColorName cname,
ColorName16 cname,
ValueTuple<byte, byte, byte> expectedColorValues
)
{
@@ -195,25 +195,25 @@ public partial class ColorTests
public static partial class ColorTestsTheoryDataGenerators
{
public static TheoryData<ColorName, ValueTuple<byte, byte, byte>> Constructor_WithColorName_AllChannelsCorrect ()
public static TheoryData<ColorName16, ValueTuple<byte, byte, byte>> Constructor_WithColorName_AllChannelsCorrect ()
{
TheoryData<ColorName, ValueTuple<byte, byte, byte>> data = [];
data.Add (ColorName.Black, new ValueTuple<byte, byte, byte> (12, 12, 12));
data.Add (ColorName.Blue, new ValueTuple<byte, byte, byte> (0, 55, 218));
data.Add (ColorName.Green, new ValueTuple<byte, byte, byte> (19, 161, 14));
data.Add (ColorName.Cyan, new ValueTuple<byte, byte, byte> (58, 150, 221));
data.Add (ColorName.Red, new ValueTuple<byte, byte, byte> (197, 15, 31));
data.Add (ColorName.Magenta, new ValueTuple<byte, byte, byte> (136, 23, 152));
data.Add (ColorName.Yellow, new ValueTuple<byte, byte, byte> (128, 64, 32));
data.Add (ColorName.Gray, new ValueTuple<byte, byte, byte> (204, 204, 204));
data.Add (ColorName.DarkGray, new ValueTuple<byte, byte, byte> (118, 118, 118));
data.Add (ColorName.BrightBlue, new ValueTuple<byte, byte, byte> (59, 120, 255));
data.Add (ColorName.BrightGreen, new ValueTuple<byte, byte, byte> (22, 198, 12));
data.Add (ColorName.BrightCyan, new ValueTuple<byte, byte, byte> (97, 214, 214));
data.Add (ColorName.BrightRed, new ValueTuple<byte, byte, byte> (231, 72, 86));
data.Add (ColorName.BrightMagenta, new ValueTuple<byte, byte, byte> (180, 0, 158));
data.Add (ColorName.BrightYellow, new ValueTuple<byte, byte, byte> (249, 241, 165));
data.Add (ColorName.White, new ValueTuple<byte, byte, byte> (242, 242, 242));
TheoryData<ColorName16, ValueTuple<byte, byte, byte>> data = [];
data.Add (ColorName16.Black, new ValueTuple<byte, byte, byte> (12, 12, 12));
data.Add (ColorName16.Blue, new ValueTuple<byte, byte, byte> (0, 55, 218));
data.Add (ColorName16.Green, new ValueTuple<byte, byte, byte> (19, 161, 14));
data.Add (ColorName16.Cyan, new ValueTuple<byte, byte, byte> (58, 150, 221));
data.Add (ColorName16.Red, new ValueTuple<byte, byte, byte> (197, 15, 31));
data.Add (ColorName16.Magenta, new ValueTuple<byte, byte, byte> (136, 23, 152));
data.Add (ColorName16.Yellow, new ValueTuple<byte, byte, byte> (128, 64, 32));
data.Add (ColorName16.Gray, new ValueTuple<byte, byte, byte> (204, 204, 204));
data.Add (ColorName16.DarkGray, new ValueTuple<byte, byte, byte> (118, 118, 118));
data.Add (ColorName16.BrightBlue, new ValueTuple<byte, byte, byte> (59, 120, 255));
data.Add (ColorName16.BrightGreen, new ValueTuple<byte, byte, byte> (22, 198, 12));
data.Add (ColorName16.BrightCyan, new ValueTuple<byte, byte, byte> (97, 214, 214));
data.Add (ColorName16.BrightRed, new ValueTuple<byte, byte, byte> (231, 72, 86));
data.Add (ColorName16.BrightMagenta, new ValueTuple<byte, byte, byte> (180, 0, 158));
data.Add (ColorName16.BrightYellow, new ValueTuple<byte, byte, byte> (249, 241, 165));
data.Add (ColorName16.White, new ValueTuple<byte, byte, byte> (242, 242, 242));
return data;
}

38
UnitTests/Drawing/ColorTests.Operators.cs
View File

@@ -64,7 +64,7 @@ public partial class ColorTests
nameof (ColorTestsTheoryDataGenerators.ExplicitOperator_FromColorName_RoundTripsCorrectly),
MemberType = typeof (ColorTestsTheoryDataGenerators)
)]
public void ImplicitOperator_FromColorName_ReturnsCorrectColorValue (ColorName cname, Color expectedColor)
public void ImplicitOperator_FromColorName_ReturnsCorrectColorValue (ColorName16 cname, Color expectedColor)
{
Color color = cname;
@@ -182,26 +182,26 @@ public partial class ColorTests
public static partial class ColorTestsTheoryDataGenerators
{
public static TheoryData<ColorName, Color> ExplicitOperator_FromColorName_RoundTripsCorrectly ()
public static TheoryData<ColorName16, Color> ExplicitOperator_FromColorName_RoundTripsCorrectly ()
{
TheoryData<ColorName, Color> data = []
TheoryData<ColorName16, Color> data = []
;
data.Add (ColorName.Black, new Color (12, 12, 12));
data.Add (ColorName.Blue, new Color (0, 55, 218));
data.Add (ColorName.Green, new Color (19, 161, 14));
data.Add (ColorName.Cyan, new Color (58, 150, 221));
data.Add (ColorName.Red, new Color (197, 15, 31));
data.Add (ColorName.Magenta, new Color (136, 23, 152));
data.Add (ColorName.Yellow, new Color (128, 64, 32));
data.Add (ColorName.Gray, new Color (204, 204, 204));
data.Add (ColorName.DarkGray, new Color (118, 118, 118));
data.Add (ColorName.BrightBlue, new Color (59, 120, 255));
data.Add (ColorName.BrightGreen, new Color (22, 198, 12));
data.Add (ColorName.BrightCyan, new Color (97, 214, 214));
data.Add (ColorName.BrightRed, new Color (231, 72, 86));
data.Add (ColorName.BrightMagenta, new Color (180, 0, 158));
data.Add (ColorName.BrightYellow, new Color (249, 241, 165));
data.Add (ColorName.White, new Color (242, 242, 242));
data.Add (ColorName16.Black, new Color (12, 12, 12));
data.Add (ColorName16.Blue, new Color (0, 55, 218));
data.Add (ColorName16.Green, new Color (19, 161, 14));
data.Add (ColorName16.Cyan, new Color (58, 150, 221));
data.Add (ColorName16.Red, new Color (197, 15, 31));
data.Add (ColorName16.Magenta, new Color (136, 23, 152));
data.Add (ColorName16.Yellow, new Color (128, 64, 32));
data.Add (ColorName16.Gray, new Color (204, 204, 204));
data.Add (ColorName16.DarkGray, new Color (118, 118, 118));
data.Add (ColorName16.BrightBlue, new Color (59, 120, 255));
data.Add (ColorName16.BrightGreen, new Color (22, 198, 12));
data.Add (ColorName16.BrightCyan, new Color (97, 214, 214));
data.Add (ColorName16.BrightRed, new Color (231, 72, 86));
data.Add (ColorName16.BrightMagenta, new Color (180, 0, 158));
data.Add (ColorName16.BrightYellow, new Color (249, 241, 165));
data.Add (ColorName16.White, new Color (242, 242, 242));
return data;
}

2
UnitTests/Drawing/ColorTests.ParsingAndFormatting.cs
View File

@@ -10,7 +10,7 @@ public partial class ColorTests
public void Color_ToString_WithNamedColor ()
{
// Arrange
var color = new Color (ColorName.Blue);// Blue
var color = new Color (ColorName16.Blue);// Blue
// Act
var colorString = color.ToString ();

40
UnitTests/Drawing/ColorTests.TypeChecks.cs
View File

@@ -8,7 +8,7 @@ public partial class ColorTests
[Fact]
[Trait ("Category", "Type Checks")]
[Trait ("Category", "Change Control")]
public void ColorName_Has_Exactly_16_Defined_Values () { Assert.Equal (16, Enum.GetValues<ColorName> ().DistinctBy (static cname => (int)cname).Count ()); }
public void ColorName_Has_Exactly_16_Defined_Values () { Assert.Equal (16, Enum.GetValues<ColorName16> ().DistinctBy (static cname => (int)cname).Count ()); }
[Theory]
[Trait ("Category", "Type Checks")]
@@ -17,7 +17,7 @@ public partial class ColorTests
nameof (ColorTestsTheoryDataGenerators.ColorName_HasCorrectOrdinals),
MemberType = typeof (ColorTestsTheoryDataGenerators)
)]
public void ColorName_HasCorrectOrdinals (ColorName cname, int ordinal) { Assert.Equal ((int)cname, ordinal); }
public void ColorName_HasCorrectOrdinals (ColorName16 cname, int ordinal) { Assert.Equal ((int)cname, ordinal); }
[Fact]
[Trait ("Category", "Type Checks")]
@@ -117,26 +117,26 @@ public partial class ColorTests
public static partial class ColorTestsTheoryDataGenerators
{
public static TheoryData<ColorName, int> ColorName_HasCorrectOrdinals ()
public static TheoryData<ColorName16, int> ColorName_HasCorrectOrdinals ()
{
TheoryData<ColorName, int> data = []
TheoryData<ColorName16, int> data = []
;
data.Add (ColorName.Black, 0);
data.Add (ColorName.Blue, 1);
data.Add (ColorName.Green, 2);
data.Add (ColorName.Cyan, 3);
data.Add (ColorName.Red, 4);
data.Add (ColorName.Magenta, 5);
data.Add (ColorName.Yellow, 6);
data.Add (ColorName.Gray, 7);
data.Add (ColorName.DarkGray, 8);
data.Add (ColorName.BrightBlue, 9);
data.Add (ColorName.BrightGreen, 10);
data.Add (ColorName.BrightCyan, 11);
data.Add (ColorName.BrightRed, 12);
data.Add (ColorName.BrightMagenta, 13);
data.Add (ColorName.BrightYellow, 14);
data.Add (ColorName.White, 15);
data.Add (ColorName16.Black, 0);
data.Add (ColorName16.Blue, 1);
data.Add (ColorName16.Green, 2);
data.Add (ColorName16.Cyan, 3);
data.Add (ColorName16.Red, 4);
data.Add (ColorName16.Magenta, 5);
data.Add (ColorName16.Yellow, 6);
data.Add (ColorName16.Gray, 7);
data.Add (ColorName16.DarkGray, 8);
data.Add (ColorName16.BrightBlue, 9);
data.Add (ColorName16.BrightGreen, 10);
data.Add (ColorName16.BrightCyan, 11);
data.Add (ColorName16.BrightRed, 12);
data.Add (ColorName16.BrightMagenta, 13);
data.Add (ColorName16.BrightYellow, 14);
data.Add (ColorName16.White, 15);
return data;
}

32
UnitTests/Drawing/ColorTests.cs
View File

@@ -26,10 +26,10 @@ public partial class ColorTests
{
// Arrange
var color = new Color (128, 64, 40); // Custom RGB color, closest to Yellow
var expectedColorName = ColorName.Yellow;
var expectedColorName = ColorName16.Yellow;
// Act
ColorName colorName = color.GetClosestNamedColor ();
ColorName16 colorName = color.GetClosestNamedColor16 ();
// Assert
Assert.Equal (expectedColorName, colorName);
@@ -39,12 +39,12 @@ public partial class ColorTests
public void Color_IsClosestToNamedColor_ReturnsExpectedValue ()
{
// Arrange
var color1 = new Color (ColorName.Red);
var color1 = new Color (ColorName16.Red);
var color2 = new Color (197, 15, 31); // Red in RGB
Assert.True (color1.IsClosestToNamedColor (ColorName.Red));
Assert.True (color1.IsClosestToNamedColor16 (ColorName16.Red));
Assert.True (color2.IsClosestToNamedColor (ColorName.Red));
Assert.True (color2.IsClosestToNamedColor16 (ColorName16.Red));
}
[Theory (Skip = "Test data is now bogus")]
@@ -52,9 +52,9 @@ public partial class ColorTests
nameof (ColorTestsTheoryDataGenerators.FindClosestColor_ReturnsClosestColor),
MemberType = typeof (ColorTestsTheoryDataGenerators)
)]
public void FindClosestColor_ReturnsClosestColor (Color inputColor, ColorName expectedColorName)
public void FindClosestColor_ReturnsClosestColor (Color inputColor, ColorName16 expectedColorName)
{
ColorName actualColorName = Color.GetClosestNamedColor (inputColor);
ColorName16 actualColorName = Color.GetClosestNamedColor16 (inputColor);
Assert.Equal (expectedColorName, actualColorName);
}
@@ -79,16 +79,16 @@ public partial class ColorTests
public static partial class ColorTestsTheoryDataGenerators
{
public static TheoryData<Color, ColorName> FindClosestColor_ReturnsClosestColor ()
public static TheoryData<Color, ColorName16> FindClosestColor_ReturnsClosestColor ()
{
TheoryData<Color, ColorName> data = [];
data.Add (new Color (0, 0), ColorName.Black);
data.Add (new Color (255, 255, 255), ColorName.White);
data.Add (new Color (5, 100, 255), ColorName.BrightBlue);
data.Add (new Color (0, 255), ColorName.BrightGreen);
data.Add (new Color (255, 70, 8), ColorName.BrightRed);
data.Add (new Color (0, 128, 128), ColorName.Cyan);
data.Add (new Color (128, 64, 32), ColorName.Yellow);
TheoryData<Color, ColorName16> data = [];
data.Add (new Color (0, 0), ColorName16.Black);
data.Add (new Color (255, 255, 255), ColorName16.White);
data.Add (new Color (5, 100, 255), ColorName16.BrightBlue);
data.Add (new Color (0, 255), ColorName16.BrightGreen);
data.Add (new Color (255, 70, 8), ColorName16.BrightRed);
data.Add (new Color (0, 128, 128), ColorName16.Cyan);
data.Add (new Color (128, 64, 32), ColorName16.Yellow);
return data;
}