[jboss-svn-commits] JBL Code SVN: r20869 - in labs/jbossrules/trunk/drools-guvnor/src: test/java/org/drools/guvnor/server/files and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2008-07-02 03:40:59 -0400 (Wed, 02 Jul 2008)
New Revision: 20869

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java
Log:
have to get query params separately for rest API urls

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java	2008-07-02 07:37:07 UTC (rev 20868)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java	2008-07-02 07:40:59 UTC (rev 20869)
@@ -73,7 +73,12 @@
         doAuthorizedAction(req, res, new A() {
 			public void a() throws Exception {
 					RestAPI api = getAPI();
-					Response apiRes = api.get(req.getRequestURI());
+					String qString = req.getQueryString();
+					String ur = req.getRequestURI();
+					if (qString != null && qString.length() > 0) {
+						ur = ur + '?' + qString;
+					}
+					Response apiRes = api.get(ur);
 			        res.setContentType( "application/x-download" );
 			        res.setHeader( "Content-Disposition",
 			                       "attachment; filename=data;");

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java	2008-07-02 07:37:07 UTC (rev 20868)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java	2008-07-02 07:40:59 UTC (rev 20869)
@@ -20,6 +20,7 @@
 	final private String uri;
 	private Map<String, String> headers;
 	ServletInputStream stream;
+	String queryString;
 
 	public MockHTTPRequest(String uri, Map<String, String> headers) {
 		this.uri = uri;
@@ -87,8 +88,7 @@
 	}
 
 	public String getQueryString() {
-		// TODO Auto-generated method stub
-		return null;
+		return queryString;
 	}
 
 	public String getRemoteUser() {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java	2008-07-02 07:37:07 UTC (rev 20868)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java	2008-07-02 07:40:59 UTC (rev 20869)
@@ -102,6 +102,18 @@
 		assertEquals("application/x-download", res.contentType);
 		assertEquals(true, res.containsHeader("Content-Disposition"));
 
+		//now try getting some version listings
+		out = new ByteArrayOutputStream();
+		req = new MockHTTPRequest(uri, headers);
+		req.queryString = "version=all";
+		res = new MockHTTPResponse(out);
+		serv.doGet(req, res);
+
+		assertEquals(0, res.errorCode);
+		data = out.toString();
+		assertFalse("some content".equals(data));
+		assertNotNull(data);
+
 	}
 
 	public void testPost() throws Exception {