Skip to content

Commit e9d50f9

Browse files
committed
Fix one test
1 parent 3e5bb7a commit e9d50f9

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

test/src/test/java/hudson/model/ParametersTest.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void parameterTypes() throws Exception {
6666

6767
HtmlElement element = (HtmlElement) ((HtmlElement) DomNodeUtil.selectSingleNode(form, "//div[input/@value='string']")).getParentNode();
6868
assertNotNull(element);
69-
assertEquals("string description", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getNextSibling().getNextSibling(), "div[@class='setting-description']")).getTextContent());
69+
assertEquals("string description", element.getParentNode().querySelector(".jenkins-form-description").getTextContent());
7070

7171
HtmlTextInput stringParameterInput = DomNodeUtil.selectSingleNode(element, ".//input[@name='value']");
7272
assertEquals("defaultValue", stringParameterInput.getAttribute("value"));
@@ -75,21 +75,20 @@ public void parameterTypes() throws Exception {
7575

7676
element = DomNodeUtil.selectSingleNode(form, "//div[input/@value='boolean']");
7777
assertNotNull(element);
78-
assertEquals("boolean description", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getParentNode().getNextSibling().getNextSibling().getNextSibling(), "div[@class='setting-description']")).getTextContent());
78+
assertEquals("boolean description", element.getParentNode().getParentNode().querySelector(".jenkins-form-description").getTextContent());
7979
Object o = DomNodeUtil.selectSingleNode(element, ".//input[@name='value']");
80-
System.out.println(o);
8180
HtmlCheckBoxInput booleanParameterInput = (HtmlCheckBoxInput) o;
8281
assertTrue(booleanParameterInput.isChecked());
8382
assertEquals("boolean", element.getTextContent());
8483

8584
element = (HtmlElement) ((HtmlElement) DomNodeUtil.selectSingleNode(form, ".//div[input/@value='choice']")).getParentNode();
8685
assertNotNull(element);
87-
assertEquals("choice description", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getNextSibling().getNextSibling(), "div[@class='setting-description']")).getTextContent());
86+
assertEquals("choice description", element.getParentNode().querySelector(".jenkins-form-description").getTextContent());
8887
assertEquals("choice", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getParentNode(), "div[contains(@class, 'jenkins-form-label')]")).getTextContent());
8988

9089
element = (HtmlElement) ((HtmlElement) DomNodeUtil.selectSingleNode(form, ".//div[input/@value='run']")).getParentNode();
9190
assertNotNull(element);
92-
assertEquals("run description", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getNextSibling().getNextSibling(), "div[@class='setting-description']")).getTextContent());
91+
assertEquals("run description", element.getParentNode().querySelector(".jenkins-form-description").getTextContent());
9392
assertEquals("run", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getParentNode(), "div[contains(@class, 'jenkins-form-label')]")).getTextContent());
9493

9594
j.submit(form);
@@ -119,7 +118,7 @@ public void choiceWithLTGT() throws Exception {
119118

120119
HtmlElement element = (HtmlElement) ((HtmlElement) DomNodeUtil.selectSingleNode(form, ".//div[input/@value='choice']")).getParentNode();
121120
assertNotNull(element);
122-
assertEquals("choice description", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getNextSibling().getNextSibling(), "div[@class='setting-description']")).getTextContent());
121+
assertEquals("choice description", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getNextSibling().getNextSibling(), "div[@class='jenkins-form-description']")).getTextContent());
123122
assertEquals("choice", ((HtmlElement) DomNodeUtil.selectSingleNode(element.getParentNode(), "div[contains(@class, 'jenkins-form-label')]")).getTextContent());
124123
HtmlOption opt = DomNodeUtil.selectSingleNode(element.getParentNode(), "div/div/select/option[@value='Choice <2>']");
125124
assertNotNull(opt);

0 commit comments

Comments
 (0)