Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-enabled tests; fixed some issues

Browse Source
This commit is contained in:
Tigger Kindel
2023-10-09 23:27:11 -06:00
committed by Tig
parent 859a7c12d5
commit c4368e4e2a
5 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Terminal.Gui/Drawing/Color.cs
View File

@@ -215,14 +215,14 @@ namespace Terminal.Gui {
/// </summary>
/// <param name="consoleColor">The <see cref="Color"/> to convert.</param>
/// <returns></returns>
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;
/// <summary>
/// Converts a legacy <see cref="ColorNames"/> index to a 24-bit <see cref="Color"/>.
/// </summary>
/// <param name="colorNameId">The index into the <see cref="ColorNames"/> enum to convert.</param>
/// <returns></returns>
public static Color FromColorName (int colorNameId)
private static Color FromColorName (int colorNameId)
{
return FromColorName ((ColorNames)colorNameId);
}

4
Terminal.Gui/Views/FileDialog.cs
View File

@@ -1197,8 +1197,8 @@ namespace Terminal.Gui {
}
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 {

2
Terminal.Gui/Views/FileSystemColorProvider.cs
View File

@@ -14,7 +14,7 @@ namespace Terminal.Gui {
/// </summary>
/// <param name="file"></param>
/// <returns></returns>
public Color? GetTrueColor (IFileSystemInfo file)
public Color? GetColor (IFileSystemInfo file)
{
if (FilenameToColor.ContainsKey (file.Name)) {
return FilenameToColor [file.Name];

52
UnitTests/Configuration/JsonConverterTests.cs
View File

@@ -33,32 +33,32 @@ namespace Terminal.Gui.ConfigurationTests {
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 } };
[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> (Color.FromColorName (color), options);
var serialized = JsonSerializer.Serialize<Color> ((Color)colorName, options);
// Assert.Equal ($"\"{expectedJson}\"", serialized);
//}
Assert.Equal ($"\"{expectedJson}\"", serialized);
}
[Fact]
public void TestSerializeColor_Black ()
@@ -67,7 +67,7 @@ namespace Terminal.Gui.ConfigurationTests {
var expectedJson = "\"Black\"";
// Act
var json = JsonSerializer.Serialize<Color> (Color.FromColorName (Color.Black), new JsonSerializerOptions {
var json = JsonSerializer.Serialize<Color> ((Color)Color.Black, new JsonSerializerOptions {
Converters = { new ColorJsonConverter () }
});
@@ -82,7 +82,7 @@ namespace Terminal.Gui.ConfigurationTests {
var expectedJson = "\"BrightRed\"";
// Act
var json = JsonSerializer.Serialize<Color> (Color.FromColorName (Color.BrightRed), new JsonSerializerOptions {
var json = JsonSerializer.Serialize<Color> ((Color)Color.BrightRed, new JsonSerializerOptions {
Converters = { new ColorJsonConverter () }
});

16
UnitTests/Drawing/ColorTests.cs
View File

@@ -257,21 +257,7 @@ public class ColorTests {
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);