Partial on #2975 - Replaces Menu v1 in many places with v2 (#4040)

* touching publish.yml * Fixed UICatalog bugs. Added fluent tests. * marked v1 menu stuff as obsolte * Tweaks. Added View.GetSubMenus<type>(). * fixed unit tests * general messing around * general messing around * Playing with Fluent * ColorScheme tweaks * WIP: ColorScheme tweaks * Playing with Fluent * Merged from laptop2 * Hacky-ish fixes to: - #4016 - #4014 * Fixed Region bug preventing menus without borders from working * Tweaks * Fixed a bunch of CM issues * Fixed OoptionSelector * ip * FixedCM issues * Fixed CM issues2 * Revert "FixedCM issues" This reverts commit dd6c6a70a3. * Reverted stuff * Found and fixed bug in AllViews_Center_Properly * Fixed CM issues2 * removed menuv2 onapplied. Changed how UICatalog Applys CM * changed test time out to see if it helkps with ubuntu fails * reset app on fail? * back to 1500ms * Made StatusBar nullable. * Code Cleanup. * HexEditor Code Cleanup. * HexEditor Code Cleanup. * Back to 3000ms. Sigh. * Trying different logic * Trying different logic2 * Fixed potential crash in runlop * Fixed potential crash in runlop2 * Tweaked Spinner stuff * Removed TabView from TextEffects scenario. Not needed and possible culprit. * back to 2000ms * WIP: Revamping menu scenarios * Menu Scenario refinements. Fixed a few bugs. Code cleanup. * fixed unit test * Fixed warnings * Fixed warnings2 * Fixed File.Exit * WIP: Dealing with QuitKey struggles * WIP: Dealing with QuitKey struggles 2 * WIP: Dealing with QuitKey struggles 3 * Fixed ListView collection nav bug * Fixed a bunch of menu stuff. Fixed Appv2 stuff. * Lots of refactoring and fixing * Lots of unit test issues * Fixed DebugIDisposable issues * Fixed release build issue * Fixed release build issue 2 * DebugIDisposable -> EnableDebugIDisposableAsserts and more * DebugIDisposable -> EnableDebugIDisposableAsserts and more 2 * Fixed Menus scenario - context menu * Added @bdisp suggested assert. Commented it out as it breaks tests. * Code cleanup * Fixed disposed but * Fixed UICatalog exit * Fixed Unit test I broke. Added 'Minimal' Theme that turns off all borders etc...
2025-12-29 09:18:01 +01:00 · 2025-04-24 05:17:58 -06:00
parent 8d3d039fb3
commit 47bcf1bf57
136 changed files with 5109 additions and 2214 deletions
--- a/Tests/UnitTestsParallelizable/View/Adornment/AdornmentSubViewTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Adornment/AdornmentSubViewTests.cs
@@ -2,6 +2,7 @@

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class AdornmentSubViewTests ()
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Adornment/AdornmentTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Adornment/AdornmentTests.cs
@@ -1,5 +1,6 @@
 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class AdornmentTests
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Adornment/ShadowStyletests.cs
+++ b/Tests/UnitTestsParallelizable/View/Adornment/ShadowStyletests.cs
@@ -1,5 +1,7 @@
 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
+
 public class ShadowStyleTests
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Keyboard/HotKeyTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Keyboard/HotKeyTests.cs
@@ -3,6 +3,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class HotKeyTests
 {
    [Theory]
@@ -372,46 +373,4 @@ public class HotKeyTests
        Assert.Equal ("", view.Title);
        Assert.Equal (KeyCode.Null, view.HotKey);
    }
-
-
-    [Fact]
-    public void HotKey_Raises_HotKeyCommand ()
-    {
-        var hotKeyRaised = false;
-        var acceptRaised = false;
-        var selectRaised = false;
-        Application.Top = new Toplevel ();
-        var view = new View
-        {
-            CanFocus = true,
-            HotKeySpecifier = new Rune ('_'),
-            Title = "_Test"
-        };
-        Application.Top.Add (view);
-        view.HandlingHotKey += (s, e) => hotKeyRaised = true;
-        view.Accepting += (s, e) => acceptRaised = true;
-        view.Selecting += (s, e) => selectRaised = true;
-
-        Assert.Equal (KeyCode.T, view.HotKey);
-        Assert.True (Application.RaiseKeyDownEvent (Key.T));
-        Assert.True (hotKeyRaised);
-        Assert.False (acceptRaised);
-        Assert.False (selectRaised);
-
-        hotKeyRaised = false;
-        Assert.True (Application.RaiseKeyDownEvent (Key.T.WithAlt));
-        Assert.True (hotKeyRaised);
-        Assert.False (acceptRaised);
-        Assert.False (selectRaised);
-
-        hotKeyRaised = false;
-        view.HotKey = KeyCode.E;
-        Assert.True (Application.RaiseKeyDownEvent (Key.E.WithAlt));
-        Assert.True (hotKeyRaised);
-        Assert.False (acceptRaised);
-        Assert.False (selectRaised);
-
-        Application.Top.Dispose ();
-        Application.ResetState (true);
-    }
 }
