diff --git a/core/src/main/resources/lib/form/option.jelly b/core/src/main/resources/lib/form/option.jelly index 3cd9ec7f46..d608f69e9f 100644 --- a/core/src/main/resources/lib/form/option.jelly +++ b/core/src/main/resources/lib/form/option.jelly @@ -1,7 +1,7 @@ + + diff --git a/test/src/test/java/hudson/model/ParametersTest.java b/test/src/test/java/hudson/model/ParametersTest.java index 31dd6de437..00d19d14af 100755 --- a/test/src/test/java/hudson/model/ParametersTest.java +++ b/test/src/test/java/hudson/model/ParametersTest.java @@ -2,20 +2,19 @@ package hudson.model; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.CaptureEnvironmentBuilder; -import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlTextInput; import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; +import com.gargoylesoftware.htmlunit.html.HtmlOption; /** * @author huybrechts */ public class ParametersTest extends HudsonTestCase { - public void testStringParameter() throws Exception { + public void testParameterTypes() throws Exception { FreeStyleProject otherProject = createFreeStyleProject(); otherProject.scheduleBuild2(0).get(); @@ -31,7 +30,7 @@ public class ParametersTest extends HudsonTestCase { WebClient wc = new WebClient(); wc.setThrowExceptionOnFailingStatusCode(false); - HtmlPage page= wc.goTo("/job/" + project.getName() + "/build?delay=0sec"); + HtmlPage page = wc.goTo("/job/" + project.getName() + "/build?delay=0sec"); HtmlForm form = page.getFormByName("parameters"); @@ -55,8 +54,6 @@ public class ParametersTest extends HudsonTestCase { element = (HtmlElement) form.selectSingleNode(".//tr[td/div/input/@value='choice']"); assertNotNull(element); assertEquals("choice description", ((HtmlElement) element.selectSingleNode("td/div")).getAttribute("description")); -// HtmlCheckBoxInput booleanParameterInput = (HtmlCheckBoxInput) element.selectSingleNode("//input[@name='value']"); -// assertEquals(true, booleanParameterInput.isChecked()); assertEquals("choice", ((HtmlElement) element.selectSingleNode("td[@class='setting-name']")).getTextContent()); element = (HtmlElement) form.selectSingleNode(".//tr[td/div/input/@value='run']"); @@ -65,8 +62,9 @@ public class ParametersTest extends HudsonTestCase { assertEquals("run", ((HtmlElement) element.selectSingleNode("td[@class='setting-name']")).getTextContent()); submit(form); - - Thread.sleep(1000); + Queue.Item q = hudson.getQueue().getItem(project); + if (q != null) q.getFuture().get(); + else Thread.sleep(1000); assertEquals("newValue", builder.getEnvVars().get("STRING")); assertEquals("true", builder.getEnvVars().get("BOOLEAN")); @@ -74,4 +72,34 @@ public class ParametersTest extends HudsonTestCase { assertEquals(hudson.getRootUrl() + otherProject.getLastBuild().getUrl(), builder.getEnvVars().get("RUN")); } + public void testChoiceWithLTGT() throws Exception { + FreeStyleProject project = createFreeStyleProject(); + ParametersDefinitionProperty pdp = new ParametersDefinitionProperty( + new ChoiceParameterDefinition("choice", "Choice 1\nChoice <2>", "choice description")); + project.addProperty(pdp); + CaptureEnvironmentBuilder builder = new CaptureEnvironmentBuilder(); + project.getBuildersList().add(builder); + + WebClient wc = new WebClient(); + wc.setThrowExceptionOnFailingStatusCode(false); + HtmlPage page = wc.goTo("/job/" + project.getName() + "/build?delay=0sec"); + HtmlForm form = page.getFormByName("parameters"); + + HtmlElement element = (HtmlElement) form.selectSingleNode(".//tr[td/div/input/@value='choice']"); + assertNotNull(element); + assertEquals("choice description", ((HtmlElement) element.selectSingleNode("td/div")).getAttribute("description")); + assertEquals("choice", ((HtmlElement) element.selectSingleNode("td[@class='setting-name']")).getTextContent()); + HtmlOption opt = (HtmlOption)element.selectSingleNode("td/div/select/option[@value='Choice <2>']"); + assertNotNull(opt); + assertEquals("Choice <2>", opt.asText()); + opt.setSelected(true); + + submit(form); + Queue.Item q = hudson.getQueue().getItem(project); + if (q != null) q.getFuture().get(); + else Thread.sleep(1000); + + assertNotNull(builder.getEnvVars()); + assertEquals("Choice <2>", builder.getEnvVars().get("CHOICE")); + } }