mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-27 00:07:58 +01:00
* Adds basic MainLoop unit tests * Remove WinChange action from Curses * Remove WinChange action from Curses * Remove ProcessInput action from Windows MainLoop * Simplified MainLoop/ConsoleDriver by making MainLoop internal and moving impt fns to Application * Modernized Terminal resize events * Modernized Terminal resize events * Removed un used property * for _isWindowsTerminal devenv->wininit; not sure what changed * Modernized mouse/keyboard events (Action->EventHandler) * Updated OnMouseEvent API docs * Using WT_SESSION to detect WT * removes hacky GetParentProcess * Updates to fix #2634 (clear last line) * removes hacky GetParentProcess2 * Addressed mac resize issue * Addressed mac resize issue * Removes ConsoleDriver.PrepareToRun, has Init return MainLoop * Removes unneeded Attribute methods * Removed GetProcesssName * Removed GetProcesssName * Refactored KeyEvent and KeyEventEventArgs into a single class * Revert "Refactored KeyEvent and KeyEventEventArgs into a single class" This reverts commit88a00658db. * Fixed key repeat issue; reverted stupidity on 1049/1047 confusion * Updated CSI API Docs * merge * Rearranged Event.cs to Keyboard.cs and Mouse.cs * Renamed KeyEventEventArgs KeyEventArgs * temp renamed KeyEvent OldKeyEvent * Merged KeyEvent into KeyEventArgs * Renamed Application.ProcessKey members * Renamed Application.ProcessKey members * Renamed Application.ProcessKey members * Added Responder.KeyPressed * Removed unused references * Fixed arg naming * InvokeKeybindings->InvokeKeyBindings * InvokeKeybindings->InvokeKeyBindings * Fixed unit tests fail * More progress on refactoring key input; still broken and probably wrong * Moved OnKeyPressed out of Responder and made ProcessKeyPrssed non-virtual * Updated API docs * Moved key handling from Responder to View * Updated API docs * Updated HotKey API docs * Updated shortcut API docs * Fixed responder unit tests * Removed Shortcut from View as it is not used * Removed unneeded OnHotKey override from Button * Fixed BackTab logic * Button now uses Key Bindings exclusively * Button now uses Key Bindings exclusively * Updated keyboard.md docs * Fixed unit tests to account for Toplevel handling default button * Added View.InvokeCommand API * Modernized RadioGroup * Removed ColdKey * Modernized (partially) StatusBar * Worked around FileDialog issue with Ctrl-F * Fixed driver unit test; view must be focused to reciev key pressed * Application code cleanup * Start on updaing menu * Menu now mostly works * Menu Select refinement * Fixed known menu bugs! * Enabled HotKey to cause focus- experimental * Fixes #3022 & adds unit test to prove it * Actually Fixes #3022 & adds unit test to prove it * Working through hotkey issues * Misc fixes * removed hot/cold key stuff from Keys scenario * Fixed scenarios * Simplified shortcut string handling * Modernized Checkbox * Modernized TileView * Updated API docs * Updated API docs * attempting to publish v2 docs * Revert "attempting to publish v2 docs" This reverts commit59dcec111b. * Playing with api docs * Removed Key.BackTab * Removed Caps/Scroll/Numlock * Partial removal of keymodifiers - unit tests pass * Partial removal of keymodifiers - broke netdriver somewhere * WindowsDriver & added KeyEventArgsTests * Fixing menu shortcut/hotkeys - broke Menu.cs into separate files * Fixed MenuBar! * Finished modernizing Menu/MenuBar * Removed Key.a-z. Broke lots of stuff * checkout@v4 * progress on key mapping and formatting * VK tests are still failing * Fixed some unit tests * Added Hotkey and Keybinding unit tests * fixed unit test * All unit tests pass again... * Fixed broken unit tests * KeyEventArgs.KeyValue -> AsRune * Fixed bugs. Still some broken * Added KeyEventArgs.IsAlpha. Added KeyEventArgs.cast ops. Fixed bugs. Unit tests pass * Fixed WindowsDriver * Oops. * Refactoring based on bdisp's help. Not complete! * removed calling into subviews from OnKeyBindings * removed calling into subviews from OnKeyBindings * Improved View KeyEvent unit tests * More hotkey unit tests * BIg change - Got rid of KeyPress w/in Application/Drivers * Unit tests now pass again * Refreshed API docs * Better HotKey logic. More progress. Getting close. * Fixed handling of shifted chars like ö * Minor code cleanup * Minor code cleanup2 * Why is build Action failing? * Why is build Action failing?? * upgraded to .net8 to try to fix weird CI/CD build errors * upgraded to .net8 to try to fix weird CI/CD build errors2 * Disabling TextViewTests to diagnose build errors * reenable TextViewTests to diagnose build errors * Arrrrrrg * Merged v2_develop * Fixed uppercase accented keys in WindowsDriver * Fixed key binding api docs * Experimental impl of CommandScope.SubViews for MenuBar * Removed dead code from application.cs * Removed dead code from application.cs * Removed dead code from ConsoleDriver.cs * Cleaned up some key binding stuff * Disabled Alt to activate menu for now * Updated label commands * Fixed menu bugs. Upgraded menu unit tests * Fixed unit tests * Working on NetDriver * fixed netdriver * Fixed issues called out by @bdisp CR * fixed CursesDriver * added todo to netdriver * Cherry picked treeview test fix1b415e5* Fix NetDriver. * CommandScope->KeyBindingScope * Address some tznind feedback * Refactored KeyBindings big time! * Added key consts to KeyEventArgs and renamed Key to ConsoleDriverKey * Fixed some API docs * Moved ConsoleDriverKey to ConsoleDriver.cs * Renamed Key->ConsoleDriverKey * Renamed Key->ConsoleDriverKey * Renamed Key->ConsoleDriverKey * renamed file I forgot to rename before * Updated name and API docs of KeyEventArgs.isAlpha * Fixed issues with OnKeyUp not doing the right thing. * Fixed MainLoop.Running never being used * Fixed MainLoop.Running never being used - unit tests * Claned up BUGBUG comments * Disabled a unit test to see why ci/cd tests are failing * Removed defunct commented code * Removed more defunct commented code * Re-eanbled unit test; jsut removing one test case... * Disabled more... * Renambed Global->Applicaton and updated scope API docs * Disabled more unit tests... * Removed dead code * Disabled more unit tests...2 * Disabled more unit tests...3 * Renambed Global->Applicaton and updated scope API docs 2 * Added more KeyBinding scope tests * Added more KeyBinding scope tests2 * ConsoleDriverKey too long. Key too ambiguous. Settled on KeyCode. (Partialy because eventually I want to intro a class named Key). * KeyEventArgs improvements. cast to Rune must be explicit as it's lossy * Fixed warnings * Renamed KeyEventArgs to Key... progress on fixing broken stuff that resulted * Fix ConsoleKeyMapping bugs. * Fix NetDriver issue from converting a lower case to a upper case. * Started migration to Key from KeyCode - e.g. made HotKeys all consistent. * Fixed build warnings * Added key defns to Key * KeyBindings now uses Key vs. KeyCode * Verified by tweaking UICatalog * Fixed treeview test ... again * Renamed ProcessKeyDown/Up to NewKeyDown/Up and OnKeyPressed to OnProcessKeyDown to make things more clear * Added test AllViews_KeyDown_All_EventsFire unit tests and fixed a few Views that were wrong * fixed stupid KeyUp event bug * If key not handled, return false for datefield * dotnet test --no-restore --verbosity diag * dotnet test --blame * run tests on windows * Fix TestVKPacket unit test and move it to ConsoleKeyMappingTests.cs file. * Remove unnecessary commented code. * Tweaked unit tests and removed Key.BareKey * Fixed little details and updated api docs * updated api docs * AddKeyBindingsForHotKey: KeyCode->Key * Cleaned up more old KeyCode usages. Added TODOs --------- Co-authored-by: BDisp <bd.bdisp@gmail.com>
300 lines
9.0 KiB
C#
300 lines
9.0 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Data;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using Xunit;
|
|
using Xunit.Abstractions;
|
|
|
|
namespace Terminal.Gui.ViewsTests;
|
|
|
|
public class TreeTableSourceTests: IDisposable {
|
|
|
|
readonly ITestOutputHelper _output;
|
|
private readonly Rune _origChecked;
|
|
private readonly Rune _origUnchecked;
|
|
public TreeTableSourceTests (ITestOutputHelper output)
|
|
{
|
|
_output = output;
|
|
|
|
_origChecked = ConfigurationManager.Glyphs.Checked;
|
|
_origUnchecked = ConfigurationManager.Glyphs.UnChecked;
|
|
ConfigurationManager.Glyphs.Checked = new Rune ('☑');
|
|
ConfigurationManager.Glyphs.UnChecked = new Rune ('☐');
|
|
}
|
|
|
|
[Fact, AutoInitShutdown]
|
|
public void TestTreeTableSource_BasicExpanding_WithKeyboard ()
|
|
{
|
|
var tv = GetTreeTable (out _);
|
|
|
|
tv.Style.GetOrCreateColumnStyle (1).MinAcceptableWidth = 1;
|
|
|
|
tv.Draw ();
|
|
|
|
string expected =
|
|
@"
|
|
│Name │Description │
|
|
├──────────────┼───────────────────────┤
|
|
│├+Lost Highway│Exciting night road │
|
|
│└+Route 66 │Great race course │";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
Assert.Equal(2, tv.Table.Rows);
|
|
|
|
// top left is selected cell
|
|
Assert.Equal (0, tv.SelectedRow);
|
|
Assert.Equal(0, tv.SelectedColumn);
|
|
|
|
// when pressing right we should expand the top route
|
|
tv.NewKeyDownEvent (new (KeyCode.CursorRight));
|
|
|
|
tv.Draw ();
|
|
|
|
expected =
|
|
@"
|
|
│Name │Description │
|
|
├─────────────────┼────────────────────┤
|
|
│├-Lost Highway │Exciting night road │
|
|
││ ├─Ford Trans-Am│Talking thunderbird │
|
|
││ └─DeLorean │Time travelling car │
|
|
│└+Route 66 │Great race course │
|
|
";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
// when pressing left we should collapse the top route again
|
|
tv.NewKeyDownEvent (new (KeyCode.CursorLeft));
|
|
|
|
tv.Draw ();
|
|
|
|
expected =
|
|
@"
|
|
│Name │Description │
|
|
├──────────────┼───────────────────────┤
|
|
│├+Lost Highway│Exciting night road │
|
|
│└+Route 66 │Great race course │
|
|
";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
}
|
|
|
|
[Fact, AutoInitShutdown]
|
|
public void TestTreeTableSource_BasicExpanding_WithMouse ()
|
|
{
|
|
var tv = GetTreeTable (out _);
|
|
|
|
tv.Style.GetOrCreateColumnStyle (1).MinAcceptableWidth = 1;
|
|
|
|
tv.Draw ();
|
|
|
|
string expected =
|
|
@"
|
|
│Name │Description │
|
|
├──────────────┼───────────────────────┤
|
|
│├+Lost Highway│Exciting night road │
|
|
│└+Route 66 │Great race course │";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
Assert.Equal (2, tv.Table.Rows);
|
|
|
|
// top left is selected cell
|
|
Assert.Equal (0, tv.SelectedRow);
|
|
Assert.Equal (0, tv.SelectedColumn);
|
|
|
|
Assert.True(tv.OnMouseEvent (new MouseEvent () { X = 2,Y=2,Flags = MouseFlags.Button1Clicked}));
|
|
|
|
tv.Draw ();
|
|
|
|
expected =
|
|
@"
|
|
│Name │Description │
|
|
├─────────────────┼────────────────────┤
|
|
│├-Lost Highway │Exciting night road │
|
|
││ ├─Ford Trans-Am│Talking thunderbird │
|
|
││ └─DeLorean │Time travelling car │
|
|
│└+Route 66 │Great race course │
|
|
";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
// Clicking to the right/left of the expand/collapse does nothing
|
|
tv.OnMouseEvent (new MouseEvent () { X = 3, Y = 2, Flags = MouseFlags.Button1Clicked });
|
|
tv.Draw ();
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
tv.OnMouseEvent (new MouseEvent () { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked });
|
|
tv.Draw ();
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
// Clicking on the + again should collapse
|
|
tv.OnMouseEvent (new MouseEvent () { X = 2, Y = 2, Flags = MouseFlags.Button1Clicked });
|
|
tv.Draw ();
|
|
|
|
expected =
|
|
@"
|
|
│Name │Description │
|
|
├──────────────┼───────────────────────┤
|
|
│├+Lost Highway│Exciting night road │
|
|
│└+Route 66 │Great race course │";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
}
|
|
|
|
[Fact, AutoInitShutdown]
|
|
public void TestTreeTableSource_CombinedWithCheckboxes ()
|
|
{
|
|
var tv = GetTreeTable (out var treeSource);
|
|
|
|
CheckBoxTableSourceWrapperByIndex checkSource;
|
|
tv.Table = checkSource = new CheckBoxTableSourceWrapperByIndex (tv, tv.Table);
|
|
tv.Style.GetOrCreateColumnStyle (2).MinAcceptableWidth = 1;
|
|
|
|
tv.Draw ();
|
|
|
|
string expected =
|
|
@"
|
|
│ │Name │Description │
|
|
├─┼──────────────┼─────────────────────┤
|
|
│☐│├+Lost Highway│Exciting night road │
|
|
│☐│└+Route 66 │Great race course │
|
|
";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
Assert.Equal (2, tv.Table.Rows);
|
|
|
|
// top left is selected cell
|
|
Assert.Equal (0, tv.SelectedRow);
|
|
Assert.Equal (0, tv.SelectedColumn);
|
|
|
|
// when pressing right we move to tree column
|
|
tv.NewKeyDownEvent(new (KeyCode.CursorRight));
|
|
|
|
// now we are in tree column
|
|
Assert.Equal (0, tv.SelectedRow);
|
|
Assert.Equal (1, tv.SelectedColumn);
|
|
|
|
Application.Top.NewKeyDownEvent (new (KeyCode.CursorRight));
|
|
|
|
tv.Draw ();
|
|
|
|
expected =
|
|
@"
|
|
|
|
│ │Name │Description │
|
|
├─┼─────────────────┼──────────────────┤
|
|
│☐│├-Lost Highway │Exciting night roa│
|
|
│☐││ ├─Ford Trans-Am│Talking thunderbir│
|
|
│☐││ └─DeLorean │Time travelling ca│
|
|
│☐│└+Route 66 │Great race course │
|
|
";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
tv.NewKeyDownEvent (new Key (KeyCode.CursorDown));
|
|
tv.NewKeyDownEvent (new Key (KeyCode.Space));
|
|
tv.Draw ();
|
|
|
|
expected =
|
|
@"
|
|
|
|
│ │Name │Description │
|
|
├─┼─────────────────┼──────────────────┤
|
|
│☐│├-Lost Highway │Exciting night roa│
|
|
│☑││ ├─Ford Trans-Am│Talking thunderbir│
|
|
│☐││ └─DeLorean │Time travelling ca│
|
|
│☐│└+Route 66 │Great race course │
|
|
";
|
|
|
|
TestHelpers.AssertDriverContentsAre (expected, _output);
|
|
|
|
var selectedObjects = checkSource.CheckedRows.Select (treeSource.GetObjectOnRow).ToArray();
|
|
var selected = Assert.Single(selectedObjects);
|
|
|
|
Assert.Equal ("Ford Trans-Am",selected.Name);
|
|
Assert.Equal ("Talking thunderbird car", selected.Description);
|
|
|
|
}
|
|
|
|
interface IDescribedThing {
|
|
string Name { get; }
|
|
string Description { get; }
|
|
}
|
|
|
|
class Road : IDescribedThing {
|
|
public string Name { get; set; }
|
|
public string Description { get; set; }
|
|
|
|
public List<Car> Traffic { get; set; }
|
|
}
|
|
|
|
class Car : IDescribedThing {
|
|
public string Name { get; set; }
|
|
public string Description { get; set; }
|
|
}
|
|
|
|
|
|
private TableView GetTreeTable (out TreeView<IDescribedThing> tree)
|
|
{
|
|
var tableView = new TableView ();
|
|
tableView.ColorScheme = Colors.TopLevel;
|
|
tableView.ColorScheme = Colors.TopLevel;
|
|
tableView.Bounds = new Rect (0, 0, 40, 6);
|
|
|
|
tableView.Style.ShowHorizontalHeaderUnderline = true;
|
|
tableView.Style.ShowHorizontalHeaderOverline = false;
|
|
tableView.Style.AlwaysShowHeaders = true;
|
|
tableView.Style.SmoothHorizontalScrolling = true;
|
|
|
|
tree = new TreeView<IDescribedThing> ();
|
|
tree.AspectGetter = (d) => d.Name;
|
|
|
|
tree.TreeBuilder = new DelegateTreeBuilder<IDescribedThing> (
|
|
(d) => d is Road r ? r.Traffic : Enumerable.Empty<IDescribedThing> ()
|
|
);
|
|
|
|
tree.AddObject (new Road {
|
|
Name = "Lost Highway",
|
|
Description = "Exciting night road",
|
|
Traffic = new List<Car> {
|
|
new Car { Name = "Ford Trans-Am", Description = "Talking thunderbird car"},
|
|
new Car { Name = "DeLorean", Description = "Time travelling car"}
|
|
}
|
|
});
|
|
|
|
tree.AddObject (new Road {
|
|
Name = "Route 66",
|
|
Description = "Great race course",
|
|
Traffic = new List<Car> {
|
|
new Car { Name = "Pink Compact", Description = "Penelope Pitstop's car"},
|
|
new Car { Name = "Mean Machine", Description = "Dick Dastardly's car"}
|
|
}
|
|
});
|
|
|
|
tableView.Table = new TreeTableSource<IDescribedThing> (tableView,"Name",tree,
|
|
new () {
|
|
{"Description",(d)=>d.Description }
|
|
});
|
|
|
|
tableView.BeginInit ();
|
|
tableView.EndInit ();
|
|
tableView.LayoutSubviews ();
|
|
|
|
Application.Top.Add (tableView);
|
|
Application.Top.EnsureFocus ();
|
|
Assert.Equal (tableView, Application.Top.MostFocused);
|
|
|
|
return tableView;
|
|
}
|
|
|
|
public void Dispose ()
|
|
{
|
|
|
|
ConfigurationManager.Glyphs.Checked = _origChecked;
|
|
ConfigurationManager.Glyphs.UnChecked = _origUnchecked;
|
|
}
|
|
}
|