Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3127 - View Layout improvements - Redefines how LayoutStyle works. Fixes AutoSize etc... (#3130)

Browse Source 
* Removes CheckAbsoulte and updates unit tests to match

* Fixed code that was dependent on ToString behavior vs. direct test for null

* Dim/Pos != null WIP

* Moved AutoSize specific tests out of Pos/Dim tests

* Broke out AutoSize = false tests to new file

* Commented test TODOs

* New test

* Removed unused API and cleaned up code

* Removed unused API and cleaned up code

* Cleaned up code

* Cleaned up code

* reorg'd Toplevel tests

* Fixed Create and related unit tests

* Added test from #3136

* Removed TopLevel.Create

* Fixed SetCurrentOverlappedAsTop

* Updated pull request template

* Updated pull request template

* Revert "Updated pull request template"

This reverts commit d807190dd9.

* reverting

* re-reverting

* Fixed every thing but autosize scenarios??

* Fixed hexview

* Fixed contextmenu

* Fixed more minor issues in tests

* Fixed more minor issues in tests

* Debugging Dialog test failure

* Fixed bad Dialog test. Was cleary invalid

* Fixed OnResizeNeeded bug

* Fixed OnResizeNeeded bug

* Fixed UICatalog to not eat exceptions

* Fixed TextView

* Removed Frame overrides

* Made Frame non-virtual

* Fixed radioGroup

* Fixed TabView

* Hcked ScrolLBarView unit tests to pass

* All AutoSize tests pass!

* All tests pass!!!!!!!

* Updated API docs. Cleaned up code.

* Fixed ColorPicker

* Added 'Bounds =' unit tests

* Refactored TextFormatter.Size setting logic

* Cleaned up OnResizeNeeded (api docs and usages)

* Merges in #3019 changes. Makes OnResizeNeeded non-virtual. If we find a use-case where someone wants to override it we can change this back.

* Fixed FileDialog bounds warning

* Removed resharper settings from editorconfig

* Added Pos.Center test to AllViewsTests.cs.
Modernized RadioGroup.
Fixed ProgressBar.

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Reverted formatting
This commit is contained in:
Tig
2024-01-12 17:43:35 -07:00
committed by GitHub
parent 4cc6339192
commit d2ad11248f
78 changed files with 21739 additions and 20765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
UnitTests/Views/WindowTests.cs
View File

@@ -1,12 +1,13 @@
using Xunit;
using System;
using Xunit;
using Xunit.Abstractions;
namespace Terminal.Gui.ViewsTests;
namespace Terminal.Gui.ViewsTests;
public class WindowTests {
readonly ITestOutputHelper _output;
public WindowTests (ITestOutputHelper output) => this._output = output;
public WindowTests (ITestOutputHelper output) => _output = output;
[Fact]
public void New_Initializes ()
@@ -14,19 +15,21 @@ public class WindowTests {
// Parameterless
var r = new Window ();
Assert.NotNull (r);
Assert.Equal (string.Empty, r.Title);
Assert.Equal (string.Empty, r.Title);
// Toplevels have Width/Height set to Dim.Fill
Assert.Equal (LayoutStyle.Computed, r.LayoutStyle);
Assert.Equal ("Window()(0,0,0,0)", r.ToString ());
// If there's no SuperView, Top, or Driver, the default Fill width is int.MaxValue
Assert.Equal ("Window()(0,0,2147483647,2147483647)", r.ToString ());
Assert.True (r.CanFocus);
Assert.False (r.HasFocus);
Assert.Equal (new Rect (0, 0, 0, 0), r.Bounds);
Assert.Equal (new Rect (0, 0, 0, 0), r.Frame);
Assert.Equal (new Rect (0, 0, 2147483645, 2147483645), r.Bounds);
Assert.Equal (new Rect (0, 0, 2147483647, 2147483647), r.Frame);
Assert.Null (r.Focused);
Assert.NotNull (r.ColorScheme);
Assert.Equal (0, r.X);
Assert.Equal (0, r.Y);
Assert.Equal (Dim.Fill (), r.Width);
Assert.Equal (Dim.Fill (), r.Height);
Assert.Null (r.X);
Assert.Null (r.Y);
Assert.False (r.IsCurrentTop);
Assert.Empty (r.Id);
Assert.False (r.WantContinuousButtonPressed);
@@ -38,8 +41,10 @@ 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 ("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);
@@ -47,10 +52,10 @@ public class WindowTests {
Assert.Equal (new Rect (0, 0, 0, 0), r.Frame);
Assert.Null (r.Focused);
Assert.NotNull (r.ColorScheme);
Assert.Null (r.Width); // All view Dim are initialized now in the IsAdded setter,
Assert.Null (r.Height); // avoiding Dim errors.
Assert.Null (r.X); // All view Pos are initialized now in the IsAdded setter,
Assert.Null (r.Y); // avoiding Pos errors.
Assert.Equal (0, r.X);
Assert.Equal (0, r.Y);
Assert.Equal (0, r.Width);
Assert.Equal (0, r.Height);
Assert.False (r.IsCurrentTop);
Assert.Equal (r.Title, r.Id);
Assert.False (r.WantContinuousButtonPressed);
@@ -63,7 +68,8 @@ 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 (LayoutStyle.Absolute, r.LayoutStyle);
Assert.Equal ("Window(title)(1,2,3,4)", r.ToString ());
Assert.True (r.CanFocus);
Assert.False (r.HasFocus);
@@ -71,10 +77,10 @@ public class WindowTests {
Assert.Equal (new Rect (1, 2, 3, 4), r.Frame);
Assert.Null (r.Focused);
Assert.NotNull (r.ColorScheme);
Assert.Null (r.Width);
Assert.Null (r.Height);
Assert.Null (r.X);
Assert.Null (r.Y);
Assert.Equal (1, r.X);
Assert.Equal (2, r.Y);
Assert.Equal (3, r.Width);
Assert.Equal (4, r.Height);
Assert.False (r.IsCurrentTop);
Assert.Equal (r.Title, r.Id);
Assert.False (r.WantContinuousButtonPressed);
@@ -85,7 +91,8 @@ public class WindowTests {
r.Dispose ();
}
[Fact] [AutoInitShutdown]
[Fact]
[AutoInitShutdown]
public void MenuBar_And_StatusBar_Inside_Window ()
{
var menu = new MenuBar (new MenuBarItem [] {
@@ -167,7 +174,8 @@ 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 };
@@ -185,7 +193,8 @@ 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 [] {
@@ -201,38 +210,4 @@ public class WindowTests {
var exception = Record.Exception (() => win.NewKeyDownEvent (new Key (KeyCode.AltMask)));
Assert.Null (exception);
}
public static TheoryData<Toplevel> ButtonContainers =>
new () {
{ new Window () },
{ new Dialog () }
};
[Theory, AutoInitShutdown]
[MemberData (nameof (ButtonContainers))]
public void With_Default_Button_Enter_Invokes_Accept_Action (Toplevel container)
{
var view = new View () { CanFocus = true };
var btnOk = new Button ("Accept") { IsDefault = true };
btnOk.Clicked += (s, e) => view.Text = "Test";
var btnCancel = new Button ("Cancel");
btnCancel.Clicked += (s, e) => view.Text = "";
container.Add (view, btnOk, btnCancel);
var rs = Application.Begin (container);
Assert.True (view.HasFocus);
Assert.Equal ("", view.Text);
Assert.True (Application.OnKeyDown (new Key (KeyCode.Enter)));
Assert.True (view.HasFocus);
Assert.Equal ("Test", view.Text);
btnOk.IsDefault = false;
btnCancel.IsDefault = true;
Assert.True (Application.OnKeyDown (new Key (KeyCode.Enter)));
Assert.True (view.HasFocus);
Assert.Equal ("", view.Text);
Application.End (rs);
}
}