svn commit: r1091835 - /wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java

[mg...@apache.org]

Author: mgrigorov
Date: Wed Apr 13 15:58:19 2011
New Revision: 1091835

URL: http://svn.apache.org/viewvc?rev=1091835&view=rev
Log:
WICKET-3347 Simplify somehow the code in org.apache.wicket.request.handler.render.WebPageRenderer.respond(RequestCycle)

Add a test for WebRequest#shouldPreserveClientUrl()


Modified:
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java?rev=1091835&r1=1091834&r2=1091835&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java Wed Apr 13 15:58:19 2011
@@ -167,6 +167,28 @@ public class WebPageRendererTest
 		verify(response, never()).sendRedirect(anyString());
 	}
 
+	/**
+	 * Tests that when {@link WebRequest#shouldPreserveClientUrl()} is <code>true</code> no redirect
+	 * should occur
+	 */
+	@Test
+	public void testShouldPreserveClientUrl()
+	{
+
+		PageRenderer renderer = new TestPageRenderer(handler);
+
+		when(urlRenderer.getBaseUrl()).thenReturn(Url.parse("something"));
+
+		when(requestCycle.mapUrlFor(eq(handler))).thenReturn(Url.parse("different"));
+
+		when(request.shouldPreserveClientUrl()).thenReturn(true);
+
+		renderer.respond(requestCycle);
+
+		verify(response).write(any(byte[].class));
+		verify(response, never()).sendRedirect(anyString());
+	}
+
 
 	/**
 	 * Configures common methods which are used by all tests