Skip to content

Fixes #4027. Add collection search matcher #4029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Apr 28, 2025
Merged

Fixes #4027. Add collection search matcher #4029

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
39c0e4b
Add collection search matcher
tznind Apr 13, 2025
ee0748e
Fix naming
tznind Apr 13, 2025
4509780
fix naming
tznind Apr 13, 2025
b76212e
Move FileDialogCollectionNavigator to its own file (no longer private…
tznind Apr 13, 2025
bd364f7
Add ICollectionNavigator interface
tznind Apr 13, 2025
98383b4
Move to separate file IListCollectionNavigator
tznind Apr 13, 2025
9db1071
Update class diagram
tznind Apr 13, 2025
4b29940
update class diagram
tznind Apr 13, 2025
135d3c5
Add tests for overriding ICollectionNavigatorMatcher
tznind Apr 15, 2025
d1d5534
xmldoc and nullability warning fixes
tznind Apr 15, 2025
be56a8e
Code Cleanup
tznind Apr 15, 2025
26ff23d
Make requested changes to naming and terminology
tznind Apr 16, 2025
1f686f9
Move to seperate namespace
tznind Apr 16, 2025
dbeba5d
Update class diagram and change TreeView to reference the interface n…
tznind Apr 16, 2025
94219c6
Switch to implicit new
tznind Apr 16, 2025
18c3d90
Merge branch 'v2_develop' into collection-navigator-matcher
tig Apr 16, 2025
0511ad9
highlight that this class also works with tree view
tznind Apr 16, 2025
932c6aa
Merge branch 'collection-navigator-matcher' of https://github.com/tzn…
tznind Apr 16, 2025
58b0178
Apply tig patch to ensure keybindings get priority over navigator
tznind Apr 17, 2025
3ec5cc6
Apply 'keybinding has priority' fix to TreeView too
tznind Apr 17, 2025
41c9134
Apply 'keybindngs priority over navigation' fix to TableView
tznind Apr 17, 2025
0e29e04
Remove entire branch for selectively returning false now that it is d…
tznind Apr 17, 2025
d142ff1
Make classes internal and remove 'custom' navigator that was configur…
tznind Apr 17, 2025
35e402d
Fix merged conflicts
tznind Apr 24, 2025
ebecbc8
Change logging in collection navigator from Trace to Debug
tznind Apr 24, 2025
ab8c830
Switch to NewKeyDownEvent and directly setting HasFocus
tznind Apr 24, 2025
65a12da
Remove application top dependency
tznind Apr 26, 2025
d15bd12
Remove references to application
tznind Apr 27, 2025
e803d37
Remove Application
tznind Apr 27, 2025
1b8ab97
Merge branch 'v2_develop' into collection-navigator-matcher
tznind Apr 27, 2025
639b1d1
Move new tests to parallel
tznind Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Tests/UnitTests/Views/TableViewTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,7 @@ public void CellEventsBackgroundFill ()

tv.Table = new DataTableSource (dt);
tv.NullSymbol = string.Empty;

var top = new Toplevel ();
top.Add (tv);
Application.Begin (top);

tv.ColorScheme = new ColorScheme ();
tv.Draw ();

var expected =
Expand Down Expand Up @@ -105,6 +101,8 @@ public void CellEventsBackgroundFill ()
style.ColorGetter = e => { return scheme; };
}

// Required or won't draw properly
Application.Driver.Clip = new Region (tv.Frame);
Copy link
Collaborator

@BDisp BDisp Apr 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Staying in the UnitTests project there is no problem. Only in the Parallelizable project that would be a problem.

Copy link
Collaborator Author

@tznind tznind Apr 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is problem, if you remove it then test fails. This commit I removed the Application.Top bit

Alone removing top causes issues with repeated draws. This line fixes that

Copy link
Collaborator

@BDisp BDisp Apr 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you didn't understand. What @tig said was "Can the dependency on Application.Top be removed so this can move to a parallelizable test?". If a test can't be run without the dependency then leave as is, otherwise remove the dependencies and move to a parallelizable test. By the fact it still need the Application it can't be removed, So, it can't, don't do anything 😃

Copy link
Collaborator Author

@tznind tznind Apr 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah OK, thanks for explaining, I will see which can be moved and which cannot

tv.SetNeedsDraw ();
tv.Draw ();

Expand All @@ -116,7 +114,6 @@ public void CellEventsBackgroundFill ()
01111101101111111110
";
DriverAssert.AssertDriverAttributesAre (expected, output, Application.Driver, tv.ColorScheme.Normal, color);
top.Dispose ();
}

[Fact]
Expand Down