Update search function for Command palette

src/main/java/org/jvnet/hudson/test/HudsonTestCase.java

@@ -27,6 +27,8 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
+import static org.jvnet.hudson.test.QueryUtils.waitUntilElementIsPresent;
+import static org.jvnet.hudson.test.QueryUtils.waitUntilStringIsNotPresent;
 
 import com.google.inject.Injector;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -167,6 +169,7 @@
 import org.htmlunit.cssparser.parser.CSSParseException;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.DomNodeUtil;
+import org.htmlunit.html.HtmlAnchor;
 import org.htmlunit.html.HtmlButton;
 import org.htmlunit.html.HtmlElement;
 import org.htmlunit.html.HtmlForm;
@@ -1593,9 +1596,30 @@ public void run() {
 
         public HtmlPage search(String q) throws IOException, SAXException {
             HtmlPage top = goTo("");
-            HtmlForm search = top.getFormByName("search");
-            search.getInputByName("q").setValue(q);
-            return (HtmlPage)HtmlFormUtil.submit(search, null);
+            HtmlButton button = top.querySelector("#button-open-command-palette");
+
+            // Legacy versions of Jenkins
+            if (button == null) {
+                HtmlForm search = top.getFormByName("search");
+                search.getInputByName("q").setValue(q);
+                return (HtmlPage) HtmlFormUtil.submit(search, null);
+            }
+
+            button.click();
+            HtmlInput search = top.querySelector("#command-bar");
+            search.setValue(q);
+            top.executeJavaScript("document.querySelector('#command-bar').dispatchEvent(new Event(\"input\"))");
+
+            // We need to wait for the 'Get help using Jenkins search' item to no longer be visible
+            waitUntilStringIsNotPresent(top, "Get help using Jenkins search");
+            HtmlAnchor firstResult = (HtmlAnchor) waitUntilElementIsPresent(top, ".jenkins-command-palette__results__item");
+
+            if (firstResult == null) {
+                System.out.println("Couldn't find result for query '" + q + "'");
+                return null;
+            }
+
+            return firstResult.click();
         }
 
         /**

src/main/java/org/jvnet/hudson/test/JenkinsRule.java

@@ -34,6 +34,8 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.jvnet.hudson.test.QueryUtils.waitUntilElementIsPresent;
+import static org.jvnet.hudson.test.QueryUtils.waitUntilStringIsNotPresent;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -207,6 +209,7 @@
 import org.htmlunit.cssparser.parser.CSSParseException;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.DomNodeUtil;
+import org.htmlunit.html.HtmlAnchor;
 import org.htmlunit.html.HtmlButton;
 import org.htmlunit.html.HtmlElement;
 import org.htmlunit.html.HtmlElementUtil;
@@ -2624,9 +2627,30 @@ public void run() {
 
         public HtmlPage search(String q) throws IOException, SAXException {
             HtmlPage top = goTo("");
-            HtmlForm search = top.getFormByName("search");
-            search.getInputByName("q").setValue(q);
-            return (HtmlPage)HtmlFormUtil.submit(search, null);
+            HtmlButton button = top.querySelector("#button-open-command-palette");
+
+            // Legacy versions of Jenkins
+            if (button == null) {
+                HtmlForm search = top.getFormByName("search");
+                search.getInputByName("q").setValue(q);
+                return (HtmlPage) HtmlFormUtil.submit(search, null);
+            }
+
+            button.click();
+            HtmlInput search = top.querySelector("#command-bar");
+            search.setValue(q);
+            top.executeJavaScript("document.querySelector('#command-bar').dispatchEvent(new Event(\"input\"))");
+
+            // We need to wait for the 'Get help using Jenkins search' item to no longer be visible
+            waitUntilStringIsNotPresent(top, "Get help using Jenkins search");
+            HtmlAnchor firstResult = (HtmlAnchor) waitUntilElementIsPresent(top, ".jenkins-command-palette__results__item");
+
+            if (firstResult == null) {
+                System.out.println("Couldn't find result for query '" + q + "'");
+                return null;
+            }
+
+            return firstResult.click();
         }
 
         /**

src/main/java/org/jvnet/hudson/test/QueryUtils.java

@@ -0,0 +1,96 @@
+package org.jvnet.hudson.test;
+
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlPage;
+
+import java.util.concurrent.TimeUnit;
+
+public final class QueryUtils {
+
+    private QueryUtils() {}
+
+    /**
+     * Waits until the given string is visible on the page, otherwise throws an exception
+     * @param page the page
+     * @param value the value to find
+     * @throws RuntimeException if string is not present after three seconds
+     */
+    public static void waitUntilStringIsPresent(HtmlPage page, String value) {
+        long maxWaitTime = TimeUnit.SECONDS.toMillis(3);
+        long startTime = System.currentTimeMillis();
+
+        while (System.currentTimeMillis() - startTime < maxWaitTime) {
+            if (page.querySelector("*").getVisibleText().contains(value)) {
+                System.out.println("Took '" + (System.currentTimeMillis() - startTime) + "ms' " +
+                        "until string '" + value + "' was present");
+                return;
+            } else {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+        throw new RuntimeException("String '" + value + "' was not present '" + value + "' after '" + maxWaitTime + "s'");
+    }
+
+    /**
+     * Waits until the given string is not visible on the page, otherwise throws an exception
+     * @param page the page
+     * @param value the value to not find
+     * @throws RuntimeException if string is present after three seconds
+     */
+    public static void waitUntilStringIsNotPresent(HtmlPage page, String value) {
+        long maxWaitTime = TimeUnit.SECONDS.toMillis(3);
+        long startTime = System.currentTimeMillis();
+
+        while (System.currentTimeMillis() - startTime < maxWaitTime) {
+            if (page.querySelector("*").getVisibleText().contains(value)) {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                System.out.println("Took '" + (System.currentTimeMillis() - startTime) + "ms' " +
+                        "until string '" + value + "' was no longer present");
+                return;
+            }
+        }
+
+        throw new RuntimeException("String '" + value + "' is still present '" + value + "' after '" + maxWaitTime + "s'");
+    }
+
+    /**
+     * Waits until the given query selector is visible on the page, otherwise returns null
+     * @param page the page
+     * @param query the query selector for the element
+     */
+    public static HtmlElement waitUntilElementIsPresent(HtmlPage page, String query) {
+        long maxWaitTime = TimeUnit.SECONDS.toMillis(3);
+        long startTime = System.currentTimeMillis();
+
+        // Loop until the element is found or timeout occurs
+        HtmlElement element = null;
+        while (element == null && System.currentTimeMillis() - startTime < maxWaitTime) {
+            // Try to find the element
+            try {
+                element = page.querySelector(query);
+            } catch (Exception ignored) {
+                System.out.println("Looking again for element: " + query);
+            }
+
+            // If the element is not found, wait for a short interval before trying again
+            if (element == null) {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return element;
+    }
+}