mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +01:00
* Add comprehensive unit tests for WindowsKeyConverter - Implement 118 parallelizable unit tests for WindowsKeyConverter - Cover ToKey and ToKeyInfo methods with full bidirectional testing - Test basic characters, modifiers, special keys, function keys - Test VK_PACKET Unicode/IME input - Test OEM keys, NumPad keys, and lock states - Include round-trip conversion tests - All tests passing successfully Fixes #4389 * Rename `start` parameter to `viewportXOffset` for clarity The `start` parameter in several methods and interfaces has been renamed to `viewportXOffset` to better reflect its purpose as the horizontal offset of the viewport during string rendering. - Updated method signatures in `ListViewWithSelection` to use `viewportXOffset` instead of `start`, including default values. - Modified the `RenderUstr` method in `ListViewWithSelection` to use `viewportXOffset` for calculating the starting index. - Renamed the `start` parameter to `viewportXOffset` in the `IListDataSource` interface and updated its documentation. - Replaced all occurrences of `start` with `viewportXOffset` in the `ListWrapper<T>` class, including method calls and logic. - Updated the `RenderUstr` method in `ListWrapper<T>` to use `viewportXOffset` for substring calculations. - Adjusted the test method in `ListViewTests.cs` to reflect the parameter name change. These changes improve code readability and make the parameter's role in rendering logic more explicit. * Remove WindowsKeyConverterTests class that was added by mistake * Modernized ListView and IListDataSource - Tons of new unit tests Refactored `ListView` and `IListDataSource` to improve readability, maintainability, and functionality. Introduced `ListWrapper<T>` as a default implementation of `IListDataSource` for easier integration with standard collections. Enhanced `ListView` with better handling of marking, selection, and scrolling. Replaced `viewportXOffset` with `viewportX` for horizontal scrolling. Added `EnsureSelectedItemVisible` to maintain visibility of the selected item. Updated `IListDataSource` with detailed XML documentation and added `SuspendCollectionChangedEvent` for bulk updates. Improved null safety with nullable reference types. Added comprehensive unit tests for `ListWrapper<T>` and `IListDataSource` to ensure robustness. Modernized the codebase with C# features like expression-bodied members and pattern matching. Fixed bugs related to `SelectedItem` validation and rendering artifacts. * Improve index validation in ComboBox and ListView Enhance robustness by adding stricter checks for valid indices in ComboBox and ListView. Updated conditions in the `_listview.SelectedItemChanged` event handler to ensure `e.Item` is non-negative before accessing `_searchSet`. Modified the `SetValue` method to use `e.Item` instead of `_listview.SelectedItem`. In ListView, updated the `OnSelectedChanged` method to validate that `SelectedItem` is non-negative (`>= 0`) before accessing the `Source` list. These changes prevent potential out-of-range errors and improve code safety. * Refactor and enhance test coverage across modules Refactored and added new tests to improve coverage, readability, and consistency across multiple test files. Key changes include: - **ShortcutTests.cs**: Added tests for `BindKeyToApplication` and removed redundant tests. - **SourcesManagerTests.cs**: Renamed `Update_*` tests to `Load_*` for clarity. - **ArrangementTests.cs**: Reintroduced `MouseGrabHandler` tests, added `ViewArrangement` flag tests, and improved structure. - **NeedsDrawTests.cs**: Replaced `Application.Screen.Size` with fixed dimensions for better isolation. - **DimAutoTests.cs**: Updated layout tests to use fixed dimensions. - **FrameTests.cs**: Standardized object initialization and validated frame behavior. - **SubViewTests.cs**: Improved formatting and modernized event handling. - **NumericUpDownTests.cs**: Decoupled layout tests from screen size. General improvements: - Enhanced formatting and removed redundant tests. - Added comments for clarity. - Introduced `ITestOutputHelper` for better debugging in `ArrangementTests`. * Refactor to use nullable types for better null safety Enabled nullable reference types across the codebase to improve null safety and prevent potential null reference issues. Refactored `SelectedItem` and related properties from `int` to `int?` to represent no selection with `null` instead of `-1`. Updated logic, event arguments, and method signatures to handle nullable values consistently. Simplified object initialization using modern C# syntax and improved code readability with interpolated strings. Added null checks and early returns to prevent runtime errors. Enhanced error handling by throwing `ArgumentOutOfRangeException` for invalid values. Updated tests to reflect the changes, replacing assertions for `-1` with `null` and ensuring proper handling of nullable values. Cleaned up redundant code and improved formatting for better maintainability. * on` functionality has been deprecated, refactored, or removed from the `Shortcut` class. * Refactor: Transition to instance-based architecture Updated `Run-LocalCoverage.ps1` to increase `--blame-hang-timeout` from 10s to 60s. Improved null safety in `GuiTestContext` by adding null-conditional operators. Commented out problematic code in `SetupFakeApplicationAttribute.cs` to prevent test hangs. Excluded `ViewBase` files from `UnitTests.Parallelizable.csproj` and removed redundant folder declarations. Simplified event handling in `IListDataSourceTests.cs` and updated `ListViewTests.cs` to use nullable reference types. Enhanced documentation to emphasize the transition to an instance-based application architecture. Updated examples in `application.md`, `multitasking.md`, and `navigation.md` to reflect the use of `Application.Create()` and `View.App`. Clarified the obsolescence of the static `Application` class. Revised table of contents in `toc.yml` to include new sections like "Application Deep Dive" and "Scheme Deep Dive." Added `dotnet-tools.json` for tool configuration. These changes improve maintainability, testability, and alignment with modern C# practices. * Refactor ListViewTests to use Terminal.Gui framework The `ListViewTests` class has been refactored to replace the `AutoInitShutdown` attribute with explicit application lifecycle management using `IApplication` and `app.Init()` from the `Terminal.Gui` framework. Key changes include: - Rewriting tests to use `Terminal.Gui`'s application lifecycle. - Adding a private `_output` field for logging test output via `ITestOutputHelper`. - Updating `DriverAssert.AssertDriverContentsWithFrameAre` to include `app.Driver` for UI verification. - Rewriting tests like `Clicking_On_Border_Is_Ignored`, `EnsureSelectedItemVisible_SelectedItem`, and others to align with the new framework. - Adding explicit calls to `app.Shutdown()` for proper cleanup. - Enabling nullable reference types with `#nullable enable`. - Updating `using` directives and `namespace` to reflect the new structure. These changes improve test maintainability, compatibility, and diagnostics. * Update Terminal.Gui/Views/CollectionNavigation/CollectionNavigatorBase.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Terminal.Gui/Views/CollectionNavigation/CollectionNavigatorBase.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Examples/UICatalog/UICatalogTop.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Terminal.Gui/Views/ListWrapper.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Terminal.Gui/Views/ListWrapper.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Updated the `SetMark` method to return `Source.IsMarked(SelectedItem.Value)` for consistency and removed an outdated comment questioning its correctness. Enhanced the exception message in the `SelectedItem` property setter to provide clearer guidance when the value is out of range. * Add comprehensive ListView behavior test coverage Added multiple test methods to validate `ListView` behavior: - `Vertical_ScrollBar_Hides_And_Shows_As_Needed`: Ensures the vertical scrollbar auto-hides/shows based on content height. - `Mouse_Wheel_Scrolls`: Verifies vertical scrolling with the mouse wheel updates `TopItem`. - `SelectedItem_With_Source_Null_Does_Nothing`: Confirms no exceptions occur when setting `SelectedItem` with a `null` source. - `Horizontal_Scroll`: Tests horizontal scrolling, including programmatic and mouse wheel interactions, ensuring `LeftItem` updates correctly. - `SetSourceAsync_SetsSource`: Validates the asynchronous `SetSourceAsync` method updates the source and item count. - `AllowsMultipleSelection_Set_To_False_Unmarks_All_But_Selected`: Ensures disabling multiple selection unmarks all but the selected item. - `Source_CollectionChanged_Remove`: Confirms `SelectedItem` and source count update correctly when items are removed from the source collection. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
351 lines
13 KiB
C#
351 lines
13 KiB
C#
#nullable enable
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
|
|
namespace UICatalog.Scenarios;
|
|
|
|
[ScenarioMetadata ("All Views Tester", "Provides a test UI for all classes derived from View.")]
|
|
[ScenarioCategory ("Layout")]
|
|
[ScenarioCategory ("Tests")]
|
|
[ScenarioCategory ("Controls")]
|
|
[ScenarioCategory ("Adornments")]
|
|
[ScenarioCategory ("Arrangement")]
|
|
public class AllViewsTester : Scenario
|
|
{
|
|
private Dictionary<string, Type>? _viewClasses;
|
|
private ListView? _classListView;
|
|
private AdornmentsEditor? _adornmentsEditor;
|
|
private ArrangementEditor? _arrangementEditor;
|
|
private LayoutEditor? _layoutEditor;
|
|
private ViewportSettingsEditor? _viewportSettingsEditor;
|
|
private ViewPropertiesEditor? _propertiesEditor;
|
|
|
|
private FrameView? _hostPane;
|
|
private View? _curView;
|
|
private EventLog? _eventLog;
|
|
|
|
public override void Main ()
|
|
{
|
|
// Don't create a sub-win (Scenario.Win); just use Application.Current
|
|
Application.Init ();
|
|
|
|
var app = new Window
|
|
{
|
|
Title = GetQuitKeyAndName (),
|
|
};
|
|
|
|
// Set the BorderStyle we use for all subviews, but disable the app border thickness
|
|
app.Border!.LineStyle = LineStyle.Heavy;
|
|
app.Border!.Thickness = new (0);
|
|
|
|
|
|
_viewClasses = GetAllViewClassesCollection ()
|
|
.OrderBy (t => t.Name)
|
|
.Select (t => new KeyValuePair<string, Type> (t.Name, t))
|
|
.ToDictionary (t => t.Key, t => t.Value);
|
|
|
|
_classListView = new ()
|
|
{
|
|
Title = "Classes [_1]",
|
|
X = 0,
|
|
Y = 0,
|
|
Width = Dim.Auto (),
|
|
Height = Dim.Fill (),
|
|
AllowsMarking = false,
|
|
SelectedItem = 0,
|
|
Source = new ListWrapper<string> (new (_viewClasses.Keys.ToList ())),
|
|
SuperViewRendersLineCanvas = true
|
|
};
|
|
_classListView.Border!.Thickness = new (1);
|
|
|
|
_classListView.SelectedItemChanged += (s, args) =>
|
|
{
|
|
// Dispose existing current View, if any
|
|
DisposeCurrentView ();
|
|
|
|
CreateCurrentView (_viewClasses.Values.ToArray () [_classListView.SelectedItem.Value]);
|
|
|
|
// Force ViewToEdit to be the view and not a subview
|
|
if (_adornmentsEditor is { })
|
|
{
|
|
_adornmentsEditor.AutoSelectSuperView = _curView;
|
|
|
|
_adornmentsEditor.ViewToEdit = _curView;
|
|
}
|
|
};
|
|
|
|
_classListView.Accepting += (sender, args) =>
|
|
{
|
|
_curView?.SetFocus ();
|
|
args.Handled = true;
|
|
};
|
|
|
|
_adornmentsEditor = new ()
|
|
{
|
|
Title = "Adornments [_2]",
|
|
X = Pos.Right (_classListView) - 1,
|
|
Y = 0,
|
|
Width = Dim.Auto (),
|
|
Height = Dim.Auto (),
|
|
AutoSelectViewToEdit = false,
|
|
AutoSelectAdornments = false,
|
|
SuperViewRendersLineCanvas = true,
|
|
};
|
|
_adornmentsEditor.Border!.Thickness = new (1);
|
|
_adornmentsEditor.ExpanderButton!.Orientation = Orientation.Horizontal;
|
|
_adornmentsEditor.ExpanderButton.Enabled = false;
|
|
|
|
_arrangementEditor = new ()
|
|
{
|
|
Title = "Arrangement [_3]",
|
|
X = Pos.Right (_classListView) - 1,
|
|
Y = Pos.Bottom (_adornmentsEditor) - Pos.Func (_ => _adornmentsEditor.Frame.Height == 1 ? 0 : 1),
|
|
Width = Dim.Width (_adornmentsEditor),
|
|
Height = Dim.Fill (),
|
|
AutoSelectViewToEdit = false,
|
|
AutoSelectAdornments = false,
|
|
SuperViewRendersLineCanvas = true
|
|
};
|
|
_arrangementEditor.ExpanderButton!.Orientation = Orientation.Horizontal;
|
|
|
|
_arrangementEditor.ExpanderButton.CollapsedChanging += (sender, args) =>
|
|
{
|
|
_adornmentsEditor.ExpanderButton.Collapsed = args.NewValue;
|
|
};
|
|
_arrangementEditor.Border!.Thickness = new (1);
|
|
|
|
_layoutEditor = new ()
|
|
{
|
|
Title = "Layout [_4]",
|
|
X = Pos.Right (_arrangementEditor) - 1,
|
|
Y = 0,
|
|
//Width = Dim.Fill (), // set below
|
|
Height = Dim.Auto (),
|
|
CanFocus = true,
|
|
AutoSelectViewToEdit = false,
|
|
AutoSelectAdornments = false,
|
|
SuperViewRendersLineCanvas = true
|
|
};
|
|
_layoutEditor.Border!.Thickness = new (1, 1, 1, 0);
|
|
|
|
_viewportSettingsEditor = new ()
|
|
{
|
|
Title = "ViewportSettings [_5]",
|
|
X = Pos.Right (_arrangementEditor) - 1,
|
|
Y = Pos.Bottom (_layoutEditor) - Pos.Func (_ => _layoutEditor.Frame.Height == 1 ? 0 : 1),
|
|
Width = Dim.Width (_layoutEditor),
|
|
Height = Dim.Auto (),
|
|
CanFocus = true,
|
|
AutoSelectViewToEdit = false,
|
|
AutoSelectAdornments = false,
|
|
SuperViewRendersLineCanvas = true
|
|
};
|
|
_viewportSettingsEditor.Border!.Thickness = new (1, 1, 1, 1);
|
|
|
|
_propertiesEditor = new ()
|
|
{
|
|
Title = "View Properties [_6]",
|
|
X = Pos.Right (_adornmentsEditor) - 1,
|
|
Y = Pos.Bottom (_viewportSettingsEditor) - Pos.Func (_ => _viewportSettingsEditor.Frame.Height == 1 ? 0 : 1),
|
|
Width = Dim.Width (_layoutEditor),
|
|
Height = Dim.Auto (),
|
|
CanFocus = true,
|
|
SuperViewRendersLineCanvas = true
|
|
};
|
|
_propertiesEditor.Border!.Thickness = new (1, 1, 1, 0);
|
|
|
|
_eventLog = new ()
|
|
{
|
|
X = Pos.AnchorEnd () - 1,
|
|
Y = 0,
|
|
Width = 30,
|
|
Height = Dim.Fill (),
|
|
SuperViewRendersLineCanvas = true
|
|
};
|
|
_eventLog.Border!.Thickness = new (1);
|
|
|
|
_layoutEditor.Width = Dim.Fill (
|
|
Dim.Func (
|
|
_ =>
|
|
{
|
|
if (_eventLog.NeedsLayout)
|
|
{
|
|
// We have two choices:
|
|
// 1) Call Layout explicitly
|
|
// 2) Throw LayoutException so Layout tries again
|
|
_eventLog.Layout ();
|
|
//throw new LayoutException ("_eventLog");
|
|
}
|
|
|
|
return _eventLog.Frame.Width;
|
|
}));
|
|
|
|
_hostPane = new ()
|
|
{
|
|
Id = "_hostPane",
|
|
X = Pos.Right (_adornmentsEditor),
|
|
Y = Pos.Bottom (_propertiesEditor),
|
|
Width = Dim.Width (_layoutEditor) - 2,
|
|
Height = Dim.Fill (),
|
|
CanFocus = true,
|
|
TabStop = TabBehavior.TabStop,
|
|
Arrangement = ViewArrangement.LeftResizable | ViewArrangement.BottomResizable | ViewArrangement.RightResizable,
|
|
BorderStyle = LineStyle.Double,
|
|
SuperViewRendersLineCanvas = true
|
|
};
|
|
_hostPane.Border!.SetScheme (app.GetScheme ());
|
|
_hostPane.Padding!.Thickness = new (1);
|
|
_hostPane.Padding.Diagnostics = ViewDiagnosticFlags.Ruler;
|
|
_hostPane.Padding.SetScheme (app.GetScheme ());
|
|
|
|
app.Add (_classListView, _adornmentsEditor, _arrangementEditor, _layoutEditor, _viewportSettingsEditor, _propertiesEditor, _eventLog, _hostPane);
|
|
|
|
app.Initialized += App_Initialized;
|
|
|
|
Application.Run (app);
|
|
app.Dispose ();
|
|
Application.Shutdown ();
|
|
}
|
|
|
|
private void App_Initialized (object? sender, EventArgs e)
|
|
{
|
|
_classListView!.SelectedItem = 0;
|
|
_classListView.SetFocus ();
|
|
}
|
|
|
|
// TODO: Add Command.HotKey handler (pop a message box?)
|
|
private void CreateCurrentView (Type type)
|
|
{
|
|
Debug.Assert (_curView is null);
|
|
|
|
// If we are to create a generic Type
|
|
if (type.IsGenericType)
|
|
{
|
|
// For each of the <T> arguments
|
|
List<Type> typeArguments = [];
|
|
|
|
// use <object> or the original type if applicable
|
|
foreach (Type arg in type.GetGenericArguments ())
|
|
{
|
|
if (arg.IsValueType && Nullable.GetUnderlyingType (arg) == null)
|
|
{
|
|
typeArguments.Add (arg);
|
|
}
|
|
else
|
|
{
|
|
typeArguments.Add (typeof (object));
|
|
}
|
|
}
|
|
|
|
// And change what type we are instantiating from MyClass<T> to MyClass<object> or MyClass<T>
|
|
type = type.MakeGenericType (typeArguments.ToArray ());
|
|
}
|
|
|
|
// Ensure the type does not contain any generic parameters
|
|
if (type.ContainsGenericParameters)
|
|
{
|
|
Logging.Warning ($"Cannot create an instance of {type} because it contains generic parameters.");
|
|
//throw new ArgumentException ($"Cannot create an instance of {type} because it contains generic parameters.");
|
|
return;
|
|
}
|
|
|
|
// Instantiate view
|
|
var view = (View)Activator.CreateInstance (type)!;
|
|
_eventLog!.ViewToLog = view;
|
|
|
|
if (view is IDesignable designable)
|
|
{
|
|
string settingsEditorDemoText = _propertiesEditor!.DemoText;
|
|
designable.EnableForDesign (ref settingsEditorDemoText);
|
|
}
|
|
else
|
|
{
|
|
view.Text = _propertiesEditor!.DemoText;
|
|
view.Title = "_Test Title";
|
|
}
|
|
|
|
|
|
view.Initialized += CurrentView_Initialized;
|
|
view.SubViewsLaidOut += CurrentView_LayoutComplete;
|
|
|
|
view.Id = "_curView";
|
|
_curView = view;
|
|
|
|
_hostPane!.Add (_curView);
|
|
_layoutEditor!.ViewToEdit = _curView;
|
|
_viewportSettingsEditor!.ViewToEdit = _curView;
|
|
_arrangementEditor!.ViewToEdit = _curView;
|
|
_propertiesEditor!.ViewToEdit = _curView;
|
|
_curView.SetNeedsLayout ();
|
|
}
|
|
|
|
|
|
private void DisposeCurrentView ()
|
|
{
|
|
if (_curView != null)
|
|
{
|
|
_curView.Initialized -= CurrentView_Initialized;
|
|
_curView.SubViewsLaidOut -= CurrentView_LayoutComplete;
|
|
_hostPane!.Remove (_curView);
|
|
_layoutEditor!.ViewToEdit = null;
|
|
_viewportSettingsEditor!.ViewToEdit = null;
|
|
_arrangementEditor!.ViewToEdit = null;
|
|
_propertiesEditor!.ViewToEdit = null;
|
|
|
|
_curView.Dispose ();
|
|
_curView = null;
|
|
}
|
|
}
|
|
|
|
private static List<Type> GetAllViewClassesCollection ()
|
|
{
|
|
List<Type> types = typeof (View).Assembly.GetTypes ()
|
|
.Where (
|
|
myType => myType is { IsClass: true, IsAbstract: false, IsPublic: true }
|
|
&& myType.IsSubclassOf (typeof (View)))
|
|
.ToList ();
|
|
|
|
types.Add (typeof (View));
|
|
|
|
return types;
|
|
}
|
|
|
|
private void CurrentView_LayoutComplete (object? sender, LayoutEventArgs args) { UpdateHostTitle (_curView); }
|
|
|
|
private void UpdateHostTitle (View? view) { _hostPane!.Title = $"{view!.GetType ().Name} [_0]"; }
|
|
|
|
private void CurrentView_Initialized (object? sender, EventArgs e)
|
|
{
|
|
if (sender is not View view)
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (view.Width == Dim.Absolute (0) || view.Width is null)
|
|
{
|
|
view.Width = Dim.Fill ();
|
|
}
|
|
|
|
if (view.Height == Dim.Absolute (0) || view.Height is null)
|
|
{
|
|
view.Height = Dim.Fill ();
|
|
}
|
|
|
|
UpdateHostTitle (view);
|
|
}
|
|
|
|
public override List<Key> GetDemoKeyStrokes ()
|
|
{
|
|
var keys = new List<Key> ();
|
|
|
|
for (int i = 0; i < GetAllViewClassesCollection ().Count; i++)
|
|
{
|
|
keys.Add (Key.CursorDown);
|
|
}
|
|
|
|
return keys;
|
|
}
|
|
}
|