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

Finished integrated tznind's work.

Browse Source
This commit is contained in:
Tig
2024-12-09 22:03:40 -08:00
parent 23344baca7
commit 2b8884a881
22 changed files with 334 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
UnitTests/Input/Keyboard/KeyBindingsTests.cs
View File

@@ -27,13 +27,13 @@ public class KeyBindingsTests ()
Assert.Contains (Command.Left, resultCommands);
}
//[Fact]
//public void Add_Invalid_Key_Throws ()
//{
// var keyBindings = new KeyBindings (new View ());
// List<Command> commands = new ();
// Assert.Throws<ArgumentException> (() => keyBindings.Add (Key.Empty, Command.Accept));
//}
[Fact]
public void Add_Invalid_Key_Throws ()
{
var keyBindings = new KeyBindings (new View ());
List<Command> commands = new ();
Assert.Throws<ArgumentException> (() => keyBindings.Add (Key.Empty, Command.Accept));
}
[Fact]
public void Add_Multiple_Commands_Adds ()
@@ -132,7 +132,7 @@ public class KeyBindingsTests ()
{
var keyBindings = new KeyBindings (new ());
Assert.Empty (keyBindings.GetBindings ());
Assert.Null (keyBindings.GetKeyFromCommands (Command.Accept));
Assert.Null (keyBindings.GetFirstFromCommands (Command.Accept));
Assert.NotNull (keyBindings.Target);
}
@@ -198,10 +198,10 @@ public class KeyBindingsTests ()
Command [] commands2 = { Command.Up, Command.Down };
keyBindings.Add (Key.B, commands2);
Key key = keyBindings.GetKeyFromCommands (commands1);
Key key = keyBindings.GetFirstFromCommands (commands1);
Assert.Equal (Key.A, key);
key = keyBindings.GetKeyFromCommands (commands2);
key = keyBindings.GetFirstFromCommands (commands2);
Assert.Equal (Key.B, key);
}
@@ -211,7 +211,7 @@ public class KeyBindingsTests ()
var keyBindings = new KeyBindings (new ());
keyBindings.Add (Key.A, Command.Right);
Key key = keyBindings.GetKeyFromCommands (Command.Right);
Key key = keyBindings.GetFirstFromCommands (Command.Right);
Assert.Equal (Key.A, key);
}
@@ -220,7 +220,7 @@ public class KeyBindingsTests ()
public void GetKeyFromCommands_Unknown_Returns_Key_Empty ()
{
var keyBindings = new KeyBindings (new ());
Assert.Null (keyBindings.GetKeyFromCommands (Command.Accept));
Assert.Null (keyBindings.GetFirstFromCommands (Command.Accept));
}
[Fact]
@@ -228,7 +228,7 @@ public class KeyBindingsTests ()
{
var keyBindings = new KeyBindings (new ());
keyBindings.Add (Key.A, Command.HotKey);
Key resultKey = keyBindings.GetKeyFromCommands (Command.HotKey);
Key resultKey = keyBindings.GetFirstFromCommands (Command.HotKey);
Assert.Equal (Key.A, resultKey);
}
@@ -241,19 +241,19 @@ public class KeyBindingsTests ()
keyBindings.Add (Key.C, Command.HotKey);
keyBindings.Add (Key.D, Command.HotKey);
keyBindings.ReplaceKey (Key.A, Key.E);
keyBindings.Replace (Key.A, Key.E);
Assert.Empty (keyBindings.GetCommands (Key.A));
Assert.Contains (Command.HotKey, keyBindings.GetCommands (Key.E));
keyBindings.ReplaceKey (Key.B, Key.F);
keyBindings.Replace (Key.B, Key.F);
Assert.Empty (keyBindings.GetCommands (Key.B));
Assert.Contains (Command.HotKey, keyBindings.GetCommands (Key.F));
keyBindings.ReplaceKey (Key.C, Key.G);
keyBindings.Replace (Key.C, Key.G);
Assert.Empty (keyBindings.GetCommands (Key.C));
Assert.Contains (Command.HotKey, keyBindings.GetCommands (Key.G));
keyBindings.ReplaceKey (Key.D, Key.H);
keyBindings.Replace (Key.D, Key.H);
Assert.Empty (keyBindings.GetCommands (Key.D));
Assert.Contains (Command.HotKey, keyBindings.GetCommands (Key.H));
}
@@ -265,7 +265,7 @@ public class KeyBindingsTests ()
keyBindings.Add (Key.A, Command.Accept);
keyBindings.Add (Key.B, Command.HotKey);
keyBindings.ReplaceKey (keyBindings.GetKeyFromCommands (Command.Accept), Key.C);
keyBindings.Replace (keyBindings.GetFirstFromCommands (Command.Accept), Key.C);
Assert.Empty (keyBindings.GetCommands (Key.A));
Assert.Contains (Command.Accept, keyBindings.GetCommands (Key.C));
}
@@ -274,7 +274,7 @@ public class KeyBindingsTests ()
public void ReplaceKey_Adds_If_DoesNotContain_Old ()
{
var keyBindings = new KeyBindings (new ());
keyBindings.ReplaceKey (Key.A, Key.B);
keyBindings.Replace (Key.A, Key.B);
Assert.True (keyBindings.TryGet (Key.B, out _));
}
@@ -283,7 +283,7 @@ public class KeyBindingsTests ()
{
var keyBindings = new KeyBindings (new ());
keyBindings.Add (Key.A, Command.HotKey);
Assert.Throws<InvalidOperationException> (() => keyBindings.ReplaceKey (Key.A, Key.Empty));
Assert.Throws<ArgumentException> (() => keyBindings.Replace (Key.A, Key.Empty));
}
[Fact]

