Merge branch 'master' of https://github.com/microsoft/XmlNotepad

Author: lovettchris

src/UnitTests/UnitTest1.cs

@@ -1631,7 +1631,7 @@ modified or altered in any way.
             w.SendKeystrokes("{HOME}");
             findDialog = OpenReplaceDialog();
             findDialog.Window.SendKeystrokes("will not find%r");
-            var popup = findDialog.Window.ExpectingPopup("Find Error");
+            var popup = findDialog.Window.ExpectingPopup("Replace Error");
             popup.DismissPopUp("{ENTER}");
 
             Trace.WriteLine("Test we can replace 2 things in sequence");
@@ -2155,7 +2155,7 @@ public void TestResizePanes()
             bounds = resizer.Bounds;
             mid = bounds.Center();
             // Drag the resizer right a few pixels.
-            Mouse.MouseDragDrop(mid, new Point(mid.X + 20, mid.Y), 1, MouseButtons.Left);
+            Mouse.MouseDragDrop(mid, new Point(mid.X + 50, mid.Y), 1, MouseButtons.Left);
             newbounds = resizer.Bounds;
             Assert.IsTrue(newbounds.Center().X > mid.X);
         }

src/UnitTests/mouse.cs

@@ -97,6 +97,7 @@ private static MouseInput GetAbsoluteMouseInput(int x, int y)
             input.dx = x;
             input.dy = y;
             input.dwFlags = (int)MouseFlags.MOUSEEVENTF_MOVE_NOCOALESCE;
+            input.mouseData = 0;
             input.time = 0;
             return input;
         }
@@ -105,19 +106,27 @@ private static MouseInput GetVirtualMouseInput(int x, int y)
         {
             MouseInput input = new MouseInput();
             input.type = (int)(InputType.INPUT_MOUSE);
-            input.dx = (x * 65536) / GetSystemMetrics(SM_CXSCREEN); ;
-            input.dy = (y * 65536) / GetSystemMetrics(SM_CYSCREEN); ;
+            input.dx = (x * 65536) / GetSystemMetrics(SM_CXSCREEN);
+            input.dy = (y * 65536) / GetSystemMetrics(SM_CYSCREEN);
             input.dwFlags = (int)(MouseFlags.MOUSEEVENTF_MOVE_NOCOALESCE | MouseFlags.MOUSEEVENTF_VIRTUALDESK);
+            input.mouseData = 0;
             input.time = 0;
             return input;
         }
 
-        public static void MouseMoveTo(int x, int y, MouseButtons buttons)
+        public static void MouseMoveTo(int x, int y, MouseButtons buttons, bool buttonUp = false)
         {
             MouseInput input = GetVirtualMouseInput(x, y);
             MouseFlags flags = (MouseFlags)input.dwFlags;
             flags |= MouseFlags.MOUSEEVENTF_MOVE | MouseFlags.MOUSEEVENTF_ABSOLUTE;
-            flags = AddMouseDownFlags(flags, buttons);
+            if (buttonUp)
+            {
+                flags = AddMouseUpFlags(flags, buttons);
+            }
+            else
+            {
+                flags = AddMouseDownFlags(flags, buttons);
+            }
             input.dwFlags = (int)flags;
             SendInput(input);
             Application.DoEvents();
@@ -132,8 +141,9 @@ public static void MouseDragDrop(Point start, Point end, int step, MouseButtons
             MouseDown(start, buttons);
             Application.DoEvents();
             Thread.Sleep(DragDelayDrop);
-            MouseDragTo(start, end, step, buttons);
+            MouseDragTo(start, end, step, buttons, true);
             Thread.Sleep(DragDelayDrop);
+            MouseDragTo(end, end, step, buttons, true);
             MouseUp(end, buttons);
             Application.DoEvents();
             Thread.Sleep(DragDelayDrop);
@@ -145,7 +155,7 @@ public static void MouseMoveTo(Point start, Point end, int step)
             MouseDragTo(start, end, step, MouseButtons.None);
         }
 
-        public static void MouseDragTo(Point start, Point end, int step, MouseButtons buttons)
+        public static void MouseDragTo(Point start, Point end, int step, MouseButtons buttons, bool finishWithButtonUp = false)
         {
             // Interpolate and move mouse smoothly over to given location.                
             double dx = end.X - start.X;
@@ -157,9 +167,11 @@ public static void MouseDragTo(Point start, Point end, int step, MouseButtons bu
                 int tx = start.X + (int)((dx * i) / length);
                 int ty = start.Y + (int)((dy * i) / length);
                 MouseMoveTo(tx, ty, buttons);
+                Thread.Sleep(1);
+                Application.DoEvents();
             }
 
-            MouseMoveTo(end.X, end.Y, buttons);
+            MouseMoveTo(end.X, end.Y, buttons, finishWithButtonUp);
         }
 
         public static void MouseWheel(AutomationWrapper w, int clicks)

src/XmlNotepad/NodeTextView.cs

@@ -927,7 +927,7 @@ void FindString(object sender, string toFind)
             TreeNode start = node;
             while (node != null)
             {
-                string s = node.Text.Trim();
+                string s = node.Text == null ? string.Empty : node.Text.Trim();
                 if (s != null && s.StartsWith(toFind, StringComparison.CurrentCultureIgnoreCase))
                 {
                     this.SelectedNode = node;