Files
Terminal.Gui/Tests/UnitTests/DriverAssert.cs
Copilot e6a0ec64ca Fixes #4361 - Consolidate FakeDriver into library and refactor driver architecture (#4362)
* Initial plan

* Add ScreenChanged event, SetScreenSize method, and fix FakeDriver buffer initialization

Co-authored-by: tig <585482+tig@users.noreply.github.com>

* Add comprehensive tests for ScreenChanged event and buffer integrity

Co-authored-by: tig <585482+tig@users.noreply.github.com>

* Replace obsolete SizeChanged usage with ScreenChanged in core and tests

Co-authored-by: tig <585482+tig@users.noreply.github.com>

* Refactor terminal size event handling

Replaced `ScreenChanged` with `SizeChanged` across the codebase to standardize naming and improve clarity. Updated event handling logic, including subscriptions, unsubscriptions, and raising methods. Removed deprecated `ScreenChanged` event and backward compatibility code.

Refactored driver initialization to handle legacy `IConsoleDriver` types separately. Updated tests and mock implementations to align with the new `SizeChanged` event. Improved documentation and comments to reflect these changes.

These updates enhance maintainability, consistency, and modernize the architecture.

* Refactor & Code Cleanup: Replace IWindowSizeMonitor with IConsoleSizeMonitor

Renamed `IWindowSizeMonitor` to `IConsoleSizeMonitor` across the codebase, updating all references, method signatures, and event handlers. Replaced the `WindowSizeMonitor` class with the new `ConsoleSizeMonitor` implementation, which includes improved terminal size change handling via the `Poll` method.

Enabled nullable reference types in several files to enhance code safety. Updated test cases to reflect the new `IConsoleSizeMonitor` interface. Removed redundant code, simplified null checks, and corrected minor typos in comments. Streamlined the codebase by removing the obsolete `WindowSizeMonitor` class and its interface.

* Code cleanup - Refactor and enhance ShadowView and FakeDriverTests

Updated ShadowView.cs to use null-conditional operators and added null checks for safer access to `ScreenContents`. Refined XML documentation in View.Layout.cs for clarity and consistency.

Refactored FakeDriverTests.cs to leverage modern C# features, including shorthand object instantiation, inline lambdas, and tuple-like syntax for `Size` and `Rectangle`. Removed redundant tests and improved test readability and reliability.

Enhanced error handling with null checks and ensured backward compatibility for deprecated events. Improved test coverage for resizing, clipboard operations, and invalid coordinates. Verified buffer integrity and screen updates after resizing.

General improvements include replacing explicit type declarations with `var`, removing unused imports, and aligning code formatting for better readability.

Refactor and improve code quality and test coverage

Updated `ShadowView` for null safety using null-conditional operators. Simplified object initializations and modernized syntax across the codebase, including shorthand initializations and inline lambdas. Enhanced event handling logic and ensured compatibility with obsolete members.

Refactored `FakeDriverTests` by removing redundant code, standardizing formatting, and improving test setup. Suppressed obsolete warnings where necessary. Improved XML documentation in `View.Layout.cs` for clarity and removed outdated references.

Performed general cleanup, including removing unused namespaces, redundant comments, and ensuring consistent formatting. These changes enhance readability, maintainability, and runtime safety.

* Code cleanup

Refactor TimedEventsTests for readability and consistency

Improved code readability and maintainability:
- Enabled nullable reference types with `#nullable enable`.
- Removed unused `using System.Diagnostics;`.
- Updated namespace to `UnitTests.ApplicationTests`.
- Replaced `Terminal.Gui.App.TimedEvents` with `TimedEvents`.
- Reformatted XML documentation comments for alignment.
- Used `var` and target-typed new expressions for consistency.
- Reformatted `Parallel.For` loops and lambdas for clarity.
- Added `Thread.Sleep(10)` to prevent excessive CPU usage in tests.
- Improved assertions and event handler formatting in tests.

Aligned with modern C# coding practices.

* Code Cleanup - No more driver warnings.

Refactor codebase and introduce FakeClipboard

