mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-27 00:07:58 +01:00
e6a0ec64ca
* Initial plan * Add ScreenChanged event, SetScreenSize method, and fix FakeDriver buffer initialization Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add comprehensive tests for ScreenChanged event and buffer integrity Co-authored-by: tig <585482+tig@users.noreply.github.com> * Replace obsolete SizeChanged usage with ScreenChanged in core and tests Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor terminal size event handling Replaced `ScreenChanged` with `SizeChanged` across the codebase to standardize naming and improve clarity. Updated event handling logic, including subscriptions, unsubscriptions, and raising methods. Removed deprecated `ScreenChanged` event and backward compatibility code. Refactored driver initialization to handle legacy `IConsoleDriver` types separately. Updated tests and mock implementations to align with the new `SizeChanged` event. Improved documentation and comments to reflect these changes. These updates enhance maintainability, consistency, and modernize the architecture. * Refactor & Code Cleanup: Replace IWindowSizeMonitor with IConsoleSizeMonitor Renamed `IWindowSizeMonitor` to `IConsoleSizeMonitor` across the codebase, updating all references, method signatures, and event handlers. Replaced the `WindowSizeMonitor` class with the new `ConsoleSizeMonitor` implementation, which includes improved terminal size change handling via the `Poll` method. Enabled nullable reference types in several files to enhance code safety. Updated test cases to reflect the new `IConsoleSizeMonitor` interface. Removed redundant code, simplified null checks, and corrected minor typos in comments. Streamlined the codebase by removing the obsolete `WindowSizeMonitor` class and its interface. * Code cleanup - Refactor and enhance ShadowView and FakeDriverTests Updated ShadowView.cs to use null-conditional operators and added null checks for safer access to `ScreenContents`. Refined XML documentation in View.Layout.cs for clarity and consistency. Refactored FakeDriverTests.cs to leverage modern C# features, including shorthand object instantiation, inline lambdas, and tuple-like syntax for `Size` and `Rectangle`. Removed redundant tests and improved test readability and reliability. Enhanced error handling with null checks and ensured backward compatibility for deprecated events. Improved test coverage for resizing, clipboard operations, and invalid coordinates. Verified buffer integrity and screen updates after resizing. General improvements include replacing explicit type declarations with `var`, removing unused imports, and aligning code formatting for better readability. Refactor and improve code quality and test coverage Updated `ShadowView` for null safety using null-conditional operators. Simplified object initializations and modernized syntax across the codebase, including shorthand initializations and inline lambdas. Enhanced event handling logic and ensured compatibility with obsolete members. Refactored `FakeDriverTests` by removing redundant code, standardizing formatting, and improving test setup. Suppressed obsolete warnings where necessary. Improved XML documentation in `View.Layout.cs` for clarity and removed outdated references. Performed general cleanup, including removing unused namespaces, redundant comments, and ensuring consistent formatting. These changes enhance readability, maintainability, and runtime safety. * Code cleanup Refactor TimedEventsTests for readability and consistency Improved code readability and maintainability: - Enabled nullable reference types with `#nullable enable`. - Removed unused `using System.Diagnostics;`. - Updated namespace to `UnitTests.ApplicationTests`. - Replaced `Terminal.Gui.App.TimedEvents` with `TimedEvents`. - Reformatted XML documentation comments for alignment. - Used `var` and target-typed new expressions for consistency. - Reformatted `Parallel.For` loops and lambdas for clarity. - Added `Thread.Sleep(10)` to prevent excessive CPU usage in tests. - Improved assertions and event handler formatting in tests. Aligned with modern C# coding practices. * Code Cleanup - No more driver warnings. Refactor codebase and introduce FakeClipboard - Adjusted `.editorconfig` to change severity levels for CS0612, CS0618, and CS0672 diagnostics. - Replaced `FakeDriver.FakeClipboard` with a new `FakeClipboard` class for testing purposes, supporting exception handling and clipboard data manipulation. - Removed redundant methods (`MakeColor`, `MapKey`) and unused classes (`MockConsoleDriver`) to streamline the codebase. - Refactored `ConsoleDriverFacade` and `FakeDriver` to simplify logic and improve maintainability. - Updated tests to use `CreateFakeDriver` and removed or commented out obsolete tests. - Reformatted and cleaned up code for readability across multiple files. * Refactor FakeDriver - Code Cleanup Standardized console size management by replacing `WindowSizeMonitor` with `ConsoleSizeMonitor` across the codebase. Updated methods `GetWindowSize` and `SetWindowSize` to `GetSize` and `SetSize` for consistency. Refactored `FakeDriver` to use `SetScreenSize` and removed redundant methods. Simplified driver initialization by removing legacy `InternalInit` logic. Standardized ANSI escape sequences by replacing `CSI_ReportTerminalSizeInChars` with `CSI_ReportWindowSizeInChars`. Updated test cases to align with the new `ConsoleSizeMonitor` and `SetScreenSize` methods. Removed obsolete test utilities like `FakeSizeMonitor` and `FakeWindowSizeMonitor`. Performed general code cleanup, including removing unused classes, redundant code, and improving formatting. Fixed resizing logic issues and improved exception handling in driver methods. * Update Terminal.Gui/Drivers/OutputBuffer.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Terminal.Gui/Drivers/MouseButtonStateEx.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Terminal.Gui/App/MainLoop/IApplicationMainLoop.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Tests/UnitTests/Views/ToplevelTests.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Terminal.Gui/ViewBase/View.Layout.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Moved all Drawing tests to Paralleizable - proving Fakedriver works Enhanced `Ruler` and `Thickness` classes by adding an optional `IConsoleDriver? driver` parameter to decouple rendering from the default `Application.Driver`, improving flexibility and testability. Updated `DriverAssert` to support nullable drivers and added defensive checks. Refactored and expanded test cases for `Ruler`, `Thickness`, `LineCanvas`, and `StraightLineExtensions` to ensure comprehensive coverage, including zero-length intersections, line rendering, and exclusion logic. Migrated rendering-dependent tests to a parallelizable namespace. Removed redundant tests, improved naming conventions, and updated documentation for better maintainability and clarity. * Fixed Run<T> startup hang. Refactor: Simplify driver logic and update SetSize methods Removed FakeDriver safeguard in unit tests to simplify CreateDriver logic. Updated SetSize methods in NetOutput, UnixOutput, and WindowsOutput to do nothing instead of throwing NotImplementedException. Modified SizeChanged event in ConsoleDriverFacade to call SetScreenSize directly. Commented out unnecessary debug validation in DimAuto. These changes improve maintainability and reduce complexity. * Fixed intermittent unit test bug. Refactored `_cachedRunStateToplevel` to `CachedRunStateToplevel` as an internal static property, delegating its management to `ApplicationImpl` for improved encapsulation. Updated all references to use the new property and centralized its handling in `ApplicationImpl`. Removed the `MouseGrabHandler` property from `ApplicationImpl` and simplified driver-related assignments by replacing `Application.ForceDriver` and `Application.Screen` with direct references. Reset `CachedRunStateToplevel` during cleanup to ensure proper state management. Updated the `Invoke` method to use `Top` directly, aligning with the refactored design. Improved debug assertions and performed general cleanup to enhance code readability and maintainability. * Fixed intermittent bug an massive code cleanup of warnings. Refactor and enhance codebase for maintainability - Applied null-conditional operator (`!`) to improve null-safety. - Refactored tests for clarity, added new cases, and removed redundancies. - Introduced `FakeApplicationFactory` and `FakeSizeMonitor` for testing. - Removed unused code, including legacy `DecodeEscSeq` logic. - Reformatted code for readability and consistency. - Updated assertions for more accurate validation in tests. - Fixed potential null reference issues across multiple files. - Improved event handling with proper null checks. - Enhanced documentation for new classes and methods. - Modernized code with C# features like `record struct` and `nullable enable`. --------- 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: 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 UnitTests.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);
|
||
Application.Driver!.SetScreenSize (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);
|
||
Application.Driver!.SetScreenSize (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);
|
||
Application.Driver!.SetScreenSize (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;
|
||
}
|
||
}
|
||
}
|