ui-tests: prepare WaitForRegExInWindowsTerminal() for disruptions

I want to add an integration test that clones a repository via SSH.
Unfortunately, I have not found a better way than to run OpenSSH for
Windows' `sshd.exe` in debug mode, in which case every successful
connection will open a terminal window.

Let's be prepared for these annoying extra windows by forcefully
activating the desired window as needed.

This change is admittedly a bit intrusive; I did not find any more
elegant way to achieve the same result, though.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

ui-tests/ui-test-library.ahk

@@ -67,7 +67,9 @@ RunWaitOne(command) {
     return Result
 }
 
-CaptureTextFromWindowsTerminal() {
+CaptureTextFromWindowsTerminal(winTitle) {
+    if winTitle != ''
+        WinActivate winTitle
     ControlGetPos &cx, &cy, &cw, &ch, 'Windows.UI.Composition.DesktopWindowContentBridge1', "A"
     titleBarHeight := 54
     scrollBarWidth := 28
@@ -76,23 +78,36 @@ CaptureTextFromWindowsTerminal() {
     SavedClipboard := ClipboardAll
     A_Clipboard := ''
     SendMode('Event')
+    if winTitle != ''
+        WinActivate winTitle
     MouseMove cx + pad, cy + titleBarHeight + pad
+    if winTitle != ''
+        WinActivate winTitle
     MouseClickDrag 'Left', , , cx + cw - scrollBarWidth, cy + ch - pad, , ''
+    if winTitle != ''
+        WinActivate winTitle
     MouseClick 'Right'
     ClipWait()
     Result := A_Clipboard
     Clipboard := SavedClipboard
     return Result
 }
 
-WaitForRegExInWindowsTerminal(regex, errorMessage, successMessage, timeout := 5000) {
+WaitForRegExInWindowsTerminal(regex, errorMessage, successMessage, timeout := 5000, winTitle := '') {
     timeout := timeout + A_TickCount
     ; Wait for the regex to match in the terminal output
-    while not RegExMatch(CaptureTextFromWindowsTerminal(), regex)
+    while true
     {
+        capturedText := CaptureTextFromWindowsTerminal(winTitle)
+        if RegExMatch(capturedText, regex)
+            break
         Sleep 100
-        if A_TickCount > timeout
+        if A_TickCount > timeout {
+            Info('Captured text:`n' . capturedText)
             ExitWithError errorMessage
+        }
+        if winTitle != ''
+            WinActivate winTitle
         MouseClick 'WheelDown', , , 20
     }
     Info(successMessage)