OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-06 08:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIXED HUDSON-3267] api/xml?xpath=...&wrapper=... behaved inconsistently for results of size 0 or 1.

Browse Source 
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16157 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
jglick committed 2009-03-11 01:19:07 +00:00
1 parent b70e53fe5b
commit 5b28310d28
2 files changed
+63 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/model/Api.java
+17 -20
View File
@@ -111,30 +111,27 @@ public class Api extends AbstractModelObject {
}
List list = dom.selectNodes(xpath);
if(list.isEmpty()) {
// XPath didn't match
if (wrapper!=null) {
Element root = DocumentFactory.getInstance().createElement(wrapper);
for (Object o : list) {
if (o instanceof String) {
root.addText(o.toString());
} else {
root.add(((org.dom4j.Node)o).detach());
}
}
result = root;
} else if (list.isEmpty()) {
rsp.setStatus(HttpServletResponse.SC_NOT_FOUND);
rsp.getWriter().print(Messages.Api_NoXPathMatch(xpath));
return;
}
if(list.size()>1) {
if(wrapper!=null) {
Element root = DocumentFactory.getInstance().createElement(wrapper);
for (Object o : list) {
if(o instanceof String)
root.addText(o.toString());
else
root.add(((org.dom4j.Node)o).detach());
}
result = root;
} else {
// XPath didn't match
rsp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
rsp.getWriter().print(Messages.Api_MultipleMatch(xpath,list.size()));
return;
}
} else
} else if (list.size() > 1) {
rsp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
rsp.getWriter().print(Messages.Api_MultipleMatch(xpath,list.size()));
return;
} else {
result = list.get(0);
}
} catch (DocumentException e) {
throw new IOException2(e);
}
test/src/test/java/hudson/model/ApiTest.java
+46
View File
@@ -23,6 +23,8 @@
*/
package hudson.model;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.Page;
import org.jvnet.hudson.test.HudsonTestCase;
import org.jvnet.hudson.test.Bug;
@@ -30,8 +32,52 @@ import org.jvnet.hudson.test.Bug;
* @author Kohsuke Kawaguchi
*/
public class ApiTest extends HudsonTestCase {
@Bug(2828)
public void testXPath() throws Exception {
new WebClient().goTo("api/xml?xpath=/*[1]","application/xml");
}
@Bug(3267)
public void testWrappedZeroItems() throws Exception {
Page page = new WebClient().goTo("api/xml?wrapper=root&xpath=/hudson/nonexistent", "application/xml");
assertEquals("<root/>", page.getWebResponse().getContentAsString());
}
@Bug(3267)
public void testWrappedOneItem() throws Exception {
Page page = new WebClient().goTo("api/xml?wrapper=root&xpath=/hudson/view/name", "application/xml");
assertEquals("<root><name>All</name></root>", page.getWebResponse().getContentAsString());
}
public void testWrappedMultipleItems() throws Exception {
createFreeStyleProject();
createFreeStyleProject();
Page page = new WebClient().goTo("api/xml?wrapper=root&xpath=/hudson/job/name", "application/xml");
assertEquals("<root><name>test0</name><name>test1</name></root>", page.getWebResponse().getContentAsString());
}
public void testUnwrappedZeroItems() throws Exception {
try {
new WebClient().goTo("api/xml?xpath=/hudson/nonexistent", "application/xml");
} catch (FailingHttpStatusCodeException x) {
assertEquals(404, x.getStatusCode());
}
}
public void testUnwrappedOneItem() throws Exception {
Page page = new WebClient().goTo("api/xml?xpath=/hudson/view/name", "application/xml");
assertEquals("<name>All</name>", page.getWebResponse().getContentAsString());
}
public void testUnwrappedMultipleItems() throws Exception {
createFreeStyleProject();
createFreeStyleProject();
try {
new WebClient().goTo("api/xml?xpath=/hudson/job/name", "application/xml");
} catch (FailingHttpStatusCodeException x) {
assertEquals(500, x.getStatusCode());
}
}
}