From 8f93adc08f0595f7f785ee454faa6f2220d803d5 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 9 Oct 2023 23:27:11 -0600 Subject: [PATCH] Re-enabled tests; fixed some issues --- Terminal.Gui/Drawing/Color.cs | 4 +- Terminal.Gui/Views/FileDialog.cs | 4 +- Terminal.Gui/Views/FileSystemColorProvider.cs | 2 +- UnitTests/Configuration/JsonConverterTests.cs | 56 +++++++++---------- UnitTests/Drawing/ColorTests.cs | 16 +----- 5 files changed, 34 insertions(+), 48 deletions(-) diff --git a/Terminal.Gui/Drawing/Color.cs b/Terminal.Gui/Drawing/Color.cs index 50cfdf2f1b..682bb7e87a 100644 --- a/Terminal.Gui/Drawing/Color.cs +++ b/Terminal.Gui/Drawing/Color.cs @@ -215,14 +215,14 @@ public int Value { /// /// The to convert. /// - public static Color FromColorName (ColorNames consoleColor) => _colorNames.FirstOrDefault (x => x.Value == consoleColor).Key; + private static Color FromColorName (ColorNames consoleColor) => _colorNames.FirstOrDefault (x => x.Value == consoleColor).Key; /// /// Converts a legacy index to a 24-bit . /// /// The index into the enum to convert. /// - public static Color FromColorName (int colorNameId) + private static Color FromColorName (int colorNameId) { return FromColorName ((ColorNames)colorNameId); } diff --git a/Terminal.Gui/Views/FileDialog.cs b/Terminal.Gui/Views/FileDialog.cs index 18aef7fa1b..5f6dfd9c54 100644 --- a/Terminal.Gui/Views/FileDialog.cs +++ b/Terminal.Gui/Views/FileDialog.cs @@ -1197,8 +1197,8 @@ private ColorScheme ColorGetter (CellColorGetterArgs args) } - var color = Style.ColorProvider.GetTrueColor (stats.FileSystemInfo) ?? Color.FromColorName (Color.White); - var black = Color.FromColorName (Color.Black); + var color = Style.ColorProvider.GetColor (stats.FileSystemInfo) ?? (Color)Color.White; + var black = (Color)Color.Black; // TODO: Add some kind of cache for this return new ColorScheme { diff --git a/Terminal.Gui/Views/FileSystemColorProvider.cs b/Terminal.Gui/Views/FileSystemColorProvider.cs index d671e66d2a..1470408324 100644 --- a/Terminal.Gui/Views/FileSystemColorProvider.cs +++ b/Terminal.Gui/Views/FileSystemColorProvider.cs @@ -14,7 +14,7 @@ public class FileSystemColorProvider { /// /// /// - public Color? GetTrueColor (IFileSystemInfo file) + public Color? GetColor (IFileSystemInfo file) { if (FilenameToColor.ContainsKey (file.Name)) { return FilenameToColor [file.Name]; diff --git a/UnitTests/Configuration/JsonConverterTests.cs b/UnitTests/Configuration/JsonConverterTests.cs index 8c1c2a7be4..17869c1649 100644 --- a/UnitTests/Configuration/JsonConverterTests.cs +++ b/UnitTests/Configuration/JsonConverterTests.cs @@ -33,32 +33,32 @@ public void TestColorDeserializationFromHumanReadableColorNames (string colorNam Assert.Equal (expectedColor, actualColor); } - //[Theory] - //[InlineData (ColorNames.Black, "Black")] - //[InlineData (ColorNames.Blue, "Blue")] - //[InlineData (ColorNames.Green, "Green")] - //[InlineData (ColorNames.Cyan, "Cyan")] - //[InlineData (ColorNames.Gray, "Gray")] - //[InlineData (ColorNames.Red, "Red")] - //[InlineData (ColorNames.Magenta, "Magenta")] - //[InlineData (ColorNames.Brown, "Brown")] - //[InlineData (ColorNames.DarkGray, "DarkGray")] - //[InlineData (ColorNames.BrightBlue, "BrightBlue")] - //[InlineData (ColorNames.BrightGreen, "BrightGreen")] - //[InlineData (ColorNames.BrightCyan, "BrightCyan")] - //[InlineData (ColorNames.BrightRed, "BrightRed")] - //[InlineData (ColorNames.BrightMagenta, "BrightMagenta")] - //[InlineData (ColorNames.BrightYellow, "BrightYellow")] - //[InlineData (ColorNames.White, "White")] - //public void SerializesEnumValuesAsStrings (ColorNames color, string expectedJson) - //{ - // var converter = new ColorJsonConverter (); - // var options = new JsonSerializerOptions { Converters = { converter } }; - - // var serialized = JsonSerializer.Serialize (Color.FromColorName (color), options); - - // Assert.Equal ($"\"{expectedJson}\"", serialized); - //} + [Theory] + [InlineData (ColorNames.Black, "Black")] + [InlineData (ColorNames.Blue, "Blue")] + [InlineData (ColorNames.Green, "Green")] + [InlineData (ColorNames.Cyan, "Cyan")] + [InlineData (ColorNames.Gray, "Gray")] + [InlineData (ColorNames.Red, "Red")] + [InlineData (ColorNames.Magenta, "Magenta")] + [InlineData (ColorNames.Brown, "Brown")] + [InlineData (ColorNames.DarkGray, "DarkGray")] + [InlineData (ColorNames.BrightBlue, "BrightBlue")] + [InlineData (ColorNames.BrightGreen, "BrightGreen")] + [InlineData (ColorNames.BrightCyan, "BrightCyan")] + [InlineData (ColorNames.BrightRed, "BrightRed")] + [InlineData (ColorNames.BrightMagenta, "BrightMagenta")] + [InlineData (ColorNames.BrightYellow, "BrightYellow")] + [InlineData (ColorNames.White, "White")] + public void SerializesEnumValuesAsStrings (ColorNames colorName, string expectedJson) + { + var converter = new ColorJsonConverter (); + var options = new JsonSerializerOptions { Converters = { converter } }; + + var serialized = JsonSerializer.Serialize ((Color)colorName, options); + + Assert.Equal ($"\"{expectedJson}\"", serialized); + } [Fact] public void TestSerializeColor_Black () @@ -67,7 +67,7 @@ public void TestSerializeColor_Black () var expectedJson = "\"Black\""; // Act - var json = JsonSerializer.Serialize (Color.FromColorName (Color.Black), new JsonSerializerOptions { + var json = JsonSerializer.Serialize ((Color)Color.Black, new JsonSerializerOptions { Converters = { new ColorJsonConverter () } }); @@ -82,7 +82,7 @@ public void TestSerializeColor_BrightRed () var expectedJson = "\"BrightRed\""; // Act - var json = JsonSerializer.Serialize (Color.FromColorName (Color.BrightRed), new JsonSerializerOptions { + var json = JsonSerializer.Serialize ((Color)Color.BrightRed, new JsonSerializerOptions { Converters = { new ColorJsonConverter () } }); diff --git a/UnitTests/Drawing/ColorTests.cs b/UnitTests/Drawing/ColorTests.cs index 0353ae7e09..6be6a2805b 100644 --- a/UnitTests/Drawing/ColorTests.cs +++ b/UnitTests/Drawing/ColorTests.cs @@ -257,21 +257,7 @@ public void Color_FromColorName_ConvertsColorNamesToColor () var expectedColor = new Color (197, 15, 31); // Red in RGB // Act - var convertedColor = Color.FromColorName (colorName); - - // Assert - Assert.Equal (expectedColor, convertedColor); - } - - [Fact] - public void Color_FromColorName_ConvertsColorNameIdToColor () - { - // Arrange - int colorNameId = (int)ColorNames.Green; - var expectedColor = new Color (19, 161, 14); // Green in RGB - - // Act - var convertedColor = Color.FromColorName (colorNameId); + var convertedColor = (Color)colorName; // Assert Assert.Equal (expectedColor, convertedColor);