mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +01:00
* Initial plan * Add IRunnable interface, Runnable base class, and RunnableSessionToken Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add comprehensive parallelizable unit tests for IRunnable Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add 41 more unit tests for comprehensive IRunnable coverage - Added ApplicationRunnableIntegrationTests with 29 integration tests covering Begin/End/Run lifecycle - Added RunnableEdgeCasesTests with 24 edge case and error condition tests - Tests cover event propagation, cancellation scenarios, nested runnables, result handling - Fixed App property not being set in Begin() method - Total test count increased from 23 to 64 tests for IRunnable functionality Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix parallel test failures in CI/CD - Fixed IsModal property to check RunnableSessionStack instead of just TopRunnable - Added "fake" driver parameter to Application.Init() in integration tests - Fixed Begin() to capture old IsModal value before pushing to stack - Moved App property assignment before stack operations to ensure proper state - Skipped 2 tests that use Run() with main loop (not suitable for parallel tests) - All 11,654 parallelizable tests now pass (4 skipped) Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor Application with IRunnable and session management Modernized `Application` and `ApplicationImpl` by introducing `IRunnable` and `RunnableSessionToken` for improved session management. Deprecated legacy methods and added `Obsolete` attributes to indicate their removal. Simplified method bodies using expression-bodied members and null-coalescing assignments. Enhanced lifecycle management in `ApplicationImpl` by removing redundant code and improving `SessionStack` iteration. Introduced `IToplevelTransitionManager` to handle top-level state changes. Updated `Runnable<TResult>` to implement `IRunnable<TResult>` with lifecycle event handling for `IsRunning` and `IsModal` states. Improved result management during lifecycle transitions. Removed legacy classes like `SessionToken` and consolidated their functionality into the new constructs. Updated and expanded the test suite to cover `IRunnable` lifecycle events, `RunnableSessionToken` behavior, and integration with `Application`. Performed code cleanup, improved readability, and updated documentation with detailed remarks and examples. Added new unit tests for edge cases and lifecycle behavior. * Implement fluent API for Init/Run/Shutdown with automatic disposal - Changed Init() to return IApplication for fluent chaining - Changed Run<TRunnable>() to return IApplication (breaking change from TRunnable) - Changed Shutdown() to return object? (extracts and returns result from last Run<T>()) - Added FrameworkOwnedRunnable property to track runnable created by Run<T>() - Shutdown() automatically disposes framework-owned runnables - Created FluentExample demonstrating: Application.Create().Init().Run<ColorPickerView>().Shutdown() - Disposal semantics: framework creates → framework disposes; caller creates → caller disposes Co-authored-by: tig <585482+tig@users.noreply.github.com> * New Example: Demonstrates new Fluent API using ColorPicker Conditional compilation (`#if POST_4148`) to support both a new Fluent API and a traditional approach for running `ColorPickerView`. The Fluent API simplifies the application lifecycle with method chaining and automatic disposal, while the traditional approach retains explicit lifecycle management. Refactor `ColorPickerView` to support both approaches: - Add an `instructions` label for user guidance. - Replace `_okButton` and `_cancelButton` with local `Button` instances. - Use a new `ColorPicker` with enhanced styling options. Add a warning log for WIP issue (#4148) in `ApplicationImpl.Run.cs` to highlight limitations with non-`Toplevel` views as runnables. Update `Terminal.sln` to include the new `FluentExample` project with appropriate build configurations. Improve code readability with verbatim string literals and better alignment/indentation. * Introduce `RunnableWrapper` for making any View runnable Added the `RunnableWrapper<TView, TResult>` pattern to enable any `View` to be run as a blocking session with typed results, without requiring inheritance from `Runnable<TResult>` or implementation of `IRunnable<TResult>`. - Added `RunnableWrapperExample` project to demonstrate usage. - Introduced `ApplicationRunnableExtensions` and `ViewRunnableExtensions` for clean, type-safe APIs to run views with or without result extraction. - Updated `CodeSharingStrategy.md` to document reduced duplication using `#if POST_4148` directives. - Added `RunnableWrapper.md` with detailed documentation and examples. - Created runnable examples in `Program.cs` showcasing various use cases. - Improved maintainability by reducing code duplication by 86% and increasing shared code by 264%. - Gated all new functionality behind the `POST_4148` feature flag for backward compatibility. * Simplified `#if POST_4148` usage to reduce duplication and improve clarity. Refactored `RunnableWrapper` to use a parameterless constructor with `required` properties, ensuring type safety and better lifecycle management. Updated `AllViewsView` with new commands, improved generic handling, and enhanced logging. Refactored `ApplicationRunnableExtensions` and `ViewRunnableExtensions` for cleaner initialization and event handling. Enhanced `TestsAllViews` to handle required properties and constraints dynamically. Updated documentation to reflect new designs and provide clearer examples. Improved overall code readability, consistency, and maintainability while leveraging modern C# features. * Update docfx documentation for IRunnable architecture - Updated View.md with comprehensive IRunnable section - Interface-based architecture explanation - Fluent API patterns and examples - Disposal semantics ("whoever creates it, owns it") - Result extraction patterns - Lifecycle properties and CWP-compliant events - Marked legacy Modal Views section for clarity - Updated application.md with IRunnable deep dive - Key features and benefits - Fluent API patterns with method chaining - Disposal semantics table - Creating runnable views with examples - Lifecycle properties and events - RunnableSessionStack management - Updated IApplication interface documentation - Updated runnable-architecture-proposal.md - Marked Phase 1 as COMPLETE ✅ - Updated status to "Phase 1 Complete - Phase 2 In Progress" - Documented all implemented features - Added bonus features (fluent API, automatic disposal) - Included migration examples All documentation is now clear, concise, and complete relative to Phase 1 implementation. Co-authored-by: tig <585482+tig@users.noreply.github.com> --------- Co-authored-by: Tig <tig@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tig <585482+tig@users.noreply.github.com>
504 lines
13 KiB
C#
504 lines
13 KiB
C#
#nullable enable
|
|
using Xunit.Abstractions;
|
|
|
|
namespace UnitTests.ApplicationTests;
|
|
|
|
/// <summary>
|
|
/// Comprehensive tests for ApplicationImpl.Begin/End logic that manages Current and SessionStack.
|
|
/// These tests ensure the fragile state management logic is robust and catches regressions.
|
|
/// Tests work directly with ApplicationImpl instances to avoid global Application state issues.
|
|
/// </summary>
|
|
public class ApplicationImplBeginEndTests (ITestOutputHelper output)
|
|
{
|
|
private readonly ITestOutputHelper _output = output;
|
|
|
|
private IApplication NewApplicationImpl ()
|
|
{
|
|
IApplication app = Application.Create ();
|
|
|
|
return app;
|
|
}
|
|
|
|
[Fact]
|
|
public void Begin_WithNullToplevel_ThrowsArgumentNullException ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
|
|
try
|
|
{
|
|
Assert.Throws<ArgumentNullException> (() => app.Begin ((Toplevel)null!));
|
|
}
|
|
finally
|
|
{
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Begin_SetsCurrent_WhenCurrentIsNull ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel = null;
|
|
|
|
try
|
|
{
|
|
toplevel = new ();
|
|
Assert.Null (app.TopRunnable);
|
|
|
|
app.Begin (toplevel);
|
|
|
|
Assert.NotNull (app.TopRunnable);
|
|
Assert.Same (toplevel, app.TopRunnable);
|
|
Assert.Single (app.SessionStack);
|
|
}
|
|
finally
|
|
{
|
|
toplevel?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Begin_PushesToSessionStack ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel1 = null;
|
|
Toplevel? toplevel2 = null;
|
|
|
|
try
|
|
{
|
|
toplevel1 = new () { Id = "1" };
|
|
toplevel2 = new () { Id = "2" };
|
|
|
|
app.Begin (toplevel1);
|
|
Assert.Single (app.SessionStack);
|
|
Assert.Same (toplevel1, app.TopRunnable);
|
|
|
|
app.Begin (toplevel2);
|
|
Assert.Equal (2, app.SessionStack.Count);
|
|
Assert.Same (toplevel2, app.TopRunnable);
|
|
}
|
|
finally
|
|
{
|
|
toplevel1?.Dispose ();
|
|
toplevel2?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Begin_SetsUniqueToplevelId_WhenIdIsEmpty ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel1 = null;
|
|
Toplevel? toplevel2 = null;
|
|
Toplevel? toplevel3 = null;
|
|
|
|
try
|
|
{
|
|
toplevel1 = new ();
|
|
toplevel2 = new ();
|
|
toplevel3 = new ();
|
|
|
|
Assert.Empty (toplevel1.Id);
|
|
Assert.Empty (toplevel2.Id);
|
|
Assert.Empty (toplevel3.Id);
|
|
|
|
app.Begin (toplevel1);
|
|
app.Begin (toplevel2);
|
|
app.Begin (toplevel3);
|
|
|
|
Assert.NotEmpty (toplevel1.Id);
|
|
Assert.NotEmpty (toplevel2.Id);
|
|
Assert.NotEmpty (toplevel3.Id);
|
|
|
|
// IDs should be unique
|
|
Assert.NotEqual (toplevel1.Id, toplevel2.Id);
|
|
Assert.NotEqual (toplevel2.Id, toplevel3.Id);
|
|
Assert.NotEqual (toplevel1.Id, toplevel3.Id);
|
|
}
|
|
finally
|
|
{
|
|
toplevel1?.Dispose ();
|
|
toplevel2?.Dispose ();
|
|
toplevel3?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void End_WithNullSessionToken_ThrowsArgumentNullException ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
|
|
try
|
|
{
|
|
Assert.Throws<ArgumentNullException> (() => app.End ((SessionToken)null!));
|
|
}
|
|
finally
|
|
{
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void End_PopsSessionStack ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel1 = null;
|
|
Toplevel? toplevel2 = null;
|
|
|
|
try
|
|
{
|
|
toplevel1 = new () { Id = "1" };
|
|
toplevel2 = new () { Id = "2" };
|
|
|
|
SessionToken token1 = app.Begin (toplevel1);
|
|
SessionToken token2 = app.Begin (toplevel2);
|
|
|
|
Assert.Equal (2, app.SessionStack.Count);
|
|
|
|
app.End (token2);
|
|
|
|
Assert.Single (app.SessionStack);
|
|
Assert.Same (toplevel1, app.TopRunnable);
|
|
|
|
app.End (token1);
|
|
|
|
Assert.Empty (app.SessionStack);
|
|
}
|
|
finally
|
|
{
|
|
toplevel1?.Dispose ();
|
|
toplevel2?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void End_ThrowsArgumentException_WhenNotBalanced ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel1 = null;
|
|
Toplevel? toplevel2 = null;
|
|
|
|
try
|
|
{
|
|
toplevel1 = new () { Id = "1" };
|
|
toplevel2 = new () { Id = "2" };
|
|
|
|
SessionToken token1 = app.Begin (toplevel1);
|
|
SessionToken token2 = app.Begin (toplevel2);
|
|
|
|
// Trying to end token1 when token2 is on top should throw
|
|
// NOTE: This throws but has the side effect of popping token2 from the stack
|
|
Assert.Throws<ArgumentException> (() => app.End (token1));
|
|
|
|
// Don't try to clean up with more End calls - the state is now inconsistent
|
|
// Let Shutdown/ResetState handle cleanup
|
|
}
|
|
finally
|
|
{
|
|
// Dispose toplevels BEFORE Shutdown to satisfy DEBUG_IDISPOSABLE assertions
|
|
toplevel1?.Dispose ();
|
|
toplevel2?.Dispose ();
|
|
|
|
// Shutdown will call ResetState which clears any remaining state
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void End_RestoresCurrentToPreviousToplevel ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel1 = null;
|
|
Toplevel? toplevel2 = null;
|
|
Toplevel? toplevel3 = null;
|
|
|
|
try
|
|
{
|
|
toplevel1 = new () { Id = "1" };
|
|
toplevel2 = new () { Id = "2" };
|
|
toplevel3 = new () { Id = "3" };
|
|
|
|
SessionToken token1 = app.Begin (toplevel1);
|
|
SessionToken token2 = app.Begin (toplevel2);
|
|
SessionToken token3 = app.Begin (toplevel3);
|
|
|
|
Assert.Same (toplevel3, app.TopRunnable);
|
|
|
|
app.End (token3);
|
|
Assert.Same (toplevel2, app.TopRunnable);
|
|
|
|
app.End (token2);
|
|
Assert.Same (toplevel1, app.TopRunnable);
|
|
|
|
app.End (token1);
|
|
}
|
|
finally
|
|
{
|
|
toplevel1?.Dispose ();
|
|
toplevel2?.Dispose ();
|
|
toplevel3?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void MultipleBeginEnd_MaintainsStackIntegrity ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
List<Toplevel> toplevels = new ();
|
|
List<SessionToken> tokens = new ();
|
|
|
|
try
|
|
{
|
|
// Begin multiple toplevels
|
|
for (var i = 0; i < 5; i++)
|
|
{
|
|
var toplevel = new Toplevel { Id = $"toplevel-{i}" };
|
|
toplevels.Add (toplevel);
|
|
tokens.Add (app.Begin (toplevel));
|
|
}
|
|
|
|
Assert.Equal (5, app.SessionStack.Count);
|
|
Assert.Same (toplevels [4], app.TopRunnable);
|
|
|
|
// End them in reverse order (LIFO)
|
|
for (var i = 4; i >= 0; i--)
|
|
{
|
|
app.End (tokens [i]);
|
|
|
|
if (i > 0)
|
|
{
|
|
Assert.Equal (i, app.SessionStack.Count);
|
|
Assert.Same (toplevels [i - 1], app.TopRunnable);
|
|
}
|
|
else
|
|
{
|
|
Assert.Empty (app.SessionStack);
|
|
}
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
foreach (Toplevel toplevel in toplevels)
|
|
{
|
|
toplevel.Dispose ();
|
|
}
|
|
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void End_UpdatesCachedSessionTokenToplevel ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel = null;
|
|
|
|
try
|
|
{
|
|
toplevel = new ();
|
|
|
|
SessionToken token = app.Begin (toplevel);
|
|
Assert.Null (app.CachedSessionTokenToplevel);
|
|
|
|
app.End (token);
|
|
|
|
Assert.Same (toplevel, app.CachedSessionTokenToplevel);
|
|
}
|
|
finally
|
|
{
|
|
toplevel?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void End_NullsSessionTokenToplevel ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel = null;
|
|
|
|
try
|
|
{
|
|
toplevel = new ();
|
|
|
|
SessionToken token = app.Begin (toplevel);
|
|
Assert.Same (toplevel, token.Toplevel);
|
|
|
|
app.End (token);
|
|
|
|
Assert.Null (token.Toplevel);
|
|
}
|
|
finally
|
|
{
|
|
toplevel?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void ResetState_ClearsSessionStack ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel1 = null;
|
|
Toplevel? toplevel2 = null;
|
|
|
|
try
|
|
{
|
|
toplevel1 = new () { Id = "1" };
|
|
toplevel2 = new () { Id = "2" };
|
|
|
|
app.Begin (toplevel1);
|
|
app.Begin (toplevel2);
|
|
|
|
Assert.Equal (2, app.SessionStack.Count);
|
|
Assert.NotNull (app.TopRunnable);
|
|
}
|
|
finally
|
|
{
|
|
// Dispose toplevels BEFORE Shutdown to satisfy DEBUG_IDISPOSABLE assertions
|
|
toplevel1?.Dispose ();
|
|
toplevel2?.Dispose ();
|
|
|
|
// Shutdown calls ResetState, which will clear SessionStack and set Current to null
|
|
app.Shutdown ();
|
|
|
|
// Verify cleanup happened
|
|
Assert.Empty (app.SessionStack);
|
|
Assert.Null (app.TopRunnable);
|
|
Assert.Null (app.CachedSessionTokenToplevel);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void ResetState_StopsAllRunningToplevels ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel1 = null;
|
|
Toplevel? toplevel2 = null;
|
|
|
|
try
|
|
{
|
|
toplevel1 = new () { Id = "1", Running = true };
|
|
toplevel2 = new () { Id = "2", Running = true };
|
|
|
|
app.Begin (toplevel1);
|
|
app.Begin (toplevel2);
|
|
|
|
Assert.True (toplevel1.Running);
|
|
Assert.True (toplevel2.Running);
|
|
}
|
|
finally
|
|
{
|
|
// Dispose toplevels BEFORE Shutdown to satisfy DEBUG_IDISPOSABLE assertions
|
|
toplevel1?.Dispose ();
|
|
toplevel2?.Dispose ();
|
|
|
|
// Shutdown calls ResetState, which will stop all running toplevels
|
|
app.Shutdown ();
|
|
|
|
// Verify toplevels were stopped
|
|
Assert.False (toplevel1!.Running);
|
|
Assert.False (toplevel2!.Running);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Begin_ActivatesNewToplevel_WhenCurrentExists ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel1 = null;
|
|
Toplevel? toplevel2 = null;
|
|
|
|
try
|
|
{
|
|
toplevel1 = new () { Id = "1" };
|
|
toplevel2 = new () { Id = "2" };
|
|
|
|
var toplevel1Deactivated = false;
|
|
var toplevel2Activated = false;
|
|
|
|
toplevel1.Deactivate += (s, e) => toplevel1Deactivated = true;
|
|
toplevel2.Activate += (s, e) => toplevel2Activated = true;
|
|
|
|
app.Begin (toplevel1);
|
|
app.Begin (toplevel2);
|
|
|
|
Assert.True (toplevel1Deactivated);
|
|
Assert.True (toplevel2Activated);
|
|
Assert.Same (toplevel2, app.TopRunnable);
|
|
}
|
|
finally
|
|
{
|
|
toplevel1?.Dispose ();
|
|
toplevel2?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Begin_DoesNotDuplicateToplevel_WhenIdAlreadyExists ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
Toplevel? toplevel = null;
|
|
|
|
try
|
|
{
|
|
toplevel = new () { Id = "test-id" };
|
|
|
|
app.Begin (toplevel);
|
|
Assert.Single (app.SessionStack);
|
|
|
|
// Calling Begin again with same toplevel should not duplicate
|
|
app.Begin (toplevel);
|
|
Assert.Single (app.SessionStack);
|
|
}
|
|
finally
|
|
{
|
|
toplevel?.Dispose ();
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void SessionStack_ContainsAllBegunToplevels ()
|
|
{
|
|
IApplication app = NewApplicationImpl ();
|
|
List<Toplevel> toplevels = new ();
|
|
|
|
try
|
|
{
|
|
for (var i = 0; i < 10; i++)
|
|
{
|
|
var toplevel = new Toplevel { Id = $"toplevel-{i}" };
|
|
toplevels.Add (toplevel);
|
|
app.Begin (toplevel);
|
|
}
|
|
|
|
// All toplevels should be in the stack
|
|
Assert.Equal (10, app.SessionStack.Count);
|
|
|
|
// Verify stack contains all toplevels
|
|
List<Toplevel> stackList = app.SessionStack.ToList ();
|
|
|
|
foreach (Toplevel toplevel in toplevels)
|
|
{
|
|
Assert.Contains (toplevel, stackList);
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
foreach (Toplevel toplevel in toplevels)
|
|
{
|
|
toplevel.Dispose ();
|
|
}
|
|
|
|
app.Shutdown ();
|
|
}
|
|
}
|
|
}
|