--- a/Tests/UnitTestsParallelizable/View/Keyboard/KeyboardEventTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Keyboard/KeyboardEventTests.cs
@@ -5,6 +5,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class KeyboardEventTests (ITestOutputHelper output) : TestsAllViews
 {
    /// <summary>
--- a/Tests/UnitTestsParallelizable/View/Layout/Dim.Tests.cs
+++ b/Tests/UnitTestsParallelizable/View/Layout/Dim.Tests.cs
@@ -6,6 +6,7 @@ using static Terminal.Gui.Dim;

 namespace Terminal.Gui.LayoutTests;

+[Collection ("Global Test Setup")]
 public class DimTests
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Layout/SetLayoutTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Layout/SetLayoutTests.cs
@@ -1,6 +1,8 @@
-namespace Terminal.Gui.LayoutTests;
+using UnitTests.Parallelizable;

-public class SetLayoutTests
+namespace Terminal.Gui.LayoutTests;
+
+public class SetLayoutTests : GlobalTestSetup
 {
    [Fact]
    public void Add_Does_Not_Call_Layout ()
--- a/Tests/UnitTestsParallelizable/View/Mouse/MouseTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Mouse/MouseTests.cs
@@ -3,6 +3,8 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewMouseTests;

+
+[Collection ("Global Test Setup")]
 [Trait ("Category", "Input")]
 public class MouseTests (ITestOutputHelper output) : TestsAllViews
 {
--- a/Tests/UnitTestsParallelizable/View/Navigation/AddRemoveTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/AddRemoveTests.cs
@@ -3,6 +3,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class AddRemoveNavigationTests () : TestsAllViews
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Navigation/CanFocusTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/CanFocusTests.cs
@@ -3,6 +3,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class CanFocusTests () : TestsAllViews
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Navigation/EnabledTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/EnabledTests.cs
@@ -2,6 +2,7 @@

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class EnabledTests : TestsAllViews
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Navigation/HasFocusChangeEventTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/HasFocusChangeEventTests.cs
@@ -3,6 +3,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class HasFocusChangeEventTests () : TestsAllViews
 {
    #region HasFocusChanging_NewValue_True
--- a/Tests/UnitTestsParallelizable/View/Navigation/HasFocusTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/HasFocusTests.cs
@@ -3,6 +3,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class HasFocusTests () : TestsAllViews
 {

--- a/Tests/UnitTestsParallelizable/View/Navigation/RestoreFocusTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/RestoreFocusTests.cs
@@ -3,6 +3,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class RestoreFocusTests () : TestsAllViews
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Navigation/SetFocusTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/SetFocusTests.cs
@@ -3,6 +3,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class SetFocusTests () : TestsAllViews
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/Navigation/VisibleTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Navigation/VisibleTests.cs
@@ -3,6 +3,7 @@ using Xunit.Abstractions;

 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class VisibleTests () : TestsAllViews
 {
    [Fact]
--- a/Tests/UnitTestsParallelizable/View/SubviewTests.cs
+++ b/Tests/UnitTestsParallelizable/View/SubviewTests.cs
@@ -1,5 +1,6 @@
 namespace Terminal.Gui.ViewTests;

+[Collection ("Global Test Setup")]
 public class SubViewTests
 {
    [Fact]
@@ -591,4 +592,70 @@ public class SubViewTests
        Assert.NotEqual (superView, subView.SuperView);
        Assert.Empty (superView.SubViews);
    }
+
+    [Fact]
+    public void RemoveAll_Removes_All_SubViews ()
+    {
+        // Arrange
+        var superView = new View ();
+        var subView1 = new View ();
+        var subView2 = new View ();
+        var subView3 = new View ();
+
+        superView.Add (subView1, subView2, subView3);
+
+        // Act
+        var removedViews = superView.RemoveAll ();
+
+        // Assert
+        Assert.Empty (superView.SubViews);
+        Assert.Equal (3, removedViews.Count);
+        Assert.Contains (subView1, removedViews);
+        Assert.Contains (subView2, removedViews);
+        Assert.Contains (subView3, removedViews);
+    }
+
+    [Fact]
+    public void RemoveAllTView_Removes_All_SubViews_Of_Specific_Type ()
+    {
+        // Arrange
+        var superView = new View ();
+        var subView1 = new View ();
+        var subView2 = new View ();
+        var subView3 = new View ();
+        var subView4 = new Button ();
+
+        superView.Add (subView1, subView2, subView3, subView4);
+
+        // Act
+        var removedViews = superView.RemoveAll<Button> ();
+
+        // Assert
+        Assert.Equal (3, superView.SubViews.Count);
+        Assert.DoesNotContain (subView4, superView.SubViews);
+        Assert.Single (removedViews);
+        Assert.Contains (subView4, removedViews);
+    }
+
+    [Fact]
+    public void RemoveAllTView_Does_Not_Remove_Other_Types ()
+    {
+        // Arrange
+        var superView = new View ();
+        var subView1 = new View ();
+        var subView2 = new Button ();
+        var subView3 = new Label ();
+
+        superView.Add (subView1, subView2, subView3);
+
+        // Act
+        var removedViews = superView.RemoveAll<Button> ();
+
+        // Assert
+        Assert.Equal (2, superView.SubViews.Count);
+        Assert.Contains (subView1, superView.SubViews);
+        Assert.Contains (subView3, superView.SubViews);
+        Assert.Single (removedViews);
+        Assert.Contains (subView2, removedViews);
+    }
 }