40
UnitTests/Input/Mouse/MouseBindingsTests.cs
View File

@@ -23,13 +23,13 @@ public class MouseBindingsTests
Assert.Contains (Command.Left, resultCommands);
}
//[Fact]
//public void Add_Invalid_Flag_Throws ()
//{
// var mouseBindings = new MouseBindings ();
// List<Command> commands = new ();
// Assert.Throws<ArgumentException> (() => mouseBindings.Add (MouseFlags.None, Command.Accept));
//}
[Fact]
public void Add_Invalid_Flag_Throws ()
{
var mouseBindings = new MouseBindings ();
List<Command> commands = new ();
Assert.Throws<ArgumentException> (() => mouseBindings.Add (MouseFlags.None, Command.Accept));
}
[Fact]
public void Add_Multiple_Commands_Adds ()
@@ -131,7 +131,7 @@ public class MouseBindingsTests
{
var mouseBindings = new MouseBindings ();
Assert.Empty (mouseBindings.GetBindings ());
Assert.Equal (MouseFlags.None, mouseBindings.GetMouseFlagsFromCommands (Command.Accept));
Assert.Equal (MouseFlags.None, mouseBindings.GetFirstFromCommands (Command.Accept));
}
[Fact]
@@ -196,10 +196,10 @@ public class MouseBindingsTests
Command [] commands2 = { Command.Up, Command.Down };
mouseBindings.Add (MouseFlags.Button2Clicked, commands2);
MouseFlags mouseFlags = mouseBindings.GetMouseFlagsFromCommands (commands1);
MouseFlags mouseFlags = mouseBindings.GetFirstFromCommands (commands1);
Assert.Equal (MouseFlags.Button1Clicked, mouseFlags);
mouseFlags = mouseBindings.GetMouseFlagsFromCommands (commands2);
mouseFlags = mouseBindings.GetFirstFromCommands (commands2);
Assert.Equal (MouseFlags.Button2Clicked, mouseFlags);
}
@@ -209,7 +209,7 @@ public class MouseBindingsTests
var mouseBindings = new MouseBindings ();
mouseBindings.Add (MouseFlags.Button1Clicked, Command.Right);
MouseFlags mouseFlags = mouseBindings.GetMouseFlagsFromCommands (Command.Right);
MouseFlags mouseFlags = mouseBindings.GetFirstFromCommands (Command.Right);
Assert.Equal (MouseFlags.Button1Clicked, mouseFlags);
}
@@ -218,7 +218,7 @@ public class MouseBindingsTests
public void GetMouseFlagsFromCommands_Unknown_Returns_Key_Empty ()
{
var mouseBindings = new MouseBindings ();
Assert.Equal (MouseFlags.None, mouseBindings.GetMouseFlagsFromCommands (Command.Accept));
Assert.Equal (MouseFlags.None, mouseBindings.GetFirstFromCommands (Command.Accept));
}
[Fact]
@@ -226,7 +226,7 @@ public class MouseBindingsTests
{
var mouseBindings = new MouseBindings ();
mouseBindings.Add (MouseFlags.Button1Clicked, Command.HotKey);
MouseFlags mouseFlags = mouseBindings.GetMouseFlagsFromCommands (Command.HotKey);
MouseFlags mouseFlags = mouseBindings.GetFirstFromCommands (Command.HotKey);
Assert.Equal (MouseFlags.Button1Clicked, mouseFlags);
}
@@ -239,19 +239,19 @@ public class MouseBindingsTests
mouseBindings.Add (MouseFlags.Button3Clicked, Command.HotKey);
mouseBindings.Add (MouseFlags.Button4Clicked, Command.HotKey);
mouseBindings.ReplaceMouseFlag (MouseFlags.Button1Clicked, MouseFlags.Button1DoubleClicked);
mouseBindings.Replace (MouseFlags.Button1Clicked, MouseFlags.Button1DoubleClicked);
Assert.Empty (mouseBindings.GetCommands (MouseFlags.Button1Clicked));
Assert.Contains (Command.HotKey, mouseBindings.GetCommands (MouseFlags.Button1DoubleClicked));
mouseBindings.ReplaceMouseFlag (MouseFlags.Button2Clicked, MouseFlags.Button2DoubleClicked);
mouseBindings.Replace (MouseFlags.Button2Clicked, MouseFlags.Button2DoubleClicked);
Assert.Empty (mouseBindings.GetCommands (MouseFlags.Button2Clicked));
Assert.Contains (Command.HotKey, mouseBindings.GetCommands (MouseFlags.Button2DoubleClicked));
mouseBindings.ReplaceMouseFlag (MouseFlags.Button3Clicked, MouseFlags.Button3DoubleClicked);
mouseBindings.Replace (MouseFlags.Button3Clicked, MouseFlags.Button3DoubleClicked);
Assert.Empty (mouseBindings.GetCommands (MouseFlags.Button3Clicked));
Assert.Contains (Command.HotKey, mouseBindings.GetCommands (MouseFlags.Button3DoubleClicked));
mouseBindings.ReplaceMouseFlag (MouseFlags.Button4Clicked, MouseFlags.Button4DoubleClicked);
mouseBindings.Replace (MouseFlags.Button4Clicked, MouseFlags.Button4DoubleClicked);
Assert.Empty (mouseBindings.GetCommands (MouseFlags.Button4Clicked));
Assert.Contains (Command.HotKey, mouseBindings.GetCommands (MouseFlags.Button4DoubleClicked));
}
@@ -263,7 +263,7 @@ public class MouseBindingsTests
mouseBindings.Add (MouseFlags.Button1Clicked, Command.Accept);
mouseBindings.Add (MouseFlags.Button2Clicked, Command.HotKey);
mouseBindings.ReplaceMouseFlag (mouseBindings.GetMouseFlagsFromCommands (Command.Accept), MouseFlags.Button3Clicked);
mouseBindings.Replace (mouseBindings.GetFirstFromCommands (Command.Accept), MouseFlags.Button3Clicked);
Assert.Empty (mouseBindings.GetCommands (MouseFlags.Button1Clicked));
Assert.Contains (Command.Accept, mouseBindings.GetCommands (MouseFlags.Button3Clicked));
}
@@ -272,7 +272,7 @@ public class MouseBindingsTests
public void ReplaceMouseFlags_Adds_If_DoesNotContain_Old ()
{
var mouseBindings = new MouseBindings ();
mouseBindings.ReplaceMouseFlag (MouseFlags.Button1Clicked, MouseFlags.Button2Clicked);
mouseBindings.Replace (MouseFlags.Button1Clicked, MouseFlags.Button2Clicked);
Assert.True (mouseBindings.TryGet (MouseFlags.Button2Clicked, out _));
}
@@ -281,7 +281,7 @@ public class MouseBindingsTests
{
var mouseBindings = new MouseBindings ();
mouseBindings.Add (MouseFlags.Button1Clicked, Command.HotKey);
Assert.Throws<ArgumentException> (() => mouseBindings.ReplaceMouseFlag (MouseFlags.Button1Clicked, MouseFlags.None));
Assert.Throws<ArgumentException> (() => mouseBindings.Replace (MouseFlags.Button1Clicked, MouseFlags.None));
}
[Fact]

2
UnitTests/View/Keyboard/HotKeyTests.cs
View File

@@ -102,7 +102,7 @@ public class HotKeyTests
commands = view.HotKeyBindings.GetCommands (KeyCode.Null);
Assert.Empty (commands);
Assert.Empty (view.HotKeyBindings.GetBoundKeys ());
Assert.Empty (view.HotKeyBindings.GetBindings ());
}
[Theory]