[JENKINS-75194][JENKINS-63963] Correct test

Author: kinow

src/test/java/org/biouno/unochoice/issue62835/TestForNodeLabelParameter.java

@@ -47,7 +47,6 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.Select;
-import org.xml.sax.SAXException;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -65,14 +64,11 @@
 @WithJenkins
 class TestForNodeLabelParameter extends BaseUiTest {
 
-    private JenkinsRule j;
-
     private DumbSlave onlineNode;
 
     @BeforeEach
     public void setUp(JenkinsRule j) {
         super.setUp(j);
-        this.j = j;
         try {
             onlineNode = j.createOnlineSlave(new LabelAtom("mylabel1"));
         } catch (Exception e) {
@@ -91,7 +87,7 @@ public void tearDown() {
     }
 
     @Test
-    void testNodeLabelParameterValueFound() throws IOException, SAXException, Descriptor.FormException {
+    void testNodeLabelParameterValueFound() throws IOException, Descriptor.FormException {
         FreeStyleProject project = j.createFreeStyleProject();
 
         final String nodeName = onlineNode.getNodeName();

src/test/java/org/biouno/unochoice/issue63963/TestGroovyScriptParametersOrder.java

@@ -23,61 +23,56 @@
  */
 package org.biouno.unochoice.issue63963;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
 import hudson.model.Descriptor;
+import hudson.model.FreeStyleProject;
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
+import org.biouno.unochoice.BaseUiTest;
 import org.biouno.unochoice.CascadeChoiceParameter;
 import org.biouno.unochoice.model.GroovyScript;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript;
 import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval;
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.JenkinsRule.WebClient;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
-import org.xml.sax.SAXException;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.Select;
 
-import org.htmlunit.html.DomElement;
-import org.htmlunit.html.DomNode;
-import org.htmlunit.html.HtmlOption;
-import org.htmlunit.html.HtmlPage;
-import org.htmlunit.html.HtmlSelect;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
 
-import hudson.model.FreeStyleProject;
-import hudson.model.ParametersDefinitionProperty;
-import hudson.model.StringParameterDefinition;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test that verifies that the order of parameters is correct
  * when using a {@code Map}.
  *
  * @since 2.5.1
  */
+@Issue("JENKINS-63963")
 @WithJenkins
-class TestGroovyScriptParametersOrder {
+class TestGroovyScriptParametersOrder extends BaseUiTest {
 
     /**
      * Using test kindly provided by Jason Antman in JENKINS-63963. See issue in JIRA for more context
      * about the problem, analysis, and solution (mostly done by Jason).
      *
      * @throws IOException if it fails to load the script
-     * @throws SAXException if the XML is malformed
      */
     @Test
-    void testGroovyScriptParametersOrder(JenkinsRule j) throws IOException, SAXException, Descriptor.FormException {
+    void testGroovyScriptParametersOrder() throws IOException, Descriptor.FormException {
         FreeStyleProject project = j.createFreeStyleProject();
 
         StringParameterDefinition teamUid = new StringParameterDefinition("TEAM_UID", "foo", "Team name (UID)");
         StringParameterDefinition environment = new StringParameterDefinition("ENVIRONMENT", "bar", "The environment name to use for this stack (default: dev)");
 
         String scriptText = """
-                Map getOptions(String teamId, String enviro) {
-                    def found_snapshots = ["":"Select a backup file or snapshot to restore for " + teamId + " enviro " + enviro]; // value => selection text
+                Map getOptions(String teamId, String env) {
+                    def found_snapshots = ["":"Select a backup file or snapshot to restore for " + teamId + " env " + env]; // value => selection text
                     found_snapshots["one"] = "snapshot e";
                     found_snapshots["two"] = "snapshot d";
                     found_snapshots["three"] = "snapshot c";
@@ -112,36 +107,25 @@ Map getOptions(String teamId, String enviro) {
         project.addProperty(new ParametersDefinitionProperty(Arrays.asList(teamUid, environment, backupFileName)));
         project.save();
 
+        driver.get(j.getURL().toString() + "job/" + project.getName() + "/build?delay=0sec");
 
-        WebClient wc = j.createWebClient();
-        wc.setThrowExceptionOnFailingStatusCode(false);
-        HtmlPage configPage = wc.goTo("job/" + project.getName() + "/build?delay=0sec");
-        DomElement renderedParameterElement = configPage.getElementById("random-name");
-        HtmlSelect select = null;
-        for (DomNode node: renderedParameterElement.getChildren()) {
-            if (node instanceof HtmlSelect) {
-                select = (HtmlSelect) node;
-                break;
-            }
-        }
-
-        assertNotNull(select, "Missing cascade parameter select HTML node element!");
+        wait.until(ExpectedConditions.invisibilityOfElementLocated(By.cssSelector(".jenkins-spinner")));
 
-        List<HtmlOption> htmlOptions = select.getOptions();
-        final List<String> options = htmlOptions
-                .stream()
-                .map(HtmlOption::getText)
-                .toList();
+        By selectOptions = By.cssSelector("div.active-choice:has([name='name'][value='BACKUP_FILENAME']) > select > option");
+        wait.until(ExpectedConditions.numberOfElementsToBe(selectOptions, 6));
+        WebElement renderedParameterElement = findSelect("BACKUP_FILENAME");
+        Select select = new Select(renderedParameterElement);
+        List<WebElement> htmlOptions = select.getOptions();
         final List<String> expected = new LinkedList<>();
-        {
-            expected.add("Select a backup file or snapshot to restore for foo enviro bar");
-            expected.add("snapshot e");
-            expected.add("snapshot d");
-            expected.add("snapshot c");
-            expected.add("snapshot b");
-            expected.add("snapshot a");
+        expected.add("Select a backup file or snapshot to restore for foo env bar");
+        expected.add("snapshot e");
+        expected.add("snapshot d");
+        expected.add("snapshot c");
+        expected.add("snapshot b");
+        expected.add("snapshot a");
+        assertEquals(expected.size(), htmlOptions.size(), "Wrong number of HTML options rendered");
+        for (int i = 0; i < htmlOptions.size(); i++) {
+            assertEquals(expected.get(i), htmlOptions.get(i).getText(), "Wrong HTML options rendered (or out of order)");
         }
-        assertEquals(expected.size(), options.size(), "Wrong number of HTML options rendered");
-        assertEquals(expected, options, "Wrong HTML options rendered (or out of order)");
     }
 }

src/test/java/org/biouno/unochoice/issue71909/TestRevertingAsynchronousProxy.java

@@ -74,13 +74,17 @@ void test() throws Exception {
         wait.until(ExpectedConditions.invisibilityOfElementLocated(By.cssSelector(".jenkins-spinner")));
 
         WebElement targetParam = findSelect("TARGET");
+
+        wait.until(ExpectedConditions.visibilityOf(targetParam));
+
         assertTrue(targetParam.isDisplayed());
         assertTrue(targetParam.isEnabled());
         new Select(targetParam).selectByValue("Item3");
 
         wait.until(ExpectedConditions.invisibilityOfElementLocated(By.cssSelector(".jenkins-spinner")));
 
         List<WebElement> dockerBaseImageParam = findRadios("DOCKER_BASE_IMAGE");
+        wait.until(ExpectedConditions.visibilityOf(dockerBaseImageParam.get(0)));
         assertEquals(2, dockerBaseImageParam.size());
 
         checkRadios(radios("DOCKER_BASE_IMAGE"), "buster", "bullseye");
@@ -89,6 +93,7 @@ void test() throws Exception {
         assertEquals("true", findRadios("DOCKER_BASE_IMAGE").get(0).getDomAttribute("checked"));
 
         List<WebElement> machinesParam = findCheckboxes("MACHINES");
+        wait.until(ExpectedConditions.visibilityOf(machinesParam.get(0)));
         assertEquals("server2", machinesParam.get(1).getDomAttribute("value"));
         machinesParam.get(1).click();