- Adjusted `.editorconfig` to change severity levels for CS0612, CS0618, and CS0672 diagnostics.
- Replaced `FakeDriver.FakeClipboard` with a new `FakeClipboard` class for testing purposes, supporting exception handling and clipboard data manipulation.
- Removed redundant methods (`MakeColor`, `MapKey`) and unused classes (`MockConsoleDriver`) to streamline the codebase.
- Refactored `ConsoleDriverFacade` and `FakeDriver` to simplify logic and improve maintainability.
- Updated tests to use `CreateFakeDriver` and removed or commented out obsolete tests.
- Reformatted and cleaned up code for readability across multiple files.

* Refactor FakeDriver - Code Cleanup

Standardized console size management by replacing `WindowSizeMonitor` with `ConsoleSizeMonitor` across the codebase. Updated methods `GetWindowSize` and `SetWindowSize` to `GetSize` and `SetSize` for consistency.

Refactored `FakeDriver` to use `SetScreenSize` and removed redundant methods. Simplified driver initialization by removing legacy `InternalInit` logic.

Standardized ANSI escape sequences by replacing `CSI_ReportTerminalSizeInChars` with `CSI_ReportWindowSizeInChars`.

Updated test cases to align with the new `ConsoleSizeMonitor` and `SetScreenSize` methods. Removed obsolete test utilities like `FakeSizeMonitor` and `FakeWindowSizeMonitor`.

Performed general code cleanup, including removing unused classes, redundant code, and improving formatting. Fixed resizing logic issues and improved exception handling in driver methods.

* Update Terminal.Gui/Drivers/OutputBuffer.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Drivers/MouseButtonStateEx.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/App/MainLoop/IApplicationMainLoop.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Tests/UnitTests/Views/ToplevelTests.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/ViewBase/View.Layout.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Moved all Drawing tests to Paralleizable - proving Fakedriver works

Enhanced `Ruler` and `Thickness` classes by adding an optional `IConsoleDriver? driver` parameter to decouple rendering from the default `Application.Driver`, improving flexibility and testability. Updated `DriverAssert` to support nullable drivers and added defensive checks.

Refactored and expanded test cases for `Ruler`, `Thickness`, `LineCanvas`, and `StraightLineExtensions` to ensure comprehensive coverage, including zero-length intersections, line rendering, and exclusion logic. Migrated rendering-dependent tests to a parallelizable namespace.

Removed redundant tests, improved naming conventions, and updated documentation for better maintainability and clarity.

* Fixed Run<T> startup hang.

Refactor: Simplify driver logic and update SetSize methods

Removed FakeDriver safeguard in unit tests to simplify
CreateDriver logic. Updated SetSize methods in NetOutput,
UnixOutput, and WindowsOutput to do nothing instead of
throwing NotImplementedException. Modified SizeChanged
event in ConsoleDriverFacade to call SetScreenSize directly.
Commented out unnecessary debug validation in DimAuto.
These changes improve maintainability and reduce complexity.

* Fixed intermittent unit test bug.

Refactored `_cachedRunStateToplevel` to `CachedRunStateToplevel` as an internal static property, delegating its management to `ApplicationImpl` for improved encapsulation. Updated all references to use the new property and centralized its handling in `ApplicationImpl`.

Removed the `MouseGrabHandler` property from `ApplicationImpl` and simplified driver-related assignments by replacing `Application.ForceDriver` and `Application.Screen` with direct references.

Reset `CachedRunStateToplevel` during cleanup to ensure proper state management. Updated the `Invoke` method to use `Top` directly, aligning with the refactored design. Improved debug assertions and performed general cleanup to enhance code readability and maintainability.

* Fixed intermittent bug an massive code cleanup of warnings.

Refactor and enhance codebase for maintainability

