You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2015/07/26 08:42:38 UTC
wicket git commit: WICKET-5955 moved test, fixed formatting
Repository: wicket
Updated Branches:
refs/heads/master bb7f9cf54 -> 249e2b923
WICKET-5955 moved test, fixed formatting
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/249e2b92
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/249e2b92
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/249e2b92
Branch: refs/heads/master
Commit: 249e2b9236928796f3f40ac7741dda3a04d5864c
Parents: bb7f9cf
Author: Sven Meier <sv...@apache.org>
Authored: Sun Jul 26 08:41:49 2015 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Sun Jul 26 08:41:49 2015 +0200
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/WebPage.java | 3 +-
...artResponseAtInterceptPageExceptionTest.java | 42 ++------------------
.../wicket/noheadnobody/NoHeadNoBodyTest.java | 34 ++++++++++++++++
3 files changed, 40 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/249e2b92/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
index 5c7d6bb..71fb9ad 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
@@ -215,7 +215,8 @@ public class WebPage extends Page
if (getApplication().usesDevelopmentConfig())
{
// check headers only when page was completely rendered
- if (wasRendered(this)) {
+ if (wasRendered(this))
+ {
validateHeaders();
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/249e2b92/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
index 8220cd0..a35b63e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RestartResponseAtInterceptPageExceptionTest.java
@@ -16,22 +16,13 @@
*/
package org.apache.wicket;
-import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.strategies.page.AbstractPageAuthorizationStrategy;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.pages.RedirectPage;
import org.apache.wicket.mock.MockApplication;
-import org.apache.wicket.mock.MockHomePage;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.resource.CoreLibrariesContributor;
import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
-import junit.framework.Assert;
-
/**
* Tests for {@link RestartResponseAtInterceptPageException}
*/
@@ -51,12 +42,10 @@ public class RestartResponseAtInterceptPageExceptionTest extends WicketTestCase
getSecuritySettings().setAuthorizationStrategy(
new AbstractPageAuthorizationStrategy()
{
- /**
- * No rendering for pages other than RedirectPage.
- */
@Override
- public boolean isActionAuthorized(Component c, Action action) {
- if ((action.toString() == Action.RENDER) && c instanceof WebPage && c.getClass() != RedirectPage.class)
+ protected <T extends Page> boolean isPageAuthorized(Class<T> pageClass)
+ {
+ if (pageClass != RedirectPage.class)
{
RedirectPage intercept = new RedirectPage("http://example.com/path");
throw new RestartResponseAtInterceptPageException(intercept);
@@ -78,27 +67,4 @@ public class RestartResponseAtInterceptPageExceptionTest extends WicketTestCase
tester.assertRenderedPage(RedirectPage.class);
}
-
- /**
- * https://issues.apache.org/jira/browse/WICKET-5955
- */
- @Test
- public void interceptPagePreventsHeaderContributionButShouldNotBeLogged()
- {
- tester.startPage(new MockHomePage() {
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- CoreLibrariesContributor.contribute(getApplication(), response);
- }
-
- @Override
- protected void reportMissingHead(CharSequence collectedHeaderOutput) {
- fail("missing headers should not be reported for unrendered page");
- }
- });
-
- tester.assertRenderedPage(RedirectPage.class);
- }
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/249e2b92/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java b/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
index bd601e0..305bbb9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/noheadnobody/NoHeadNoBodyTest.java
@@ -20,6 +20,10 @@ import static org.hamcrest.Matchers.is;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.mock.MockHomePage;
+import org.apache.wicket.resource.CoreLibrariesContributor;
import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.Test;
@@ -49,4 +53,34 @@ public class NoHeadNoBodyTest extends WicketTestCase
tester.startPage(page);
assertThat(reported.get(), is(true));
}
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-5955
+ */
+ @Test
+ public void interceptedRenderDoesNotReportMissingHeader()
+ {
+ tester.startPage(new MockHomePage()
+ {
+ @Override
+ protected void onInitialize()
+ {
+ throw new RestartResponseAtInterceptPageException(getApplication().getHomePage());
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response)
+ {
+ super.renderHead(response);
+
+ CoreLibrariesContributor.contribute(getApplication(), response);
+ }
+
+ @Override
+ protected void reportMissingHead(CharSequence collectedHeaderOutput)
+ {
+ fail("missing headers should not be reported when rendering was interceptede");
+ }
+ });
+ }
}