Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleans up/Refactors View.Subviews (#3962)

Browse Source 
* Subview clean up

* New Add/Remove event pattern

* Using Logging

* cleanup

* Subview -> SubView

* Test code cleanup. Killed many warnings.

* Fix tznind feedback

* Refactored AllViewTest helpers

* Moved keyboard tests to parallel

* Moved mouse tests to parallel

* Moved view tests to parallel

* Test code cleanup. Killed many warnings.

* dupe test

* Some mouse tests can't run in parallel because MouseGrabView

* Made SpinnerView more testable

* Moved more tests

* SubViews to IReadOnlyCollection<View>

* SubViews to IReadOnlyCollection<View> 2

* scrollbar tests

* shortcut tests

* Use InternalSubViews vs. _subviews

* Nuked View.IsAdded.
Added View.SuperViewChanged.

* API doc updats

* Unit Test tweak

* Unit Test tweak
This commit is contained in:
Tig
2025-03-08 15:42:17 -07:00
committed by GitHub
parent 85cf6619ed
commit acb5979e6c
226 changed files with 7235 additions and 7188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Tests/UnitTests/Views/MenuBarTests.cs
View File

@@ -1,5 +1,4 @@
using UnitTests;
using UnitTests;
using Xunit.Abstractions;
namespace Terminal.Gui.ViewsTests;
@@ -410,13 +409,13 @@ public class MenuBarTests (ITestOutputHelper output)
);
Assert.True (
top.Subviews [1]
top.SubViews.ElementAt (1)
.NewMouseEvent (
new () { Position = new (0, 2), Flags = MouseFlags.Button1Clicked, View = top.Subviews [1] }
new () { Position = new (0, 2), Flags = MouseFlags.Button1Clicked, View = top.SubViews.ElementAt (1) }
)
);
top.Subviews [1].Layout();
top.Subviews [1].Draw ();
top.SubViews.ElementAt (1).Layout();
top.SubViews.ElementAt (1).Draw ();
DriverAssert.AssertDriverAttributesAre (
@"
@@ -433,12 +432,12 @@ public class MenuBarTests (ITestOutputHelper output)
);
Assert.True (
top.Subviews [1]
top.SubViews.ElementAt (1)
.NewMouseEvent (
new () { Position = new (0, 2), Flags = MouseFlags.ReportMousePosition, View = top.Subviews [1] }
new () { Position = new (0, 2), Flags = MouseFlags.ReportMousePosition, View = top.SubViews.ElementAt (1) }
)
);
top.Subviews [1].Draw ();
top.SubViews.ElementAt (1).Draw ();
DriverAssert.AssertDriverAttributesAre (
@"
@@ -1218,7 +1217,7 @@ wo
Application.Top.Draw ();
DriverAssert.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), output);
Assert.True (Application.Top.Subviews [1].NewKeyDownEvent (Key.N));
Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.N));
Application.MainLoop.RunIteration ();
Assert.True (newAction);
@@ -1227,7 +1226,7 @@ wo
Application.Top.Draw ();
DriverAssert.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (1), output);
Assert.True (Application.Top.Subviews [1].NewKeyDownEvent (Key.C));
Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.C));
Application.MainLoop.RunIteration ();
Assert.True (copyAction);
top.Dispose ();
@@ -1979,7 +1978,7 @@ wo
output
);
Assert.True (top.Subviews [0].NewKeyDownEvent (Key.CursorRight));
Assert.True (top.SubViews.ElementAt (0).NewKeyDownEvent (Key.CursorRight));
Application.LayoutAndDraw ();
DriverAssert.AssertDriverContentsWithFrameAre (
@@ -1996,7 +1995,7 @@ wo
);
Assert.True (
((MenuBar)top.Subviews [0])._openMenu.NewKeyDownEvent (Key.CursorRight)
((MenuBar)top.SubViews.ElementAt (0))._openMenu.NewKeyDownEvent (Key.CursorRight)
);
top.Draw ();
@@ -2014,7 +2013,7 @@ wo
);
Assert.True (
((MenuBar)top.Subviews [0])._openMenu.NewKeyDownEvent (Key.CursorRight)
((MenuBar)top.SubViews.ElementAt (0))._openMenu.NewKeyDownEvent (Key.CursorRight)
);
View.SetClipToScreen ();
top.Draw ();
@@ -2089,7 +2088,7 @@ wo
DriverAssert.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), output);
// Open second
Assert.True (Application.Top.Subviews [1].NewKeyDownEvent (Key.CursorRight));
Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorRight));
Assert.True (menu.IsMenuOpen);
View.SetClipToScreen ();
top.Draw ();
@@ -2137,7 +2136,7 @@ wo
DriverAssert.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), output);
// Open second
Assert.True (top.Subviews [1].NewKeyDownEvent (Key.CursorRight));
Assert.True (top.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorRight));
Assert.True (menu.IsMenuOpen);
View.SetClipToScreen ();
Application.Top.Draw ();
@@ -2844,7 +2843,7 @@ Edit
menuBar2.Visible = true;
w.Add (menuBar2);
MenuBar [] menuBars = w.Subviews.OfType<MenuBar> ().ToArray ();
MenuBar [] menuBars = w.SubViews.OfType<MenuBar> ().ToArray ();
Assert.Equal (2, menuBars.Length);
Assert.Equal (Dim.Fill (), menuBars [0].Width);
@@ -3081,7 +3080,7 @@ Edit
pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
Assert.True (Application.Top.Subviews [1].NewKeyDownEvent (Key.CursorDown));
Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorDown));
top.Draw ();
expected = @"
@@ -3096,7 +3095,7 @@ Edit
pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
Assert.True (Application.Top.Subviews [2].NewKeyDownEvent (Key.CursorLeft));
Assert.True (Application.Top.SubViews.ElementAt (2).NewKeyDownEvent (Key.CursorLeft));
top.Draw ();
expected = @"
@@ -3110,7 +3109,7 @@ Edit
pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
Assert.True (Application.Top.Subviews [1].NewKeyDownEvent (Key.Esc));
Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.Esc));
top.Draw ();
expected = @"
@@ -3192,7 +3191,7 @@ Edit
menu.NewMouseEvent (
new ()
{
Position = new (1, 2), Flags = MouseFlags.ReportMousePosition, View = Application.Top.Subviews [1]
Position = new (1, 2), Flags = MouseFlags.ReportMousePosition, View = Application.Top.SubViews.ElementAt (1)
}
);
top.Draw ();
@@ -3214,7 +3213,7 @@ Edit
menu.NewMouseEvent (
new ()
{
Position = new (1, 1), Flags = MouseFlags.ReportMousePosition, View = Application.Top.Subviews [1]
Position = new (1, 1), Flags = MouseFlags.ReportMousePosition, View = Application.Top.SubViews.ElementAt (1)
}
)
);
@@ -3383,8 +3382,8 @@ Edit
pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new (1, 0, 10, 6), pos);
Assert.True (Application.Top.Subviews [1].NewKeyDownEvent (Key.CursorDown));
Assert.True (Application.Top.Subviews [1].NewKeyDownEvent (Key.Enter));
Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorDown));
Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.Enter));
top.Draw ();
expected = @"
@@ -3400,7 +3399,7 @@ Edit
pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new (1, 0, 15, 7), pos);
Assert.True (Application.Top.Subviews [2].NewKeyDownEvent (Key.Enter));
Assert.True (Application.Top.SubViews.ElementAt (2).NewKeyDownEvent (Key.Enter));
top.Draw ();
expected = @"
@@ -3415,7 +3414,7 @@ Edit
pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new (1, 0, 10, 6), pos);
Assert.True (Application.Top.Subviews [1].NewKeyDownEvent (Key.Esc));
Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.Esc));
top.Draw ();
expected = @"
@@ -3495,7 +3494,7 @@ Edit
pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new (1, 0, 10, 6), pos);
Assert.False (menu.NewMouseEvent (new () { Position = new (1, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [1] }));
Assert.False (menu.NewMouseEvent (new () { Position = new (1, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top.SubViews.ElementAt (1) }));
top.Draw ();
expected = @"
@@ -3511,7 +3510,7 @@ Edit
pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new (1, 0, 15, 7), pos);
menu.NewMouseEvent (new () { Position = new (1, 1), Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [2] });
menu.NewMouseEvent (new () { Position = new (1, 1), Flags = MouseFlags.Button1Clicked, View = Application.Top.SubViews.ElementAt (2) });
top.Draw ();
expected = @"
@@ -3681,7 +3680,7 @@ Edit
Assert.Equal (new (1, 0, 8, 4), pos);
menu.NewMouseEvent (
new () { Position = new (1, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [1] }
new () { Position = new (1, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top.SubViews.ElementAt (1) }
);
top.Draw ();
@@ -3697,7 +3696,7 @@ Edit
Assert.Equal (new (1, 0, 13, 5), pos);
menu.NewMouseEvent (
new () { Position = new (1, 1), Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [2] }
new () { Position = new (1, 1), Flags = MouseFlags.Button1Clicked, View = Application.Top.SubViews.ElementAt (2) }
);
top.Draw ();