Re-enabled tests; fixed some issues

gui-cs · Oct 10, 2023 · 8f93adc · 8f93adc
1 parent 5ea9203
commit 8f93adc
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 48 deletions.
diff --git a/Terminal.Gui/Drawing/Color.cs b/Terminal.Gui/Drawing/Color.cs
@@ -215,14 +215,14 @@ public int Value {
 		/// </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);
 		}

diff --git 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
@@ -14,7 +14,7 @@ public class FileSystemColorProvider {
 		/// </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];

diff --git 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> (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> ((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> (Color.FromColorName (Color.Black), new JsonSerializerOptions {
+			var json = JsonSerializer.Serialize<Color> ((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> (Color.FromColorName (Color.BrightRed), new JsonSerializerOptions {
+			var json = JsonSerializer.Serialize<Color> ((Color)Color.BrightRed, new JsonSerializerOptions {
 				Converters = { new ColorJsonConverter () }
 			});
 

diff --git 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);