Author: nbelaevski
Date: 2007-04-11 20:37:30 -0400 (Wed, 11 Apr 2007)
New Revision: 77
Modified:
trunk/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
Log:
sendResource() method is now used instead of getResourceAsStream() to handle
Image2DResource
Modified: trunk/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
===================================================================
--- trunk/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-04-11
22:32:46 UTC (rev 76)
+++ trunk/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-04-12
00:37:30 UTC (rev 77)
@@ -21,10 +21,14 @@
package org.ajax4jsf.tests;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
@@ -41,6 +45,7 @@
import javax.faces.render.RenderKitFactory;
import javax.faces.render.Renderer;
import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import org.ajax4jsf.framework.ajax.AjaxContext;
@@ -191,15 +196,25 @@
String testResourceContextPath =
facesContext.getExternalContext().getRequestContextPath() +
AbstractAjax4JsfTestCase.SLASHED_RESOURCE_URI_PREFIX;
if (settings.getURL().getFile().startsWith(testResourceContextPath)) {
- InternetResource resource = InternetResourceBuilder.getInstance().getResource(
- settings.getURL().getFile().substring(testResourceContextPath.length()));
+ String uri =
settings.getURL().getFile().substring(testResourceContextPath.length());
+
+ InternetResourceBuilder resourceBuilder = InternetResourceBuilder.getInstance();
+
+ InternetResource resource = resourceBuilder.getResourceForKey(uri);
+ Object resourceData = resourceBuilder.getResourceDataForKey(uri);
final MockFacesResourceContext resourceContext = new
MockFacesResourceContext(facesContext);
+ resourceContext.setResourceData(resourceData);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ response.setOutputStream(new MockServletOutputStream(baos));
+
resource.sendHeaders(resourceContext);
-
+ resource.send(resourceContext);
+
return new WebResponseImpl(
new WebResponseData(
- resource.getResourceAsStream(resourceContext),
+ new ByteArrayInputStream(baos.toByteArray()),
HttpServletResponse.SC_OK,
"OK",
resourceContext.getHeaders()),
Show replies by date