Files
Terminal.Gui/Tests/UnitTestsParallelizable/View/Navigation/AdvanceFocusTests.cs
Tig be9d1939c1 Fixes #4372 - Genericize FlagSelector/OptionSelector, Replace RadioGroup (#4373)
* Refactor selectors and improve UI components

Refactored `MarginEditor` and `UICatalogTop` to use new `OptionSelector` and `FlagSelector` classes, introducing type-safe generic versions for better flexibility and maintainability. Added `SelectorBase` as a shared foundation for these components, along with the `SelectorStyles` enum for customizable styles.

Enhanced unit tests to cover new implementations and edge cases. Enabled nullable reference types for improved null safety. Improved code readability, reduced redundancy, and enhanced user experience with better hotkey management, focus handling, and layout adjustments.

* Refactor UI components and remove unused classes

Significant refactoring and simplification of the codebase:
- Updated `CharacterMap` to use `OptionSelector<UnicodeCategory>`.
- Removed `FlagSelector`, `FlagSelector<TEnum>`, and `FlagSelectorStyles`.
- Replaced `OptionSelector.Options` with `Labels` in `MenuBarv2`.
- Removed `OptionSelector` and its associated properties/methods.
- Updated terminology from "Activate" to "Select" across components.
- Refactored `SelectorBase` to align with new "Select" behavior.
- Removed redundant methods, properties, and event handlers.

These changes streamline the codebase, reduce complexity, and align with updated design principles.

* Fixes #4374 - 'Application.Screen' is empty when 'Init' returns

Refactor and enhance testability of ApplicationImpl

Refactored `ApplicationImpl` and related classes to improve modularity and testability. Replaced `FakeConsoleOutput` with `FakeOutput` and introduced `FakeInput` for better test isolation. Added platform-specific factories (`FakeNetComponentFactory`, `FakeWindowsComponentFactory`) to simplify fake component creation.

Refactored `GuiTestContext` into partial classes, adding methods for simulating user interactions and improving initialization logic. Enhanced error handling and logging during test setup.

Updated tests to use the new `FakeOutput` and `FakeInput` implementations. Standardized driver initialization with `Application.Init(null, "fake")`. Skipped tests relying on the fake driver due to known issues.

Performed general cleanup, modernized syntax, and removed redundant code to improve readability and maintainability.

* Disable "windows" test case in SynchronizationContextTests

The `InlineData("windows")` attribute in the
`SynchronizationContext_Post` test method has been commented out.
This change temporarily excludes the `"windows"` driverName from
the test suite while retaining other test cases (`"fake"`,
`"dotnet"`, and `"unix"`). The exclusion may be for debugging,
deprecation, or other maintenance purposes.

* Disable "windows" test case in SynchronizationContextTests

The `[InlineData("windows")]` attribute in the
`SynchronizationContextTests` class has been commented out,
disabling the test case for the `"windows"` driver name.

This change may have been made for debugging, deprecation, or
because the test is no longer relevant. Other test cases
(`"fake"`, `"dotnet"`, and `"unix"`) remain active.

* Update Terminal.Gui/Drivers/FakeDriver/FakeConsole.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Views/Selectors/SelectorStyles.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Views/Selectors/SelectorBase.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Views/Selectors/OptionSelector.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Views/Selectors/OptionSelector.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Views/Selectors/OptionSelector.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Views/Selectors/SelectorBase.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Backported Checkbox from Activate PR

* Backported Checkbox from Activate PR 2

* Backported Checkbox from Activate PR 3

* Backported Selctors Scenario

* Backported Bars Scenario

* Backported AllViewsTester Scenario

* Backported Dialogs Scenario

* Backported MessageBoxes Scenario

* Backported ArrangementEditor

* Backported mouse binding fix

* Update Terminal.Gui/Views/Selectors/OptionSelector.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Drivers/WindowsDriver/WindowsOutput.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Views/CheckBox.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fixed typo

* Refactor ArrangementEditor event handling

Removed the `ArrangementFlagsOnValueChanged` method, which previously handled updates to `ViewToEdit` properties based on arrangement flags. Updated `ArrangementEditor_Initialized` to attach the event handler to `_arrangementSelector.ValueChanged`. The logic for handling arrangement changes has been refactored or relocated.

* Refactor AlignKeys for type safety and readability

Updated the `AlignKeys` method in the `Shortcuts` class to replace generic `View` references with the more specific `Shortcut` type. Improved type safety by using `IEnumerable<Shortcut>` and `.Cast<Shortcut>()`. Simplified the `max` calculation logic with a single LINQ query and removed redundant casting in the `foreach` loop. These changes enhance code readability, maintainability, and ensure better type safety.

