Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-30 17:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added AllViews_AtLeastOneNavKey_Leaves

Browse Source
This commit is contained in:
Tig
2024-07-31 09:05:26 -04:00
parent 3d00102125
commit 47e1c87590
2 changed files with 101 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Terminal.Gui/Views/TextValidateField.cs
View File

@@ -664,6 +664,11 @@ namespace Terminal.Gui
/// <returns>True if moved.</returns>
private bool CursorLeft ()
{
if (_provider is null)
{
return false;
}
int current = _cursorPosition;
_cursorPosition = _provider.CursorLeft (_cursorPosition);
SetNeedsDisplay ();
@@ -675,6 +680,11 @@ namespace Terminal.Gui
/// <returns>True if moved.</returns>
private bool CursorRight ()
{
if (_provider is null)
{
return false;
}
int current = _cursorPosition;
_cursorPosition = _provider.CursorRight (_cursorPosition);
SetNeedsDisplay ();

101
UnitTests/View/NavigationTests.cs
View File

@@ -2,7 +2,7 @@
namespace Terminal.Gui.ViewTests;
public class NavigationTests (ITestOutputHelper output) : TestsAllViews
public class NavigationTests (ITestOutputHelper _output) : TestsAllViews
{
[Fact]
public void BringSubviewForward_Subviews_vs_TabIndexes ()
@@ -853,7 +853,7 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
│ │
│ │
└──────────────────┘",
output
_output
);
// top
@@ -1004,7 +1004,7 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
│ │
│ │
└──────────────────┘",
output
_output
);
// mean the output started at col 3 and line 2
@@ -1619,20 +1619,20 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
if (view == null)
{
output.WriteLine ($"Ignoring {viewType} - It's a Generic");
_output.WriteLine ($"Ignoring {viewType} - It's a Generic");
return;
}
if (!view.CanFocus)
{
output.WriteLine ($"Ignoring {viewType} - It can't focus.");
_output.WriteLine ($"Ignoring {viewType} - It can't focus.");
return;
}
if (view is Toplevel && ((Toplevel)view).Modal)
{
output.WriteLine ($"Ignoring {viewType} - It's a Modal Toplevel");
_output.WriteLine ($"Ignoring {viewType} - It's a Modal Toplevel");
return;
}
@@ -1727,7 +1727,7 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
switch (view.TabStop)
{
case TabBehavior.NoStop:
view.SetFocus();
view.SetFocus ();
break;
case TabBehavior.TabStop:
Application.OnKeyDown (Key.Tab);
@@ -1762,20 +1762,20 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
if (view == null)
{
output.WriteLine ($"Ignoring {viewType} - It's a Generic");
_output.WriteLine ($"Ignoring {viewType} - It's a Generic");
return;
}
if (!view.CanFocus)
{
output.WriteLine ($"Ignoring {viewType} - It can't focus.");
_output.WriteLine ($"Ignoring {viewType} - It can't focus.");
return;
}
if (view is Toplevel && ((Toplevel)view).Modal)
{
output.WriteLine ($"Ignoring {viewType} - It's a Modal Toplevel");
_output.WriteLine ($"Ignoring {viewType} - It's a Modal Toplevel");
return;
}
@@ -1845,4 +1845,85 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
top.Dispose ();
Application.Shutdown ();
}
[Theory]
[MemberData (nameof (AllViewTypes))]
public void AllViews_AtLeastOneNavKey_Leaves (Type viewType)
{
var view = CreateInstanceIfNotGeneric (viewType);
if (view == null)
{
_output.WriteLine ($"Ignoring {viewType} - It's a Generic");
return;
}
if (!view.CanFocus)
{
_output.WriteLine ($"Ignoring {viewType} - It can't focus.");
return;
}
Application.Init (new FakeDriver ());
Toplevel top = new ();
View otherView = new ()
{
Id = "otherView",
CanFocus = true,
TabStop = view.TabStop
};
top.Add (view, otherView);
Application.Begin (top);
// Start with the focus on our test view
view.SetFocus ();
int tries = 0;
Key [] navKeys = new Key [] { Key.Tab, Key.Tab.WithShift, Key.CursorUp, Key.CursorDown, Key.CursorLeft, Key.CursorRight };
if (view.TabStop == TabBehavior.TabGroup)
{
navKeys = new Key [] { Key.Tab.WithCtrl, Key.Tab.WithCtrl.WithShift };
}
bool left = false;
foreach (Key key in navKeys)
{
switch (view.TabStop)
{
case TabBehavior.TabStop:
case TabBehavior.NoStop:
case TabBehavior.TabGroup:
Application.OnKeyDown (key);
break;
default:
Application.OnKeyDown (Key.Tab);
break;
}
if (!view.HasFocus)
{
left = true;
_output.WriteLine ($"{view.GetType ().Name} - {key} Left.");
view.SetFocus();
}
else
{
_output.WriteLine ($"{view.GetType ().Name} - {key} did not Leave.");
}
}
top.Dispose ();
Application.Shutdown ();
Assert.True (left);
}
}