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>
933 lines
31 KiB
C#
933 lines
31 KiB
C#
#nullable enable
|
||
using System.Text;
|
||
using UnitTests;
|
||
using Xunit.Abstractions;
|
||
|
||
namespace Terminal.Gui.ViewTests;
|
||
|
||
[Trait ("Category", "Output")]
|
||
public class DrawTests (ITestOutputHelper output)
|
||
{
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
[Trait ("Category", "Unicode")]
|
||
public void CJK_Compatibility_Ideographs_ConsoleWidth_ColumnWidth_Equal_Two ()
|
||
{
|
||
const string us = "\U0000f900";
|
||
var r = (Rune)0xf900;
|
||
|
||
Assert.Equal ("豈", us);
|
||
Assert.Equal ("豈", r.ToString ());
|
||
Assert.Equal (us, r.ToString ());
|
||
|
||
Assert.Equal (2, us.GetColumns ());
|
||
Assert.Equal (2, r.GetColumns ());
|
||
|
||
var win = new Window { Title = us };
|
||
var view = new View { Text = r.ToString (), Height = Dim.Fill (), Width = Dim.Fill () };
|
||
var tf = new TextField { Text = us, Y = 1, Width = 3 };
|
||
win.Add (view, tf);
|
||
Toplevel top = new ();
|
||
top.Add (win);
|
||
|
||
Application.Begin (top);
|
||
AutoInitShutdownAttribute.FakeResize(new Size(10, 4)) ;
|
||
|
||
const string expectedOutput = """
|
||
|
||
┌┤豈├────┐
|
||
│豈 │
|
||
│豈 │
|
||
└────────┘
|
||
""";
|
||
DriverAssert.AssertDriverContentsWithFrameAre (expectedOutput, output);
|
||
|
||
DriverAssert.AssertDriverContentsAre (expectedOutput, output);
|
||
|
||
// This test has nothing to do with color - removing as it is not relevant and fragile
|
||
top.Dispose ();
|
||
}
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
[Trait ("Category", "Output")]
|
||
public void Colors_On_TextAlignment_Right_And_Bottom ()
|
||
{
|
||
var viewRight = new View
|
||
{
|
||
Text = "Test",
|
||
Width = 6,
|
||
Height = 1,
|
||
TextAlignment = Alignment.End,
|
||
};
|
||
|
||
var viewBottom = new View
|
||
{
|
||
Text = "Test",
|
||
TextDirection = TextDirection.TopBottom_LeftRight,
|
||
Y = 1,
|
||
Width = 1,
|
||
Height = 6,
|
||
VerticalTextAlignment = Alignment.End,
|
||
};
|
||
Toplevel top = new ();
|
||
top.Add (viewRight, viewBottom);
|
||
|
||
var rs = Application.Begin (top);
|
||
AutoInitShutdownAttribute.FakeResize(new Size(7, 7));
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
Test
|
||
|
||
|
||
T
|
||
e
|
||
s
|
||
t
|
||
""",
|
||
output
|
||
);
|
||
|
||
DriverAssert.AssertDriverAttributesAre (
|
||
"""
|
||
|
||
000000
|
||
0
|
||
0
|
||
0
|
||
0
|
||
0
|
||
0
|
||
""",
|
||
output,
|
||
Application.Driver,
|
||
SchemeManager.GetSchemes () ["Base"]!.Normal
|
||
);
|
||
top.Dispose ();
|
||
}
|
||
|
||
[Fact]
|
||
[SetupFakeDriver]
|
||
public void Draw_Minimum_Full_Border_With_Empty_Viewport ()
|
||
{
|
||
var view = new View { Width = 2, Height = 2, BorderStyle = LineStyle.Single };
|
||
Assert.True (view.NeedsLayout);
|
||
Assert.True (view.NeedsDraw);
|
||
view.Layout ();
|
||
|
||
Assert.Equal (new (0, 0, 2, 2), view.Frame);
|
||
Assert.Equal (Rectangle.Empty, view.Viewport);
|
||
|
||
Assert.True (view.NeedsDraw);
|
||
view.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
┌┐
|
||
└┘
|
||
""",
|
||
output
|
||
);
|
||
}
|
||
|
||
[Fact]
|
||
[SetupFakeDriver]
|
||
public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Bottom ()
|
||
{
|
||
var view = new View { Width = 2, Height = 1, BorderStyle = LineStyle.Single };
|
||
view.Border!.Thickness = new (1, 1, 1, 0);
|
||
view.BeginInit ();
|
||
view.EndInit ();
|
||
view.SetRelativeLayout (Application.Screen.Size);
|
||
|
||
Assert.Equal (new (0, 0, 2, 1), view.Frame);
|
||
Assert.Equal (Rectangle.Empty, view.Viewport);
|
||
|
||
view.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre ("──", output);
|
||
}
|
||
|
||
[Fact]
|
||
[SetupFakeDriver]
|
||
public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Left ()
|
||
{
|
||
var view = new View { Width = 1, Height = 2, BorderStyle = LineStyle.Single };
|
||
view.Border!.Thickness = new (0, 1, 1, 1);
|
||
view.BeginInit ();
|
||
view.EndInit ();
|
||
view.SetRelativeLayout (Application.Screen.Size);
|
||
|
||
Assert.Equal (new (0, 0, 1, 2), view.Frame);
|
||
Assert.Equal (Rectangle.Empty, view.Viewport);
|
||
|
||
view.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
│
|
||
│
|
||
""",
|
||
output
|
||
);
|
||
}
|
||
|
||
[Fact]
|
||
[SetupFakeDriver]
|
||
public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Right ()
|
||
{
|
||
var view = new View { Width = 1, Height = 2, BorderStyle = LineStyle.Single };
|
||
view.Border!.Thickness = new (1, 1, 0, 1);
|
||
view.BeginInit ();
|
||
view.EndInit ();
|
||
view.SetRelativeLayout (Application.Screen.Size);
|
||
|
||
Assert.Equal (new (0, 0, 1, 2), view.Frame);
|
||
Assert.Equal (Rectangle.Empty, view.Viewport);
|
||
|
||
view.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
│
|
||
│
|
||
""",
|
||
output
|
||
);
|
||
}
|
||
|
||
[Fact]
|
||
[SetupFakeDriver]
|
||
public void Draw_Minimum_Full_Border_With_Empty_Viewport_Without_Top ()
|
||
{
|
||
var view = new View { Width = 2, Height = 1, BorderStyle = LineStyle.Single };
|
||
view.Border!.Thickness = new (1, 0, 1, 1);
|
||
|
||
view.BeginInit ();
|
||
view.EndInit ();
|
||
view.SetRelativeLayout (Application.Screen.Size);
|
||
|
||
Assert.Equal (new (0, 0, 2, 1), view.Frame);
|
||
Assert.Equal (Rectangle.Empty, view.Viewport);
|
||
|
||
view.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"││",
|
||
output
|
||
);
|
||
}
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
public void Draw_Negative_Viewport_Horizontal_With_New_Lines ()
|
||
{
|
||
var subView = new View
|
||
{
|
||
Id = "subView",
|
||
X = 1,
|
||
Width = 1,
|
||
Height = 7,
|
||
Text = """
|
||
s
|
||
u
|
||
b
|
||
V
|
||
i
|
||
e
|
||
w
|
||
"""
|
||
};
|
||
|
||
var view = new View
|
||
{
|
||
Id = "view", Width = 2, Height = 20, Text = """
|
||
0
|
||
1
|
||
2
|
||
3
|
||
4
|
||
5
|
||
6
|
||
7
|
||
8
|
||
9
|
||
0
|
||
1
|
||
2
|
||
3
|
||
4
|
||
5
|
||
6
|
||
7
|
||
8
|
||
9
|
||
"""
|
||
};
|
||
view.Add (subView);
|
||
var content = new View { Id = "content", Width = 20, Height = 20 };
|
||
content.Add (view);
|
||
|
||
var container = new View
|
||
{
|
||
Id = "container",
|
||
X = 1,
|
||
Y = 1,
|
||
Width = 5,
|
||
Height = 5
|
||
};
|
||
container.Add (content);
|
||
Toplevel top = new ();
|
||
top.Add (container);
|
||
var rs = Application.Begin (top);
|
||
|
||
top.Draw ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
0s
|
||
1u
|
||
2b
|
||
3V
|
||
4i
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.X = -1;
|
||
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
s
|
||
u
|
||
b
|
||
V
|
||
i
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.X = -2;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre (@"", output);
|
||
|
||
content.X = 0;
|
||
content.Y = -1;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
1u
|
||
2b
|
||
3V
|
||
4i
|
||
5e
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.Y = -6;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
6w
|
||
7
|
||
8
|
||
9
|
||
0
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.Y = -19;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
9
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.Y = -20;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre ("", output);
|
||
|
||
content.X = -2;
|
||
content.Y = 0;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre ("", output);
|
||
top.Dispose ();
|
||
}
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
public void Draw_Negative_Viewport_Horizontal_Without_New_Lines ()
|
||
{
|
||
// BUGBUG: This previously assumed the default height of a View was 1.
|
||
var subView = new View
|
||
{
|
||
Id = "subView",
|
||
Y = 1,
|
||
Width = 7,
|
||
Height = 1,
|
||
Text = "subView"
|
||
};
|
||
var view = new View { Id = "view", Width = 20, Height = 2, Text = "01234567890123456789" };
|
||
view.Add (subView);
|
||
var content = new View { Id = "content", Width = 20, Height = 20 };
|
||
content.Add (view);
|
||
|
||
var container = new View
|
||
{
|
||
Id = "container",
|
||
X = 1,
|
||
Y = 1,
|
||
Width = 5,
|
||
Height = 5
|
||
};
|
||
container.Add (content);
|
||
Toplevel top = new ();
|
||
top.Add (container);
|
||
|
||
// BUGBUG: v2 - it's bogus to reference .Frame before BeginInit. And why is the clip being set anyway???
|
||
|
||
top.SubViewsLaidOut += Top_LayoutComplete;
|
||
Application.Begin (top);
|
||
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
01234
|
||
subVi
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.X = -1;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
12345
|
||
ubVie
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.Y = -1;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
ubVie
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.Y = -2;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre ("", output);
|
||
|
||
content.X = -20;
|
||
content.Y = 0;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre ("", output);
|
||
top.Dispose ();
|
||
|
||
return;
|
||
|
||
void Top_LayoutComplete (object? sender, LayoutEventArgs e) { Application.Driver!.Clip = new (container.Frame); }
|
||
}
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
public void Draw_Negative_Viewport_Vertical ()
|
||
{
|
||
var subView = new View
|
||
{
|
||
Id = "subView",
|
||
X = 1,
|
||
Width = 1,
|
||
Height = 7,
|
||
Text = "subView",
|
||
TextDirection = TextDirection.TopBottom_LeftRight
|
||
};
|
||
|
||
var view = new View
|
||
{
|
||
Id = "view",
|
||
Width = 2,
|
||
Height = 20,
|
||
Text = "01234567890123456789",
|
||
TextDirection = TextDirection.TopBottom_LeftRight
|
||
};
|
||
view.Add (subView);
|
||
var content = new View { Id = "content", Width = 20, Height = 20 };
|
||
content.Add (view);
|
||
|
||
var container = new View
|
||
{
|
||
Id = "container",
|
||
X = 1,
|
||
Y = 1,
|
||
Width = 5,
|
||
Height = 5
|
||
};
|
||
container.Add (content);
|
||
Toplevel top = new ();
|
||
top.Add (container);
|
||
Application.Begin (top);
|
||
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
0s
|
||
1u
|
||
2b
|
||
3V
|
||
4i
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.X = -1;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
s
|
||
u
|
||
b
|
||
V
|
||
i
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.X = -2;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre (@"", output);
|
||
|
||
content.X = 0;
|
||
content.Y = -1;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
1u
|
||
2b
|
||
3V
|
||
4i
|
||
5e
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.Y = -6;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
6w
|
||
7
|
||
8
|
||
9
|
||
0
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.Y = -19;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
"""
|
||
|
||
9
|
||
""",
|
||
output
|
||
);
|
||
|
||
content.Y = -20;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre ("", output);
|
||
|
||
content.X = -2;
|
||
content.Y = 0;
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
DriverAssert.AssertDriverContentsWithFrameAre ("", output);
|
||
top.Dispose ();
|
||
}
|
||
|
||
[Theory]
|
||
[SetupFakeDriver]
|
||
[InlineData ("𝔽𝕆𝕆𝔹𝔸R")]
|
||
[InlineData ("a𐐀b")]
|
||
public void DrawHotString_NonBmp (string expected)
|
||
{
|
||
var view = new View { Width = 10, Height = 1 };
|
||
view.DrawHotString (expected, Attribute.Default, Attribute.Default);
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
|
||
}
|
||
|
||
// TODO: The tests below that use Label should use View instead.
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
public void Non_Bmp_ConsoleWidth_ColumnWidth_Equal_Two ()
|
||
{
|
||
var us = "\U0001d539";
|
||
var r = (Rune)0x1d539;
|
||
|
||
Assert.Equal ("𝔹", us);
|
||
Assert.Equal ("𝔹", r.ToString ());
|
||
Assert.Equal (us, r.ToString ());
|
||
|
||
Assert.Equal (1, us.GetColumns ());
|
||
Assert.Equal (1, r.GetColumns ());
|
||
|
||
var win = new Window { Title = us };
|
||
var view = new Label { Text = r.ToString () };
|
||
var tf = new TextField { Text = us, Y = 1, Width = 3 };
|
||
win.Add (view, tf);
|
||
Toplevel top = new ();
|
||
top.Add (win);
|
||
|
||
Application.Begin (top);
|
||
AutoInitShutdownAttribute.FakeResize(new Size(10, 4));
|
||
|
||
|
||
var expected = """
|
||
|
||
┌┤𝔹├─────┐
|
||
│𝔹 │
|
||
│𝔹 │
|
||
└────────┘
|
||
""";
|
||
DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
|
||
|
||
DriverAssert.AssertDriverContentsAre (expected, output);
|
||
top.Dispose ();
|
||
|
||
// This test has nothing to do with color - removing as it is not relevant and fragile
|
||
}
|
||
|
||
[Fact]
|
||
[TestRespondersDisposed]
|
||
public void Draw_Throws_IndexOutOfRangeException_With_Negative_Bounds ()
|
||
{
|
||
Application.Init (new FakeDriver ());
|
||
|
||
Toplevel top = new ();
|
||
|
||
var view = new View { X = -2, Text = "view" };
|
||
top.Add (view);
|
||
|
||
Application.Iteration += (s, a) =>
|
||
{
|
||
Assert.Equal (-2, view.X);
|
||
|
||
Application.RequestStop ();
|
||
};
|
||
|
||
try
|
||
{
|
||
Application.Run (top);
|
||
}
|
||
catch (IndexOutOfRangeException ex)
|
||
{
|
||
// After the fix this exception will not be caught.
|
||
Assert.IsType<IndexOutOfRangeException> (ex);
|
||
}
|
||
|
||
top.Dispose ();
|
||
|
||
// Shutdown must be called to safely clean up Application if Init has been called
|
||
Application.Shutdown ();
|
||
}
|
||
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
public void Correct_Redraw_Viewport_NeedDisplay_On_Shrink_And_Move_Down_Right_Using_Frame ()
|
||
{
|
||
var label = new Label { Text = "At 0,0" };
|
||
|
||
var view = new DerivedView
|
||
{
|
||
X = 2,
|
||
Y = 2,
|
||
Width = 30,
|
||
Height = 2,
|
||
Text = "A text with some long width\n and also with two lines."
|
||
};
|
||
Toplevel top = new ();
|
||
top.Add (label, view);
|
||
RunState runState = Application.Begin (top);
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
@"
|
||
At 0,0
|
||
|
||
A text with some long width
|
||
and also with two lines. "
|
||
,
|
||
output
|
||
);
|
||
|
||
view.Frame = new (3, 3, 10, 1);
|
||
Assert.Equal (new (3, 3, 10, 1), view.Frame);
|
||
Assert.Equal (new (0, 0, 10, 1), view.Viewport);
|
||
Assert.Equal (new (0, 0, 10, 1), view.NeedsDrawRect);
|
||
//Application.Refresh();
|
||
top.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
@"
|
||
At 0,0
|
||
|
||
|
||
A text wit",
|
||
output
|
||
);
|
||
Application.End (runState);
|
||
top.Dispose ();
|
||
}
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
public void Correct_Redraw_Viewport_NeedDisplay_On_Shrink_And_Move_Down_Right_Using_Pos_Dim ()
|
||
{
|
||
var label = new Label { Text = "At 0,0" };
|
||
|
||
var view = new DerivedView
|
||
{
|
||
X = 2,
|
||
Y = 2,
|
||
Width = 30,
|
||
Height = 2,
|
||
Text = "A text with some long width\n and also with two lines."
|
||
};
|
||
Toplevel top = new ();
|
||
top.Add (label, view);
|
||
RunState runState = Application.Begin (top);
|
||
|
||
top.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
@"
|
||
At 0,0
|
||
|
||
A text with some long width
|
||
and also with two lines. "
|
||
,
|
||
output
|
||
);
|
||
|
||
view.X = 3;
|
||
view.Y = 3;
|
||
view.Width = 10;
|
||
view.Height = 1;
|
||
Assert.Equal (new (3, 3, 10, 1), view.Frame);
|
||
Assert.Equal (new (0, 0, 10, 1), view.Viewport);
|
||
Assert.Equal (new (0, 0, 10, 1), view.NeedsDrawRect);
|
||
View.SetClipToScreen ();
|
||
top.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
@"
|
||
At 0,0
|
||
|
||
|
||
A text wit"
|
||
,
|
||
output
|
||
);
|
||
Application.End (runState);
|
||
top.Dispose ();
|
||
}
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
public void Correct_Redraw_Viewport_NeedDisplay_On_Shrink_And_Move_Up_Left_Using_Frame ()
|
||
{
|
||
var label = new Label { Text = "At 0,0" };
|
||
|
||
var view = new DerivedView
|
||
{
|
||
X = 2,
|
||
Y = 2,
|
||
Width = 30,
|
||
Height = 2,
|
||
Text = "A text with some long width\n and also with two lines."
|
||
};
|
||
Toplevel top = new ();
|
||
top.Add (label, view);
|
||
RunState runState = Application.Begin (top);
|
||
AutoInitShutdownAttribute.RunIteration ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
@"
|
||
At 0,0
|
||
|
||
A text with some long width
|
||
and also with two lines. "
|
||
,
|
||
output
|
||
);
|
||
|
||
view.Frame = new (1, 1, 10, 1);
|
||
Assert.Equal (new (1, 1, 10, 1), view.Frame);
|
||
Assert.Equal (new (0, 0, 10, 1), view.Viewport);
|
||
Assert.Equal (new (0, 0, 10, 1), view.NeedsDrawRect);
|
||
top.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
@"
|
||
At 0,0
|
||
A text wit"
|
||
,
|
||
output
|
||
);
|
||
Application.End (runState);
|
||
top.Dispose ();
|
||
}
|
||
|
||
[Fact]
|
||
[AutoInitShutdown]
|
||
public void Correct_Redraw_Viewport_NeedDisplay_On_Shrink_And_Move_Up_Left_Using_Pos_Dim ()
|
||
{
|
||
var label = new Label { Text = "At 0,0" };
|
||
|
||
var view = new DerivedView
|
||
{
|
||
X = 2,
|
||
Y = 2,
|
||
Width = 30,
|
||
Height = 2,
|
||
Text = "A text with some long width\n and also with two lines."
|
||
};
|
||
Toplevel top = new ();
|
||
top.Add (label, view);
|
||
RunState runState = Application.Begin (top);
|
||
|
||
top.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
@"
|
||
At 0,0
|
||
|
||
A text with some long width
|
||
and also with two lines. "
|
||
,
|
||
output
|
||
);
|
||
|
||
view.X = 1;
|
||
view.Y = 1;
|
||
view.Width = 10;
|
||
view.Height = 1;
|
||
Assert.Equal (new (1, 1, 10, 1), view.Frame);
|
||
Assert.Equal (new (0, 0, 10, 1), view.Viewport);
|
||
Assert.Equal (new (0, 0, 10, 1), view.NeedsDrawRect);
|
||
View.SetClipToScreen ();
|
||
|
||
top.Draw ();
|
||
|
||
DriverAssert.AssertDriverContentsWithFrameAre (
|
||
@"
|
||
At 0,0
|
||
A text wit"
|
||
,
|
||
output
|
||
);
|
||
Application.End (runState);
|
||
top.Dispose ();
|
||
}
|
||
public class DerivedView : View
|
||
{
|
||
public DerivedView () { CanFocus = true; }
|
||
public bool IsKeyDown { get; set; }
|
||
public bool IsKeyPress { get; set; }
|
||
public bool IsKeyUp { get; set; }
|
||
public override string Text { get; set; } = null!;
|
||
|
||
protected override bool OnDrawingContent ()
|
||
{
|
||
var idx = 0;
|
||
|
||
// BUGBUG: v2 - this should use Viewport, not Frame
|
||
for (var r = 0; r < Frame.Height; r++)
|
||
{
|
||
for (var c = 0; c < Frame.Width; c++)
|
||
{
|
||
if (idx < Text.Length)
|
||
{
|
||
char rune = Text [idx];
|
||
|
||
if (rune != '\n')
|
||
{
|
||
AddRune (c, r, (Rune)Text [idx]);
|
||
}
|
||
|
||
idx++;
|
||
|
||
if (rune == '\n')
|
||
{
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
ClearNeedsDraw ();
|
||
|
||
return true;
|
||
}
|
||
|
||
protected override bool OnKeyDown (Key keyEvent)
|
||
{
|
||
IsKeyDown = true;
|
||
|
||
return true;
|
||
}
|
||
|
||
public override bool OnKeyUp (Key keyEvent)
|
||
{
|
||
IsKeyUp = true;
|
||
|
||
return true;
|
||
}
|
||
|
||
protected override bool OnKeyDownNotHandled (Key keyEvent)
|
||
{
|
||
IsKeyPress = true;
|
||
|
||
return true;
|
||
}
|
||
}
|
||
}
|