* Refactor ArrangementEditor for clarity and consistency

Refactored `ArrangementEditor` to improve code readability and maintainability:
- Enabled nullable reference types with `#nullable enable`.
- Removed unused `using` directives.
- Adjusted namespace declaration for formatting consistency.
- Reformatted `_arrangementSelector` initialization and property assignment.
- Simplified `OnViewToEditChanged` logic with a ternary expression.
- Refactored `ArrangementEditor_Initialized` into a single-line block.

* Update Examples/UICatalog/Scenarios/Shortcuts.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Views/Selectors/OptionSelector.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Refactor and enhance OptionSelector and SelectorBase

Refactored `OptionSelector` and `SelectorBase` to simplify logic, improve hotkey assignment, and ensure robust behavior. Updated `Shortcuts.cs` and `DialogTests.cs` to address nullability issues.

Added comprehensive unit tests for `OptionSelector` and `SelectorBase`, covering properties, methods, edge cases, and layout behaviors. These changes improve code readability, maintainability, and functionality while adhering to modern C# practices.

* add FlagSelector comprehensive tests

Refactored `UncheckNone` and `UncheckAll` methods in `FlagSelector` to improve clarity and prevent concurrent modifications using a new `_updatingChecked` flag. Removed the old `UncheckNone` implementation and reorganized logic for maintainability.

Added extensive unit tests in `FlagSelectorTests` to validate functionality, including edge cases and generic implementations. Tests cover flag combination, toggling, "None" flag behavior, and enum-based generic handling.

Improved overall maintainability and test coverage for the `FlagSelector` class.

* Fixes #4375. UnixDriver fails Toplevel_TabGroup_Forward_Backward Fluent Tests

* Refactor RadioGroup to use OptionSelector

The `RadioGroup` class has been refactored to inherit from the `OptionSelector` class instead of `View`, marking it as `[Obsolete]` and recommending the use of `OptionSelector`.

The previous implementation of `RadioGroup` has been entirely removed, including its properties, methods, events, and internal logic. This includes initialization logic, key bindings, layout management, and event handling.

The new `RadioGroup` is now a thin wrapper around `OptionSelector` and implements the `IDesignable` interface. The `EnableForDesign` method has been simplified to set default options for design purposes.

This change simplifies the codebase and encourages the use of `OptionSelector` for managing mutually exclusive options.

* Backported focus tests and add bug-exposing test case

Refactored `AdvanceFocusTests` to improve assertion clarity by replacing `Assert.True`/`Assert.False` with `Assert.Equal`. Enhanced test documentation with detailed view hierarchy comments for better readability.

Added a new test case, `FocusNavigation_Should_Cycle_Back_To_Top_Level_Views`, which exposes a bug in focus navigation logic where focus does not cycle back to top-level views after traversing nested views.

Updated existing tests to ensure consistent handling of `TabBehavior` and made minor adjustments for improved validation of focus navigation logic.

* Remove all tests for RadioGroup component

The `RadioGroupTests.cs` file has been completely cleared of all test cases and associated code. This includes the removal of unit tests that validated the `RadioGroup` component's functionality, behavior, and edge cases.

The deleted tests covered:
- Default constructor behavior and initialization.
- Handling of the `SelectedItem` property, including edge cases.
- Hotkey bindings and their behavior under different focus states.
- Command handling for focus, selection, and acceptance.
- Orientation changes and their impact on layout.
- Event handling for `SelectedItemChanged`, `Selecting`, and `Accepting`.
- Mouse interactions, including single-click and double-click events.

This removal eliminates all automated validation for the `RadioGroup` component, leaving it untested and increasing the risk of regressions or undetected issues in future changes.

* Fix unix and fake fluent tests.

* More fixes for unix and fake drivers

* Change classes names for more consistency

* Fix typos in docs and method signature

Updated XML documentation in `FakeConsole.cs` to replace `<see cref="FakeDriver"/>` with `<exception cref="FakeDriver"></exception>` for clarity.

Corrected a parameter name in `WindowsOutput.cs`'s `WriteConsole` method from `numberOfCharsToWritten` to `numberOfCharsToWrite` to fix a typo and improve readability.

* Refactor: Replace RadioGroup with OptionSelector

Replaced all instances of `RadioGroup` with `OptionSelector` across the codebase to standardize the control for mutually exclusive options. Updated associated properties, methods, and event handlers to align with the `OptionSelector` API, including replacing `RadioLabels` with `AssignHotKeys` and `SelectedItemChanged` with `ValueChanged`.

Removed the `RadioGroup` class, marking it as obsolete. Updated documentation, comments, and test cases to reflect the new control. Adjusted layout and positioning logic in various scenarios to ensure UI consistency.

