From d5fe8b48fcca2e3c0dd9ccc3ee0241c18b4f5544 Mon Sep 17 00:00:00 2001 From: Tig Kindel Date: Sun, 7 Jan 2024 15:09:53 -0700 Subject: [PATCH] re-reverting --- Terminal.Gui/Views/Toplevel.cs | 34 +++-- .../Views/{Toplevel => }/OverlappedTests.cs | 15 +-- .../Views/{Toplevel => }/ToplevelTests.cs | 125 +++++++++--------- UnitTests/Views/{Toplevel => }/WindowTests.cs | 24 ++-- 4 files changed, 97 insertions(+), 101 deletions(-) rename UnitTests/Views/{Toplevel => }/OverlappedTests.cs (99%) rename UnitTests/Views/{Toplevel => }/ToplevelTests.cs (94%) rename UnitTests/Views/{Toplevel => }/WindowTests.cs (94%) diff --git a/Terminal.Gui/Views/Toplevel.cs b/Terminal.Gui/Views/Toplevel.cs index 9df50b683..6c674b26a 100644 --- a/Terminal.Gui/Views/Toplevel.cs +++ b/Terminal.Gui/Views/Toplevel.cs @@ -11,7 +11,7 @@ namespace Terminal.Gui; /// /// /// -/// Toplevels can run as modal (popup) views, started by calling +/// Toplevels can be modally executing views, started by calling /// . /// They return control to the caller when has /// been called (which sets the property to false). @@ -22,14 +22,14 @@ namespace Terminal.Gui; /// The application Toplevel can be accessed via . Additional /// Toplevels can be created /// and run (e.g. s. To run a Toplevel, create the and -/// call . +/// call +/// . /// /// public partial class Toplevel : View { internal static Point? _dragPosition; Point _startGrabPoint; - // BUGBUG: Remove; Toplevel should be ComputedLayout /// /// Initializes a new instance of the class with the specified /// layout. @@ -42,8 +42,8 @@ public partial class Toplevel : View { /// /// Initializes a new instance of the class with - /// layout, defaulting to full screen. The and properties - /// will be set to the dimensions of the terminal using . + /// layout, + /// defaulting to full screen. /// public Toplevel () { @@ -306,17 +306,17 @@ public partial class Toplevel : View { KeyBindings.Add ((KeyCode)Application.QuitKey, Command.QuitToplevel); KeyBindings.Add (KeyCode.CursorRight, Command.NextView); - KeyBindings.Add (KeyCode.CursorDown, Command.NextView); - KeyBindings.Add (KeyCode.CursorLeft, Command.PreviousView); - KeyBindings.Add (KeyCode.CursorUp, Command.PreviousView); + KeyBindings.Add (KeyCode.CursorDown, Command.NextView); + KeyBindings.Add (KeyCode.CursorLeft, Command.PreviousView); + KeyBindings.Add (KeyCode.CursorUp, Command.PreviousView); - KeyBindings.Add (KeyCode.Tab, Command.NextView); - KeyBindings.Add (KeyCode.Tab | KeyCode.ShiftMask, Command.PreviousView); - KeyBindings.Add (KeyCode.Tab | KeyCode.CtrlMask, Command.NextViewOrTop); + KeyBindings.Add (KeyCode.Tab, Command.NextView); + KeyBindings.Add (KeyCode.Tab | KeyCode.ShiftMask, Command.PreviousView); + KeyBindings.Add (KeyCode.Tab | KeyCode.CtrlMask, Command.NextViewOrTop); KeyBindings.Add (KeyCode.Tab | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.PreviousViewOrTop); - KeyBindings.Add (KeyCode.F5, Command.Refresh); - KeyBindings.Add ((KeyCode)Application.AlternateForwardKey, Command.NextViewOrTop); // Needed on Unix + KeyBindings.Add (KeyCode.F5, Command.Refresh); + KeyBindings.Add ((KeyCode)Application.AlternateForwardKey, Command.NextViewOrTop); // Needed on Unix KeyBindings.Add ((KeyCode)Application.AlternateBackwardKey, Command.PreviousViewOrTop); // Needed on Unix #if UNIX_KEY_BINDINGS @@ -389,6 +389,12 @@ public partial class Toplevel : View { QuitKeyChanged?.Invoke (this, e); } + /// + /// Convenience factory method that creates a new Toplevel with the current terminal dimensions. + /// + /// The created Toplevel. + public static Toplevel Create () => new (new Rect (0, 0, Driver.Cols, Driver.Rows)); + void MovePreviousViewOrTop () { if (Application.OverlappedTop == null) { @@ -676,7 +682,7 @@ public partial class Toplevel : View { public virtual void PositionToplevel (Toplevel top) { var superView = GetLocationThatFits (top, top.Frame.X, top.Frame.Y, - out var nx, out var ny, out _, out var sb); + out var nx, out var ny, out _, out var sb); var layoutSubviews = false; var maxWidth = 0; if (superView.Margin != null && superView == top.SuperView) { diff --git a/UnitTests/Views/Toplevel/OverlappedTests.cs b/UnitTests/Views/OverlappedTests.cs similarity index 99% rename from UnitTests/Views/Toplevel/OverlappedTests.cs rename to UnitTests/Views/OverlappedTests.cs index da3beccce..efb482586 100644 --- a/UnitTests/Views/Toplevel/OverlappedTests.cs +++ b/UnitTests/Views/OverlappedTests.cs @@ -1,9 +1,8 @@ using System; -using Terminal.Gui; using Xunit; using Xunit.Abstractions; -namespace TerminalGui.ViewsTests; +namespace Terminal.Gui.ViewsTests; public class OverlappedTests { readonly ITestOutputHelper _output; @@ -17,8 +16,7 @@ public class OverlappedTests { #endif } - [Fact] - [TestRespondersDisposed] + [Fact] [TestRespondersDisposed] public void Dispose_Toplevel_IsOverlappedContainer_False_With_Begin_End () { Application.Init (new FakeDriver ()); @@ -37,8 +35,7 @@ public class OverlappedTests { #endif } - [Fact] - [TestRespondersDisposed] + [Fact] [TestRespondersDisposed] public void Dispose_Toplevel_IsOverlappedContainer_True_With_Begin () { Application.Init (new FakeDriver ()); @@ -50,8 +47,7 @@ public class OverlappedTests { Application.Shutdown (); } - [Fact] - [AutoInitShutdown] + [Fact] [AutoInitShutdown] public void Application_RequestStop_With_Params_On_A_Not_OverlappedContainer_Always_Use_Application_Current () { var top1 = new Toplevel (); @@ -687,8 +683,7 @@ public class OverlappedTests { [Fact] public void MoveToOverlappedChild_Throw_NullReferenceException_Passing_Null_Parameter () => Assert.Throws (delegate { Application.MoveToOverlappedChild (null); }); - [Fact] - [AutoInitShutdown] + [Fact] [AutoInitShutdown] public void Visible_False_Does_Not_Clear () { var overlapped = new Overlapped (); diff --git a/UnitTests/Views/Toplevel/ToplevelTests.cs b/UnitTests/Views/ToplevelTests.cs similarity index 94% rename from UnitTests/Views/Toplevel/ToplevelTests.cs rename to UnitTests/Views/ToplevelTests.cs index 071252e9d..c460c3b63 100644 --- a/UnitTests/Views/Toplevel/ToplevelTests.cs +++ b/UnitTests/Views/ToplevelTests.cs @@ -1,9 +1,8 @@ using System; -using Terminal.Gui; using Xunit; using Xunit.Abstractions; -namespace TerminalGui.ViewsTests; +namespace Terminal.Gui.ViewsTests; public class ToplevelTests { readonly ITestOutputHelper _output; @@ -17,8 +16,8 @@ public class ToplevelTests { var top = new Toplevel (); Assert.Equal (Colors.TopLevel, top.ColorScheme); - Assert.Equal ("Fill(0)", top.Width.ToString ()); - Assert.Equal ("Fill(0)", top.Height.ToString ()); + Assert.Equal ("Fill(0)", top.Width.ToString ()); + Assert.Equal ("Fill(0)", top.Height.ToString ()); Assert.False (top.Running); Assert.False (top.Modal); Assert.Null (top.MenuBar); @@ -226,8 +225,8 @@ public class ToplevelTests { // Application.Top without menu and status bar. var supView = top.GetLocationThatFits (top, 2, 2, out var nx, out var ny, out var mb, out var sb); Assert.Equal (Application.Top, supView); - Assert.Equal (0, nx); - Assert.Equal (0, ny); + Assert.Equal (0, nx); + Assert.Equal (0, ny); Assert.Null (mb); Assert.Null (sb); @@ -341,7 +340,7 @@ public class ToplevelTests { // Application.Top with a menu and status bar. top.GetLocationThatFits (win, 30, 20, out nx, out ny, out mb, out sb); Assert.Equal (20, nx); // 20+60=80 - Assert.Equal (9, ny); // 9+15+1(mb)=25 + Assert.Equal (9, ny); // 9+15+1(mb)=25 Assert.NotNull (mb); Assert.NotNull (sb); @@ -389,10 +388,10 @@ public class ToplevelTests { Application.Begin (top); top.Running = true; - Assert.Equal (new Rect (0, 0, 40, 25), win1.Frame); + Assert.Equal (new Rect (0, 0, 40, 25), win1.Frame); Assert.Equal (new Rect (41, 0, 40, 25), win2.Frame); - Assert.Equal (win1, top.Focused); - Assert.Equal (tf1W1, top.MostFocused); + Assert.Equal (win1, top.Focused); + Assert.Equal (tf1W1, top.MostFocused); Assert.True (isRunning); Assert.True (Application.OnKeyDown (Application.QuitKey)); @@ -409,13 +408,13 @@ public class ToplevelTests { Assert.True (Application.OnKeyDown (new Key (KeyCode.Tab | KeyCode.ShiftMask))); Assert.Equal ($"First line Win1{Environment.NewLine}Second line Win1", tvW1.Text); Assert.True (Application.OnKeyDown (new Key (KeyCode.Tab | KeyCode.CtrlMask))); - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf2W1, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.Tab))); - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf1W1, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.CursorRight))); - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf1W1, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.CursorDown))); Assert.Equal (win1, top.Focused); @@ -429,22 +428,22 @@ public class ToplevelTests { Assert.Equal (win1, top.Focused); Assert.Equal (tvW1, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.CursorLeft))); - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf1W1, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.CursorUp))); - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf2W1, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.Tab | KeyCode.CtrlMask))); - Assert.Equal (win2, top.Focused); + Assert.Equal (win2, top.Focused); Assert.Equal (tf1W2, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.Tab | KeyCode.CtrlMask | KeyCode.ShiftMask))); - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf2W1, top.MostFocused); Assert.True (Application.OnKeyDown (Application.AlternateForwardKey)); - Assert.Equal (win2, top.Focused); + Assert.Equal (win2, top.Focused); Assert.Equal (tf1W2, top.MostFocused); Assert.True (Application.OnKeyDown (Application.AlternateBackwardKey)); - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf2W1, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.CursorUp))); Assert.Equal (win1, top.Focused); @@ -454,23 +453,23 @@ public class ToplevelTests { #else Assert.True (Application.OnKeyDown (new Key (KeyCode.CursorLeft))); #endif - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf1W1, top.MostFocused); Assert.True (Application.OnKeyDown (new Key (KeyCode.CursorDown))); - Assert.Equal (win1, top.Focused); - Assert.Equal (tvW1, top.MostFocused); + Assert.Equal (win1, top.Focused); + Assert.Equal (tvW1, top.MostFocused); Assert.Equal (new Point (0, 0), tvW1.CursorPosition); Assert.True (Application.OnKeyDown (new Key (KeyCode.End | KeyCode.CtrlMask))); - Assert.Equal (win1, top.Focused); - Assert.Equal (tvW1, top.MostFocused); + Assert.Equal (win1, top.Focused); + Assert.Equal (tvW1, top.MostFocused); Assert.Equal (new Point (16, 1), tvW1.CursorPosition); #if UNIX_KEY_BINDINGS Assert.True (Application.OnKeyDown (new (Key.F | Key.CtrlMask))); #else Assert.True (Application.OnKeyDown (new Key (KeyCode.CursorRight))); #endif - Assert.Equal (win1, top.Focused); + Assert.Equal (win1, top.Focused); Assert.Equal (tf2W1, top.MostFocused); #if UNIX_KEY_BINDINGS @@ -537,7 +536,7 @@ public class ToplevelTests { Assert.Null (top.Focused); Assert.Null (top.MostFocused); Assert.Equal (tf1W2, win2.MostFocused); - Assert.Equal (2, Application.OverlappedChildren.Count); + Assert.Equal (2, Application.OverlappedChildren.Count); Application.MoveToOverlappedChild (win1); Assert.Equal (win1, Application.Current); @@ -559,13 +558,13 @@ public class ToplevelTests { Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.Tab | KeyCode.ShiftMask))); Assert.Equal ($"First line Win1{Environment.NewLine}Second line Win1", tvW1.Text); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.Tab | KeyCode.CtrlMask))); - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf2W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.Tab))); - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf1W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.CursorRight))); - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf1W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.CursorDown))); Assert.Equal (win1, Application.OverlappedChildren [0]); @@ -579,27 +578,27 @@ public class ToplevelTests { Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tvW1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.CursorLeft))); - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf1W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.CursorUp))); - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf2W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.Tab))); - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf1W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.Tab | KeyCode.CtrlMask))); - Assert.Equal (win2, Application.OverlappedChildren [0]); + Assert.Equal (win2, Application.OverlappedChildren [0]); Assert.Equal (tf1W2, win2.MostFocused); tf2W2.SetFocus (); Assert.True (tf2W2.HasFocus); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.Tab | KeyCode.CtrlMask | KeyCode.ShiftMask))); - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf1W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (Application.AlternateForwardKey)); - Assert.Equal (win2, Application.OverlappedChildren [0]); + Assert.Equal (win2, Application.OverlappedChildren [0]); Assert.Equal (tf2W2, win2.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (Application.AlternateBackwardKey)); - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf1W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.CursorDown))); Assert.Equal (win1, Application.OverlappedChildren [0]); @@ -609,22 +608,22 @@ public class ToplevelTests { #else Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.CursorLeft))); #endif - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf1W1, win1.MostFocused); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.CursorDown))); - Assert.Equal (win1, Application.OverlappedChildren [0]); - Assert.Equal (tvW1, win1.MostFocused); + Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (tvW1, win1.MostFocused); Assert.Equal (new Point (0, 0), tvW1.CursorPosition); Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.End | KeyCode.CtrlMask))); - Assert.Equal (win1, Application.OverlappedChildren [0]); - Assert.Equal (tvW1, win1.MostFocused); + Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (tvW1, win1.MostFocused); Assert.Equal (new Point (16, 1), tvW1.CursorPosition); #if UNIX_KEY_BINDINGS Assert.True (Application.OverlappedChildren [0].ProcessKeyDown (new (Key.F | Key.CtrlMask))); #else Assert.True (Application.OverlappedChildren [0].NewKeyDownEvent (new Key (KeyCode.CursorRight))); #endif - Assert.Equal (win1, Application.OverlappedChildren [0]); + Assert.Equal (win1, Application.OverlappedChildren [0]); Assert.Equal (tf2W1, win1.MostFocused); #if UNIX_KEY_BINDINGS @@ -693,16 +692,16 @@ public class ToplevelTests { Assert.Equal (KeyCode.Null, quitKey); Assert.Equal (KeyCode.PageDown | KeyCode.CtrlMask, Application.AlternateForwardKey); - Assert.Equal (KeyCode.PageUp | KeyCode.CtrlMask, Application.AlternateBackwardKey); - Assert.Equal (KeyCode.Q | KeyCode.CtrlMask, Application.QuitKey); + Assert.Equal (KeyCode.PageUp | KeyCode.CtrlMask, Application.AlternateBackwardKey); + Assert.Equal (KeyCode.Q | KeyCode.CtrlMask, Application.QuitKey); Application.AlternateForwardKey = KeyCode.A; Application.AlternateBackwardKey = KeyCode.B; Application.QuitKey = KeyCode.C; Assert.Equal (KeyCode.PageDown | KeyCode.CtrlMask, alternateForwardKey); - Assert.Equal (KeyCode.PageUp | KeyCode.CtrlMask, alternateBackwardKey); - Assert.Equal (KeyCode.Q | KeyCode.CtrlMask, quitKey); + Assert.Equal (KeyCode.PageUp | KeyCode.CtrlMask, alternateBackwardKey); + Assert.Equal (KeyCode.Q | KeyCode.CtrlMask, quitKey); Assert.Equal (KeyCode.A, Application.AlternateForwardKey); Assert.Equal (KeyCode.B, Application.AlternateBackwardKey); @@ -714,8 +713,8 @@ public class ToplevelTests { Application.QuitKey = KeyCode.Q | KeyCode.CtrlMask; Assert.Equal (KeyCode.PageDown | KeyCode.CtrlMask, Application.AlternateForwardKey); - Assert.Equal (KeyCode.PageUp | KeyCode.CtrlMask, Application.AlternateBackwardKey); - Assert.Equal (KeyCode.Q | KeyCode.CtrlMask, Application.QuitKey); + Assert.Equal (KeyCode.PageUp | KeyCode.CtrlMask, Application.AlternateBackwardKey); + Assert.Equal (KeyCode.Q | KeyCode.CtrlMask, Application.QuitKey); } [Fact] @@ -761,7 +760,7 @@ public class ToplevelTests { Flags = MouseFlags.Button1Pressed })); - Assert.Equal (Application.Current, Application.MouseGrabView); + Assert.Equal (Application.Current, Application.MouseGrabView); Assert.Equal (new Rect (2, 2, 10, 3), Application.MouseGrabView.Frame); } else if (iterations == 3) { @@ -774,7 +773,7 @@ public class ToplevelTests { })); Application.Refresh (); - Assert.Equal (Application.Current, Application.MouseGrabView); + Assert.Equal (Application.Current, Application.MouseGrabView); Assert.Equal (new Rect (1, 2, 10, 3), Application.MouseGrabView.Frame); } else if (iterations == 4) { @@ -800,7 +799,7 @@ public class ToplevelTests { })); Application.Refresh (); - Assert.Equal (Application.Current, Application.MouseGrabView); + Assert.Equal (Application.Current, Application.MouseGrabView); Assert.Equal (new Rect (1, 1, 10, 3), Application.MouseGrabView.Frame); } else if (iterations == 6) { @@ -815,7 +814,7 @@ public class ToplevelTests { │ │ └─────────────┘", _output); - Assert.Equal (Application.Current, Application.MouseGrabView); + Assert.Equal (Application.Current, Application.MouseGrabView); Assert.Equal (new Rect (1, 1, 10, 3), Application.MouseGrabView.Frame); } else if (iterations == 7) { @@ -875,7 +874,7 @@ public class ToplevelTests { Flags = MouseFlags.Button1Pressed })); - Assert.Equal (win, Application.MouseGrabView); + Assert.Equal (win, Application.MouseGrabView); Assert.Equal (location, Application.MouseGrabView.Frame); } else if (iterations == 2) { Assert.Equal (win, Application.MouseGrabView); @@ -1168,10 +1167,10 @@ public class ToplevelTests { top.Add (scrollView); Application.Begin (top); - Assert.Equal (new Rect (0, 0, 80, 25), top.Frame); - Assert.Equal (new Rect (3, 3, 40, 16), scrollView.Frame); + Assert.Equal (new Rect (0, 0, 80, 25), top.Frame); + Assert.Equal (new Rect (3, 3, 40, 16), scrollView.Frame); Assert.Equal (new Rect (0, 0, 200, 100), scrollView.Subviews [0].Frame); - Assert.Equal (new Rect (3, 3, 194, 94), win.Frame); + Assert.Equal (new Rect (3, 3, 194, 94), win.Frame); TestHelpers.AssertDriverContentsWithFrameAre (@" ▲ ┬ @@ -1195,7 +1194,7 @@ public class ToplevelTests { Y = 6, Flags = MouseFlags.Button1Pressed })); - Assert.Equal (win, Application.MouseGrabView); + Assert.Equal (win, Application.MouseGrabView); Assert.Equal (new Rect (3, 3, 194, 94), win.Frame); Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent { @@ -1280,7 +1279,7 @@ public class ToplevelTests { Application.Begin (window); Application.Refresh (); Assert.Equal (new Rect (0, 0, 40, 10), top.Frame); - Assert.Equal (new Rect (0, 0, 20, 3), window.Frame); + Assert.Equal (new Rect (0, 0, 20, 3), window.Frame); TestHelpers.AssertDriverContentsWithFrameAre (@" ┌──────────────────┐ │ │ @@ -1305,7 +1304,7 @@ public class ToplevelTests { Application.Refresh (); Assert.Equal (new Rect (0, 0, 40, 10), top.Frame); - Assert.Equal (new Rect (0, 0, 20, 3), window.Frame); + Assert.Equal (new Rect (0, 0, 20, 3), window.Frame); TestHelpers.AssertDriverContentsWithFrameAre (@" ┌──────────────────┐ │ │ @@ -1338,7 +1337,7 @@ public class ToplevelTests { })); Application.Refresh (); - Assert.Equal (new Rect (0, 0, 19, 2), top.Frame); + Assert.Equal (new Rect (0, 0, 19, 2), top.Frame); Assert.Equal (new Rect (-1, 0, 20, 3), window.Frame); TestHelpers.AssertDriverContentsWithFrameAre (@" ──────────────────┐ @@ -1352,7 +1351,7 @@ public class ToplevelTests { })); Application.Refresh (); - Assert.Equal (new Rect (0, 0, 19, 2), top.Frame); + Assert.Equal (new Rect (0, 0, 19, 2), top.Frame); Assert.Equal (new Rect (18, 1, 20, 3), window.Frame); TestHelpers.AssertDriverContentsWithFrameAre (@" ┌", _output); @@ -1365,7 +1364,7 @@ public class ToplevelTests { })); Application.Refresh (); - Assert.Equal (new Rect (0, 0, 19, 2), top.Frame); + Assert.Equal (new Rect (0, 0, 19, 2), top.Frame); Assert.Equal (new Rect (19, 2, 20, 3), window.Frame); TestHelpers.AssertDriverContentsWithFrameAre (@"", _output); } @@ -1420,7 +1419,7 @@ public class ToplevelTests { firstIteration = false; Application.RunIteration (ref rs, ref firstIteration); - Assert.Equal (window, Application.MouseGrabView); + Assert.Equal (window, Application.MouseGrabView); Assert.Equal (new Rect (1, 1, 10, 3), window.Frame); TestHelpers.AssertDriverContentsWithFrameAre (@" ┌────────┐ diff --git a/UnitTests/Views/Toplevel/WindowTests.cs b/UnitTests/Views/WindowTests.cs similarity index 94% rename from UnitTests/Views/Toplevel/WindowTests.cs rename to UnitTests/Views/WindowTests.cs index 08d922321..17732912e 100644 --- a/UnitTests/Views/Toplevel/WindowTests.cs +++ b/UnitTests/Views/WindowTests.cs @@ -1,8 +1,7 @@ -using Terminal.Gui; -using Xunit; +using Xunit; using Xunit.Abstractions; -namespace TerminalGui.ViewsTests; +namespace Terminal.Gui.ViewsTests; public class WindowTests { readonly ITestOutputHelper _output; @@ -15,9 +14,9 @@ public class WindowTests { // Parameterless var r = new Window (); Assert.NotNull (r); - Assert.Equal (string.Empty, r.Title); + Assert.Equal (string.Empty, r.Title); Assert.Equal (LayoutStyle.Computed, r.LayoutStyle); - Assert.Equal ("Window()(0,0,0,0)", r.ToString ()); + Assert.Equal ("Window()(0,0,0,0)", r.ToString ()); Assert.True (r.CanFocus); Assert.False (r.HasFocus); Assert.Equal (new Rect (0, 0, 0, 0), r.Bounds); @@ -39,8 +38,8 @@ public class WindowTests { // Empty Rect r = new Window (Rect.Empty) { Title = "title" }; Assert.NotNull (r); - Assert.Equal ("title", r.Title); - Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle); + Assert.Equal ("title", r.Title); + Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle); Assert.Equal ("Window(title)(0,0,0,0)", r.ToString ()); Assert.True (r.CanFocus); Assert.False (r.HasFocus); @@ -64,7 +63,7 @@ public class WindowTests { r = new Window (new Rect (1, 2, 3, 4)) { Title = "title" }; Assert.Equal ("title", r.Title); Assert.NotNull (r); - Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle); + Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle); Assert.Equal ("Window(title)(1,2,3,4)", r.ToString ()); Assert.True (r.CanFocus); Assert.False (r.HasFocus); @@ -86,8 +85,7 @@ public class WindowTests { r.Dispose (); } - [Fact] - [AutoInitShutdown] + [Fact] [AutoInitShutdown] public void MenuBar_And_StatusBar_Inside_Window () { var menu = new MenuBar (new MenuBarItem [] { @@ -169,8 +167,7 @@ public class WindowTests { └──────────────────┘", _output); } - [Fact] - [AutoInitShutdown] + [Fact] [AutoInitShutdown] public void OnCanFocusChanged_Only_Must_ContentView_Forces_SetFocus_After_IsInitialized_Is_True () { var win1 = new Window { Id = "win1", Width = 10, Height = 1 }; @@ -188,8 +185,7 @@ public class WindowTests { Assert.False (view2.HasFocus); } - [Fact] - [AutoInitShutdown] + [Fact] [AutoInitShutdown] public void Activating_MenuBar_By_Alt_Key_Does_Not_Throw () { var menu = new MenuBar (new MenuBarItem [] {