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

Merged v2_develop.

Browse Source 
Code cleanup
This commit is contained in:
Tig
2024-12-07 14:37:17 -08:00
parent 3e6e758302
commit 5a0b3507a0
11 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UnitTests/View/Keyboard/KeyboardEventTests.cs
View File

@@ -273,12 +273,12 @@ public class KeyboardEventTests (ITestOutputHelper output) : TestsAllViews
[InlineData (null, null)]
[InlineData (true, true)]
[InlineData (false, false)]
public void InvokeCommandsBoundToKey_Returns_Nullable_Properly (bool? toReturn, bool? expected)
public void InvokeCommands_Returns_Nullable_Properly (bool? toReturn, bool? expected)
{
var view = new KeyBindingsTestView ();
view.CommandReturns = toReturn;
bool? result = view.InvokeCommandsBoundToKey (Key.A);
bool? result = view.InvokeCommands (Key.A);
Assert.Equal (expected, result);
}

48
UnitTests/View/ViewCommandTests.cs
View File

@@ -1,12 +1,9 @@
using System.ComponentModel;
using System.Text;
using Xunit.Abstractions;
namespace Terminal.Gui.ViewTests;
public class ViewCommandTests (ITestOutputHelper output)
public class ViewCommandTests
{
#region OnAccept/Accept tests
[Fact]
public void Accept_Command_Raises_NoFocus ()
{
@@ -77,8 +74,8 @@ public class ViewCommandTests (ITestOutputHelper output)
[Fact]
public void Accept_Command_Bubbles_Up_To_SuperView ()
{
var view = new ViewEventTester () { Id = "view" };
var subview = new ViewEventTester () { Id = "subview" };
var view = new ViewEventTester { Id = "view" };
var subview = new ViewEventTester { Id = "subview" };
view.Add (subview);
subview.InvokeCommand (Command.Accept);
@@ -97,7 +94,7 @@ public class ViewCommandTests (ITestOutputHelper output)
Assert.Equal (1, view.OnAcceptedCount);
// Add a super view to test deeper hierarchy
var superView = new ViewEventTester () { Id = "superView" };
var superView = new ViewEventTester { Id = "superView" };
superView.Add (view);
subview.InvokeCommand (Command.Accept);
@@ -135,7 +132,7 @@ public class ViewCommandTests (ITestOutputHelper output)
[CombinatorialData]
public void Select_Command_Raises_SetsFocus (bool canFocus)
{
var view = new ViewEventTester ()
var view = new ViewEventTester
{
CanFocus = canFocus
};
@@ -236,30 +233,29 @@ public class ViewCommandTests (ITestOutputHelper output)
CanFocus = true;
Accepting += (s, a) =>
{
a.Cancel = HandleAccepted;
AcceptedCount++;
};
{
a.Cancel = HandleAccepted;
AcceptedCount++;
};
HandlingHotKey += (s, a) =>
{
a.Cancel = HandleHandlingHotKey;
HandlingHotKeyCount++;
};
{
a.Cancel = HandleHandlingHotKey;
HandlingHotKeyCount++;
};
Selecting += (s, a) =>
{
a.Cancel = HandleSelecting;
SelectingCount++;
};
{
a.Cancel = HandleSelecting;
SelectingCount++;
};
}
public int OnAcceptedCount { get; set; }
public int AcceptedCount { get; set; }
public bool HandleOnAccepted { get; set; }
/// <inheritdoc />
/// <inheritdoc/>
protected override bool OnAccepting (CommandEventArgs args)
{
OnAcceptedCount++;
@@ -273,7 +269,7 @@ public class ViewCommandTests (ITestOutputHelper output)
public int HandlingHotKeyCount { get; set; }
public bool HandleOnHandlingHotKey { get; set; }
/// <inheritdoc />
/// <inheritdoc/>
protected override bool OnHandlingHotKey (CommandEventArgs args)
{
OnHandlingHotKeyCount++;
@@ -283,12 +279,11 @@ public class ViewCommandTests (ITestOutputHelper output)
public bool HandleHandlingHotKey { get; set; }
public int OnSelectingCount { get; set; }
public int SelectingCount { get; set; }
public bool HandleOnSelecting { get; set; }
/// <inheritdoc />
/// <inheritdoc/>
protected override bool OnSelecting (CommandEventArgs args)
{
OnSelectingCount++;
@@ -297,6 +292,5 @@ public class ViewCommandTests (ITestOutputHelper output)
}
public bool HandleSelecting { get; set; }
}
}