Refactored scenarios such as `Buttons`, `ColorPickers`, `DynamicMenuBar`, `FileDialogExamples`, `Images`, `PosAlignDemo`, `ProgressBarStyles`, `RegionScenario`, `Themes`, and others to use `OptionSelector`. Updated `Glyphs` and `View` classes to reflect the terminology change. Cleaned up redundant code and ensured compatibility across the application.

* Refactor OptionSelector to use Value instead of SelectedItem

Replaced the SelectedItem property with a nullable Value property across the codebase to simplify the API and improve consistency. Updated event handlers from SelectedItemChanged to ValueChanged and adjusted logic accordingly.

Refactored UI scenarios (e.g., Buttons, CharacterMap, ColorPickers) and dependent classes (e.g., BorderEditor, DimEditor, PosEditor) to use the new Value property. Improved null handling and streamlined initialization of controls.

Updated tests to validate the Value property and renamed test methods for clarity. Removed the RegionOpSelector class as it was no longer needed. Performed general code cleanup, including formatting and removal of redundant code.

* Refactor OptionSelector: Replace RadioLabels with Labels

Updated the `OptionSelector` class and its derived classes to replace the `RadioLabels` property with a more generic `Labels` property, aligning with the base class `SelectorBase`. This change standardizes the API and simplifies label-related functionality.

Refactored all instances of `RadioLabels` across the codebase, including property assignments, method calls, and references in scenarios, tests, and examples. Updated classes include `ColorPickers`, `Dialogs`, `DimAutoDemo`, `DynamicMenuBar`, `FileDialogExamples`, `Images`, `PosAlignDemo`, `Selectors`, `Shortcuts`, `TextAlignmentAndDirection`, `Themes`, `UnicodeInMenu`, `Wizards`, `UICatalogTop`, and `ScenarioTests`.

Modified `OptionSelector<TEnum>` to initialize `Labels` directly using `Enum.GetValues<TEnum>()`. Removed the `RadioLabels` property from `OptionSelector`, consolidating functionality under `Labels`.

Verified functionality through updated tests and scenarios to ensure consistent behavior with the previous implementation.

* Refactor: Replace "radio group" with "option selector"

Updated terminology across multiple classes to replace "radio group" with "option selector" for improved clarity and consistency.

- Removed unused `OptionSelector` in `ColorPickers`.
- Renamed `Title` in `DimAutoDemo` to "Options" and updated `BorderStyle`.
- Replaced `_radioItems` with `_optionLabels` in `DimEditor` and `PosEditor`.
- Renamed `styleRadioGroup` to `styleOptionSelector` in `MessageBoxes`.
- Renamed `radioGroup` to `optionSelector` in `UnicodeInMenu` and `OrientationTests`.
- Adjusted related references, event handlers, and UI properties.

These changes align the codebase with updated terminology and improve readability.

* Replace RadioGroup with OptionSelector and update docs

The `RadioGroup` control has been replaced or renamed to `OptionSelector`. Documentation has been updated to reflect this change, including the behavior of raising the `Selecting` event when an option is selected.

The navigation table now describes `OptionSelector` as supporting multiple options with actions like `Advance`, `SetValue+OnAccept`, and `Focus+SetValue`. A new section introduces the `OptionSelector` view, which displays mutually-exclusive items with hotkeys.

Enhancements to `Menuv2` and `MenuBarv2` include setting focus on `MenuItemv2` selections and raising the `SelectedMenuItemChanged` event. Additionally, a progress bar view has been introduced to visually indicate activity progress.

* Fixed `EndAfterFirstIteration`

Renamed the `EndAfterFirstIteration` property to `StopAfterFirstIteration` across the codebase for improved clarity and consistency. Updated all references in the `Application`, `ApplicationImpl`, `IApplication`, and `ITimedEvents` classes, as well as related tests and documentation.

Modified the application loop logic to use `StopAfterFirstIteration` for controlling the termination of the application after the first iteration. Set its default value to `false`.

Updated test cases, demo applications, and XML documentation to reflect the new property name. Added a new project, `OutputView`, to the solution with appropriate configuration entries.

Performed minor code cleanup to ensure consistency in naming and behavior.

* Enhance selectors and clean up documentation

- Added `args.Handled = true` to `CheckBox` event handlers in `FlagSelector` and `OptionSelector` to mark events as handled.
- Introduced `_value` field in `FlagSelector` and added a `Cycle` method in `OptionSelector` for better value management.
- Updated `OptionSelector` documentation to reference `OptionSelector<TEnum>` for type-safe enum usage.
- Improved `UpdateChecked` method documentation in `OptionSelector` to clarify exception behavior.
- Enabled nullable reference types in `FlagSelectorTests` and `SelectorBaseTests` and moved them to a new namespace.
- Removed outdated auto-generated content from `views.md`.
- Removed `CheckBox.DefaultHighlightStyle` from the default theme configuration in `OutputView.cs`.

