Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-02 01:03:29 +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

46
UnitTests/Configuration/JsonConverterTests.cs
View File

@@ -41,23 +41,23 @@ public class ColorJsonConverterTests
}
[Theory]
[InlineData (ColorName.Black, "Black")]
[InlineData (ColorName.Blue, "Blue")]
[InlineData (ColorName.Green, "Green")]
[InlineData (ColorName.Cyan, "Cyan")]
[InlineData (ColorName.Gray, "Gray")]
[InlineData (ColorName.Red, "Red")]
[InlineData (ColorName.Magenta, "Magenta")]
[InlineData (ColorName.Yellow, "Yellow")]
[InlineData (ColorName.DarkGray, "DarkGray")]
[InlineData (ColorName.BrightBlue, "BrightBlue")]
[InlineData (ColorName.BrightGreen, "BrightGreen")]
[InlineData (ColorName.BrightCyan, "BrightCyan")]
[InlineData (ColorName.BrightRed, "BrightRed")]
[InlineData (ColorName.BrightMagenta, "BrightMagenta")]
[InlineData (ColorName.BrightYellow, "BrightYellow")]
[InlineData (ColorName.White, "White")]
public void SerializesEnumValuesAsStrings (ColorName colorName, string expectedJson)
[InlineData (ColorName16.Black, "Black")]
[InlineData (ColorName16.Blue, "Blue")]
[InlineData (ColorName16.Green, "Green")]
[InlineData (ColorName16.Cyan, "Cyan")]
[InlineData (ColorName16.Gray, "Gray")]
[InlineData (ColorName16.Red, "Red")]
[InlineData (ColorName16.Magenta, "Magenta")]
[InlineData (ColorName16.Yellow, "Yellow")]
[InlineData (ColorName16.DarkGray, "DarkGray")]
[InlineData (ColorName16.BrightBlue, "BrightBlue")]
[InlineData (ColorName16.BrightGreen, "BrightGreen")]
[InlineData (ColorName16.BrightCyan, "BrightCyan")]
[InlineData (ColorName16.BrightRed, "BrightRed")]
[InlineData (ColorName16.BrightMagenta, "BrightMagenta")]
[InlineData (ColorName16.BrightYellow, "BrightYellow")]
[InlineData (ColorName16.White, "White")]
public void SerializesEnumValuesAsStrings (ColorName16 colorName, string expectedJson)
{
var converter = new ColorJsonConverter ();
var options = new JsonSerializerOptions { Converters = { converter } };
@@ -101,7 +101,7 @@ public class ColorJsonConverterTests
[InlineData ("Magenta", Color.Magenta)]
[InlineData ("Red", Color.Red)]
[InlineData ("White", Color.White)]
public void TestColorDeserializationFromHumanReadableColorNames (string colorName, ColorName expectedColor)
public void TestColorDeserializationFromHumanReadableColorName16 (string colorName, ColorName16 expectedColor)
{
// Arrange
var json = $"\"{colorName}\"";
@@ -135,7 +135,7 @@ public class ColorJsonConverterTests
{
// Arrange
var json = "\"BrightRed\"";
var expectedColor = new Color (ColorName.BrightRed);
var expectedColor = Color.BrightRed;
// Act
var color = JsonSerializer.Deserialize<Color> (
@@ -188,14 +188,14 @@ public class AttributeJsonConverterTests
// Test deserializing from human-readable color names
var json = "{\"Foreground\":\"Blue\",\"Background\":\"Green\"}";
var attribute = JsonSerializer.Deserialize<Attribute> (json, ConfigurationManagerTests._jsonOptions);
Assert.Equal (Color.Blue, attribute.Foreground.GetClosestNamedColor ());
Assert.Equal (Color.Green, attribute.Background.GetClosestNamedColor ());
Assert.Equal (Color.Blue, attribute.Foreground.GetClosestNamedColor16 ());
Assert.Equal (Color.Green, attribute.Background.GetClosestNamedColor16 ());
// Test deserializing from RGB values
json = "{\"Foreground\":\"rgb(255,0,0)\",\"Background\":\"rgb(0,255,0)\"}";
attribute = JsonSerializer.Deserialize<Attribute> (json, ConfigurationManagerTests._jsonOptions);
Assert.Equal (Color.Red, attribute.Foreground.GetClosestNamedColor ());
Assert.Equal (Color.BrightGreen, attribute.Background.GetClosestNamedColor ());
Assert.Equal (Color.Red, attribute.Foreground.GetClosestNamedColor16 ());
Assert.Equal (Color.BrightGreen, attribute.Background.GetClosestNamedColor16 ());
}
[Fact]

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;
}

20
UnitTests/Text/TextFormatterTests.cs
View File

@@ -4143,8 +4143,8 @@ ssb
tf.Draw (
new (0, 0, width, height),
new (ColorName.White, ColorName.Black),
new (ColorName.Blue, ColorName.Black),
new (ColorName16.White, ColorName16.Black),
new (ColorName16.Blue, ColorName16.Black),
default (Rectangle),
driver
);
@@ -4161,8 +4161,8 @@ ssb
Attribute [] attrs =
{
Attribute.Default, new (ColorName.Green, ColorName.BrightMagenta),
new (ColorName.Blue, ColorName.Cyan)
Attribute.Default, new (ColorName16.Green, ColorName16.BrightMagenta),
new (ColorName16.Blue, ColorName16.Cyan)
};
var tf = new TextFormatter { ConstrainToSize = new (14, 3), Text = "Test\nTest long\nTest long long\n", MultiLine = true };
@@ -5965,8 +5965,8 @@ ek")]
tf.Draw (
new (0, 0, width, height),
new (ColorName.White, ColorName.Black),
new (ColorName.Blue, ColorName.Black),
new (ColorName16.White, ColorName16.Black),
new (ColorName16.Blue, ColorName16.Black),
default (Rectangle),
driver
);
@@ -6005,8 +6005,8 @@ ek")]
tf.Draw (
new (0, 0, width, height),
new (ColorName.White, ColorName.Black),
new (ColorName.Blue, ColorName.Black),
new (ColorName16.White, ColorName16.Black),
new (ColorName16.Blue, ColorName16.Black),
default (Rectangle),
driver
);
@@ -6045,8 +6045,8 @@ ek")]
tf.Draw (
new (0, 0, width, height),
new (ColorName.White, ColorName.Black),
new (ColorName.Blue, ColorName.Black),
new (ColorName16.White, ColorName16.Black),
new (ColorName16.Blue, ColorName16.Black),
default (Rectangle),
driver
);

8
UnitTests/View/Adornment/BorderTests.cs
View File

@@ -24,8 +24,8 @@ public class BorderTests (ITestOutputHelper output)
Focus = new (Color.Green, Color.Red)
};
Assert.NotEqual (view.ColorScheme.Normal.Foreground, view.ColorScheme.Focus.Foreground);
Assert.Equal (ColorName.Red, view.Border.GetNormalColor ().Foreground.GetClosestNamedColor ());
Assert.Equal (ColorName.Green, view.Border.GetFocusColor ().Foreground.GetClosestNamedColor ());
Assert.Equal (ColorName16.Red, view.Border.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
Assert.Equal (ColorName16.Green, view.Border.GetFocusColor ().Foreground.GetClosestNamedColor16 ());
Assert.Equal (view.GetFocusColor (), view.Border.GetFocusColor ());
superView.BeginInit ();
@@ -57,8 +57,8 @@ public class BorderTests (ITestOutputHelper output)
{
Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
};
Assert.Equal (ColorName.Red, view.Border.GetNormalColor ().Foreground.GetClosestNamedColor ());
Assert.Equal (ColorName.Green, view.Border.GetFocusColor ().Foreground.GetClosestNamedColor ());
Assert.Equal (ColorName16.Red, view.Border.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
Assert.Equal (ColorName16.Green, view.Border.GetFocusColor ().Foreground.GetClosestNamedColor16 ());
Assert.Equal (view.GetNormalColor (), view.Border.GetNormalColor ());
Assert.Equal (view.GetFocusColor (), view.Border.GetFocusColor ());

4
UnitTests/View/Adornment/MarginTests.cs
View File

@@ -20,8 +20,8 @@ public class MarginTests (ITestOutputHelper output)
};
superView.Add (view);
Assert.Equal (ColorName.Red, view.Margin.GetNormalColor ().Foreground.GetClosestNamedColor ());
Assert.Equal (ColorName.Red, superView.GetNormalColor ().Foreground.GetClosestNamedColor ());
Assert.Equal (ColorName16.Red, view.Margin.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
Assert.Equal (ColorName16.Red, superView.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
Assert.Equal (superView.GetNormalColor (), view.Margin.GetNormalColor ());
Assert.Equal (superView.GetFocusColor (), view.Margin.GetFocusColor ());

2
UnitTests/View/Adornment/PaddingTests.cs
View File

@@ -17,7 +17,7 @@ public class PaddingTests (ITestOutputHelper output)
Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
};
Assert.Equal (ColorName.Red, view.Padding.GetNormalColor ().Foreground.GetClosestNamedColor ());
Assert.Equal (ColorName16.Red, view.Padding.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
Assert.Equal (view.GetNormalColor (), view.Padding.GetNormalColor ());
view.BeginInit ();

2
UnitTests/View/Mouse/MouseTests.cs
View File

@@ -361,7 +361,7 @@ public class MouseTests (ITestOutputHelper output) : TestsAllViews
int enablingHighlight = 0;
int disablingHighlight = 0;
view.Highlight += View_Highlight;
view.ColorScheme = new ColorScheme (new Attribute (ColorName.Red, ColorName.Blue));
view.ColorScheme = new ColorScheme (new Attribute (ColorName16.Red, ColorName16.Blue));
ColorScheme originalColorScheme = view.ColorScheme;
view.NewMouseEvent (new () { Flags = MouseFlags.Button1Pressed, });

26
UnitTests/Views/ColorPicker16Tests.cs
View File

@@ -6,7 +6,7 @@ public class ColorPicker16Tests
public void Constructors ()
{
var colorPicker = new ColorPicker16 ();
Assert.Equal (ColorName.Black, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Black, colorPicker.SelectedColor);
Assert.Equal (Point.Empty, colorPicker.Cursor);
Assert.True (colorPicker.CanFocus);
@@ -20,25 +20,25 @@ public class ColorPicker16Tests
public void KeyBindings_Command ()
{
var colorPicker = new ColorPicker16 ();
Assert.Equal (ColorName.Black, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Black, colorPicker.SelectedColor);
Assert.True (colorPicker.NewKeyDownEvent (Key.CursorRight));
Assert.Equal (ColorName.Blue, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Blue, colorPicker.SelectedColor);
Assert.True (colorPicker.NewKeyDownEvent (Key.CursorDown));
Assert.Equal (ColorName.BrightBlue, colorPicker.SelectedColor);
Assert.Equal (ColorName16.BrightBlue, colorPicker.SelectedColor);
Assert.True (colorPicker.NewKeyDownEvent (Key.CursorLeft));
Assert.Equal (ColorName.DarkGray, colorPicker.SelectedColor);
Assert.Equal (ColorName16.DarkGray, colorPicker.SelectedColor);
Assert.True (colorPicker.NewKeyDownEvent (Key.CursorUp));
Assert.Equal (ColorName.Black, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Black, colorPicker.SelectedColor);
Assert.True (colorPicker.NewKeyDownEvent (Key.CursorLeft));
Assert.Equal (ColorName.Black, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Black, colorPicker.SelectedColor);
Assert.True (colorPicker.NewKeyDownEvent (Key.CursorUp));
Assert.Equal (ColorName.Black, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Black, colorPicker.SelectedColor);
}
[Fact]
@@ -46,7 +46,7 @@ public class ColorPicker16Tests
public void MouseEvents ()
{
var colorPicker = new ColorPicker16 { X = 0, Y = 0, Height = 4, Width = 32 };
Assert.Equal (ColorName.Black, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Black, colorPicker.SelectedColor);
var top = new Toplevel ();
top.Add (colorPicker);
Application.Begin (top);
@@ -54,7 +54,7 @@ public class ColorPicker16Tests
Assert.False (colorPicker.NewMouseEvent (new ()));
Assert.True (colorPicker.NewMouseEvent (new () { Position = new (4, 1), Flags = MouseFlags.Button1Clicked }));
Assert.Equal (ColorName.Blue, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Blue, colorPicker.SelectedColor);
top.Dispose ();
}
@@ -62,7 +62,7 @@ public class ColorPicker16Tests
public void SelectedColorAndCursor ()
{
var colorPicker = new ColorPicker16 ();
colorPicker.SelectedColor = ColorName.White;
colorPicker.SelectedColor = ColorName16.White;
Assert.Equal (7, colorPicker.Cursor.X);
Assert.Equal (1, colorPicker.Cursor.Y);
@@ -71,9 +71,9 @@ public class ColorPicker16Tests
Assert.Equal (0, colorPicker.Cursor.Y);
colorPicker.Cursor = new (7, 1);
Assert.Equal (ColorName.White, colorPicker.SelectedColor);
Assert.Equal (ColorName16.White, colorPicker.SelectedColor);
colorPicker.Cursor = Point.Empty;
Assert.Equal (ColorName.Black, colorPicker.SelectedColor);
Assert.Equal (ColorName16.Black, colorPicker.SelectedColor);
}
}