- Applied null-conditional operator (`!`) to improve null-safety.
- Refactored tests for clarity, added new cases, and removed redundancies.
- Introduced `FakeApplicationFactory` and `FakeSizeMonitor` for testing.
- Removed unused code, including legacy `DecodeEscSeq` logic.
- Reformatted code for readability and consistency.
- Updated assertions for more accurate validation in tests.
- Fixed potential null reference issues across multiple files.
- Improved event handling with proper null checks.
- Enhanced documentation for new classes and methods.
- Modernized code with C# features like `record struct` and `nullable enable`.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: tig <585482+tig@users.noreply.github.com>
Co-authored-by: Tig <tig@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-27 23:34:14 -06:00

391 lines
14 KiB
C#

#nullable enable
using System.Text;
using System.Text.RegularExpressions;
using Xunit.Abstractions;
namespace UnitTests;
/// <summary>
/// Provides xUnit-style assertions for <see cref="IConsoleDriver"/> contents.
/// </summary>
internal partial class DriverAssert
{
private const char SPACE_CHAR = ' ';
private static readonly Rune _spaceRune = (Rune)SPACE_CHAR;
#pragma warning disable xUnit1013 // Public method should be marked as test
/// <summary>
/// Verifies <paramref name="expectedAttributes"/> are found at the locations specified by
/// <paramref name="expectedLook"/>. <paramref name="expectedLook"/> is a bitmap of indexes into
/// <paramref name="expectedAttributes"/> (e.g. "00110" means the attribute at <c>expectedAttributes[1]</c> is expected
/// at the 3rd and 4th columns of the 1st row of driver.Contents).
/// </summary>
/// <param name="expectedLook">
/// Numbers between 0 and 9 for each row/col of the console. Must be valid indexes into
/// <paramref name="expectedAttributes"/>.
/// </param>
/// <param name="output"></param>
/// <param name="driver">The IConsoleDriver to use. If null <see cref="Application.Driver"/> will be used.</param>
/// <param name="expectedAttributes"></param>
public static void AssertDriverAttributesAre (
string expectedLook,
ITestOutputHelper output,
IConsoleDriver? driver = null,
params Attribute [] expectedAttributes
)
{
#pragma warning restore xUnit1013 // Public method should be marked as test
if (expectedAttributes.Length > 10)
{
throw new ArgumentException ("This method only works for UIs that use at most 10 colors");
}
expectedLook = expectedLook.Trim ();
driver ??= Application.Driver;
Cell [,] contents = driver!.Contents!;
var line = 0;
foreach (string lineString in expectedLook.Split ('\n').Select (l => l.Trim ()))
{
for (var c = 0; c < lineString.Length; c++)
{
Attribute? val = contents! [line, c].Attribute;
List<Attribute> match = expectedAttributes.Where (e => e == val).ToList ();
switch (match.Count)
{
case 0:
output.WriteLine (
$"{Application.ToString (driver)}\n"
+ $"Expected Attribute {val} at Contents[{line},{c}] {contents [line, c]} was not found.\n"
+ $" Expected: {string.Join (",", expectedAttributes.Select (attr => attr))}\n"
+ $" But Was: <not found>"
);
Assert.Empty (match);
return;
case > 1:
throw new ArgumentException (
$"Bad value for expectedColors, {match.Count} Attributes had the same Value"
);
}
char colorUsed = Array.IndexOf (expectedAttributes, match [0]).ToString () [0];
char userExpected = lineString [c];
if (colorUsed != userExpected)
{
output.WriteLine ($"{Application.ToString (driver)}");
output.WriteLine ($"Unexpected Attribute at Contents[{line},{c}] = {contents [line, c]}.");
output.WriteLine ($" Expected: {userExpected} ({expectedAttributes [int.Parse (userExpected.ToString ())]})");
output.WriteLine ($" But Was: {colorUsed} ({val})");
// Print `contents` as the expected and actual attribute indexes in a grid where each cell is of the form "e:a" (e = expected, a = actual)
// e.g:
// 0:1 0:0 1:1
// 0:0 1:1 0:0
// 0:0 1:1 0:0
//// Use StringBuilder since output only has .WriteLine
//var sb = new StringBuilder ();
//// for each line in `contents`
//for (var r = 0; r < driver.Rows; r++)
//{
// // for each column in `contents`
// for (var cc = 0; cc < driver.Cols; cc++)
// {
// // get the attribute at the current location
// Attribute? val2 = contents [r, cc].Attribute;
// // if the attribute is not null
// if (val2.HasValue)
// {
// // get the index of the attribute in `expectedAttributes`
// int index = Array.IndexOf (expectedAttributes, val2.Value);
// // if the index is -1, it means the attribute was not found in `expectedAttributes`
// // get the index of the actual attribute in `expectedAttributes`
// if (index == -1)
// {
// sb.Append ("x:x ");
// }
// else
// {
// sb.Append ($"{index}:{val2.Value} ");
// }
// }
// else
// {
// sb.Append ("x:x ");
// }
// }
// sb.AppendLine ();
//}
//output.WriteLine ($"Contents:\n{sb}");
Assert.Equal (userExpected, colorUsed);
return;
}
}
line++;
}
}
#pragma warning disable xUnit1013 // Public method should be marked as test
/// <summary>Asserts that the driver contents match the expected contents, optionally ignoring any trailing whitespace.</summary>
/// <param name="expectedLook"></param>
/// <param name="output"></param>
/// <param name="driver">The IConsoleDriver to use. If null <see cref="Application.Driver"/> will be used.</param>
/// <param name="ignoreLeadingWhitespace"></param>
public static void AssertDriverContentsAre (
string expectedLook,
ITestOutputHelper output,
IConsoleDriver? driver = null,
bool ignoreLeadingWhitespace = false
)
{
#pragma warning restore xUnit1013 // Public method should be marked as test
var actualLook = Application.ToString (driver ?? Application.Driver);
if (string.Equals (expectedLook, actualLook))
{
return;
}
// get rid of trailing whitespace on each line (and leading/trailing whitespace of start/end of full string)
expectedLook = TrailingWhiteSpaceRegEx ().Replace (expectedLook, "").Trim ();
actualLook = TrailingWhiteSpaceRegEx ().Replace (actualLook, "").Trim ();
if (ignoreLeadingWhitespace)
{
expectedLook = LeadingWhitespaceRegEx ().Replace (expectedLook, "").Trim ();
actualLook = LeadingWhitespaceRegEx ().Replace (actualLook, "").Trim ();
}
// standardize line endings for the comparison
expectedLook = expectedLook.Replace ("\r\n", "\n");
actualLook = actualLook.Replace ("\r\n", "\n");
// If test is about to fail show user what things looked like
if (!string.Equals (expectedLook, actualLook))
{
output?.WriteLine ("Expected:" + Environment.NewLine + expectedLook);
output?.WriteLine (" But Was:" + Environment.NewLine + actualLook);
}
Assert.Equal (expectedLook, actualLook);
}
/// <summary>
/// Asserts that the driver contents are equal to the provided string.
/// </summary>
/// <param name="expectedLook"></param>
/// <param name="output"></param>
/// <param name="driver">The IConsoleDriver to use. If null <see cref="Application.Driver"/> will be used.</param>
/// <returns></returns>
public static Rectangle AssertDriverContentsWithFrameAre (
string expectedLook,
ITestOutputHelper output,
IConsoleDriver? driver = null
)
{
List<List<Rune>> lines = [];
var sb = new StringBuilder ();
driver ??= Application.Driver;
int x = -1;
int y = -1;
int w = -1;
int h = -1;
Cell [,] contents = driver!.Contents!;
for (var rowIndex = 0; rowIndex < driver.Rows; rowIndex++)
{
List<Rune> runes = [];
for (var colIndex = 0; colIndex < driver.Cols; colIndex++)
{
Rune runeAtCurrentLocation = contents! [rowIndex, colIndex].Rune;
if (runeAtCurrentLocation != _spaceRune)
{
if (x == -1)
{
x = colIndex;
y = rowIndex;
for (var i = 0; i < colIndex; i++)
{
runes.InsertRange (i, [_spaceRune]);
}
}
if (runeAtCurrentLocation.GetColumns () > 1)
{
colIndex++;
}
if (colIndex + 1 > w)
{
w = colIndex + 1;
}
h = rowIndex - y + 1;
}
if (x > -1)
{
runes.Add (runeAtCurrentLocation);
}
// See Issue #2616
//foreach (var combMark in contents [r, c].CombiningMarks) {
// runes.Add (combMark);
//}
}
if (runes.Count > 0)
{
lines.Add (runes);
}
}
// Remove unnecessary empty lines
if (lines.Count > 0)
{
for (int r = lines.Count - 1; r > h - 1; r--)
{
lines.RemoveAt (r);
}
}
// Remove trailing whitespace on each line
foreach (List<Rune> row in lines)
{
for (int c = row.Count - 1; c >= 0; c--)
{
Rune rune = row [c];
if (rune != (Rune)' ' || row.Sum (x => x.GetColumns ()) == w)
{
break;
}
row.RemoveAt (c);
}
}
// Convert Rune list to string
for (var r = 0; r < lines.Count; r++)
{
var line = StringExtensions.ToString (lines [r]);
if (r == lines.Count - 1)
{
sb.Append (line);
}
else
{
sb.AppendLine (line);
}
}
var actualLook = sb.ToString ();
if (string.Equals (expectedLook, actualLook))
{
return new (x > -1 ? x : 0, y > -1 ? y : 0, w > -1 ? w : 0, h > -1 ? h : 0);
}
// standardize line endings for the comparison
expectedLook = expectedLook.ReplaceLineEndings ();
actualLook = actualLook.ReplaceLineEndings ();
// Remove the first and the last line ending from the expectedLook
if (expectedLook.StartsWith (Environment.NewLine))
{
expectedLook = expectedLook [Environment.NewLine.Length..];
}
if (expectedLook.EndsWith (Environment.NewLine))
{
expectedLook = expectedLook [..^Environment.NewLine.Length];
}
// If test is about to fail show user what things looked like
if (!string.Equals (expectedLook, actualLook))
{
output?.WriteLine ("Expected:" + Environment.NewLine + expectedLook);
output?.WriteLine (" But Was:" + Environment.NewLine + actualLook);
}
Assert.Equal (expectedLook, actualLook);
return new (x > -1 ? x : 0, y > -1 ? y : 0, w > -1 ? w : 0, h > -1 ? h : 0);
}
/// <summary>
/// Verifies the console used all the <paramref name="expectedColors"/> when rendering. If one or more of the
/// expected colors are not used then the failure will output both the colors that were found to be used and which of
/// your expectations was not met.
/// </summary>
/// <param name="driver">if null uses <see cref="Application.Driver"/></param>
/// <param name="expectedColors"></param>
internal static void AssertDriverUsedColors (IConsoleDriver? driver = null, params Attribute [] expectedColors)
{
driver ??= Application.Driver;
Cell [,] contents = driver?.Contents!;
List<Attribute> toFind = expectedColors.ToList ();
// Contents 3rd column is an Attribute
HashSet<Attribute> colorsUsed = new ();
for (var r = 0; r < driver!.Rows; r++)
{
for (var c = 0; c < driver.Cols; c++)
{
Attribute? val = contents [r, c].Attribute;
if (val.HasValue)
{
colorsUsed.Add (val.Value);
Attribute match = toFind.FirstOrDefault (e => e == val);
// need to check twice because Attribute is a struct and therefore cannot be null
if (toFind.Any (e => e == val))
{
toFind.Remove (match);
}
}
}
}
if (!toFind.Any ())
{
return;
}
var sb = new StringBuilder ();
sb.AppendLine ("The following colors were not used:" + string.Join ("; ", toFind.Select (a => a.ToString ())));
sb.AppendLine ("Colors used were:" + string.Join ("; ", colorsUsed.Select (a => a.ToString ())));
throw new (sb.ToString ());
}
[GeneratedRegex ("^\\s+", RegexOptions.Multiline)]
private static partial Regex LeadingWhitespaceRegEx ();
[GeneratedRegex ("\\s+$", RegexOptions.Multiline)]
private static partial Regex TrailingWhiteSpaceRegEx ();
}