* Update event handling and expand UI documentation

Modified `args.Handled` in `FlagSelector` and `OptionSelector` to allow `Accepting` event propagation, improving event handling behavior. Added comments to clarify the changes.

Expanded `views.md` with detailed documentation for built-in views and controls in *Terminal.Gui*, including descriptions, examples, and rendered outputs for components like `Bar`, `Button`, `CheckBox`, and more. This update enhances developer guidance for building terminal-based UIs.

* Fixed `EndAfterFirstIteration` in `ApplicationImpl`

Renamed the `EndAfterFirstIteration` property to `StopAfterFirstIteration` across the codebase for improved clarity. Updated its implementation to use a getter and setter that interact with the `ApplicationImpl.Instance` singleton for centralized management.

Modified the `RunLoop` method to check the new `StopAfterFirstIteration` property. Updated the default value to `false` in the `Application` class.

Added a private `_stopAfterFirstIteration` field and a corresponding public property in the `ApplicationImpl` class. Updated the `Run` method in `ApplicationImpl` to stop after the first iteration if the property is set to `true`, with appropriate logging.

Updated the `IApplication` interface to include the `StopAfterFirstIteration` property and clarified the behavior of the `RequestStop` method. Revised XML documentation comments to reflect these changes.

* Fixed EndfterFirstIteration in ApplicaitonImpl

Refactored `StopAfterFirstIteration` in `ApplicationImpl` to use an auto-property for simplicity. Updated `RunIteration` to call `view.RequestStop()` instead of modifying `view.Running`.

Replaced references to `Application.EndAfterFirstIteration` with `Application.StopAfterFirstIteration` across the codebase, including `ITimedEvents`, `ApplicationTests`, and `GlobalTestSetup`.

Added a new test, `InitRunShutdown_StopAfterFirstIteration_Stops`, to verify the application stops correctly after the first iteration. Updated related documentation and assertions for consistency.

* Refactor Value handling and improve type safety

Refactored `Value` handling across multiple classes to use nullable generic types, improving type safety and eliminating unnecessary casting. Simplified `ValueChanged` event handlers with concise lambda expressions.

Enhanced `FlagSelector<TFlagsEnum>` and `OptionSelector<TEnum>` with generic `ValueChanged` events and type-safe event handling. Added nullable reference type annotations to align with modern C# practices.

Improved test code by using null-forgiving operators and more descriptive assertions. Cleaned up redundant code and ensured consistency in `Value` handling. Updated `FlagSelectorTests` and `SelectorBaseTests` for better readability and maintainability.

Added the `System` namespace to `FlagSelectorTEnum.cs` for compatibility. Overall, these changes enhance code readability, maintainability, and robustness.

* Merged v2_develop

* Update README badges for v2_develop branch

Updated the `.NET Core` badge to reference the `v2_develop` branch. Adjusted the `codecov` badge to remove branch-specific paths and added a token parameter. Reorganized the `codecov` badge position in the README. Retained other badges without modification.

* codcov2

* fixed pos tests

* Improve cleanup, coverage config, and SpinnerStyle tests

Enhanced resource cleanup in `Pos.CombineTests.cs` by disposing of `Application.Top` to prevent leaks. Updated `codecov.yml` to focus coverage on `Terminal.Gui`, simplified path patterns, and clarified configurations.

Added `SpinnerStyleTests` with extensive unit tests for `SpinnerStyle` and its variants, covering default properties, behaviors, edge cases, and immutability. Organized tests for readability and ensured thorough validation of all spinner styles. Enabled nullable reference types for improved safety.

* Remove .NET Core badge; add comprehensive boundary tests

The `.NET Core` workflow badge was removed from the `README.md` file.

Added a comprehensive suite of unit tests for the `Region.DrawOuterBoundary` method in `DrawOuterBoundaryTests.cs`. These tests validate the method's behavior across various scenarios, including:
- Intersected, unioned, and complex shapes.
- Edge cases like empty regions, zero-width/height rectangles, and single-pixel rectangles.
- Specific shapes such as L-shaped, T-shaped, and hollow rectangles.
- Overlapping, adjacent, and separate rectangles.
- Thread safety with parallel drawing.
- Different line styles, custom attributes, and very large regions.
- Various positions, sizes, and multiple calls on the same canvas.

The tests use the `Xunit` framework and include both `[Fact]` and `[Theory]` test cases. These changes enhance the codebase's robustness and ensure correctness in a wide range of scenarios.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: BDisp <bd.bdisp@gmail.com>
2025-11-11 20:37:33 -07:00

