svn commit: r1091834 - /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:55:39 2011
New Revision: 1091834

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

Add test for the case when the fromUrl and toUrl are the same and the configured RedirectStrategy is REDIRECT_TO_RENDER.
In this case no redirect should occur.


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=1091834&r1=1091833&r2=1091834&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:55:39 2011
@@ -135,6 +135,40 @@ public class WebPageRendererTest
 	}
 
 	/**
+	 * Tests that when the fromUrl and toUrl are the same and
+	 * {@link IRequestCycleSettings.RenderStrategy#REDIRECT_TO_RENDER} is configured there wont be a
+	 * redirect issued
+	 */
+	@Test
+	public void testSameUrlsAndRedirectToRender()
+	{
+
+		PageRenderer renderer = new TestPageRenderer(handler)
+		{
+			@Override
+			protected boolean isRedirectToRender()
+			{
+				return true;
+			}
+
+		};
+
+		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());
+	}
+
+
+	/**
 	 * Configures common methods which are used by all tests
 	 */
 	private static class TestPageRenderer extends WebPageRenderer
@@ -158,5 +192,18 @@ public class WebPageRendererTest
 			return webResponse;
 		}
 
+		@Override
+		protected boolean isOnePassRender()
+		{
+			return false;
+		}
+
+		@Override
+		protected boolean isRedirectToRender()
+		{
+			return false;
+		}
+
+
 	}
 }