mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +01:00
* Fixes #4004. Driver "windows" broken in conhost and cmd
* Fix unit tests
* Remove IsVirtualTerminal from IApplication. Add IDriverInternal and IOutputInternal interfaces
* Fix result.IsSupported
* Remove internal interfaces and add them in the implementations classes
* Move Sixel from IApplication to IDriver interface it's a characteristic of the driver
* Only if IOutput is OutputBase then set the internal properties
* Prevents driver windows error on Unix system
* Fix scenario sixel error
* Comment some tests because is keyboard layout dependent and shifted key is needed to produce them (Pt)
* Add 🇵🇹 regional indicators test proving they ca be joined as only one grapheme
* SetConsoleActiveScreenBuffer is already called by the constructor and is only needed once
* Finally fixed non virtual terminal in windows driver
* Add more Sixel unit tests
* Add unit tests for OutputBase class
* Avoid emit escape sequence
* Fix assertion failure in UICatalog
* Let each driver to deal with the Sixel write
* When Shutdown is called by the static Application then the ApplicationImpl.ResetStateStatic should be also called
* Add more OutputBase with Sixel unit tests
* Fix some issues with IsVirtualTerminal and Force16Colors with unit tests improvement
* Add Sixel Detect method unit test
* Make Sixel IsSupported and SupportsTransparency consistent with more unit tests
* Fix namespaces and unit test
* Covering more ApplicationImpl Sixel unit test
* Remove DriverImplProxy because sometimes fails in parallel unit tests
* Fix Init_KeyBindings_Are_Not_Reset unit test failing
* Revert "Fix Init_KeyBindings_Are_Not_Reset unit test failing"
This reverts commit 0ab298bc56.
* Fix Force16Colors but still use Application.Force16Colors because of CM
* Enforce conditional
* Revert change
* Moving to a new file
* Add the same workaround as the All_Scenarios_Benchmark unit test
* Fixes #4440. TextView with ReadOnly as true, MoveRight doesn't select text up to the end of the line
* Fixes #4442. TextField PositionCursor doesn't treat zero width as one column
* Each character must return at least one column, with the exception of Tab.
* Add unit test for the ScrollOffset
* Each character must return at least one column, with the exception of Tab.
* Add unit test for the LeftColumn
* WIP
* Refactor DriverImpl and OutputBase for maintainability
Refactored `DriverImpl` to remove `IDisposable` and streamline event
handling, including replacing `OnSizeMonitorOnSizeChanged` with an
inline lambda. Reintroduced `SizeChanged` and updated `SetScreenSize`
to invoke it. Moved `SupportsTrueColor` from `OutputBase` to
`DriverImpl` and reintroduced `Force16Colors` with updated logic.
Reintroduced and updated several `OutputBuffer`-related properties
and methods in `DriverImpl`, including `Screen`, `Clip`, `Cols`, and
`Contents`. Moved `Clipboard` from `OutputBase` to `DriverImpl` and
initialized it with `FakeClipboard`. Simplified `Refresh` and `ToAnsi`
methods in `DriverImpl`.
Removed `Force16Colors` from `OutputBase` and simplified method
signatures, including `ToAnsi` and `BuildAnsiForRegion`. Fixed a
parameter name typo in `AppendOrWriteAttribute`. Made minor code
formatting adjustments.
These changes improve code maintainability, reduce redundancy, and
align the implementation with updated design requirements.
* Refactor Force16Colors handling and improve UICatalog
Refactored the `Force16Colors` property:
- Moved it from `DriverImpl` to `IOutput` and `OutputBase`.
- Simplified its management by removing redundant logic.
- Added `OnDriverOnForce16ColorsChanged` to handle updates.
Updated `UICatalogRunnable`:
- Replaced `Driver.Force16Colors` with `Application.Driver.Force16Colors`.
- Added an `F7` shortcut to toggle `Force16Colors`.
- Removed redundant event handlers and improved formatting.
Updated `config.json`:
- Replaced `Application.Force16Colors` with `Driver.Force16Colors`.
- Improved theme configuration formatting for readability.
Other changes:
- Removed the `force16Colors` parameter from `IOutput.ToAnsi`.
- Improved diagnostics handling in `UICatalogRunnable`.
- General code cleanup for readability and maintainability.
* Refactor `Force16Colors` access and improve null safety
Refactored `Force16Colors` property access to use `Application.Driver!`
for null safety and consistency. Updated event handlers to align with
this pattern. Replaced nullable `DrawContext?` parameters with
non-nullable `DrawContext` in `OnDrawingContent` overrides across
multiple classes to enforce stricter nullability checks.
Removed unused `_cachedCursorVisibility` field in `OutputBase.cs` and
cleaned up commented-out legacy code in `UICatalogRunnable.cs`. Updated
XML documentation to reflect method signature changes and property
references. Refactored `Shortcut` example in documentation for
consistency.
Replaced `Application.LayoutAndDraw` with `SetNeedsDraw` for marking
views as needing redraw. Performed general code cleanup to remove
redundant code and improve consistency.
* Refactor ForceDriver and Force16Colors properties
Removed `[Obsolete]` from `Application.ForceDriver`, making it a stable API. Added comments to clarify its role as a configuration property and its synchronization with `IApplication.ForceDriver`. Introduced `_forceDriver` as a private backing field.
Removed `Force16Colors` from `ApplicationImpl` and eliminated reset logic for `ForceDriver` and `Force16Colors` during shutdown, shifting state management responsibility to the library user.
Updated comments in `Driver.cs` to document `Force16Colors` as a configuration property and its synchronization with `IDriver.Force16Colors`. Retained `_force16Colors` as a private backing field for configuration overrides.
* Updated docs
* There is no way to detect Sixel transparency and so relying in VTS or Xterm with transparency
* Fix detect Sixel unit tests with the adjusting code
* Refactored Output.
* MErging
* - Added `OnDriverOnForce16ColorsChanged` method to handle `Driver.Force16ColorsChanged` events and update the `Force16Colors` property.
- Implemented `IDisposable` to ensure proper cleanup of resources, including unsubscribing from `SizeMonitor.SizeChanged` and `Driver.Force16ColorsChanged` events, and disposing of `_output`.
- Replaced inline `SizeMonitor.SizeChanged` event handler with a dedicated method, `OnSizeMonitorOnSizeChanged`, for better readability and maintainability.
- Simplified the `Screen` property by removing commented-out code and directly returning a `Rectangle` based on `OutputBuffer` dimensions.
- Updated the `Force16Colors` property to use `_output` for both getting and setting its value.
- Performed general cleanup, including removing unused code and improving code structure.
* merged
* Refactor Sixel handling with ConcurrentQueue
Replaced `List<SixelToRender>` with `ConcurrentQueue<SixelToRender>`
to improve thread safety and performance in sixel management.
Updated the `Images` class to avoid unnecessary removal and
re-creation of sixel objects by updating existing ones in place.
Refactored `Application.Sixel` to return a `ConcurrentQueue` and
introduced `GetSixels` in `IDriver` and `IOutput` for consistent
access. Updated `OutputBase` to use a private `ConcurrentQueue`
and adjusted rendering logic accordingly.
Removed legacy and redundant code, including `Application.Driver?.Sixel.Clear()`
and unused properties in `DriverImpl` and `ApplicationImpl`. Updated
tests in `OutputBaseTests` to align with the new implementation.
Added `using System.Collections.Concurrent` where necessary and
improved documentation to reflect the changes. These updates
enhance thread safety, simplify the codebase, and align with
modern concurrent programming practices.
* Tweak
* Refactor DriverImpl to use Dispose and improve modularity
Replaced `Driver.End()` with `Driver.Dispose()` across the codebase, aligning with the `IDisposable` pattern for proper resource cleanup. Updated `DriverImpl` to implement `Dispose`, ensuring event unsubscriptions and resource disposal.
Enhanced `DriverImpl` structure by organizing code into logical regions, improving modularity and readability. Refactored and reintroduced methods and properties like `Clipboard`, `Screen`, `SetScreenSize`, `Cols`, `Rows`, and others for better encapsulation.
Updated the `IDriver` interface to include `IDisposable` and reorganized it into regions. Added new methods and properties such as `Init`, `Refresh`, `Suspend`, `QueueAnsiRequest`, and `ToAnsi`.
Refactored unit tests to replace `driver.End()` with `driver.Dispose()` and ensured proper resource cleanup. Improved code comments and documentation for better clarity.
Aligned with modern C# practices, adopting features like null-coalescing operators and pattern matching. Removed redundant code, addressed some TODOs, and modularized the codebase for maintainability and extensibility.
* Refactor driver docs and update View.Driver usage
Updated `application.md` to clarify the purpose of the `View.Driver` property, replacing the obsolete `Application.Driver`. Added a reference to the "Drivers Deep Dive" documentation for further details.
Refactored the `OnDrawContent` method to use the `Driver` property, ensuring compatibility with the new driver architecture.
Added a new section, "Testing with the New Architecture," to `application.md`, highlighting the improved testability of the instance-based architecture.
Expanded and reorganized `drivers.md` to provide a detailed breakdown of the `IDriver` interface, including lifecycle, components, screen and display, color support, content buffer, drawing, cursor, input events, and ANSI escape sequences. Introduced new subsections for clarity and emphasized the modular design for maintainability.
Added a note in `drivers.md` discouraging direct access to the `Driver` and recommending higher-level abstractions like `Terminal.Gui.App.Application.Screen` and `Terminal.Gui.ViewBase.View` methods for positioning and drawing.
* Refactor IsVirtualTerminal to IsLegacyConsole
Replaced the `IsVirtualTerminal` property with `IsLegacyConsole` across the codebase to better represent legacy versus modern terminal environments. Updated logic in `SixelSupportDetector`, `DriverImpl`, and `OutputBase` to use the new property.
Refactored tests to align with the updated property, including renaming test methods, adjusting mock setups, and replacing `VirtualTerminalTests` with `LegacyConsoleTests`.
Simplified `WindowsOutput` implementation to handle console modes and sixel rendering based on `IsLegacyConsole`. Removed redundant code related to `IsVirtualTerminal`.
Improved code readability and maintainability by using more descriptive property names and ensuring consistency across the codebase. Updated `.DotSettings` with new entries.
* Update Examples/UICatalog/Scenarios/LineDrawing.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Examples/UICatalog/Scenarios/Images.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Examples/UICatalog/Scenarios/Images.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Terminal.Gui/App/IApplication.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Terminal.Gui/App/ApplicationImpl.Lifecycle.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Examples/UICatalog/Scenarios/ColorPicker.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Examples/UICatalog/Scenarios/ColorPicker.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Fix formatting and typo in code and documentation
Improved code readability in `LineDrawing.cs` by fixing spacing
around the ternary operator in `Width` and `Y` property assignments.
Corrected a typo in `drivers.md` by changing "Configuraiton Manager"
to "Configuration Manager" for accurate documentation.
* Test failure casued by assert left in by accident.
* Added a workaround in `OutputBase.cs` to address dirty cell handling in legacy console mode by marking all buffer cells as dirty.
Refactored `_disableMouseCb` event handling in `UICatalogRunnable.cs` to use the `Selecting` event for toggling `Application.IsMouseDisabled`. Simplified `MouseImpl.cs` by converting `App` to an auto-implemented property and removing redundant namespace usage.
Streamlined logging in `WindowsOutput.cs` by replacing verbose `Logging.Logger` calls with shorter alternatives (`Logging.Information`, `Logging.Error`, etc.).
* Update theme and remove unused ListView component
The application's default theme configuration was updated from "Light" to "Amber Phosphor" by modifying the `ConfigurationManager.RuntimeConfig` value.
Additionally, the `ListView` component in the `ExampleWindow` class was removed. This included its initialization, layout properties (`Y`, `Height`, `Width`), and its data source (["One", "Two", "Three", "Four"]).
* Increase safety timeout in NestedRunTimeoutTests to 10s
The timeout duration for the safety mechanism in the
`NestedRunTimeoutTests` class was increased from 5000ms (5s)
to 10000ms (10s). This change allows the app more time to
complete before triggering the safety timeout, reducing the
likelihood of premature termination during long-running tests.
Refactor and enhance test coverage
Refactored `Load_WithInvalidJson_AddsJsonError` test in `SourcesManagerTests.cs` to improve organization and added a note about its impact on parallel execution. Increased the safety timeout in `NestedRunTimeoutTests.cs` from 5 seconds to 10 seconds to address potential premature test timeouts.
* Handle null Driver gracefully in event subscription
Replaced `ArgumentNullException.ThrowIfNull(Driver)` with a null-check conditional in `SubscribeDriverEvents` and `UnsubscribeDriverEvents`. If `Driver` is `null`, the methods now log an error using `Logging.Error` and return early. This prevents potential exceptions and improves error handling.
---------
Co-authored-by: BDisp <bd.bdisp@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
463 lines
18 KiB
C#
463 lines
18 KiB
C#
using Xunit.Abstractions;
|
|
|
|
namespace ApplicationTests.Timeout;
|
|
|
|
/// <summary>
|
|
/// Tests for timeout behavior with nested Application.Run() calls.
|
|
/// These tests verify that timeouts scheduled in a parent run loop continue to fire
|
|
/// correctly when a nested modal dialog is shown via Application.Run().
|
|
/// </summary>
|
|
public class NestedRunTimeoutTests (ITestOutputHelper output)
|
|
{
|
|
[Fact]
|
|
public void Multiple_Timeouts_Fire_In_Correct_Order_With_Nested_Run ()
|
|
{
|
|
// Arrange
|
|
using IApplication? app = Application.Create ();
|
|
app.Init ("FakeDriver");
|
|
|
|
List<string> executionOrder = new ();
|
|
|
|
var mainWindow = new Window { Title = "Main Window" };
|
|
var dialog = new Dialog { Title = "Nested Dialog", Buttons = [new() { Text = "Ok" }] };
|
|
var nestedRunCompleted = false;
|
|
|
|
// Use iteration counter for safety instead of time-based timeout
|
|
var iterations = 0;
|
|
app.Iteration += IterationHandler;
|
|
|
|
try
|
|
{
|
|
// Schedule multiple timeouts
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (100),
|
|
() =>
|
|
{
|
|
executionOrder.Add ("Timeout1-100ms");
|
|
output.WriteLine ("Timeout1 fired at 100ms");
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (200),
|
|
() =>
|
|
{
|
|
executionOrder.Add ("Timeout2-200ms-StartNestedRun");
|
|
output.WriteLine ("Timeout2 fired at 200ms - Starting nested run");
|
|
|
|
// Start nested run
|
|
app.Run (dialog);
|
|
|
|
executionOrder.Add ("Timeout2-NestedRunEnded");
|
|
nestedRunCompleted = true;
|
|
output.WriteLine ("Nested run ended");
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (300),
|
|
() =>
|
|
{
|
|
executionOrder.Add ("Timeout3-300ms-InNestedRun");
|
|
output.WriteLine ($"Timeout3 fired at 300ms - TopRunnable: {app.TopRunnableView?.Title}");
|
|
|
|
// This should fire while dialog is running
|
|
Assert.Equal (dialog, app.TopRunnableView);
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (400),
|
|
() =>
|
|
{
|
|
executionOrder.Add ("Timeout4-400ms-CloseDialog");
|
|
output.WriteLine ("Timeout4 fired at 400ms - Closing dialog");
|
|
|
|
// Close the dialog
|
|
app.RequestStop (dialog);
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// Event-driven: Only stop main window AFTER nested run completes
|
|
// Use a repeating timeout that checks the condition
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (50),
|
|
() =>
|
|
{
|
|
// Keep checking until nested run completes
|
|
if (nestedRunCompleted)
|
|
{
|
|
executionOrder.Add ("Timeout5-AfterNestedRun-StopMain");
|
|
output.WriteLine ("Timeout5 fired after nested run completed - Stopping main window");
|
|
app.RequestStop (mainWindow);
|
|
|
|
return false; // Don't repeat
|
|
}
|
|
|
|
return true; // Keep checking
|
|
}
|
|
);
|
|
|
|
// Act
|
|
app.Run (mainWindow);
|
|
|
|
// Assert - Verify all timeouts fired in the correct order
|
|
output.WriteLine ($"Execution order: {string.Join (", ", executionOrder)}");
|
|
|
|
Assert.Equal (6, executionOrder.Count); // 5 timeout events + 1 nested run end marker
|
|
Assert.Equal ("Timeout1-100ms", executionOrder [0]);
|
|
Assert.Equal ("Timeout2-200ms-StartNestedRun", executionOrder [1]);
|
|
Assert.Equal ("Timeout3-300ms-InNestedRun", executionOrder [2]);
|
|
Assert.Equal ("Timeout4-400ms-CloseDialog", executionOrder [3]);
|
|
Assert.Equal ("Timeout2-NestedRunEnded", executionOrder [4]);
|
|
Assert.Equal ("Timeout5-AfterNestedRun-StopMain", executionOrder [5]);
|
|
}
|
|
finally
|
|
{
|
|
app.Iteration -= IterationHandler;
|
|
dialog.Dispose ();
|
|
mainWindow.Dispose ();
|
|
}
|
|
|
|
return;
|
|
|
|
void IterationHandler (object? s, EventArgs<IApplication?> e)
|
|
{
|
|
iterations++;
|
|
|
|
// Safety limit - should never be hit with event-driven logic
|
|
if (iterations > 2000)
|
|
{
|
|
output.WriteLine ($"SAFETY: Hit iteration limit. Execution order: {string.Join (", ", executionOrder)}");
|
|
app.RequestStop ();
|
|
}
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Timeout_Fires_In_Nested_Run ()
|
|
{
|
|
// Arrange
|
|
using IApplication? app = Application.Create ();
|
|
|
|
app.Init ("FakeDriver");
|
|
|
|
var timeoutFired = false;
|
|
var nestedRunStarted = false;
|
|
var nestedRunEnded = false;
|
|
|
|
// Create a simple window for the main run loop
|
|
var mainWindow = new Window { Title = "Main Window" };
|
|
|
|
// Create a dialog for the nested run loop
|
|
var dialog = new Dialog { Title = "Nested Dialog", Buttons = [new() { Text = "Ok" }] };
|
|
|
|
// Schedule a safety timeout that will ensure the app quits if test hangs
|
|
var requestStopTimeoutFired = false;
|
|
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (10000),
|
|
() =>
|
|
{
|
|
output.WriteLine ("SAFETY: RequestStop Timeout fired - test took too long!");
|
|
requestStopTimeoutFired = true;
|
|
app.RequestStop ();
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// Schedule a timeout that will fire AFTER the nested run starts and stop the dialog
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (200),
|
|
() =>
|
|
{
|
|
output.WriteLine ($"DialogRequestStop Timeout fired! TopRunnable: {app.TopRunnableView?.Title ?? "null"}");
|
|
timeoutFired = true;
|
|
|
|
// Close the dialog when timeout fires
|
|
if (app.TopRunnableView == dialog)
|
|
{
|
|
app.RequestStop (dialog);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// After 100ms, start the nested run loop
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (100),
|
|
() =>
|
|
{
|
|
output.WriteLine ("Starting nested run...");
|
|
nestedRunStarted = true;
|
|
|
|
// This blocks until the dialog is closed (by the timeout at 200ms)
|
|
app.Run (dialog);
|
|
|
|
output.WriteLine ("Nested run ended");
|
|
nestedRunEnded = true;
|
|
|
|
// Stop the main window after nested run completes
|
|
app.RequestStop ();
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// Act - Start the main run loop
|
|
app.Run (mainWindow);
|
|
|
|
// Assert
|
|
Assert.True (nestedRunStarted, "Nested run should have started");
|
|
Assert.True (timeoutFired, "Timeout should have fired during nested run");
|
|
Assert.True (nestedRunEnded, "Nested run should have ended");
|
|
|
|
Assert.False (requestStopTimeoutFired, "Safety timeout should NOT have fired");
|
|
|
|
dialog.Dispose ();
|
|
mainWindow.Dispose ();
|
|
}
|
|
|
|
[Fact]
|
|
public void Timeout_Fires_With_Single_Session ()
|
|
{
|
|
// Arrange
|
|
using IApplication? app = Application.Create ();
|
|
|
|
app.Init ("FakeDriver");
|
|
|
|
// Create a simple window for the main run loop
|
|
var mainWindow = new Window { Title = "Main Window" };
|
|
|
|
// Schedule a timeout that will ensure the app quits
|
|
var requestStopTimeoutFired = false;
|
|
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (100),
|
|
() =>
|
|
{
|
|
output.WriteLine ("RequestStop Timeout fired!");
|
|
requestStopTimeoutFired = true;
|
|
app.RequestStop ();
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// Act - Start the main run loop
|
|
app.Run (mainWindow);
|
|
|
|
// Assert
|
|
Assert.True (requestStopTimeoutFired, "RequestStop Timeout should have fired");
|
|
|
|
mainWindow.Dispose ();
|
|
}
|
|
|
|
[Fact]
|
|
public void Timeout_Queue_Persists_Across_Nested_Runs ()
|
|
{
|
|
// Verify that the timeout queue is not cleared when nested runs start/end
|
|
|
|
// Arrange
|
|
using IApplication? app = Application.Create ();
|
|
app.Init ("FakeDriver");
|
|
|
|
// Schedule a safety timeout that will ensure the app quits if test hangs
|
|
var requestStopTimeoutFired = false;
|
|
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (10000),
|
|
() =>
|
|
{
|
|
output.WriteLine ("SAFETY: RequestStop Timeout fired - test took too long!");
|
|
requestStopTimeoutFired = true;
|
|
app.RequestStop ();
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
var mainWindow = new Window { Title = "Main Window" };
|
|
var dialog = new Dialog { Title = "Dialog", Buttons = [new() { Text = "Ok" }] };
|
|
|
|
var initialTimeoutCount = 0;
|
|
var timeoutCountDuringNestedRun = 0;
|
|
var timeoutCountAfterNestedRun = 0;
|
|
|
|
// Schedule 5 timeouts at different times with wider spacing
|
|
for (var i = 0; i < 5; i++)
|
|
{
|
|
int capturedI = i;
|
|
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (150 * (i + 1)), // Increased spacing from 100ms to 150ms
|
|
() =>
|
|
{
|
|
output.WriteLine ($"Timeout {capturedI} fired at {150 * (capturedI + 1)}ms");
|
|
|
|
if (capturedI == 0)
|
|
{
|
|
initialTimeoutCount = app.TimedEvents!.Timeouts.Count;
|
|
output.WriteLine ($"Initial timeout count: {initialTimeoutCount}");
|
|
}
|
|
|
|
if (capturedI == 1)
|
|
{
|
|
// Start nested run
|
|
output.WriteLine ("Starting nested run");
|
|
app.Run (dialog);
|
|
output.WriteLine ("Nested run ended");
|
|
|
|
timeoutCountAfterNestedRun = app.TimedEvents!.Timeouts.Count;
|
|
output.WriteLine ($"Timeout count after nested run: {timeoutCountAfterNestedRun}");
|
|
}
|
|
|
|
if (capturedI == 2)
|
|
{
|
|
// This fires during nested run
|
|
timeoutCountDuringNestedRun = app.TimedEvents!.Timeouts.Count;
|
|
output.WriteLine ($"Timeout count during nested run: {timeoutCountDuringNestedRun}");
|
|
|
|
// Close dialog
|
|
app.RequestStop (dialog);
|
|
}
|
|
|
|
if (capturedI == 4)
|
|
{
|
|
// Stop main window
|
|
app.RequestStop (mainWindow);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
);
|
|
}
|
|
|
|
// Act
|
|
app.Run (mainWindow);
|
|
|
|
// Assert
|
|
output.WriteLine ($"Final counts - Initial: {initialTimeoutCount}, During: {timeoutCountDuringNestedRun}, After: {timeoutCountAfterNestedRun}");
|
|
|
|
// The timeout queue should have pending timeouts throughout
|
|
Assert.True (initialTimeoutCount >= 0, "Should have timeouts in queue initially");
|
|
Assert.True (timeoutCountDuringNestedRun >= 0, "Should have timeouts in queue during nested run");
|
|
Assert.True (timeoutCountAfterNestedRun >= 0, "Should have timeouts in queue after nested run");
|
|
|
|
Assert.False (requestStopTimeoutFired, "Safety timeout should NOT have fired");
|
|
|
|
dialog.Dispose ();
|
|
mainWindow.Dispose ();
|
|
}
|
|
|
|
[Fact]
|
|
public void Timeout_Scheduled_Before_Nested_Run_Fires_During_Nested_Run ()
|
|
{
|
|
// This test specifically reproduces the ESC key issue scenario:
|
|
// - Timeouts are scheduled upfront (like demo keys)
|
|
// - A timeout fires and triggers a nested run (like Enter opening MessageBox)
|
|
// - A subsequent timeout should still fire during the nested run (like ESC closing MessageBox)
|
|
|
|
// Arrange
|
|
using IApplication? app = Application.Create ();
|
|
app.Init ("FakeDriver");
|
|
|
|
var enterFired = false;
|
|
var escFired = false;
|
|
var messageBoxShown = false;
|
|
var messageBoxClosed = false;
|
|
|
|
var mainWindow = new Window { Title = "Login Window" };
|
|
var messageBox = new Dialog { Title = "Success", Buttons = [new() { Text = "Ok" }] };
|
|
|
|
// Schedule a safety timeout that will ensure the app quits if test hangs
|
|
var requestStopTimeoutFired = false;
|
|
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (10000),
|
|
() =>
|
|
{
|
|
output.WriteLine ("SAFETY: RequestStop Timeout fired - test took too long!");
|
|
requestStopTimeoutFired = true;
|
|
app.RequestStop ();
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// Schedule "Enter" timeout at 100ms
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (100),
|
|
() =>
|
|
{
|
|
output.WriteLine ("Enter timeout fired - showing MessageBox");
|
|
enterFired = true;
|
|
|
|
// Simulate Enter key opening MessageBox
|
|
messageBoxShown = true;
|
|
app.Run (messageBox);
|
|
messageBoxClosed = true;
|
|
|
|
output.WriteLine ("MessageBox closed");
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// Schedule "ESC" timeout at 200ms (should fire while MessageBox is running)
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (200),
|
|
() =>
|
|
{
|
|
output.WriteLine ($"ESC timeout fired - TopRunnable: {app.TopRunnableView?.Title}");
|
|
escFired = true;
|
|
|
|
// Simulate ESC key closing MessageBox
|
|
if (app.TopRunnableView == messageBox)
|
|
{
|
|
output.WriteLine ("Closing MessageBox with ESC");
|
|
app.RequestStop (messageBox);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// Increased delay from 300ms to 500ms to ensure nested run completes before stopping main
|
|
app.AddTimeout (
|
|
TimeSpan.FromMilliseconds (500),
|
|
() =>
|
|
{
|
|
output.WriteLine ("Stopping main window");
|
|
app.RequestStop (mainWindow);
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
// Act
|
|
app.Run (mainWindow);
|
|
|
|
// Assert
|
|
Assert.True (enterFired, "Enter timeout should have fired");
|
|
Assert.True (messageBoxShown, "MessageBox should have been shown");
|
|
Assert.True (escFired, "ESC timeout should have fired during MessageBox"); // THIS WAS THE BUG - NOW FIXED!
|
|
Assert.True (messageBoxClosed, "MessageBox should have been closed");
|
|
|
|
Assert.False (requestStopTimeoutFired, "Safety timeout should NOT have fired");
|
|
|
|
messageBox.Dispose ();
|
|
mainWindow.Dispose ();
|
|
}
|
|
}
|