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

Fixed unit tests

Browse Source
This commit is contained in:
Tig
2024-12-07 10:58:34 -08:00
parent 725df05f7b
commit 3edcf643dc
14 changed files with 222 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
UnitTests/Views/ContextMenuTests.cs
View File

@@ -1483,9 +1483,9 @@ public class ContextMenuTests (ITestOutputHelper output)
Assert.False (deleteFile);
cm.Show (menuItems);
Assert.True (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.True (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.D.WithCtrl));
Assert.True (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.True (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.D.WithCtrl));
Assert.True (Application.RaiseKeyDownEvent (Key.N.WithCtrl));
Application.MainLoop!.RunIteration ();
@@ -1502,9 +1502,9 @@ public class ContextMenuTests (ITestOutputHelper output)
Assert.True (deleteFile);
Assert.False (cm.MenuBar.IsMenuOpen);
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.D.WithCtrl));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.D.WithCtrl));
newFile = false;
renameFile = false;
@@ -1555,8 +1555,8 @@ public class ContextMenuTests (ITestOutputHelper output)
top.Add (menuBar);
Application.Begin (top);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.Null (cm.MenuBar);
Assert.True (Application.RaiseKeyDownEvent (Key.N.WithCtrl));
@@ -1568,10 +1568,10 @@ public class ContextMenuTests (ITestOutputHelper output)
newFile = false;
cm.Show (menuItems);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.True (cm.MenuBar.IsMenuOpen);
Assert.True (Application.RaiseKeyDownEvent (Key.N.WithCtrl));
@@ -1584,10 +1584,10 @@ public class ContextMenuTests (ITestOutputHelper output)
Assert.True (renameFile);
Assert.False (cm.MenuBar.IsMenuOpen);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithCtrl));
newFile = false;
renameFile = false;
@@ -1634,7 +1634,7 @@ public class ContextMenuTests (ITestOutputHelper output)
top.Add (menuBar);
Application.Begin (top);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.Null (cm.MenuBar);
Assert.True (Application.RaiseKeyDownEvent (Key.N.WithCtrl));
@@ -1645,8 +1645,8 @@ public class ContextMenuTests (ITestOutputHelper output)
newMenuBar = false;
cm.Show (menuItems);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (cm.MenuBar.IsMenuOpen);
Assert.True (Application.RaiseKeyDownEvent (Key.N.WithCtrl));
@@ -1657,8 +1657,8 @@ public class ContextMenuTests (ITestOutputHelper output)
Assert.True (newContextMenu);
Assert.False (cm.MenuBar!.IsMenuOpen);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithCtrl));
newMenuBar = false;
newContextMenu = false;
@@ -1704,20 +1704,20 @@ public class ContextMenuTests (ITestOutputHelper output)
cm.Show (menuItems);
Assert.True (cm.MenuBar!.IsMenuOpen);
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.D.WithAlt));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.D.NoShift));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.D.WithAlt));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.D.NoShift));
Assert.Single (Application.Top!.Subviews);
View [] menus = Application.Top!.Subviews.Where (v => v is Menu m && m.Host == cm.MenuBar).ToArray ();
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.D.WithAlt));
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.D.NoShift));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.D.WithAlt));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.D.NoShift));
Assert.True (Application.RaiseKeyDownEvent (Key.N.WithAlt));
Assert.False (cm.MenuBar!.IsMenuOpen);
@@ -1734,12 +1734,12 @@ public class ContextMenuTests (ITestOutputHelper output)
Application.MainLoop!.RunIteration ();
Assert.True (deleteFile);
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.D.WithAlt));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.D.NoShift));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.D.WithAlt));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.D.NoShift));
newFile = false;
renameFile = false;
@@ -1796,9 +1796,9 @@ public class ContextMenuTests (ITestOutputHelper output)
top.Add (menuBar);
Application.Begin (top);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.F.WithAlt));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.F.WithAlt));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
View [] menus = Application.Top!.Subviews.Where (v => v is Menu m && m.Host == menuBar).ToArray ();
Assert.Empty (menus);
Assert.Null (cm.MenuBar);
@@ -1807,7 +1807,7 @@ public class ContextMenuTests (ITestOutputHelper output)
Assert.True (menuBar.IsMenuOpen);
Assert.Equal (2, Application.Top!.Subviews.Count);
menus = Application.Top!.Subviews.Where (v => v is Menu m && m.Host == menuBar).ToArray ();
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.True (Application.RaiseKeyDownEvent (Key.N.WithAlt));
Assert.False (menuBar.IsMenuOpen);
Assert.False (Application.RaiseKeyDownEvent (Key.R.WithAlt));
@@ -1818,29 +1818,29 @@ public class ContextMenuTests (ITestOutputHelper output)
newFile = false;
cm.Show (menuItems);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.F.WithAlt));
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.F.NoShift));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.F.WithAlt));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.F.NoShift));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (cm.MenuBar!.IsMenuOpen);
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.F.WithAlt));
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.F.NoShift));
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.False (cm.MenuBar!.KeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.F.WithAlt));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.F.NoShift));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.False (cm.MenuBar!.HotKeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.Equal (3, Application.Top!.Subviews.Count);
menus = Application.Top!.Subviews.Where (v => v is Menu m && m.Host == cm.MenuBar).ToArray ();
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.True (menus [1].KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.True (menus [1].KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.True (menus [1].HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.True (menus [1].HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (cm.MenuBar.IsMenuOpen);
Assert.True (Application.RaiseKeyDownEvent (Key.F.WithAlt));
Assert.False (cm.MenuBar.IsMenuOpen);
@@ -1852,14 +1852,14 @@ public class ContextMenuTests (ITestOutputHelper output)
Assert.True (cm.MenuBar.IsMenuOpen);
Assert.Equal (3, Application.Top!.Subviews.Count);
menus = Application.Top!.Subviews.Where (v => v is Menu m && m.Host == cm.MenuBar).ToArray ();
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.True (menus [0].KeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.False (menus [0].KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (menus [0].KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.False (menus [1].KeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.False (menus [1].KeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.True (menus [1].KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.True (menus [1].KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.True (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.False (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (menus [0].HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.False (menus [1].HotKeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.False (menus [1].HotKeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.True (menus [1].HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.True (menus [1].HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (Application.RaiseKeyDownEvent (Key.E.NoShift));
Assert.True (Application.RaiseKeyDownEvent (Key.R.WithAlt));
Assert.False (cm.MenuBar.IsMenuOpen);
@@ -1867,14 +1867,14 @@ public class ContextMenuTests (ITestOutputHelper output)
Assert.True (renameFile);
Assert.Single (Application.Top!.Subviews);
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.F.WithAlt));
Assert.True (menuBar.KeyBindings.Bindings.ContainsKey (Key.F.NoShift));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (menuBar.KeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (cm.MenuBar.KeyBindings.Bindings.ContainsKey (Key.R.NoShift));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.F.WithAlt));
Assert.True (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.F.NoShift));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.WithAlt));
Assert.False (menuBar.HotKeyBindings.Bindings.ContainsKey (Key.N.NoShift));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.E.WithAlt));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.E.NoShift));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.WithAlt));
Assert.False (cm.MenuBar.HotKeyBindings.Bindings.ContainsKey (Key.R.NoShift));
newFile = false;
renameFile = false;

16
UnitTests/Views/MenuBarTests.cs
View File

@@ -19,8 +19,8 @@ public class MenuBarTests (ITestOutputHelper output)
menuBar.Menus = [menuBarItem];
Assert.Single (menuBar.Menus);
Assert.Single (menuBar.Menus [0].Children!);
Assert.Contains (Key.N.WithAlt, menuBar.KeyBindings.Bindings);
Assert.DoesNotContain (Key.I, menuBar.KeyBindings.Bindings);
Assert.Contains (Key.N.WithAlt, menuBar.HotKeyBindings.Bindings);
Assert.DoesNotContain (Key.I, menuBar.HotKeyBindings.Bindings);
var top = new Toplevel ();
top.Add (menuBar);
@@ -39,12 +39,12 @@ public class MenuBarTests (ITestOutputHelper output)
menuItem.RemoveMenuItem ();
Assert.Single (menuBar.Menus);
Assert.Null (menuBar.Menus [0].Children);
Assert.Contains (Key.N.WithAlt, menuBar.KeyBindings.Bindings);
Assert.DoesNotContain (Key.I, menuBar.KeyBindings.Bindings);
Assert.Contains (Key.N.WithAlt, menuBar.HotKeyBindings.Bindings);
Assert.DoesNotContain (Key.I, menuBar.HotKeyBindings.Bindings);
menuBarItem.RemoveMenuItem ();
Assert.Empty (menuBar.Menus);
Assert.DoesNotContain (Key.N.WithAlt, menuBar.KeyBindings.Bindings);
Assert.DoesNotContain (Key.N.WithAlt, menuBar.HotKeyBindings.Bindings);
top.Dispose ();
}
@@ -2998,12 +2998,12 @@ Edit
]
};
Assert.Contains (Key.A.WithCtrl, menuBar.KeyBindings.Bindings);
Assert.Contains (Key.A.WithCtrl, menuBar.HotKeyBindings.Bindings);
menuBar.Menus [0].Children! [0].ShortcutKey = Key.B.WithCtrl;
Assert.DoesNotContain (Key.A.WithCtrl, menuBar.KeyBindings.Bindings);
Assert.Contains (Key.B.WithCtrl, menuBar.KeyBindings.Bindings);
Assert.DoesNotContain (Key.A.WithCtrl, menuBar.HotKeyBindings.Bindings);
Assert.Contains (Key.B.WithCtrl, menuBar.HotKeyBindings.Bindings);
}
[Fact]

44
UnitTests/Views/RadioGroupTests.cs
View File

@@ -64,24 +64,28 @@ public class RadioGroupTests (ITestOutputHelper output)
}
[Fact]
public void KeyBindings_Are_Added_Correctly ()
public void HotKeyBindings_Are_Added_Correctly ()
{
var rg = new RadioGroup { RadioLabels = new [] { "_Left", "_Right" } };
Assert.NotEmpty (rg.KeyBindings.GetCommands (Key.L));
Assert.NotEmpty (rg.KeyBindings.GetCommands (Key.R));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (Key.L));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (Key.R));
Assert.NotEmpty (rg.KeyBindings.GetCommands (Key.L.WithShift));
Assert.NotEmpty (rg.KeyBindings.GetCommands (Key.L.WithAlt));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (Key.L.WithShift));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (Key.L.WithAlt));
Assert.NotEmpty (rg.KeyBindings.GetCommands (Key.R.WithShift));
Assert.NotEmpty (rg.KeyBindings.GetCommands (Key.R.WithAlt));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (Key.R.WithShift));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (Key.R.WithAlt));
}
[Fact]
public void Commands_HasFocus ()
{
Application.Navigation = new ();
var rg = new RadioGroup { RadioLabels = new [] { "Test", "New Test" } };
var rg = new RadioGroup
{
Id = "rg",
RadioLabels = ["Test", "New Test"]
};
Application.Top = new ();
Application.Top.Add (rg);
rg.SetFocus ();
@@ -201,7 +205,7 @@ public class RadioGroupTests (ITestOutputHelper output)
public void HotKey_HasFocus_False ()
{
Application.Navigation = new ();
var rg = new RadioGroup { RadioLabels = new [] { "Test", "New Test" } };
var rg = new RadioGroup { RadioLabels = ["Test", "New Test"] };
Application.Top = new ();
// With !HasFocus
@@ -278,7 +282,7 @@ public class RadioGroupTests (ITestOutputHelper output)
public void HotKeys_HasFocus_False_Does_Not_SetFocus_Selects ()
{
Application.Navigation = new ();
var rg = new RadioGroup { RadioLabels = new [] { "Item _A", "Item _B" } };
var rg = new RadioGroup { RadioLabels = ["Item _A", "Item _B"] };
Application.Top = new ();
// With !HasFocus
@@ -363,14 +367,14 @@ public class RadioGroupTests (ITestOutputHelper output)
[Fact]
public void HotKeys_HasFocus_True_Selects ()
{
var rg = new RadioGroup { RadioLabels = new [] { "_Left", "_Right", "Cen_tered", "_Justified" } };
var rg = new RadioGroup { RadioLabels = ["_Left", "_Right", "Cen_tered", "_Justified"] };
Application.Top = new ();
Application.Top.Add (rg);
rg.SetFocus ();
Assert.NotEmpty (rg.KeyBindings.GetCommands (KeyCode.L));
Assert.NotEmpty (rg.KeyBindings.GetCommands (KeyCode.L | KeyCode.ShiftMask));
Assert.NotEmpty (rg.KeyBindings.GetCommands (KeyCode.L | KeyCode.AltMask));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (KeyCode.L));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (KeyCode.L | KeyCode.ShiftMask));
Assert.NotEmpty (rg.HotKeyBindings.GetCommands (KeyCode.L | KeyCode.AltMask));
Assert.True (Application.RaiseKeyDownEvent (Key.T));
Assert.Equal (2, rg.SelectedItem);
@@ -425,7 +429,7 @@ public class RadioGroupTests (ITestOutputHelper output)
var group = new RadioGroup
{
Title = "Radio_Group",
RadioLabels = new [] { "_Left", "_Right", "Cen_tered", "_Justified" }
RadioLabels = ["_Left", "_Right", "Cen_tered", "_Justified"]
};
superView.Add (group);
@@ -450,7 +454,7 @@ public class RadioGroupTests (ITestOutputHelper output)
var group = new RadioGroup
{
Title = "Radio_Group",
RadioLabels = new [] { "_Left", "_Right", "Cen_tered", "_Justified" }
RadioLabels = ["_Left", "_Right", "Cen_tered", "_Justified"]
};
group.SelectedItem = -1;
@@ -488,7 +492,7 @@ public class RadioGroupTests (ITestOutputHelper output)
[Fact]
public void HotKey_Command_Does_Not_Accept ()
{
var group = new RadioGroup { RadioLabels = new [] { "_Left", "_Right", "Cen_tered", "_Justified" } };
var group = new RadioGroup { RadioLabels = ["_Left", "_Right", "Cen_tered", "_Justified"] };
var accepted = false;
group.Accepting += OnAccept;
@@ -504,7 +508,7 @@ public class RadioGroupTests (ITestOutputHelper output)
[Fact]
public void Accept_Command_Fires_Accept ()
{
var group = new RadioGroup { RadioLabels = new [] { "_Left", "_Right", "Cen_tered", "_Justified" } };
var group = new RadioGroup { RadioLabels = ["_Left", "_Right", "Cen_tered", "_Justified"] };
var accepted = false;
group.Accepting += OnAccept;
@@ -521,7 +525,7 @@ public class RadioGroupTests (ITestOutputHelper output)
[AutoInitShutdown]
public void Orientation_Width_Height_Vertical_Horizontal_Space ()
{
var rg = new RadioGroup { RadioLabels = new [] { "Test", "New Test 你" } };
var rg = new RadioGroup { RadioLabels = ["Test", "New Test 你"] };
var win = new Window { Width = Dim.Fill (), Height = Dim.Fill () };
win.Add (rg);
var top = new Toplevel ();
@@ -597,7 +601,7 @@ public class RadioGroupTests (ITestOutputHelper output)
{
int previousSelectedItem = -1;
int selectedItem = -1;
var rg = new RadioGroup { RadioLabels = new [] { "Test", "New Test" } };
var rg = new RadioGroup { RadioLabels = ["Test", "New Test"] };
rg.SelectedItemChanged += (s, e) =>
{

18
UnitTests/Views/ShortcutTests.cs
View File

@@ -281,16 +281,16 @@ public class ShortcutTests
var shortcut = new Shortcut ();
shortcut.Key = Key.A;
Assert.Contains (Key.A, shortcut.KeyBindings.Bindings.Keys);
Assert.Contains (Key.A, shortcut.HotKeyBindings.Bindings.Keys);
shortcut.Key = Key.B;
Assert.DoesNotContain (Key.A, shortcut.KeyBindings.Bindings.Keys);
Assert.Contains (Key.B, shortcut.KeyBindings.Bindings.Keys);
Assert.DoesNotContain (Key.A, shortcut.HotKeyBindings.Bindings.Keys);
Assert.Contains (Key.B, shortcut.HotKeyBindings.Bindings.Keys);
}
// Test Key gets bound correctly
[Fact]
public void KeyBindingScope_Defaults_To_HotKey ()
public void BindKeyToApplication_Defaults_To_HotKey ()
{
var shortcut = new Shortcut ();
@@ -298,7 +298,7 @@ public class ShortcutTests
}
[Fact]
public void KeyBindingScope_Can_Be_Set ()
public void BindKeyToApplication_Can_Be_Set ()
{
var shortcut = new Shortcut ();
@@ -308,19 +308,19 @@ public class ShortcutTests
}
[Fact]
public void KeyBindingScope_Changing_Adjusts_KeyBindings ()
public void BindKeyToApplication_Changing_Adjusts_KeyBindings ()
{
var shortcut = new Shortcut ();
shortcut.Key = Key.A;
Assert.Contains (Key.A, shortcut.KeyBindings.Bindings.Keys);
Assert.Contains (Key.A, shortcut.HotKeyBindings.Bindings.Keys);
shortcut.BindKeyToApplication = true;
Assert.DoesNotContain (Key.A, shortcut.KeyBindings.Bindings.Keys);
Assert.DoesNotContain (Key.A, shortcut.HotKeyBindings.Bindings.Keys);
Assert.NotEmpty (Application.KeyBindings.GetBindings(Key.A));
shortcut.BindKeyToApplication = false;
Assert.Contains (Key.A, shortcut.KeyBindings.Bindings.Keys);
Assert.Contains (Key.A, shortcut.HotKeyBindings.Bindings.Keys);
Assert.Empty (Application.KeyBindings.GetBindings (Key.A));
}