mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +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>
587 lines
19 KiB
C#
587 lines
19 KiB
C#
#nullable enable
|
|
using System.Collections.Concurrent;
|
|
using System.Runtime.CompilerServices;
|
|
using Microsoft.Extensions.Logging;
|
|
using Moq;
|
|
using TerminalGuiFluentTesting;
|
|
|
|
namespace Terminal.Gui.ApplicationTests;
|
|
public class ApplicationImplTests
|
|
{
|
|
public ApplicationImplTests ()
|
|
{
|
|
ConsoleDriver.RunningUnitTests = true;
|
|
}
|
|
|
|
private ApplicationImpl NewApplicationImpl (TestDriver driver = TestDriver.DotNet)
|
|
{
|
|
|
|
if (driver == TestDriver.DotNet)
|
|
{
|
|
var netInput = new Mock<INetInput> ();
|
|
SetupRunInputMockMethodToBlock (netInput);
|
|
|
|
var m = new Mock<IComponentFactory<ConsoleKeyInfo>> ();
|
|
m.Setup (f => f.CreateInput ()).Returns (netInput.Object);
|
|
m.Setup (f => f.CreateInputProcessor (It.IsAny<ConcurrentQueue<ConsoleKeyInfo>> ())).Returns (Mock.Of <IInputProcessor> ());
|
|
m.Setup (f => f.CreateOutput ()).Returns (Mock.Of<IConsoleOutput> ());
|
|
m.Setup (f => f.CreateWindowSizeMonitor (It.IsAny<IConsoleOutput> (),It.IsAny<IOutputBuffer> ())).Returns (Mock.Of<IWindowSizeMonitor> ());
|
|
|
|
return new (m.Object);
|
|
}
|
|
else
|
|
{
|
|
|
|
var winInput = new Mock<IConsoleInput<WindowsConsole.InputRecord>> ();
|
|
SetupRunInputMockMethodToBlock (winInput);
|
|
var m = new Mock<IComponentFactory<WindowsConsole.InputRecord>> ();
|
|
m.Setup (f => f.CreateInput ()).Returns (winInput.Object);
|
|
m.Setup (f => f.CreateInputProcessor (It.IsAny<ConcurrentQueue<WindowsConsole.InputRecord>> ())).Returns (Mock.Of<IInputProcessor> ());
|
|
m.Setup (f => f.CreateOutput ()).Returns (Mock.Of<IConsoleOutput> ());
|
|
m.Setup (f => f.CreateWindowSizeMonitor (It.IsAny<IConsoleOutput> (), It.IsAny<IOutputBuffer> ())).Returns (Mock.Of<IWindowSizeMonitor> ());
|
|
return new (m.Object);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Init_CreatesKeybindings ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
Application.KeyBindings.Clear ();
|
|
|
|
Assert.Empty (Application.KeyBindings.GetBindings ());
|
|
|
|
v2.Init ();
|
|
|
|
Assert.NotEmpty (Application.KeyBindings.GetBindings ());
|
|
|
|
v2.Shutdown ();
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
|
|
[Fact]
|
|
public void Init_DriverIsFacade ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
Assert.Null (Application.Driver);
|
|
v2.Init ();
|
|
Assert.NotNull (Application.Driver);
|
|
|
|
var type = Application.Driver.GetType ();
|
|
Assert.True (type.IsGenericType);
|
|
Assert.True (type.GetGenericTypeDefinition () == typeof (ConsoleDriverFacade<>));
|
|
v2.Shutdown ();
|
|
|
|
Assert.Null (Application.Driver);
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
/*
|
|
[Fact]
|
|
public void Init_ExplicitlyRequestWin ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
Assert.Null (Application.Driver);
|
|
var netInput = new Mock<INetInput> (MockBehavior.Strict);
|
|
var netOutput = new Mock<IConsoleOutput> (MockBehavior.Strict);
|
|
var winInput = new Mock<IWindowsInput> (MockBehavior.Strict);
|
|
var winOutput = new Mock<IConsoleOutput> (MockBehavior.Strict);
|
|
|
|
winInput.Setup (i => i.Initialize (It.IsAny<ConcurrentQueue<WindowsConsole.InputRecord>> ()))
|
|
.Verifiable (Times.Once);
|
|
SetupRunInputMockMethodToBlock (winInput);
|
|
winInput.Setup (i => i.Dispose ())
|
|
.Verifiable (Times.Once);
|
|
winOutput.Setup (i => i.Dispose ())
|
|
.Verifiable (Times.Once);
|
|
|
|
var v2 = new ApplicationV2 (
|
|
() => netInput.Object,
|
|
() => netOutput.Object,
|
|
() => winInput.Object,
|
|
() => winOutput.Object);
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
Assert.Null (Application.Driver);
|
|
v2.Init (null, "v2win");
|
|
Assert.NotNull (Application.Driver);
|
|
|
|
var type = Application.Driver.GetType ();
|
|
Assert.True (type.IsGenericType);
|
|
Assert.True (type.GetGenericTypeDefinition () == typeof (ConsoleDriverFacade<>));
|
|
v2.Shutdown ();
|
|
|
|
Assert.Null (Application.Driver);
|
|
|
|
winInput.VerifyAll ();
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
|
|
[Fact]
|
|
public void Init_ExplicitlyRequestNet ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var netInput = new Mock<INetInput> (MockBehavior.Strict);
|
|
var netOutput = new Mock<IConsoleOutput> (MockBehavior.Strict);
|
|
var winInput = new Mock<IWindowsInput> (MockBehavior.Strict);
|
|
var winOutput = new Mock<IConsoleOutput> (MockBehavior.Strict);
|
|
|
|
netInput.Setup (i => i.Initialize (It.IsAny<ConcurrentQueue<ConsoleKeyInfo>> ()))
|
|
.Verifiable (Times.Once);
|
|
SetupRunInputMockMethodToBlock (netInput);
|
|
netInput.Setup (i => i.Dispose ())
|
|
.Verifiable (Times.Once);
|
|
netOutput.Setup (i => i.Dispose ())
|
|
.Verifiable (Times.Once);
|
|
var v2 = new ApplicationV2 (
|
|
() => netInput.Object,
|
|
() => netOutput.Object,
|
|
() => winInput.Object,
|
|
() => winOutput.Object);
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
Assert.Null (Application.Driver);
|
|
v2.Init (null, "v2net");
|
|
Assert.NotNull (Application.Driver);
|
|
|
|
var type = Application.Driver.GetType ();
|
|
Assert.True (type.IsGenericType);
|
|
Assert.True (type.GetGenericTypeDefinition () == typeof (ConsoleDriverFacade<>));
|
|
v2.Shutdown ();
|
|
|
|
Assert.Null (Application.Driver);
|
|
|
|
netInput.VerifyAll ();
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
*/
|
|
private void SetupRunInputMockMethodToBlock (Mock<IConsoleInput<WindowsConsole.InputRecord>> winInput)
|
|
{
|
|
winInput.Setup (r => r.Run (It.IsAny<CancellationToken> ()))
|
|
.Callback<CancellationToken> (token =>
|
|
{
|
|
// Simulate an infinite loop that checks for cancellation
|
|
while (!token.IsCancellationRequested)
|
|
{
|
|
// Perform the action that should repeat in the loop
|
|
// This could be some mock behavior or just an empty loop depending on the context
|
|
}
|
|
})
|
|
.Verifiable (Times.Once);
|
|
}
|
|
|
|
private void SetupRunInputMockMethodToBlock (Mock<INetInput> netInput)
|
|
{
|
|
netInput.Setup (r => r.Run (It.IsAny<CancellationToken> ()))
|
|
.Callback<CancellationToken> (token =>
|
|
{
|
|
// Simulate an infinite loop that checks for cancellation
|
|
while (!token.IsCancellationRequested)
|
|
{
|
|
// Perform the action that should repeat in the loop
|
|
// This could be some mock behavior or just an empty loop depending on the context
|
|
}
|
|
})
|
|
.Verifiable (Times.Once);
|
|
}
|
|
|
|
[Fact]
|
|
public void NoInitThrowOnRun ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
Assert.Null (Application.Driver);
|
|
var app = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (app);
|
|
|
|
var ex = Assert.Throws<NotInitializedException> (() => app.Run (new Window ()));
|
|
Assert.Equal ("Run cannot be accessed before Initialization", ex.Message);
|
|
app.Shutdown();
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
|
|
[Fact]
|
|
public void InitRunShutdown_Top_Set_To_Null_After_Shutdown ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
v2.Init ();
|
|
|
|
var timeoutToken = v2.AddTimeout (TimeSpan.FromMilliseconds (150),
|
|
() =>
|
|
{
|
|
if (Application.Top != null)
|
|
{
|
|
Application.RequestStop ();
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
);
|
|
Assert.Null (Application.Top);
|
|
|
|
// Blocks until the timeout call is hit
|
|
|
|
v2.Run (new Window ());
|
|
|
|
// We returned false above, so we should not have to remove the timeout
|
|
Assert.False(v2.RemoveTimeout (timeoutToken));
|
|
|
|
Assert.NotNull (Application.Top);
|
|
Application.Top?.Dispose ();
|
|
v2.Shutdown ();
|
|
Assert.Null (Application.Top);
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
|
|
[Fact]
|
|
public void InitRunShutdown_Running_Set_To_False ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
v2.Init ();
|
|
|
|
Toplevel top = new Window ()
|
|
{
|
|
Title = "InitRunShutdown_Running_Set_To_False"
|
|
};
|
|
var timeoutToken = v2.AddTimeout (TimeSpan.FromMilliseconds (150),
|
|
() =>
|
|
{
|
|
Assert.True (top!.Running);
|
|
if (Application.Top != null)
|
|
{
|
|
Application.RequestStop ();
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
Assert.False (top!.Running);
|
|
|
|
// Blocks until the timeout call is hit
|
|
v2.Run (top);
|
|
// We returned false above, so we should not have to remove the timeout
|
|
Assert.False (v2.RemoveTimeout (timeoutToken));
|
|
|
|
Assert.False (top!.Running);
|
|
|
|
// BUGBUG: Shutdown sets Top to null, not End.
|
|
//Assert.Null (Application.Top);
|
|
Application.Top?.Dispose ();
|
|
v2.Shutdown ();
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
|
|
[Fact]
|
|
public void InitRunShutdown_End_Is_Called ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
Assert.Null (Application.Top);
|
|
Assert.Null (Application.Driver);
|
|
|
|
v2.Init ();
|
|
|
|
Toplevel top = new Window ();
|
|
|
|
// BUGBUG: Both Closed and Unloaded are called from End; what's the difference?
|
|
int closedCount = 0;
|
|
top.Closed
|
|
+= (_, a) =>
|
|
{
|
|
closedCount++;
|
|
};
|
|
|
|
int unloadedCount = 0;
|
|
top.Unloaded
|
|
+= (_, a) =>
|
|
{
|
|
unloadedCount++;
|
|
};
|
|
|
|
var timeoutToken = v2.AddTimeout (TimeSpan.FromMilliseconds (150),
|
|
() =>
|
|
{
|
|
Assert.True (top!.Running);
|
|
if (Application.Top != null)
|
|
{
|
|
Application.RequestStop ();
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
Assert.Equal (0, closedCount);
|
|
Assert.Equal (0, unloadedCount);
|
|
|
|
// Blocks until the timeout call is hit
|
|
v2.Run (top);
|
|
|
|
Assert.Equal (1, closedCount);
|
|
Assert.Equal (1, unloadedCount);
|
|
|
|
// We returned false above, so we should not have to remove the timeout
|
|
Assert.False (v2.RemoveTimeout (timeoutToken));
|
|
|
|
Application.Top?.Dispose ();
|
|
v2.Shutdown ();
|
|
Assert.Equal (1, closedCount);
|
|
Assert.Equal (1, unloadedCount);
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
|
|
[Fact]
|
|
public void InitRunShutdown_QuitKey_Quits ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
v2.Init ();
|
|
|
|
Toplevel top = new Window ()
|
|
{
|
|
Title = "InitRunShutdown_QuitKey_Quits"
|
|
};
|
|
var timeoutToken = v2.AddTimeout (TimeSpan.FromMilliseconds (150),
|
|
() =>
|
|
{
|
|
Assert.True (top!.Running);
|
|
if (Application.Top != null)
|
|
{
|
|
Application.RaiseKeyDownEvent (Application.QuitKey);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
);
|
|
|
|
Assert.False (top!.Running);
|
|
|
|
// Blocks until the timeout call is hit
|
|
v2.Run (top);
|
|
|
|
// We returned false above, so we should not have to remove the timeout
|
|
Assert.False (v2.RemoveTimeout (timeoutToken));
|
|
|
|
Assert.False (top!.Running);
|
|
|
|
Assert.NotNull (Application.Top);
|
|
top.Dispose ();
|
|
v2.Shutdown ();
|
|
Assert.Null (Application.Top);
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
|
|
[Fact]
|
|
public void InitRunShutdown_Generic_IdleForExit ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
v2.Init ();
|
|
|
|
v2.AddTimeout (TimeSpan.Zero, IdleExit);
|
|
Assert.Null (Application.Top);
|
|
|
|
// Blocks until the timeout call is hit
|
|
|
|
v2.Run<Window> ();
|
|
|
|
Assert.NotNull (Application.Top);
|
|
Application.Top?.Dispose ();
|
|
v2.Shutdown ();
|
|
Assert.Null (Application.Top);
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
|
|
[Fact]
|
|
public void Shutdown_Closing_Closed_Raised ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
v2.Init ();
|
|
|
|
int closing = 0;
|
|
int closed = 0;
|
|
var t = new Toplevel ();
|
|
t.Closing
|
|
+= (_, a) =>
|
|
{
|
|
// Cancel the first time
|
|
if (closing == 0)
|
|
{
|
|
a.Cancel = true;
|
|
}
|
|
closing++;
|
|
Assert.Same (t, a.RequestingTop);
|
|
};
|
|
|
|
t.Closed
|
|
+= (_, a) =>
|
|
{
|
|
closed++;
|
|
Assert.Same (t, a.Toplevel);
|
|
};
|
|
|
|
v2.AddTimeout(TimeSpan.Zero, IdleExit);
|
|
|
|
// Blocks until the timeout call is hit
|
|
|
|
v2.Run (t);
|
|
|
|
Application.Top?.Dispose ();
|
|
v2.Shutdown ();
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
|
|
Assert.Equal (2, closing);
|
|
Assert.Equal (1, closed);
|
|
}
|
|
|
|
private bool IdleExit ()
|
|
{
|
|
if (Application.Top != null)
|
|
{
|
|
Application.RequestStop ();
|
|
return true;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
/*
|
|
[Fact]
|
|
public void Shutdown_Called_Repeatedly_DoNotDuplicateDisposeOutput ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var netInput = new Mock<INetInput> ();
|
|
SetupRunInputMockMethodToBlock (netInput);
|
|
Mock<IConsoleOutput>? outputMock = null;
|
|
|
|
|
|
var v2 = new ApplicationV2 (
|
|
() => netInput.Object,
|
|
() => (outputMock = new Mock<IConsoleOutput> ()).Object,
|
|
Mock.Of<IWindowsInput>,
|
|
Mock.Of<IConsoleOutput>);
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
v2.Init (null, "v2net");
|
|
|
|
|
|
v2.Shutdown ();
|
|
outputMock!.Verify (o => o.Dispose (), Times.Once);
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
}
|
|
*/
|
|
|
|
[Fact]
|
|
public void Open_Calls_ContinueWith_On_UIThread ()
|
|
{
|
|
var orig = ApplicationImpl.Instance;
|
|
|
|
var v2 = NewApplicationImpl ();
|
|
ApplicationImpl.ChangeInstance (v2);
|
|
|
|
v2.Init ();
|
|
var b = new Button ();
|
|
|
|
bool result = false;
|
|
|
|
b.Accepting +=
|
|
(_, _) =>
|
|
{
|
|
|
|
Task.Run (() =>
|
|
{
|
|
Task.Delay (300).Wait ();
|
|
}).ContinueWith (
|
|
(t, _) =>
|
|
{
|
|
// no longer loading
|
|
Application.Invoke (() =>
|
|
{
|
|
result = true;
|
|
Application.RequestStop ();
|
|
});
|
|
},
|
|
TaskScheduler.FromCurrentSynchronizationContext ());
|
|
};
|
|
|
|
v2.AddTimeout (TimeSpan.FromMilliseconds (150),
|
|
() =>
|
|
{
|
|
// Run asynchronous logic inside Task.Run
|
|
if (Application.Top != null)
|
|
{
|
|
b.NewKeyDownEvent (Key.Enter);
|
|
b.NewKeyUpEvent (Key.Enter);
|
|
}
|
|
|
|
return false;
|
|
});
|
|
|
|
Assert.Null (Application.Top);
|
|
|
|
var w = new Window ()
|
|
{
|
|
Title = "Open_CallsContinueWithOnUIThread"
|
|
};
|
|
w.Add (b);
|
|
|
|
// Blocks until the timeout call is hit
|
|
v2.Run (w);
|
|
|
|
Assert.NotNull (Application.Top);
|
|
Application.Top?.Dispose ();
|
|
v2.Shutdown ();
|
|
Assert.Null (Application.Top);
|
|
|
|
ApplicationImpl.ChangeInstance (orig);
|
|
|
|
Assert.True (result);
|
|
}
|
|
}
|