mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-27 00:07:58 +01:00
* Initial plan * Remove legacy drivers and reorganize v2 architecture Co-authored-by: tig <585482+tig@users.noreply.github.com> * Extract Windows key helper utilities and fix build Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix all test references to legacy drivers Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update documentation to reflect new driver architecture Co-authored-by: tig <585482+tig@users.noreply.github.com> * Remove V2.cd diagram file Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix test failures: support legacy drivers and update exception handling Co-authored-by: tig <585482+tig@users.noreply.github.com> * updated driver names * Move V2 tests from ConsoleDrivers/V2 to proper locations Co-authored-by: tig <585482+tig@users.noreply.github.com> * Rename ApplicationV2 to ModernApplicationImpl to remove v2 terminology Co-authored-by: tig <585482+tig@users.noreply.github.com> * Remove V2 terminology from test drivers and FakeDriver classes Co-authored-by: tig <585482+tig@users.noreply.github.com> * Merge ModernApplicationImpl into ApplicationImpl and move to App folder Co-authored-by: tig <585482+tig@users.noreply.github.com> * Create modern FakeDriver with component factory architecture in Terminal.Gui project Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor: Move non-platform-dependent code from /Drivers to /App Co-authored-by: tig <585482+tig@users.noreply.github.com> * Code cleanup and org * Unit test reorg * Refactor MainLoop architecture: rename classes and enhance documentation for clarity Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add comprehensive FakeDriver tests (WIP - some tests need fixes) Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fixed FakeDriver build failures * Fix all FakeDriver test failures - Application.Top creation and clipboard behaviors Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fixed FakeDriver build failures2 * Remove hanging legacy FakeDriver tests that use Console.MockKeyPresses Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fixed some tests * Fixed more tests * Fixed more tests * Fix bad copilot (#4277) * Update Terminal.Gui/Drivers/FakeDriver/FakeConsoleOutput.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Refactor Application Init and Update Tests Refactored `Application.Init` to improve initialization logic: - Added fallback to `ForceDriver` when `driverName` is null. - Changed repeated `Init` calls to throw `InvalidOperationException`. - Updated `_driverName` assignment logic for robustness. Enhanced `IConsoleDriver` with detailed remarks on implementations. Revised test cases to align with updated `Application.Init` behavior: - Replaced `FakeDriver` with `null` and `driverName: "fake"`. - Skipped or commented out tests incompatible with new logic. - Improved formatting and removed redundant setup code. Improved code style and consistency across the codebase: - Standardized parameter formatting and spacing. - Removed outdated comments and unused code. General cleanup to enhance readability and maintainability. * Warp fix copilot (#4278) * More fixes (#4279) * Fixes/works around test failures and temporarily disable failing test Updated `FakeDriver` to set `RunningUnitTests` to `true` and initialize dimensions using `FakeConsole`. Modified `TestRespondersDisposedAttribute` to set `ConsoleDriver.RunningUnitTests` in the `Before` method, ensuring proper behavior during unit tests. Temporarily disabled the `Button_CanFocus_False_Raises_Accepted_Correctly` test in `ViewCommandTests` by adding a `Skip` parameter to the `[Fact]` attribute, referencing issue #4270. * Allow all tests to run despite failures in UnitTests Modified the `dotnet test` command in the `Run UnitTestsParallelizable` step to set `xunit.stopOnFail` to `false`. This ensures that the test runner does not stop execution on the first failure, allowing all tests to execute regardless of individual test outcomes. * Refactor ApplicationScreenTests for cleaner setup/teardown Refactored `ClearContents_Called_When_Top_Frame_Changes` test: - Added `[AutoInitShutdown]` attribute for automatic lifecycle management. - Replaced manual `Application.Init` and `Application.Top` setup with `Application.Begin` and `RunState`. - Simplified event handling by defining `ClearedContents` handler inline. - Removed explicit cleanup logic, relying on `Application.End` for teardown. Updated `using` directives to include `UnitTests` namespace. * Attempt to fix intermittent local test failures. Update ApplicationImpl initialization parameter Changed the second parameter of the `impl.Init` method in the `FakeApplicationFactory` class from `"dotnet"` to `"fake"`. * Code cleanup to cause Action to re-run. * Stop tests on first failure in UnitTestsParallelizable Updated the `dotnet test` command in `unit-tests.yml` to set the `xunit.stopOnFail` parameter to `true`. This change ensures that test execution halts immediately upon encountering a failure, allowing quicker identification and resolution of issues. Note that this may prevent the full test suite from running in the event of a failure. * Allow all tests to run despite failures in CI Updated `unit-tests.yml` to set `xunit.stopOnFail` to `false` in both `Run UnitTests` and `Run UnitTestsParallelizable` steps. This ensures that the test runner does not stop execution on the first test failure, allowing all tests to complete even if some fail. * Enhance RuneExtensions docs and update user dictionary Updated the `<remarks>` section in `RuneExtensions.GetColumns` to include details about the `wcwidth` implementation and improved readability with `<para>` tags. Added `wcwidth` to the user dictionary in `Terminal.sln.DotSettings` to avoid spelling errors. * Improve XML doc formatting in RuneExtensions.cs Updated the remarks section of the `GetColumns` method in the `RuneExtensions` class to enhance readability by reformatting and properly indenting `<para>` tags. The content remains unchanged, describing the method's implementation via `wcwidth` and its role as a Terminal.Gui extension for `System.Text.Rune`. * Refactor drivers and improve clipboard handling Replaced legacy drivers (`CursesDriver`, `NetDriver`) with `UnixDriver` and `DotNetDriver` across the codebase, including comments, method names, and test cases. Updated documentation and remarks to reflect the new driver names and platforms. Revamped clipboard handling with new platform-specific implementations: `UnixClipboard` for Unix, `MacOSXClipboard` for macOS, and `WSLClipboard` for Linux under WSL. Removed the old `CursesClipboard` and consolidated clipboard logic. Updated test cases to align with the new drivers and clipboard implementations. Improved naming consistency and cleaned up redundant code. Updated the README and documentation to reflect these changes. * Remove `PlatformColor` from `Attribute` struct This commit removes the `PlatformColor` property from the `Attribute` struct, simplifying the codebase by eliminating platform-specific color handling. The following changes were made: - Removed `PlatformColor` from the `Attribute` struct, including its initialization, usage, and related comments. - Updated constructors to no longer initialize or use `PlatformColor`. - Modified `Equals` and `GetHashCode` methods to exclude `PlatformColor`. - Updated `UnixComponentFactory` documentation to remove references to "v2unix." - Renamed `v2TestDriver` to `testDriver` in the `With` class for clarity. - Removed `PlatformColor` references in `DriverAssert` and related error messages. - Deleted test cases in `AttributeTests` that relied on `PlatformColor`. - Cleaned up comments and TODOs related to `PlatformColor` and `UnixDriver`. These changes reflect a shift away from platform-dependent color management, improving code clarity and reducing complexity. Remove `PlatformColor` and simplify `Attribute` logic The `PlatformColor` property has been removed from the `Attribute` struct, along with its associated logic, simplifying the codebase and eliminating platform-specific dependencies. Constructors, equality checks, and hash code generation in `Attribute` have been updated accordingly. The `CurrentAttribute` property in `ConsoleDriver` and `OutputBuffer` has been simplified, removing dependencies on `Application.Driver`. The `MakeColor` method logic has been removed or simplified in related classes. Tests in `AttributeTests` have been refactored to reflect these changes, focusing on `Foreground`, `Background`, and `Style`. Unix-specific logic tied to `PlatformColor` has been eliminated. Additional updates include renaming parameters in the `With` class for clarity, simplifying `DriverAssert` output, and performing minor code cleanups to improve readability and maintainability. * Refactor Terminal.Gui driver architecture for v2 Updated documentation to reflect the new modular driver architecture in Terminal.Gui v2. - Revised `namespace-drivers.md` to include new components (`IConsoleInput`, `IConsoleOutput`, `IInputProcessor`, `IOutputBuffer`, `IWindowSizeMonitor`) and terminal size monitoring. - Replaced "Key Components" with "Architecture Overview" and added details on the **Component Factory** pattern. - Documented the four driver implementations (`DotNetDriver`, `WindowsDriver`, `UnixDriver`, `FakeDriver`) and their platform-specific optimizations. - Added a "Threading Model" section to explain the multi-threaded design for responsive input handling. - Updated examples to demonstrate driver capabilities and explicit driver selection. In `drivers.md`: - Expanded the "Overview" to emphasize the modular, component-based architecture. - Reorganized "Drivers" into "Available Drivers" and added details on `FakeDriver` for unit testing. - Added sections on "Initialization Flow," "Shutdown Flow," and platform-specific driver details. - Provided examples for accessing driver components and creating custom drivers. In `index.md`: - Updated "Cross Platform" feature to reflect new driver names and clarified compatibility with SSH and monochrome terminals. * Moved files around --------- 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: Thomas Nind <31306100+tznind@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
236 lines
7.9 KiB
C#
236 lines
7.9 KiB
C#
using Moq;
|
|
|
|
namespace Terminal.Gui.DriverTests;
|
|
|
|
|
|
public class AnsiRequestSchedulerTests
|
|
{
|
|
private readonly Mock<IAnsiResponseParser> _parserMock;
|
|
private readonly AnsiRequestScheduler _scheduler;
|
|
|
|
private static DateTime _staticNow; // Static value to hold the current time
|
|
|
|
public AnsiRequestSchedulerTests ()
|
|
{
|
|
_parserMock = new Mock<IAnsiResponseParser> (MockBehavior.Strict);
|
|
_staticNow = DateTime.UtcNow; // Initialize static time
|
|
_scheduler = new AnsiRequestScheduler (_parserMock.Object, () => _staticNow);
|
|
}
|
|
|
|
[Fact]
|
|
public void SendOrSchedule_SendsDeviceAttributeRequest_WhenNoOutstandingRequests ()
|
|
{
|
|
// Arrange
|
|
var request = new AnsiEscapeSequenceRequest
|
|
{
|
|
Request = "\u001b[0c", // ESC [ c
|
|
Terminator = "c",
|
|
ResponseReceived = r => { }
|
|
};
|
|
|
|
// we have no outstanding for c already
|
|
_parserMock.Setup (p => p.IsExpecting ("c")).Returns (false).Verifiable(Times.Once);
|
|
|
|
// then we should execute our request
|
|
_parserMock.Setup (p => p.ExpectResponse ("c", It.IsAny<Action<string>> (), null, false)).Verifiable (Times.Once);
|
|
|
|
// Act
|
|
bool result = _scheduler.SendOrSchedule (request);
|
|
|
|
|
|
// Assert
|
|
Assert.Empty (_scheduler.QueuedRequests); // We sent it i.e. we did not queue it for later
|
|
Assert.True (result); // Should send immediately
|
|
_parserMock.Verify ();
|
|
}
|
|
[Fact]
|
|
public void SendOrSchedule_QueuesRequest_WhenOutstandingRequestExists ()
|
|
{
|
|
// Arrange
|
|
var request1 = new AnsiEscapeSequenceRequest
|
|
{
|
|
Request = "\u001b[0c", // ESC [ 0 c
|
|
Terminator = "c",
|
|
ResponseReceived = r => { }
|
|
};
|
|
|
|
// Parser already has an ongoing request for "c"
|
|
_parserMock.Setup (p => p.IsExpecting ("c")).Returns (true).Verifiable (Times.Once);
|
|
|
|
// Act
|
|
var result = _scheduler.SendOrSchedule (request1);
|
|
|
|
// Assert
|
|
Assert.Single (_scheduler.QueuedRequests); // Ensure only one request is in the queue
|
|
Assert.False (result); // Should be queued
|
|
_parserMock.Verify ();
|
|
}
|
|
|
|
|
|
[Fact]
|
|
public void RunSchedule_ThrottleNotExceeded_AllowSend ()
|
|
{
|
|
// Arrange
|
|
var request = new AnsiEscapeSequenceRequest
|
|
{
|
|
Request = "\u001b[0c", // ESC [ 0 c
|
|
Terminator = "c",
|
|
ResponseReceived = r => { }
|
|
};
|
|
|
|
// Set up to expect no outstanding request for "c" i.e. parser instantly gets response and resolves it
|
|
_parserMock.Setup (p => p.IsExpecting ("c")).Returns (false).Verifiable(Times.Exactly (2));
|
|
_parserMock.Setup (p => p.ExpectResponse ("c", It.IsAny<Action<string>> (), null, false)).Verifiable (Times.Exactly (2));
|
|
|
|
_scheduler.SendOrSchedule (request);
|
|
|
|
// Simulate time passing beyond throttle
|
|
SetTime (101); // Exceed throttle limit
|
|
|
|
|
|
// Act
|
|
|
|
// Send another request after the throttled time limit
|
|
var result = _scheduler.SendOrSchedule (request);
|
|
|
|
// Assert
|
|
Assert.Empty (_scheduler.QueuedRequests); // Should send and clear the request
|
|
Assert.True (result); // Should have found and sent the request
|
|
_parserMock.Verify ();
|
|
}
|
|
|
|
[Fact]
|
|
public void RunSchedule_ThrottleExceeded_QueueRequest ()
|
|
{
|
|
// Arrange
|
|
var request = new AnsiEscapeSequenceRequest
|
|
{
|
|
Request = "\u001b[0c", // ESC [ 0 c
|
|
Terminator = "c",
|
|
ResponseReceived = r => { }
|
|
};
|
|
|
|
// Set up to expect no outstanding request for "c" i.e. parser instantly gets response and resolves it
|
|
_parserMock.Setup (p => p.IsExpecting ("c")).Returns (false).Verifiable (Times.Exactly (2));
|
|
_parserMock.Setup (p => p.ExpectResponse ("c", It.IsAny<Action<string>> (), null, false)).Verifiable (Times.Exactly (2));
|
|
|
|
_scheduler.SendOrSchedule (request);
|
|
|
|
// Simulate time passing
|
|
SetTime (55); // Does not exceed throttle limit
|
|
|
|
|
|
// Act
|
|
|
|
// Send another request after the throttled time limit
|
|
var result = _scheduler.SendOrSchedule (request);
|
|
|
|
// Assert
|
|
Assert.Single (_scheduler.QueuedRequests); // Should have been queued
|
|
Assert.False(result); // Should have been queued
|
|
|
|
// Throttle still not exceeded
|
|
Assert.False(_scheduler.RunSchedule ());
|
|
|
|
SetTime (90);
|
|
|
|
// Throttle still not exceeded
|
|
Assert.False (_scheduler.RunSchedule ());
|
|
|
|
SetTime (105);
|
|
|
|
// Throttle exceeded - so send the request
|
|
Assert.True (_scheduler.RunSchedule ());
|
|
|
|
_parserMock.Verify ();
|
|
}
|
|
|
|
[Fact]
|
|
public void EvictStaleRequests_RemovesStaleRequest_AfterTimeout ()
|
|
{
|
|
// Arrange
|
|
var request1 = new AnsiEscapeSequenceRequest
|
|
{
|
|
Request = "\u001b[0c",
|
|
Terminator = "c",
|
|
ResponseReceived = r => { }
|
|
};
|
|
|
|
// Send
|
|
_parserMock.Setup (p => p.IsExpecting ("c")).Returns (false).Verifiable (Times.Once);
|
|
_parserMock.Setup (p => p.ExpectResponse ("c", It.IsAny<Action<string>> (), null, false)).Verifiable (Times.Exactly (2));
|
|
|
|
Assert.True (_scheduler.SendOrSchedule (request1));
|
|
|
|
// Parser already has an ongoing request for "c"
|
|
_parserMock.Setup (p => p.IsExpecting ("c")).Returns (true).Verifiable (Times.Exactly (2));
|
|
|
|
// Cannot send because there is already outstanding request
|
|
Assert.False(_scheduler.SendOrSchedule (request1));
|
|
Assert.Single (_scheduler.QueuedRequests);
|
|
|
|
// Simulate request going stale
|
|
SetTime (5001); // Exceeds stale timeout
|
|
|
|
// Parser should be told to give up on this one (evicted)
|
|
_parserMock.Setup (p => p.StopExpecting ("c", false))
|
|
.Callback (() =>
|
|
{
|
|
// When we tell parser to evict - it should now tell us it is no longer expecting
|
|
_parserMock.Setup (p => p.IsExpecting ("c")).Returns (false).Verifiable (Times.Once);
|
|
}).Verifiable ();
|
|
|
|
// When we send again the evicted one should be
|
|
var evicted = _scheduler.RunSchedule ();
|
|
|
|
Assert.True (evicted); // Stale request should be evicted
|
|
Assert.Empty (_scheduler.QueuedRequests);
|
|
|
|
// Assert
|
|
_parserMock.Verify ();
|
|
}
|
|
|
|
[Fact]
|
|
public void RunSchedule_DoesNothing_WhenQueueIsEmpty ()
|
|
{
|
|
// Act
|
|
var result = _scheduler.RunSchedule ();
|
|
|
|
// Assert
|
|
Assert.False (result); // No requests to process
|
|
Assert.Empty (_scheduler.QueuedRequests);
|
|
}
|
|
|
|
[Fact]
|
|
public void SendOrSchedule_ManagesIndependentTerminatorsCorrectly ()
|
|
{
|
|
// Arrange
|
|
var request1 = new AnsiEscapeSequenceRequest { Request = "\u001b[0c", Terminator = "c", ResponseReceived = r => { } };
|
|
var request2 = new AnsiEscapeSequenceRequest { Request = "\u001b[0x", Terminator = "x", ResponseReceived = r => { } };
|
|
|
|
// Already have a 'c' ongoing
|
|
_parserMock.Setup (p => p.IsExpecting ("c")).Returns (true).Verifiable (Times.Once);
|
|
|
|
// 'x' is free
|
|
_parserMock.Setup (p => p.IsExpecting ("x")).Returns (false).Verifiable (Times.Once);
|
|
_parserMock.Setup (p => p.ExpectResponse ("x", It.IsAny<Action<string>> (), null, false)).Verifiable (Times.Once);
|
|
|
|
// Act
|
|
var a = _scheduler.SendOrSchedule (request1);
|
|
var b = _scheduler.SendOrSchedule (request2);
|
|
|
|
// Assert
|
|
Assert.False (a);
|
|
Assert.True (b);
|
|
Assert.Equal(request1, Assert.Single (_scheduler.QueuedRequests));
|
|
_parserMock.Verify ();
|
|
}
|
|
|
|
|
|
private void SetTime (int milliseconds)
|
|
{
|
|
// This simulates the passing of time by setting the Now function to return a specific time.
|
|
var newNow = _staticNow.AddMilliseconds (milliseconds);
|
|
_scheduler.Now = () => newNow;
|
|
}
|
|
} |