@@ -66,7 +66,7 @@ public void parameterTypes() throws Exception {
66
66
67
67
HtmlElement element = (HtmlElement ) ((HtmlElement ) DomNodeUtil .selectSingleNode (form , "//div[input/@value='string']" )).getParentNode ();
68
68
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 ());
70
70
71
71
HtmlTextInput stringParameterInput = DomNodeUtil .selectSingleNode (element , ".//input[@name='value']" );
72
72
assertEquals ("defaultValue" , stringParameterInput .getAttribute ("value" ));
@@ -75,21 +75,20 @@ public void parameterTypes() throws Exception {
75
75
76
76
element = DomNodeUtil .selectSingleNode (form , "//div[input/@value='boolean']" );
77
77
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 ());
79
79
Object o = DomNodeUtil .selectSingleNode (element , ".//input[@name='value']" );
80
- System .out .println (o );
81
80
HtmlCheckBoxInput booleanParameterInput = (HtmlCheckBoxInput ) o ;
82
81
assertTrue (booleanParameterInput .isChecked ());
83
82
assertEquals ("boolean" , element .getTextContent ());
84
83
85
84
element = (HtmlElement ) ((HtmlElement ) DomNodeUtil .selectSingleNode (form , ".//div[input/@value='choice']" )).getParentNode ();
86
85
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 ());
88
87
assertEquals ("choice" , ((HtmlElement ) DomNodeUtil .selectSingleNode (element .getParentNode (), "div[contains(@class, 'jenkins-form-label')]" )).getTextContent ());
89
88
90
89
element = (HtmlElement ) ((HtmlElement ) DomNodeUtil .selectSingleNode (form , ".//div[input/@value='run']" )).getParentNode ();
91
90
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 ());
93
92
assertEquals ("run" , ((HtmlElement ) DomNodeUtil .selectSingleNode (element .getParentNode (), "div[contains(@class, 'jenkins-form-label')]" )).getTextContent ());
94
93
95
94
j .submit (form );
@@ -119,7 +118,7 @@ public void choiceWithLTGT() throws Exception {
119
118
120
119
HtmlElement element = (HtmlElement ) ((HtmlElement ) DomNodeUtil .selectSingleNode (form , ".//div[input/@value='choice']" )).getParentNode ();
121
120
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 ());
123
122
assertEquals ("choice" , ((HtmlElement ) DomNodeUtil .selectSingleNode (element .getParentNode (), "div[contains(@class, 'jenkins-form-label')]" )).getTextContent ());
124
123
HtmlOption opt = DomNodeUtil .selectSingleNode (element .getParentNode (), "div/div/select/option[@value='Choice <2>']" );
125
124
assertNotNull (opt );
0 commit comments