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

[mg...@apache.org]

Author: mgrigorov
Date: Fri Apr 15 07:48:48 2011
New Revision: 1092616

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

Add a test for the case when fromUrl and toUrl are the same and the page is stateful.
In this case directly write the page markup in the response without redirect.


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=1092616&r1=1092615&r2=1092616&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 Fri Apr 15 07:48:48 2011
@@ -173,6 +173,32 @@ public class WebPageRendererTest
 	}
 
 	/**
+	 * Tests that when the fromUrl and toUrl are the same and the page is not stateless there wont
+	 * be a redirect issued
+	 */
+	@Test
+	public void testSameUrlsAndStatefulPage()
+	{
+		when(provider.isNewPageInstance()).thenReturn(false);
+		when(page.isPageStateless()).thenReturn(false);
+
+		PageRenderer renderer = new TestPageRenderer(handler);
+
+		Url sameUrl = Url.parse("anything");
+
+		when(urlRenderer.getBaseUrl()).thenReturn(sameUrl);
+
+		when(requestCycle.mapUrlFor(eq(handler))).thenReturn(sameUrl);
+
+		when(request.shouldPreserveClientUrl()).thenReturn(false);
+
+		renderer.respond(requestCycle);
+
+		verify(response).write(any(byte[].class));
+		verify(response, never()).sendRedirect(anyString());
+	}
+
+	/**
 	 * Tests that when {@link WebRequest#shouldPreserveClientUrl()} is <code>true</code> no redirect
 	 * should occur
 	 */
@@ -604,6 +630,12 @@ public class WebPageRendererTest
 		}
 
 		@Override
+		protected boolean isRedirectToBuffer()
+		{
+			return false;
+		}
+
+		@Override
 		protected boolean isSessionTemporary()
 		{
 			return false;