3:58 a.m.
Author: max_shaposhnik
Date: 2009-09-10 04:58:25 -0400 (Thu, 10 Sep 2009)
New Revision: 159
Removed:
ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/servlet/
Modified:
ws/trunk/pom.xml
ws/trunk/rest/core/pom.xml
ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/AbstractResourceTest.java
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletRequest.java
Log:
https://jira.jboss.org/jira/browse/EXOJCR-152
Modified: ws/trunk/pom.xml
===================================================================
--- ws/trunk/pom.xml 2009-09-10 07:39:31 UTC (rev 158)
+++ ws/trunk/pom.xml 2009-09-10 08:58:25 UTC (rev 159)
@@ -55,6 +55,7 @@
<module>commons</module>
<module>frameworks/json</module>
<module>frameworks/servlet</module>
+ <module>testframework</module>
<module>rest/core</module>
<module>rest/ext</module>
</modules>
@@ -77,6 +78,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.testframework</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.component.common</artifactId>
<version>${org.exoplatform.kernel.version}</version>
Modified: ws/trunk/rest/core/pom.xml
===================================================================
--- ws/trunk/rest/core/pom.xml 2009-09-10 07:39:31 UTC (rev 158)
+++ ws/trunk/rest/core/pom.xml 2009-09-10 08:58:25 UTC (rev 159)
@@ -46,6 +46,11 @@
<artifactId>exo.ws.frameworks.json</artifactId>
</dependency>
<dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.testframework</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
Modified:
ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/AbstractResourceTest.java
===================================================================
---
ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/AbstractResourceTest.java 2009-09-10
07:39:31 UTC (rev 158)
+++
ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/AbstractResourceTest.java 2009-09-10
08:58:25 UTC (rev 159)
@@ -23,11 +23,14 @@
import org.exoplatform.services.rest.impl.EnvironmentContext;
import org.exoplatform.services.rest.impl.InputHeadersMap;
import org.exoplatform.services.rest.impl.MultivaluedMapImpl;
-import org.exoplatform.services.rest.servlet.mock.MockHttpServletRequest;
+import org.exoplatform.testframework.MockHttpServletRequest;
import org.exoplatform.services.rest.tools.DummyContainerResponseWriter;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.MultivaluedMap;
@@ -54,13 +57,17 @@
if (data != null)
in = new ByteArrayInputStream(data);
+ HashMap<String, List> map = new HashMap();
+ map.putAll((HashMap)headers);
+
+
EnvironmentContext envctx = new EnvironmentContext();
HttpServletRequest httpRequest =
- new MockHttpServletRequest(in, in != null ? in.available() : 0, method, new
InputHeadersMap(headers));
+ new MockHttpServletRequest("",in, in != null ? in.available() : 0,
method, map);
envctx.put(HttpServletRequest.class, httpRequest);
EnvironmentContext.setCurrent(envctx);
ContainerRequest request =
- new ContainerRequest(method, new URI(requestURI), new URI(baseURI), in, new
InputHeadersMap(headers));
+ new ContainerRequest(method, new URI(requestURI), new URI(baseURI), in,
headers);
ContainerResponse response = new ContainerResponse(writer);
requestHandler.handleRequest(request, response);
return response;
Modified:
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletRequest.java
===================================================================
---
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletRequest.java 2009-09-10
07:39:31 UTC (rev 158)
+++
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletRequest.java 2009-09-10
08:58:25 UTC (rev 159)
@@ -29,6 +29,7 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -96,7 +97,7 @@
* @param headers
* the headers
*/
- public MockHttpServletRequest(String url, InputStream data, int length, String method,
Map<String, ArrayList> headers)
+ public MockHttpServletRequest(String url, InputStream data, int length, String method,
HashMap<String, List> headers)
{
this.requestURL = url;
this.data = data;