Author: ivaynberg Date: Tue Mar 2 06:40:28 2010 New Revision: 917895 URL: http://svn.apache.org/viewvc?rev=917895&view=rev Log: more test fixes
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java?rev=917895&r1=917894&r2=917895&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java Tue Mar 2 06:40:28 2010 @@ -17,6 +17,7 @@ package org.apache.wicket.protocol.http.request; import org.apache.wicket.ng.request.cycle.RequestCycle; +import org.apache.wicket.ng.resource.ContentDisposition; import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler; import org.apache.wicket.util.resource.WebExternalResourceStream; import org.slf4j.Logger; @@ -54,6 +55,7 @@ { super(new WebExternalResourceStream(uri)); this.uri = uri; + setContentDisposition(ContentDisposition.INLINE); } /** Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java?rev=917895&r1=917894&r2=917895&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java Tue Mar 2 06:40:28 2010 @@ -40,7 +40,7 @@ * with web requests. */ private String fileName; - private ContentDisposition contentDisposition; + private ContentDisposition contentDisposition = ContentDisposition.INLINE; /** the resource stream for the response. */ private final IResourceStream resourceStream; Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java?rev=917895&r1=917894&r2=917895&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java Tue Mar 2 06:40:28 2010 @@ -94,7 +94,7 @@ @Override public String getContentType() { - return null; + return WebApplication.get().getServletContext().getMimeType(url); } public InputStream getInputStream() throws ResourceStreamNotFoundException Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=917895&r1=917894&r2=917895&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Tue Mar 2 06:40:28 2010 @@ -83,7 +83,6 @@ import org.apache.wicket.ng.request.handler.impl.render.PageRenderer; import org.apache.wicket.pageStore.IPageManager; import org.apache.wicket.pageStore.IPageManagerContext; -import org.apache.wicket.protocol.http.MockServletContext; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.protocol.http.mock.MockHttpServletRequest; import org.apache.wicket.protocol.http.mock.MockHttpServletResponse; @@ -215,13 +214,6 @@ { return homePage; } - - @Override - protected void outputDevelopmentModeWarning() - { - // Do nothing. - } - }); } @@ -233,8 +225,24 @@ */ public BaseWicketTester(final WebApplication application) { + this(application, null); + } + + /** + * Creates a <code>WicketTester</code>. + * + * @param application + * a <code>WicketTester</code> <code>WebApplication</code> object + * + * + * @param servletContextBasePath + * the absolute path on disk to the web application's contents (e.g. war root) - may + * be <code>null</code> + */ + public BaseWicketTester(final WebApplication application, String servletContextBasePath) + { servletContext = new org.apache.wicket.protocol.http.mock.MockServletContext(application, - ""); + servletContextBasePath); hsession = new MockHttpSession(servletContext); oldThreadContext = ThreadContext.detach(); @@ -246,7 +254,7 @@ this.application.setName("WicketTesterApplication-" + UUID.randomUUID()); this.application.set(); - application.setServletContext(new MockServletContext(application, "")); + application.setServletContext(servletContext); // initialize the application this.application.initApplication(); Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=917895&r1=917894&r2=917895&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java Tue Mar 2 06:40:28 2010 @@ -198,10 +198,10 @@ * @see org.apache.wicket.protocol.http.MockWebApplication#MockWebApplication(org.apache.wicket.protocol.http.WebApplication, * String) */ -// public WicketTester(final WebApplication application, final String path) -// { -// super(application, path); -// } + public WicketTester(final MockApplication application, final String path) + { + super(application, path); + } /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java?rev=917895&r1=917894&r2=917895&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java Tue Mar 2 06:40:28 2010 @@ -20,7 +20,9 @@ import java.io.FileOutputStream; import java.io.InputStream; -import org.apache.wicket.WicketTestCase; +import junit.framework.TestCase; + +import org.apache.wicket.ng.mock.MockApplication; import org.apache.wicket.protocol.http.request.WebExternalResourceRequestTarget; import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler; import org.apache.wicket.util.io.Streams; @@ -32,8 +34,10 @@ * * @author <a href="mailto:j...@apache.org">Jean-Baptiste Quenot</a> */ -public class WebExternalResourceTest extends WicketTestCase +public class WebExternalResourceTest extends TestCase { + private WicketTester tester; + @Override protected void setUp() throws Exception { @@ -45,10 +49,18 @@ Streams.copy(in, out); in.close(); out.close(); - tester = new WicketTester(tempDir.getPath()); + tester = new WicketTester(new MockApplication(), tempDir.getPath()); // We fake the browser URL, otherwise Wicket doesn't know the requested URL and cannot guess // the Content-Type - tester.getRequest().setPath("/index.html"); + tester.getRequest().setURL("index.html"); + + + } + + @Override + protected void tearDown() throws Exception + { + tester.destroy(); } /** @@ -58,13 +70,9 @@ public void testWebExternalResourceRequestTarget() throws Exception { WebExternalResourceRequestTarget rt = new WebExternalResourceRequestTarget("/index.html"); - WebRequestCycle cycle = tester.createRequestCycle(); - cycle.setRequestTarget(rt); - tester.processRequestCycle(cycle); + tester.processRequest(rt); assertTrue(tester.getContentTypeFromResponseHeader().startsWith("text/html")); - // WebExternalResourceRequestTarget does not set Content-Length - // assertEquals(23, getContentLength()); - tester.assertResultPage(WebExternalResourceTest.class, "index.html"); + tester.assertContains("<h1>Hello, World!</h1>"); } /** @@ -76,12 +84,8 @@ { WebExternalResourceStream resource = new WebExternalResourceStream("/index.html"); ResourceStreamRequestHandler rt = new ResourceStreamRequestHandler(resource); - WebRequestCycle cycle = tester.createRequestCycle(); - cycle.setRequestTarget(rt); - tester.processRequestCycle(cycle); + tester.processRequest(rt); assertTrue(tester.getContentTypeFromResponseHeader().startsWith("text/html")); - // WebExternalResourceStream does not set Content-Length - // assertEquals(23, getContentLength()); - tester.assertResultPage(WebExternalResourceTest.class, "index.html"); + tester.assertContains("<h1>Hello, World!</h1>"); } }