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

KeyDown API usage cleanup

Browse Source
This commit is contained in:
Tig
2024-10-14 14:56:46 -06:00
parent f536945df5
commit bc51f8868b
11 changed files with 248 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UnitTests/Views/MenuBarTests.cs
View File

@@ -2666,7 +2666,7 @@ Edit
top.Draw ();
TestHelpers.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), output);
Assert.True (Application.NewKeyDown (menu.Key));
Assert.True (Application.RaiseKeyDownEvent (menu.Key));
Assert.False (menu.IsMenuOpen);
Assert.True (tf.HasFocus);
top.Draw ();
@@ -2949,7 +2949,7 @@ Edit
top.Add (menu);
Application.Begin (top);
Application.NewKeyDown (Key.S.WithCtrl);
Application.RaiseKeyDownEvent (Key.S.WithCtrl);
Application.MainLoop.RunIteration ();
Assert.True (saveAction);

66
UnitTests/Views/RadioGroupTests.cs
View File

@@ -57,7 +57,7 @@ public class RadioGroupTests (ITestOutputHelper output)
rg.SetFocus ();
Assert.Equal (-1, rg.SelectedItem);
Application.NewKeyDown (Key.Space);
Application.RaiseKeyDownEvent (Key.Space);
Assert.Equal (0, rg.SelectedItem);
Application.Top.Dispose ();
@@ -105,21 +105,21 @@ public class RadioGroupTests (ITestOutputHelper output)
// With HasFocus
// Test up/down without Select
Assert.False (Application.NewKeyDown (Key.CursorUp)); // Should not change (should focus prev view if there was one, which there isn't)
Assert.False (Application.RaiseKeyDownEvent (Key.CursorUp)); // Should not change (should focus prev view if there was one, which there isn't)
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (0, rg.Cursor);
Assert.Equal (0, selectedItemChangedCount);
Assert.Equal (0, selectingCount);
Assert.Equal (0, acceptedCount);
Assert.True (Application.NewKeyDown (Key.CursorDown));
Assert.True (Application.RaiseKeyDownEvent (Key.CursorDown));
Assert.Equal (0, rg.SelectedItem); // Cursor changed, but selection didnt
Assert.Equal (1, rg.Cursor);
Assert.Equal (0, selectedItemChangedCount);
Assert.Equal (0, selectingCount);
Assert.Equal (0, acceptedCount);
Assert.False (Application.NewKeyDown (Key.CursorDown)); // Should not change selection (should focus next view if there was one, which there isn't)
Assert.False (Application.RaiseKeyDownEvent (Key.CursorDown)); // Should not change selection (should focus next view if there was one, which there isn't)
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
Assert.Equal (0, selectedItemChangedCount);
@@ -127,7 +127,7 @@ public class RadioGroupTests (ITestOutputHelper output)
Assert.Equal (0, acceptedCount);
// Test Select (Space) when Cursor != SelectedItem - Should select cursor
Assert.True (Application.NewKeyDown (Key.Space));
Assert.True (Application.RaiseKeyDownEvent (Key.Space));
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
Assert.Equal (1, selectedItemChangedCount);
@@ -135,34 +135,34 @@ public class RadioGroupTests (ITestOutputHelper output)
Assert.Equal (0, acceptedCount);
// Test Select (Space) when Cursor == SelectedItem - Should cycle
Assert.True (Application.NewKeyDown (Key.Space));
Assert.True (Application.RaiseKeyDownEvent (Key.Space));
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (0, rg.Cursor);
Assert.Equal (2, selectedItemChangedCount);
Assert.Equal (2, selectingCount);
Assert.Equal (0, acceptedCount);
Assert.True (Application.NewKeyDown (Key.Space));
Assert.True (Application.RaiseKeyDownEvent (Key.Space));
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
Assert.True (Application.NewKeyDown (Key.Space));
Assert.True (Application.RaiseKeyDownEvent (Key.Space));
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (0, rg.Cursor);
Assert.True (Application.NewKeyDown (Key.Space));
Assert.True (Application.RaiseKeyDownEvent (Key.Space));
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
Assert.True (Application.NewKeyDown (Key.Home));
Assert.True (Application.RaiseKeyDownEvent (Key.Home));
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (0, rg.Cursor);
Assert.True (Application.NewKeyDown (Key.Space));
Assert.True (Application.RaiseKeyDownEvent (Key.Space));
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (0, rg.Cursor);
Assert.True (Application.NewKeyDown (Key.End));
Assert.True (Application.RaiseKeyDownEvent (Key.End));
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
Assert.True (Application.NewKeyDown (Key.Space));
Assert.True (Application.RaiseKeyDownEvent (Key.Space));
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
Assert.Equal (7, selectedItemChangedCount);
@@ -174,7 +174,7 @@ public class RadioGroupTests (ITestOutputHelper output)
rg.HotKey = Key.L;
Assert.Equal (Key.L, rg.HotKey);
Assert.True (Application.NewKeyDown (rg.HotKey));
Assert.True (Application.RaiseKeyDownEvent (rg.HotKey));
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (0, rg.Cursor);
Assert.Equal (8, selectedItemChangedCount);
@@ -182,12 +182,12 @@ public class RadioGroupTests (ITestOutputHelper output)
Assert.Equal (0, acceptedCount);
// Make Selected != Cursor
Assert.True (Application.NewKeyDown (Key.CursorDown));
Assert.True (Application.RaiseKeyDownEvent (Key.CursorDown));
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
// Selected != Cursor - Raise HotKey event - Since we're focused, this should just advance
Assert.True (Application.NewKeyDown (rg.HotKey));
Assert.True (Application.RaiseKeyDownEvent (rg.HotKey));
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
Assert.Equal (9, selectedItemChangedCount);
@@ -239,7 +239,7 @@ public class RadioGroupTests (ITestOutputHelper output)
// Selected (0) == Cursor (0) - SetFocus
rg.HotKey = Key.L;
Assert.Equal (Key.L, rg.HotKey);
Assert.True (Application.NewKeyDown (rg.HotKey));
Assert.True (Application.RaiseKeyDownEvent (rg.HotKey));
Assert.True (rg.HasFocus);
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (0, rg.Cursor);
@@ -248,14 +248,14 @@ public class RadioGroupTests (ITestOutputHelper output)
Assert.Equal (0, acceptCount);
// Make Selected != Cursor
Assert.True (Application.NewKeyDown (Key.CursorDown));
Assert.True (Application.RaiseKeyDownEvent (Key.CursorDown));
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
otherView.SetFocus ();
// Selected != Cursor - SetFocus
Assert.True (Application.NewKeyDown (rg.HotKey));
Assert.True (Application.RaiseKeyDownEvent (rg.HotKey));
Assert.True (rg.HasFocus);
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
@@ -263,7 +263,7 @@ public class RadioGroupTests (ITestOutputHelper output)
Assert.Equal (0, selectCount);
Assert.Equal (0, acceptCount);
Assert.True (Application.NewKeyDown (rg.HotKey));
Assert.True (Application.RaiseKeyDownEvent (rg.HotKey));
Assert.True (rg.HasFocus);
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
@@ -314,7 +314,7 @@ public class RadioGroupTests (ITestOutputHelper output)
// Test RadioTitem.HotKey - Should never SetFocus
// Selected (0) == Cursor (0)
Assert.True (Application.NewKeyDown (Key.A));
Assert.True (Application.RaiseKeyDownEvent (Key.A));
Assert.False (rg.HasFocus);
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (0, rg.Cursor);
@@ -325,14 +325,14 @@ public class RadioGroupTests (ITestOutputHelper output)
rg.SetFocus ();
// Make Selected != Cursor
Assert.True (Application.NewKeyDown (Key.CursorDown));
Assert.True (Application.RaiseKeyDownEvent (Key.CursorDown));
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
otherView.SetFocus ();
// Selected != Cursor
Assert.True (Application.NewKeyDown (Key.A));
Assert.True (Application.RaiseKeyDownEvent (Key.A));
Assert.False (rg.HasFocus);
Assert.Equal (0, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
@@ -341,7 +341,7 @@ public class RadioGroupTests (ITestOutputHelper output)
Assert.Equal (0, acceptCount);
// Selected != Cursor - Should not set focus
Assert.True (Application.NewKeyDown (Key.B));
Assert.True (Application.RaiseKeyDownEvent (Key.B));
Assert.False (rg.HasFocus);
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
@@ -349,7 +349,7 @@ public class RadioGroupTests (ITestOutputHelper output)
Assert.Equal (1, selectCount);
Assert.Equal (0, acceptCount);
Assert.True (Application.NewKeyDown (Key.B));
Assert.True (Application.RaiseKeyDownEvent (Key.B));
Assert.False (rg.HasFocus);
Assert.Equal (1, rg.SelectedItem);
Assert.Equal (1, rg.Cursor);
@@ -372,22 +372,22 @@ public class RadioGroupTests (ITestOutputHelper output)
Assert.NotEmpty (rg.KeyBindings.GetCommands (KeyCode.L | KeyCode.ShiftMask));
Assert.NotEmpty (rg.KeyBindings.GetCommands (KeyCode.L | KeyCode.AltMask));
Assert.True (Application.NewKeyDown (Key.T));
Assert.True (Application.RaiseKeyDownEvent (Key.T));
Assert.Equal (2, rg.SelectedItem);
Assert.True (Application.NewKeyDown (Key.L));
Assert.True (Application.RaiseKeyDownEvent (Key.L));
Assert.Equal (0, rg.SelectedItem);
Assert.True (Application.NewKeyDown (Key.J));
Assert.True (Application.RaiseKeyDownEvent (Key.J));
Assert.Equal (3, rg.SelectedItem);
Assert.True (Application.NewKeyDown (Key.R));
Assert.True (Application.RaiseKeyDownEvent (Key.R));
Assert.Equal (1, rg.SelectedItem);
Assert.True (Application.NewKeyDown (Key.T.WithAlt));
Assert.True (Application.RaiseKeyDownEvent (Key.T.WithAlt));
Assert.Equal (2, rg.SelectedItem);
Assert.True (Application.NewKeyDown (Key.L.WithAlt));
Assert.True (Application.RaiseKeyDownEvent (Key.L.WithAlt));
Assert.Equal (0, rg.SelectedItem);
Assert.True (Application.NewKeyDown (Key.J.WithAlt));
Assert.True (Application.RaiseKeyDownEvent (Key.J.WithAlt));
Assert.Equal (3, rg.SelectedItem);
Assert.True (Application.NewKeyDown (Key.R.WithAlt));
Assert.True (Application.RaiseKeyDownEvent (Key.R.WithAlt));
Assert.Equal (1, rg.SelectedItem);
var superView = new View ();

6
UnitTests/Views/TextFieldTests.cs
View File

@@ -524,7 +524,7 @@ public class TextFieldTests (ITestOutputHelper output)
Application.Top = new ();
Application.Top.Add (tf);
tf.SetFocus ();
Application.NewKeyDown (Key.Space);
Application.RaiseKeyDownEvent (Key.Space);
Application.Top.Dispose ();
Application.ResetState (true);
@@ -541,7 +541,7 @@ public class TextFieldTests (ITestOutputHelper output)
Application.Top = new ();
Application.Top.Add (tf);
tf.SetFocus ();
Application.NewKeyDown (Key.Enter);
Application.RaiseKeyDownEvent (Key.Enter);
Assert.Equal (0, selectingCount);
@@ -560,7 +560,7 @@ public class TextFieldTests (ITestOutputHelper output)
Application.Top = new ();
Application.Top.Add (tf);
tf.SetFocus ();
Application.NewKeyDown (Key.Enter);
Application.RaiseKeyDownEvent (Key.Enter);
Assert.Equal (1, acceptedCount);