766 lines
26 KiB
C#

using System.Runtime.Intrinsics;
using Xunit.Abstractions;
namespace UnitTests_Parallelizable.ViewTests;
public class AdvanceFocusTests ()
{
[Fact]
public void AdvanceFocus_CanFocus_Mixed ()
{
var r = new View ();
var v1 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
var v2 = new View { CanFocus = false, TabStop = TabBehavior.TabStop };
var v3 = new View { CanFocus = false, TabStop = TabBehavior.NoStop };
r.Add (v1, v2, v3);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.Dispose ();
}
[Theory]
[CombinatorialData]
public void AdvanceFocus_Change_CanFocus_Works ([CombinatorialValues (TabBehavior.NoStop, TabBehavior.TabStop, TabBehavior.TabGroup)] TabBehavior behavior)
{
var r = new View { CanFocus = true };
var v1 = new View ();
var v2 = new View ();
var v3 = new View ();
Assert.True (r.CanFocus);
Assert.False (v1.CanFocus);
Assert.False (v2.CanFocus);
Assert.False (v3.CanFocus);
r.Add (v1, v2, v3);
r.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
v1.CanFocus = true;
v1.TabStop = behavior;
r.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
v2.CanFocus = true;
v2.TabStop = behavior;
r.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.False (v1.HasFocus);
Assert.True (v2.HasFocus);
Assert.False (v3.HasFocus);
v3.CanFocus = true;
v3.TabStop = behavior;
r.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.True (v3.HasFocus);
r.Dispose ();
}
[Fact]
public void AdvanceFocus_SubViews_TabStop ()
{
TabBehavior behavior = TabBehavior.TabStop;
var top = new View { Id = "top", CanFocus = true };
var v1 = new View { Id = "v1", CanFocus = true, TabStop = behavior };
var v2 = new View { Id = "v2", CanFocus = true, TabStop = behavior };
var v3 = new View { Id = "v3", CanFocus = false, TabStop = behavior };
top.Add (v1, v2, v3);
// Cycle through v1 & v2
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v1.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v2.HasFocus);
// Should cycle back to v1
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v1.HasFocus);
// Go backwards
top.AdvanceFocus (NavigationDirection.Backward, behavior);
Assert.True (v2.HasFocus);
top.AdvanceFocus (NavigationDirection.Backward, behavior);
Assert.True (v1.HasFocus);
top.Dispose ();
}
[Fact]
public void AdvanceFocus_Compound_SubView_TabStop ()
{
TabBehavior behavior = TabBehavior.TabStop;
var top = new View { Id = "top", CanFocus = true };
var compoundSubView = new View
{
CanFocus = true,
Id = "compoundSubView",
TabStop = behavior
};
var v1 = new View { Id = "v1", CanFocus = true, TabStop = behavior };
var v2 = new View { Id = "v2", CanFocus = true, TabStop = behavior };
var v3 = new View { Id = "v3", CanFocus = false, TabStop = behavior };
compoundSubView.Add (v1, v2, v3);
top.Add (compoundSubView);
// Cycle through v1 & v2
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.Equal (v1, compoundSubView.Focused);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.Equal (v2, compoundSubView.Focused);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.Equal (v1, compoundSubView.Focused);
// Add another subview
View otherSubView = new ()
{
CanFocus = true,
TabStop = behavior,
Id = "otherSubView"
};
top.Add (otherSubView);
// Adding a focusable subview causes advancefocus
Assert.True (otherSubView.HasFocus);
Assert.False (v1.HasFocus);
// Cycle through v1 & v2
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.False (v1.HasFocus);
Assert.True (v2.HasFocus);
Assert.False (v3.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
Assert.True (otherSubView.HasFocus);
// v2 was previously focused down the compoundSubView focus chain
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.False (v1.HasFocus);
Assert.True (v2.HasFocus);
Assert.False (v3.HasFocus);
top.Dispose ();
}
[Fact]
public void AdvanceFocus_CompoundCompound_SubView_TabStop ()
{
//top
// ├── topv1, topv2, topv3 (only topv1 and topv2 are focusable)
// └── compoundSubView
// ├── v1, v2, v3 (v3 is not focusable)
// └── compoundCompoundSubView
// └── v4, v5, v6 (v6 is not focusable)
TabBehavior behavior = TabBehavior.TabStop;
var top = new View { Id = "top", CanFocus = true };
var topv1 = new View { Id = "topv1", CanFocus = true, TabStop = behavior };
var topv2 = new View { Id = "topv2", CanFocus = true, TabStop = behavior };
var topv3 = new View { Id = "topv3", CanFocus = false, TabStop = behavior };
top.Add (topv1, topv2, topv3);
var compoundSubView = new View
{
CanFocus = true,
Id = "compoundSubView",
TabStop = behavior
};
var v1 = new View { Id = "v1", CanFocus = true, TabStop = behavior };
var v2 = new View { Id = "v2", CanFocus = true, TabStop = behavior };
var v3 = new View { Id = "v3", CanFocus = false, TabStop = behavior };
compoundSubView.Add (v1, v2, v3);
var compoundCompoundSubView = new View
{
CanFocus = true,
Id = "compoundCompoundSubView",
TabStop = behavior
};
var v4 = new View { Id = "v4", CanFocus = true, TabStop = behavior };
var v5 = new View { Id = "v5", CanFocus = true, TabStop = behavior };
var v6 = new View { Id = "v6", CanFocus = false, TabStop = behavior };
compoundCompoundSubView.Add (v4, v5, v6);
compoundSubView.Add (compoundCompoundSubView);
top.Add (compoundSubView);
top.SetFocus ();
Assert.True (topv1.HasFocus);
// Cycle through topv2
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (topv2.HasFocus);
// Cycle v1, v2, v4, v5
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v1.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v2.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v4.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (v5.HasFocus);
// Should cycle back to topv1
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.Equal (topv1, top.Focused);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.Equal (topv2, top.Focused);
// Add another top subview. Should cycle to it after v5
View otherSubView = new ()
{
CanFocus = true,
TabStop = behavior,
Id = "otherSubView"
};
top.Add (otherSubView);
// Adding a focusable subview causes advancefocus
Assert.True (otherSubView.HasFocus);
// Cycle through topv1, topv2, v1, v2, v4, v5
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (topv1.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (topv2.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
// the above should have cycled to v5 since it was the previously most focused subview of compoundSubView
Assert.True (v5.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (otherSubView.HasFocus);
// Should cycle back to topv1
top.AdvanceFocus (NavigationDirection.Forward, behavior);
Assert.True (topv1.HasFocus);
top.Dispose ();
}
[Fact]
public void FocusNavigation_Should_Cycle_Back_To_Top_Level_Views ()
{
// Create a simplified version of the hierarchy from CompoundCompound test
// top
// ├── topButton1, topButton2
// └── nestedContainer
// └── innerButton
// Create top-level view
View top = new ()
{
Id = "top",
CanFocus = true
};
// Create top-level buttons
View topButton1 = new ()
{
Id = "topButton1",
CanFocus = true,
TabStop = TabBehavior.TabStop
};
View topButton2 = new ()
{
Id = "topButton2",
CanFocus = true,
TabStop = TabBehavior.TabStop
};
// Create nested container with a button inside
View nestedContainer = new ()
{
Id = "nestedContainer",
CanFocus = true,
TabStop = TabBehavior.TabStop
};
View innerButton = new ()
{
Id = "innerButton",
CanFocus = true,
TabStop = TabBehavior.TabStop
};
// Build the view hierarchy
nestedContainer.Add (innerButton);
top.Add (topButton1, topButton2, nestedContainer);
// Initial focus on topButton1
topButton1.SetFocus ();
Assert.Equal (topButton1, top.Focused);
// Advance focus to topButton2
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.Equal (topButton2, top.Focused);
// Advance focus to innerButton
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.Equal (innerButton, nestedContainer.Focused);
Assert.Equal (nestedContainer, top.Focused);
// THIS IS WHERE THE BUG OCCURS
// Advancing focus from innerButton should go back to topButton1
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
// This assertion will fail with current implementation
Assert.Equal (topButton1, top.Focused);
top.Dispose ();
}
[Fact]
public void AdvanceFocus_Compound_SubView_TabGroup ()
{
var top = new View { Id = "top", CanFocus = true, TabStop = TabBehavior.TabGroup };
var compoundSubView = new View
{
CanFocus = true,
Id = "compoundSubView",
TabStop = TabBehavior.TabGroup
};
var tabStopView = new View { Id = "tabStop", CanFocus = true, TabStop = TabBehavior.TabStop };
var tabGroupView1 = new View { Id = "tabGroup1", CanFocus = true, TabStop = TabBehavior.TabGroup };
var tabGroupView2 = new View { Id = "tabGroup2", CanFocus = true, TabStop = TabBehavior.TabGroup };
compoundSubView.Add (tabStopView, tabGroupView1, tabGroupView2);
top.Add (compoundSubView);
top.SetFocus ();
Assert.True (tabStopView.HasFocus);
// TabGroup should cycle to tabGroup1 then tabGroup2
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabGroup);
Assert.False (tabStopView.HasFocus);
Assert.True (tabGroupView1.HasFocus);
Assert.False (tabGroupView2.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabGroup);
Assert.False (tabStopView.HasFocus);
Assert.False (tabGroupView1.HasFocus);
Assert.True (tabGroupView2.HasFocus);
// Add another TabGroup subview
View otherTabGroupSubView = new ()
{
CanFocus = true,
TabStop = TabBehavior.TabGroup,
Id = "otherTabGroupSubView"
};
top.Add (otherTabGroupSubView);
// Adding a focusable subview causes advancefocus
Assert.True (otherTabGroupSubView.HasFocus);
Assert.False (tabStopView.HasFocus);
// TabGroup navs to the other subview
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabGroup);
Assert.Equal (compoundSubView, top.Focused);
Assert.True (tabStopView.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabGroup);
Assert.Equal (compoundSubView, top.Focused);
Assert.True (tabGroupView1.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabGroup);
Assert.Equal (compoundSubView, top.Focused);
Assert.True (tabGroupView2.HasFocus);
// Now go backwards
top.AdvanceFocus (NavigationDirection.Backward, TabBehavior.TabGroup);
Assert.Equal (compoundSubView, top.Focused);
Assert.True (tabGroupView1.HasFocus);
top.AdvanceFocus (NavigationDirection.Backward, TabBehavior.TabGroup);
Assert.Equal (otherTabGroupSubView, top.Focused);
Assert.True (otherTabGroupSubView.HasFocus);
top.Dispose ();
}
[Fact]
public void AdvanceFocus_NoStop_And_CanFocus_True_No_Focus ()
{
var r = new View ();
var v1 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
var v2 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
var v3 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
r.Add (v1, v2, v3);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.Dispose ();
}
[Fact]
public void AdvanceFocus_NoStop_Change_Enables_Stop ()
{
var r = new View { CanFocus = true };
var v1 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
var v2 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
var v3 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
r.Add (v1, v2, v3);
v1.TabStop = TabBehavior.TabStop;
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.True (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
v2.TabStop = TabBehavior.TabStop;
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.True (v2.HasFocus);
Assert.False (v3.HasFocus);
v3.TabStop = TabBehavior.TabStop;
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.True (v3.HasFocus);
r.Dispose ();
}
[Fact]
public void AdvanceFocus_NoStop_Prevents_Stop ()
{
var r = new View ();
var v1 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
var v2 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
var v3 = new View { CanFocus = true, TabStop = TabBehavior.NoStop };
r.Add (v1, v2, v3);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
}
[Fact]
public void AdvanceFocus_Null_And_CanFocus_False_No_Advance ()
{
var r = new View ();
var v1 = new View ();
var v2 = new View ();
var v3 = new View ();
Assert.False (v1.CanFocus);
Assert.Null (v1.TabStop);
r.Add (v1, v2, v3);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
r.Dispose ();
}
[Fact]
public void AdvanceFocus_SubViews_Raises_HasFocusChanged ()
{
var top = new View
{
Id = "top",
CanFocus = true
};
var subView1 = new View
{
Id = "subView1",
CanFocus = true
};
var subView2 = new View
{
Id = "subView2",
CanFocus = true
};
top.Add (subView1, subView2);
var subView1HasFocusChangedTrueCount = 0;
var subView1HasFocusChangedFalseCount = 0;
subView1.HasFocusChanged += (s, e) =>
{
if (e.NewValue)
{
subView1HasFocusChangedTrueCount++;
}
else
{
subView1HasFocusChangedFalseCount++;
}
};
var subView2HasFocusChangedTrueCount = 0;
var subView2HasFocusChangedFalseCount = 0;
subView2.HasFocusChanged += (s, e) =>
{
if (e.NewValue)
{
subView2HasFocusChangedTrueCount++;
}
else
{
subView2HasFocusChangedFalseCount++;
}
};
top.SetFocus ();
Assert.True (top.HasFocus);
Assert.True (subView1.HasFocus);
Assert.False (subView2.HasFocus);
Assert.Equal (1, subView1HasFocusChangedTrueCount);
Assert.Equal (0, subView1HasFocusChangedFalseCount);
Assert.Equal (0, subView2HasFocusChangedTrueCount);
Assert.Equal (0, subView2HasFocusChangedFalseCount);
top.AdvanceFocus (NavigationDirection.Forward, null);
Assert.False (subView1.HasFocus);
Assert.True (subView2.HasFocus);
Assert.Equal (1, subView1HasFocusChangedTrueCount);
Assert.Equal (1, subView1HasFocusChangedFalseCount);
Assert.Equal (1, subView2HasFocusChangedTrueCount);
Assert.Equal (0, subView2HasFocusChangedFalseCount);
top.AdvanceFocus (NavigationDirection.Forward, null);
Assert.True (subView1.HasFocus);
Assert.False (subView2.HasFocus);
Assert.Equal (2, subView1HasFocusChangedTrueCount);
Assert.Equal (1, subView1HasFocusChangedFalseCount);
Assert.Equal (1, subView2HasFocusChangedTrueCount);
Assert.Equal (1, subView2HasFocusChangedFalseCount);
}
[Fact]
public void AdvanceFocus_SubViews_Raises_HasFocusChanging ()
{
var top = new View
{
Id = "top",
CanFocus = true
};
var subView1 = new View
{
Id = "subView1",
CanFocus = true
};
var subView2 = new View
{
Id = "subView2",
CanFocus = true
};
top.Add (subView1, subView2);
var subView1HasFocusChangingTrueCount = 0;
var subView1HasFocusChangingFalseCount = 0;
subView1.HasFocusChanging += (s, e) =>
{
if (e.NewValue)
{
subView1HasFocusChangingTrueCount++;
}
else
{
subView1HasFocusChangingFalseCount++;
}
};
var subView2HasFocusChangingTrueCount = 0;
var subView2HasFocusChangingFalseCount = 0;
subView2.HasFocusChanging += (s, e) =>
{
if (e.NewValue)
{
subView2HasFocusChangingTrueCount++;
}
else
{
subView2HasFocusChangingFalseCount++;
}
};
top.SetFocus ();
Assert.True (top.HasFocus);
Assert.True (subView1.HasFocus);
Assert.False (subView2.HasFocus);
Assert.Equal (1, subView1HasFocusChangingTrueCount);
Assert.Equal (0, subView1HasFocusChangingFalseCount);
Assert.Equal (0, subView2HasFocusChangingTrueCount);
Assert.Equal (0, subView2HasFocusChangingFalseCount);
top.AdvanceFocus (NavigationDirection.Forward, null);
Assert.False (subView1.HasFocus);
Assert.True (subView2.HasFocus);
Assert.Equal (1, subView1HasFocusChangingTrueCount);
Assert.Equal (1, subView1HasFocusChangingFalseCount);
Assert.Equal (1, subView2HasFocusChangingTrueCount);
Assert.Equal (0, subView2HasFocusChangingFalseCount);
top.AdvanceFocus (NavigationDirection.Forward, null);
Assert.True (subView1.HasFocus);
Assert.False (subView2.HasFocus);
Assert.Equal (2, subView1HasFocusChangingTrueCount);
Assert.Equal (1, subView1HasFocusChangingFalseCount);
Assert.Equal (1, subView2HasFocusChangingTrueCount);
Assert.Equal (1, subView2HasFocusChangingFalseCount);
}
[Fact]
public void AdvanceFocus_With_CanFocus_Are_All_True ()
{
var top = new View { Id = "top", CanFocus = true };
var v1 = new View { Id = "v1", CanFocus = true };
var v2 = new View { Id = "v2", CanFocus = true };
var v3 = new View { Id = "v3", CanFocus = true };
top.Add (v1, v2, v3);
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.True (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.False (v3.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.True (v2.HasFocus);
Assert.False (v3.HasFocus);
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.False (v1.HasFocus);
Assert.False (v2.HasFocus);
Assert.True (v3.HasFocus);
top.Dispose ();
}
[Theory]
[CombinatorialData]
public void TabStop_And_CanFocus_Are_Decoupled (bool canFocus, TabBehavior tabStop)
{
var view = new View { CanFocus = canFocus, TabStop = tabStop };
Assert.Equal (canFocus, view.CanFocus);
Assert.Equal (tabStop, view.TabStop);
}
[Fact]
public void AdvanceFocus_Cycles_Through_Peers_And_All_Nested_SubViews_When_Multiple ()
{
var top = new View { Id = "top", CanFocus = true };
View peer1 = new View
{
CanFocus = true,
Id = "peer1",
};
var peer2 = new View
{
CanFocus = true,
Id = "peer2",
};
var peer2SubView = new View
{
Id = "peer2SubView", CanFocus = true
};
var v1 = new View { Id = "v1", CanFocus = true };
var v2 = new View { Id = "v2", CanFocus = true };
peer2SubView.Add (v1, v2);
peer2.Add (peer2SubView);
top.Add (peer1, peer2);
top.SetFocus ();
Assert.Equal (peer1, top.MostFocused);
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.Equal (v1, top.MostFocused);
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.Equal (v2, top.MostFocused);
// This should cycle to peer1 - previously it incorrectly cycled to v1
top.AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
Assert.Equal (peer1, top.MostFocused);
top.Dispose ();
}
}