From dceed59a5fae2aaaa24d48e56c80683e183951b7 Mon Sep 17 00:00:00 2001 From: Tig Date: Fri, 5 Apr 2024 12:27:04 -0400 Subject: [PATCH] Fixed more unit tests --- UnitTests/Text/AutocompleteTests.cs | 2 +- UnitTests/Views/StatusBarTests.cs | 2 +- UnitTests/Views/TableViewTests.cs | 14 +++++----- UnitTests/Views/TextFieldTests.cs | 16 +++++------ UnitTests/Views/TextValidateFieldTests.cs | 2 +- UnitTests/Views/TextViewTests.cs | 34 +++++++++++------------ UnitTests/Views/ToplevelTests.cs | 6 ++-- UnitTests/Views/TreeViewTests.cs | 8 +++--- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/UnitTests/Text/AutocompleteTests.cs b/UnitTests/Text/AutocompleteTests.cs index e3cf22218..6072d4126 100644 --- a/UnitTests/Text/AutocompleteTests.cs +++ b/UnitTests/Text/AutocompleteTests.cs @@ -50,7 +50,7 @@ This a long line and against TextView. } Assert.True ( - tv.OnMouseEvent ( + tv.NewMouseEvent ( new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed } ) ); diff --git a/UnitTests/Views/StatusBarTests.cs b/UnitTests/Views/StatusBarTests.cs index b2a9dfdc3..1c94dec0e 100644 --- a/UnitTests/Views/StatusBarTests.cs +++ b/UnitTests/Views/StatusBarTests.cs @@ -163,7 +163,7 @@ CTRL-O Open { { Assert.Equal ("Quiting...", msg); msg = ""; - sb.OnMouseEvent (new MouseEvent { X = 1, Y = 24, Flags = MouseFlags.Button1Clicked }); + sb.NewMouseEvent (new MouseEvent { X = 1, Y = 24, Flags = MouseFlags.Button1Clicked }); } else { diff --git a/UnitTests/Views/TableViewTests.cs b/UnitTests/Views/TableViewTests.cs index 574ad85a8..4706c695b 100644 --- a/UnitTests/Views/TableViewTests.cs +++ b/UnitTests/Views/TableViewTests.cs @@ -2196,7 +2196,7 @@ public class TableViewTests tv.MultiSelect = true; // Clicking in bottom row - tv.OnMouseEvent ( + tv.NewMouseEvent ( new MouseEvent { X = 1, Y = 4, Flags = MouseFlags.Button1Clicked } ); @@ -2204,7 +2204,7 @@ public class TableViewTests Assert.Equal (2, tv.SelectedRow); // shift clicking top row - tv.OnMouseEvent ( + tv.NewMouseEvent ( new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl } ); @@ -2268,7 +2268,7 @@ public class TableViewTests tv.Style.AlwaysUseNormalColorForVerticalCellLines = true; // Clicking in bottom row - tv.OnMouseEvent ( + tv.NewMouseEvent ( new MouseEvent { X = 1, Y = 4, Flags = MouseFlags.Button1Clicked } ); @@ -2323,7 +2323,7 @@ public class TableViewTests tv.Style.ShowVerticalHeaderLines = false; // Clicking in bottom row - tv.OnMouseEvent ( + tv.NewMouseEvent ( new MouseEvent { X = 1, Y = 4, Flags = MouseFlags.Button1Clicked } ); @@ -2376,7 +2376,7 @@ A B C tv.Style.ShowHorizontalBottomline = true; // Clicking in bottom row - tv.OnMouseEvent ( + tv.NewMouseEvent ( new MouseEvent { X = 1, Y = 4, Flags = MouseFlags.Button1Clicked } ); @@ -2557,7 +2557,7 @@ A B C tv.MultiSelect = true; // Clicking in bottom row - tv.OnMouseEvent ( + tv.NewMouseEvent ( new MouseEvent { X = 1, Y = 3, Flags = MouseFlags.Button1Clicked } ); @@ -2565,7 +2565,7 @@ A B C Assert.Equal (1, tv.SelectedRow); // shift clicking top row - tv.OnMouseEvent ( + tv.NewMouseEvent ( new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked | MouseFlags.ButtonShift } ); diff --git a/UnitTests/Views/TextFieldTests.cs b/UnitTests/Views/TextFieldTests.cs index 7794837ed..5c3b3bd68 100644 --- a/UnitTests/Views/TextFieldTests.cs +++ b/UnitTests/Views/TextFieldTests.cs @@ -122,7 +122,7 @@ public class TextFieldTests Assert.False (fv.CanFocus); Assert.False (fv.HasFocus); - tf.OnMouseEvent ( + tf.NewMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked } ); @@ -136,7 +136,7 @@ public class TextFieldTests fv.CanFocus = true; tf.CanFocus = true; - tf.OnMouseEvent ( + tf.NewMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked } ); @@ -148,7 +148,7 @@ public class TextFieldTests fv.CanFocus = false; - tf.OnMouseEvent ( + tf.NewMouseEvent ( new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked } ); @@ -484,7 +484,7 @@ public class TextFieldTests tf.Text = "Les Misérables movie."; Assert.True ( - tf.OnMouseEvent ( + tf.NewMouseEvent ( new MouseEvent { X = 7, Y = 1, Flags = MouseFlags.Button1DoubleClicked, View = tf } ) ); @@ -1152,12 +1152,12 @@ public class TextFieldTests var ev = new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1DoubleClicked }; - tf.OnMouseEvent (ev); + tf.NewMouseEvent (ev); Assert.Equal (1, tf.SelectedLength); ev = new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }; - tf.OnMouseEvent (ev); + tf.NewMouseEvent (ev); Assert.Equal (1, tf.SelectedLength); } @@ -1537,14 +1537,14 @@ public class TextFieldTests Assert.Equal ("m", runes [idx].ToString ()); Assert.True ( - tf.OnMouseEvent ( + tf.NewMouseEvent ( new MouseEvent { X = idx, Y = 1, Flags = MouseFlags.Button1DoubleClicked, View = tf } ) ); Assert.Equal ("movie.", tf.SelectedText); Assert.True ( - tf.OnMouseEvent ( + tf.NewMouseEvent ( new MouseEvent { X = idx + 1, Y = 1, Flags = MouseFlags.Button1DoubleClicked, View = tf } ) ); diff --git a/UnitTests/Views/TextValidateFieldTests.cs b/UnitTests/Views/TextValidateFieldTests.cs index 981c83a27..de5f6274c 100644 --- a/UnitTests/Views/TextValidateFieldTests.cs +++ b/UnitTests/Views/TextValidateFieldTests.cs @@ -322,7 +322,7 @@ public class TextValidateField_NET_Provider_Tests Assert.False (field.IsValid); Assert.Equal ("--(1 )--", field.Provider.Text); - field.OnMouseEvent (new MouseEvent { X = 25, Flags = MouseFlags.Button1Pressed }); + field.NewMouseEvent (new MouseEvent { X = 25, Flags = MouseFlags.Button1Pressed }); field.NewKeyDownEvent (Key.D1); diff --git a/UnitTests/Views/TextViewTests.cs b/UnitTests/Views/TextViewTests.cs index 2eb28a06d..7f35dd4ce 100644 --- a/UnitTests/Views/TextViewTests.cs +++ b/UnitTests/Views/TextViewTests.cs @@ -160,7 +160,7 @@ public class TextViewTests Assert.False (fv.CanFocus); Assert.False (fv.HasFocus); - tv.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tv.NewMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.Empty (tv.SelectedText); Assert.False (tv.CanFocus); @@ -171,7 +171,7 @@ public class TextViewTests Assert.Throws (() => tv.CanFocus = true); fv.CanFocus = true; tv.CanFocus = true; - tv.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tv.NewMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.Equal ("some ", tv.SelectedText); Assert.True (tv.CanFocus); @@ -180,7 +180,7 @@ public class TextViewTests Assert.True (fv.HasFocus); fv.CanFocus = false; - tv.OnMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tv.NewMouseEvent (new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.Equal ("some ", tv.SelectedText); // Setting CanFocus to false don't change the SelectedText Assert.False (tv.CanFocus); @@ -1072,7 +1072,7 @@ This is the second line. for (var i = 0; i < 12; i++) { - tv.OnMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledRight }); + tv.NewMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledRight }); tv.PositionCursor (); Assert.Equal (Math.Min (i + 1, 11), tv.LeftColumn); Assert.Equal (CursorVisibility.Invisible, tv.DesiredCursorVisibility); @@ -1080,7 +1080,7 @@ This is the second line. for (var i = 11; i > 0; i--) { - tv.OnMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledLeft }); + tv.NewMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledLeft }); tv.PositionCursor (); Assert.Equal (i - 1, tv.LeftColumn); @@ -1115,7 +1115,7 @@ This is the second line. for (var i = 0; i < 12; i++) { - tv.OnMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledDown }); + tv.NewMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledDown }); tv.PositionCursor (); Assert.Equal (i + 1, tv.TopRow); Assert.Equal (CursorVisibility.Invisible, tv.DesiredCursorVisibility); @@ -1123,7 +1123,7 @@ This is the second line. for (var i = 12; i > 0; i--) { - tv.OnMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledUp }); + tv.NewMouseEvent (new MouseEvent { Flags = MouseFlags.WheeledUp }); tv.PositionCursor (); Assert.Equal (i - 1, tv.TopRow); @@ -6788,7 +6788,7 @@ This is the second line. Assert.Equal ("TAB to jump between text fields.", _textView.Text); Assert.True ( - _textView.OnMouseEvent ( + _textView.NewMouseEvent ( new MouseEvent { X = 12, Y = 0, Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift } ) ); @@ -6798,7 +6798,7 @@ This is the second line. Assert.True (_textView.Selecting); Assert.Equal ("TAB to jump ", _textView.SelectedText); - Assert.True (_textView.OnMouseEvent (new MouseEvent { X = 12, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (_textView.NewMouseEvent (new MouseEvent { X = 12, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (new Point (12, 0), _textView.CursorPosition); @@ -6806,7 +6806,7 @@ This is the second line. Assert.Equal ("TAB to jump ", _textView.SelectedText); Assert.True ( - _textView.OnMouseEvent ( + _textView.NewMouseEvent ( new MouseEvent { X = 19, Y = 0, Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift } ) ); @@ -6816,7 +6816,7 @@ This is the second line. Assert.True (_textView.Selecting); Assert.Equal ("TAB to jump between", _textView.SelectedText); - Assert.True (_textView.OnMouseEvent (new MouseEvent { X = 19, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (_textView.NewMouseEvent (new MouseEvent { X = 19, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (new Point (19, 0), _textView.CursorPosition); @@ -6824,7 +6824,7 @@ This is the second line. Assert.Equal ("TAB to jump between", _textView.SelectedText); Assert.True ( - _textView.OnMouseEvent ( + _textView.NewMouseEvent ( new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift } ) ); @@ -6834,14 +6834,14 @@ This is the second line. Assert.True (_textView.Selecting); Assert.Equal ("TAB to jump between text", _textView.SelectedText); - Assert.True (_textView.OnMouseEvent (new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Clicked })); + Assert.True (_textView.NewMouseEvent (new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Clicked })); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (new Point (24, 0), _textView.CursorPosition); Assert.True (_textView.Selecting); Assert.Equal ("TAB to jump between text", _textView.SelectedText); - Assert.True (_textView.OnMouseEvent (new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Pressed })); + Assert.True (_textView.NewMouseEvent (new MouseEvent { X = 24, Y = 0, Flags = MouseFlags.Button1Pressed })); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (0, _textView.SelectionStartRow); Assert.Equal (new Point (24, 0), _textView.CursorPosition); @@ -7624,12 +7624,12 @@ TAB to jump between text field", var ev = new MouseEvent { X = 0, Y = 0, Flags = MouseFlags.Button1DoubleClicked }; - tv.OnMouseEvent (ev); + tv.NewMouseEvent (ev); Assert.Equal (1, tv.SelectedLength); ev = new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1DoubleClicked }; - tv.OnMouseEvent (ev); + tv.NewMouseEvent (ev); Assert.Equal (1, tv.SelectedLength); } @@ -7744,7 +7744,7 @@ line. _output ); - Assert.True (tv.OnMouseEvent (new MouseEvent { X = 0, Y = 3, Flags = MouseFlags.Button1Pressed })); + Assert.True (tv.NewMouseEvent (new MouseEvent { X = 0, Y = 3, Flags = MouseFlags.Button1Pressed })); tv.Draw (); Assert.Equal (new Point (0, 3), tv.CursorPosition); Assert.Equal (new Point (13, 0), cp); diff --git a/UnitTests/Views/ToplevelTests.cs b/UnitTests/Views/ToplevelTests.cs index 601c5925c..8c9f270b8 100644 --- a/UnitTests/Views/ToplevelTests.cs +++ b/UnitTests/Views/ToplevelTests.cs @@ -382,12 +382,12 @@ public class ToplevelTests Assert.Equal (new Rectangle (0, 1, 60, 15), win.Frame); //Assert.Null (Toplevel._dragPosition); - win.OnMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed }); + win.NewMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed }); // Assert.Equal (new Point (6, 0), Toplevel._dragPosition); - win.OnMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Released }); + win.NewMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Released }); //Assert.Null (Toplevel._dragPosition); win.CanFocus = false; - win.OnMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed }); + win.NewMouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed }); //Assert.Null (Toplevel._dragPosition); } diff --git a/UnitTests/Views/TreeViewTests.cs b/UnitTests/Views/TreeViewTests.cs index 6a2805d40..dfa4e1e3b 100644 --- a/UnitTests/Views/TreeViewTests.cs +++ b/UnitTests/Views/TreeViewTests.cs @@ -453,7 +453,7 @@ public class TreeViewTests Assert.False (called); // double click triggers activation - tree.OnMouseEvent (new MouseEvent { Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tree.NewMouseEvent (new MouseEvent { Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.True (called); Assert.Same (f, activated); @@ -485,12 +485,12 @@ public class TreeViewTests Assert.False (called); // double click does nothing because we changed button binding to right click - tree.OnMouseEvent (new MouseEvent { Y = 1, Flags = MouseFlags.Button1DoubleClicked }); + tree.NewMouseEvent (new MouseEvent { Y = 1, Flags = MouseFlags.Button1DoubleClicked }); Assert.Null (activated); Assert.False (called); - tree.OnMouseEvent (new MouseEvent { Y = 1, Flags = MouseFlags.Button2Clicked }); + tree.NewMouseEvent (new MouseEvent { Y = 1, Flags = MouseFlags.Button2Clicked }); Assert.True (called); Assert.Same (car1, activated); @@ -522,7 +522,7 @@ public class TreeViewTests Assert.False (called); // double click does nothing because we changed button to null - tree.OnMouseEvent (new MouseEvent { Y = 0, Flags = MouseFlags.Button1DoubleClicked }); + tree.NewMouseEvent (new MouseEvent { Y = 0, Flags = MouseFlags.Button1DoubleClicked }); Assert.False (called); Assert.Null (activated);