Author: ivaynberg Date: Wed Feb 24 06:46:19 2010 New Revision: 915699 URL: http://svn.apache.org/viewvc?rev=915699&view=rev Log: more tests wip
Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java (with props) Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/B.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java Wed Feb 24 06:46:19 2010 @@ -37,26 +37,44 @@ public RestartResponseAtInterceptPageException(Page interceptPage) { super(new RenderPageRequestHandler(new PageProvider(interceptPage))); - SessionData.set(); + InterceptData.set(); } public RestartResponseAtInterceptPageException(Class<? extends Page> interceptPageClass) { super(new RenderPageRequestHandler(new PageProvider(interceptPageClass))); - SessionData.set(); + InterceptData.set(); } - private static class SessionData implements Serializable + /** + * INTERNAL CLASS, DO NOT USE + * + * TODO Public for now, need to move the test that is using this to this package and make it + * package private + * + * @author igor.vaynberg + */ + public static class InterceptData implements Serializable { private Url originalUrl; private Map<String, List<StringValue>> postParameters; private boolean continueOk; + public Url getOriginalUrl() + { + return originalUrl; + } + + public Map<String, List<StringValue>> getPostParameters() + { + return postParameters; + } + public static void set() { Session session = Session.get(); session.bind(); - SessionData data = new SessionData(); + InterceptData data = new InterceptData(); Request request = RequestCycle.get().getRequest(); data.originalUrl = request.getOriginalUrl(); data.postParameters = new HashMap<String, List<StringValue>>(); @@ -69,7 +87,7 @@ session.setMetaData(key, data); } - public static SessionData get() + public static InterceptData get() { Session session = Session.get(); if (session != null) @@ -91,7 +109,7 @@ } } - private static MetaDataKey<SessionData> key = new MetaDataKey<SessionData>() + private static MetaDataKey<InterceptData> key = new MetaDataKey<InterceptData>() { private static final long serialVersionUID = 1L; }; @@ -99,7 +117,7 @@ static boolean continueToOriginalDestination() { - SessionData data = SessionData.get(); + InterceptData data = InterceptData.get(); if (data != null) { data.continueOk = true; @@ -124,7 +142,7 @@ public IRequestHandler mapRequest(Request request) { - SessionData data = SessionData.get(); + InterceptData data = InterceptData.get(); if (data != null) { if (data.originalUrl.equals(request.getOriginalUrl())) @@ -139,7 +157,7 @@ parameters.setParameterValues(s, data.postParameters.get(s)); } } - SessionData.clear(); + InterceptData.clear(); } } return null; Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java?rev=915699&view=auto ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java (added) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java Wed Feb 24 06:46:19 2010 @@ -0,0 +1,103 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.protocol.http.servlet; + +import javax.servlet.http.HttpServletResponse; + +import org.apache.wicket.AbortException; +import org.apache.wicket.AbstractRestartResponseException; +import org.apache.wicket.IRequestHandler; +import org.apache.wicket.ng.request.cycle.RequestCycle; +import org.apache.wicket.protocol.http.WebResponse; + +/** + * Causes Wicket to abort processing and set the specified HTTP error code, with the provided + * message if specified. + * + * @author igor.vaynberg + * + * @see AbortException + */ +public final class AbortWithWebErrorCodeException extends AbstractRestartResponseException +{ + private static final long serialVersionUID = 1L; + + private final int errorCode; + private final String message; + + /** + * Construct. + * + * @param errorCode + * the servlet error code; use one of the + * {...@link javax.servlet.http.HttpServletResponse} constants + * @see javax.servlet.http.HttpServletResponse + */ + public AbortWithWebErrorCodeException(int errorCode, String message) + { + super(new ErrorCodeHandler(errorCode, message)); + this.errorCode = errorCode; + this.message = message; + } + + private static class ErrorCodeHandler implements IRequestHandler + { + private final int erorrCode; + private final String message; + + public ErrorCodeHandler(int erorrCode, String message) + { + this.erorrCode = erorrCode; + this.message = message; + } + + public void detach(RequestCycle requestCycle) + { + } + + public void respond(RequestCycle requestCycle) + { + ((WebResponse)requestCycle.getResponse()).sendError(erorrCode, message); + } + + } + + /** + * Gets the error code. + * + * @return errorCode + * @see HttpServletResponse + */ + public int getErrorCode() + { + return errorCode; + } + + /** + * Gets the error message + * + * @return error message + */ + + @Override + public String getMessage() + { + return message; + } + + +} Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java ------------------------------------------------------------------------------ svn:executable = * Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java Wed Feb 24 06:46:19 2010 @@ -16,6 +16,7 @@ */ package org.apache.wicket.redirect; +import org.apache.wicket.RestartResponseAtInterceptPageException; import org.apache.wicket.markup.html.WebPage; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java Wed Feb 24 06:46:19 2010 @@ -17,7 +17,6 @@ package org.apache.wicket.redirect; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.util.lang.PackageName; public class RestartWithMountedPageTest extends WicketTestCase { @@ -41,17 +40,6 @@ } /** - * Tests that a protected page can redirect to a login page from a mounted package. - */ - public void testWithMountedPackage() - { - tester.getApplication().mount("/test", - PackageName.forPackage(ProtectedPage.class.getPackage())); - tester.startPage(ProtectedPage.class); - tester.assertRenderedPage(LoginPage.class); - } - - /** * Tests that a protected page can redirect to a login page from mounted pages. */ public void testWithMountedLoginPage() Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Wed Feb 24 06:46:19 2010 @@ -25,6 +25,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.ng.request.component.PageParameters; +import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException; /** * Page that optionally throws an abortexception during render phase. @@ -37,7 +38,7 @@ public AbortExceptionPage(PageParameters parameters) { - final boolean triggerError = parameters.getBoolean("trigger"); + final boolean triggerError = parameters.getNamedParameter("trigger").toBoolean(); if (!triggerError) { Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java Wed Feb 24 06:46:19 2010 @@ -21,6 +21,7 @@ import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.WicketTestCase; import org.apache.wicket.ng.request.component.PageParameters; +import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException; /** * Testcase for WICKET-1418, throwing an abortexception during rendering. @@ -37,9 +38,8 @@ */ public void testNoAbort() { - System.out.println("testing good usecase"); - tester.processRequestCycle(AbortExceptionPage.class, new PageParameters("trigger=false")); - Assert.assertEquals(1234, tester.getServletResponse().getCode()); + tester.startPage(AbortExceptionPage.class, new PageParameters("trigger=false")); + Assert.assertEquals((Integer)1234, tester.getLastResponse().getStatus()); } /** @@ -49,10 +49,9 @@ { try { - - System.out.println("testing bad usecase"); - tester.processRequestCycle(AbortExceptionPage.class, new PageParameters("trigger=true")); - Assert.assertEquals(1234, tester.getServletResponse().getCode()); // this will fail + tester.startPage(AbortExceptionPage.class, new PageParameters("trigger=true")); + Assert.assertEquals((Integer)1234, tester.getLastResponse().getStatus()); // this will + // fail } catch (WicketRuntimeException x) { Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java Wed Feb 24 06:46:19 2010 @@ -39,7 +39,7 @@ { ((WicketApplication)WebApplication.get()).intercept(); - file = parameters.getString("file"); + file = parameters.getNamedParameter("file").toString(); add(new Label("file", file)); } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/B.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/B.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/B.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/B.java Wed Feb 24 06:46:19 2010 @@ -16,8 +16,11 @@ */ package org.apache.wicket.redirect.encodingtest; +import org.apache.wicket.RestartResponseAtInterceptPageException.InterceptData; import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; +import org.apache.wicket.model.Model; /** * Homepage @@ -31,9 +34,9 @@ */ public B() { - // TODO NG -// add(new Label("interceptContinuationURL", new PropertyModel<String>(getPageMap(), -// "interceptContinuationURL"))); + add(new Label("interceptContinuationURL", new Model<String>(InterceptData.get() + .getOriginalUrl() + .toString()))); add(new Link<Void>("link") { Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java Wed Feb 24 06:46:19 2010 @@ -16,7 +16,8 @@ */ package org.apache.wicket.redirect.encodingtest; -import org.apache.wicket.WicketTestCase; +import junit.framework.TestCase; + import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.util.tester.WicketTester; import org.slf4j.Logger; @@ -25,12 +26,13 @@ /** * */ -public class RequestEncodingTest extends WicketTestCase +public class RequestEncodingTest extends TestCase { /** Log. */ private static final Logger log = LoggerFactory.getLogger(RequestEncodingTest.class); private WicketApplication application; + private WicketTester tester; /** * @see org.apache.wicket.WicketTestCase#setUp() @@ -42,7 +44,13 @@ tester = new WicketTester(application); tester.startPage(HomePage.class); tester.assertRenderedPage(HomePage.class); - // String document = tester.getServletResponse().getDocument(); + } + + @Override + protected void tearDown() throws Exception + { + super.tearDown(); + tester.destroy(); } /** @@ -50,10 +58,6 @@ */ public void testDefault() { - // TODO Wicket NG - if (true) - return; - tester.startPage(A.class, new PageParameters("file=umlaut-\u00E4-\u00F6-\u00FC")); tester.assertRenderedPage(B.class); @@ -66,32 +70,16 @@ String file = ((A)tester.getLastRenderedPage()).getFileParameter(); assertEquals("umlaut-\u00E4-\u00F6-\u00FC", file); - String document = tester.getServletResponse().getDocument(); + String document = tester.getLastResponseAsString(); assertTrue(document.contains("\u00E4-\u00F6-\u00FC")); } - /** - * - */ - public void testUmlautsInQueryParameter() - { - // TODO Wicket NG - if (true) - return; - - application.mount(new MixedParamUrlCodingStrategy("Apath", A.class, new String[] { "file" })); - testDefault(); - } /** * */ public void testUmlautsInRequestUri() { - // TODO Wicket NG - if (true) - return; - application.mountBookmarkablePage("Aparameter", A.class); testDefault(); } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java Wed Feb 24 06:46:19 2010 @@ -17,7 +17,8 @@ package org.apache.wicket.redirect.encodingtest; import org.apache.wicket.Page; -import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.RestartResponseAtInterceptPageException; +import org.apache.wicket.ng.mock.MockApplication; /** * Application object for your web application. If you want to run this application without @@ -25,18 +26,11 @@ * * @see wicket.myproject.Start#main(String[]) */ -public class WicketApplication extends WebApplication +public class WicketApplication extends MockApplication { private boolean showIntercept = false; /** - * Constructor - */ - public WicketApplication() - { - } - - /** * @see wicket.Application#getHomePage() */ @Override Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java Wed Feb 24 06:46:19 2010 @@ -18,6 +18,7 @@ import org.apache.wicket.Component; import org.apache.wicket.Page; +import org.apache.wicket.RestartResponseAtInterceptPageException; import org.apache.wicket.WicketTestCase; import org.apache.wicket.authorization.Action; import org.apache.wicket.authorization.IAuthorizationStrategy; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java Wed Feb 24 06:46:19 2010 @@ -16,11 +16,13 @@ */ package org.apache.wicket.session; +import org.apache.wicket.AbstractRestartResponseException; import org.apache.wicket.IPageFactory; import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.WicketTestCase; import org.apache.wicket.ng.request.component.PageParameters; +import org.apache.wicket.request.target.basic.EmptyRequestHandler; /** @@ -42,7 +44,7 @@ */ public AbortAndRespondPage1() { - throw new AbstractRestartResponseException() + throw new AbstractRestartResponseException(EmptyRequestHandler.getInstance()) { /** @@ -68,7 +70,7 @@ */ public AbortAndRespondPage2(PageParameters params) { - throw new AbstractRestartResponseException() + throw new AbstractRestartResponseException(EmptyRequestHandler.getInstance()) { /** @@ -93,7 +95,7 @@ */ public AbortAndRespondPage3() { - throw new AbstractRestartResponseException() + throw new AbstractRestartResponseException(EmptyRequestHandler.getInstance()) { /** @@ -111,7 +113,7 @@ */ public AbortAndRespondPage3(PageParameters params) { - throw new AbstractRestartResponseException() + throw new AbstractRestartResponseException(EmptyRequestHandler.getInstance()) { /** @@ -156,8 +158,6 @@ { try { - tester.setupRequestAndResponse(); - tester.createRequestCycle(); pageFactory.newPage(AbortAndRespondPage1.class); fail(); } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java Wed Feb 24 06:46:19 2010 @@ -17,6 +17,7 @@ package org.apache.wicket.stateless; import org.apache.wicket.WicketTestCase; +import org.apache.wicket.ng.request.Url; import org.apache.wicket.ng.request.component.PageParameters; /** @@ -24,18 +25,6 @@ */ public class StatelessComponentTest extends WicketTestCase { - - /** - * Construct. - * - * @param name - */ - public StatelessComponentTest(String name) - { - super(name); - } - - /** * @throws Exception */ @@ -43,14 +32,13 @@ { executeTest(StatelessComponentPage.class, "StatelessComponentPage_result.html"); - tester.setupRequestAndResponse(); - tester.getServletRequest() - .setURL( - "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPage&wicket:interface=:0:link::ILinkListener::"); + tester.getRequest() + .setUrl( + Url.parse("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPage&wicket:interface=:0:link::ILinkListener::")); try { - tester.processRequestCycle(); - assertTrue(false); + tester.processRequest(); + fail(); } catch (Exception e) { @@ -67,13 +55,12 @@ tester.getApplication().mountBookmarkablePage("/stateless", StatelessComponentPage.class); // test is always the home page. it doesn't work then executeTest(StatelessComponentPage.class, "StatelessComponentPage_mount_result.html"); - tester.setupRequestAndResponse(); - tester.getServletRequest() - .setURL( - "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/wicket:interface/:0:link::ILinkListener::"); + tester.getRequest() + .setUrl( + Url.parse("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/wicket:interface/:0:link::ILinkListener::")); try { - tester.processRequestCycle(); + tester.processRequest(); fail("An exception should have been thrown for this request!"); } catch (Exception e) @@ -88,20 +75,19 @@ public void testStatelessComponentPageWithParams() throws Exception { PageParameters params = new PageParameters(); - params.put("testParam1", "testValue1"); - params.put("testParam2", "testValue2"); + params.setNamedParameter("testParam1", "testValue1"); + params.setNamedParameter("testParam2", "testValue2"); executeTest(StatelessComponentPageWithParams.class, params, "StatelessComponentPageWithParams_result.html"); - tester.setupRequestAndResponse(); - tester.getServletRequest() - .setURL( - "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPageWithParams&testParam1=testValue1&testParam2=testValue2&wicket:interface=:0:link::ILinkListener::"); + tester.getRequest() + .setUrl( + Url.parse("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPageWithParams&testParam1=testValue1&testParam2=testValue2&wicket:interface=:0:link::ILinkListener::")); try { - tester.processRequestCycle(); - assertTrue(false); + tester.processRequest(); + fail(); } catch (Exception e) { @@ -116,20 +102,19 @@ public void testStatelessComponentPageWithParamsWithMount() throws Exception { PageParameters params = new PageParameters(); - params.put("testParam1", "testValue1"); - params.put("testParam2", "testValue2"); + params.setNamedParameter("testParam1", "testValue1"); + params.setNamedParameter("testParam2", "testValue2"); tester.getApplication().mountBookmarkablePage("/stateless", StatelessComponentPageWithParams.class); // test is always the home page. it doesn't work then executeTest(StatelessComponentPageWithParams.class, params, "StatelessComponentPageWithParams_mount_result.html"); - tester.setupRequestAndResponse(); - tester.getServletRequest() - .setURL( - "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/testParam1/testValue1/testParam2/testValue2/wicket:interface/%3A0%3Alink%3A%3AILinkListener%3A%3A/"); + tester.getRequest() + .setUrl( + Url.parse("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/testParam1/testValue1/testParam2/testValue2/wicket:interface/%3A0%3Alink%3A%3AILinkListener%3A%3A/")); try { - tester.processRequestCycle(); + tester.processRequest(); fail("An exception should have been thrown for this request!"); } catch (Exception e) @@ -144,22 +129,19 @@ public void testStatelessComponentPageWithParamsWithIndexMount() throws Exception { PageParameters params = new PageParameters(); - params.put("0", "testValue1"); - params.put("1", "testValue2"); - tester.getApplication() - .mount( - new IndexedParamUrlCodingStrategy("/stateless", - StatelessComponentPageWithParams.class)); + params.setIndexedParameter(0, "testValue1"); + params.setIndexedParameter(1, "testValue2"); + tester.getApplication().mountBookmarkablePage("/stateless", + StatelessComponentPageWithParams.class); // test is always the home page. it doesn't work then executeTest(StatelessComponentPageWithParams.class, params, "StatelessComponentPageWithParams_indexed_mount_result.html"); - tester.setupRequestAndResponse(); - tester.getServletRequest() - .setURL( - "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/testValue1/testValue2/wicket:interface/%3A0%3Alink%3A%3AILinkListener%3A%3A/"); + tester.getRequest() + .setUrl( + Url.parse("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/testValue1/testValue2/wicket:interface/%3A0%3Alink%3A%3AILinkListener%3A%3A/")); try { - tester.processRequestCycle(); + tester.processRequest(); fail("An exception should have been thrown for this request!"); } catch (Exception e) Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java Wed Feb 24 06:46:19 2010 @@ -19,9 +19,7 @@ import junit.framework.TestCase; import org.apache.wicket.Page; -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.session.HttpSessionStore; -import org.apache.wicket.session.ISessionStore; +import org.apache.wicket.ng.mock.MockApplication; import org.apache.wicket.stateless.pages.HomePage; import org.apache.wicket.stateless.pages.LoginPage; import org.apache.wicket.util.tester.FormTester; @@ -39,7 +37,7 @@ private WicketTester mock = null; - private WebApplication application; + private MockApplication application; private Class<? extends Page> homePage = HomePage.class; private Class<? extends Page> loginPage = LoginPage.class; @@ -48,7 +46,7 @@ @Override protected void setUp() throws Exception { - mock = new WicketTester(application = new WebApplication() + mock = new WicketTester(application = new MockApplication() { @Override public Class<? extends Page> getHomePage() @@ -56,28 +54,14 @@ return StatelessFormTest.this.getHomePage(); } - @Override - protected void outputDevelopmentModeWarning() - { - // Do nothing. - } - - @Override - protected ISessionStore newSessionStore() - { - // Don't use a filestore, or we spawn lots of threads, which makes things slow. - return new HttpSessionStore(); - } - - }, "src/test/java/" + getClass().getPackage().getName().replace('.', '/')); + }); } @Override protected void tearDown() throws Exception { - mock.setupRequestAndResponse(); - mock.getWicketSession().invalidate(); - mock.processRequestCycle(); + mock.getSession().invalidate(); + mock.processRequest(); mock.destroy(); mock = null; application = null; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=915699&r1=915698&r2=915699&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java Wed Feb 24 06:46:19 2010 @@ -19,7 +19,7 @@ import org.apache.wicket.Page; import org.apache.wicket.Session; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.ng.mock.MockApplication; import org.apache.wicket.stateless.pages.HomePage; import org.apache.wicket.stateless.pages.LoginPage; import org.apache.wicket.util.tester.FormTester; @@ -34,7 +34,7 @@ */ public class TemporarySessionTest extends WicketTestCase { -// private WicketTester tester; + private WicketTester tester; /** * @see junit.framework.TestCase#setUp() @@ -42,7 +42,7 @@ @Override protected void setUp() throws Exception { - tester = new WicketTester(new WebApplication() + tester = new WicketTester(new MockApplication() { @Override @@ -51,47 +51,35 @@ return HomePage.class; } - @Override - protected void outputDevelopmentModeWarning() - { - // Do nothing. - } - }, "src/test/java/" + getClass().getPackage().getName().replace('.', '/')) - { - @Override - public boolean initializeHttpSessionAsTemporary() - { - return true; - } - }; + }); } /** * @see junit.framework.TestCase#tearDown() */ -// protected void tearDown() throws Exception -// { -// tester.destroy(); -// } + @Override + protected void tearDown() throws Exception + { + tester.destroy(); + } + /** * Test if we can keep a session temporary. */ public void testSessionIsTemporary() { tester.startPage(LoginPage.class); - tester.setupRequestAndResponse(); - assertTrue(tester.getWicketSession().isTemporary()); - tester.processRequestCycle(LoginPage.class); + assertTrue(tester.getSession().isTemporary()); + tester.startPage(LoginPage.class); FormTester form = tester.newFormTester("signInPanel:signInForm"); form.setValue("username", "test"); form.setValue("password", "test"); - tester.getWicketSession().bind(); + tester.getSession().bind(); form.submit(); tester.assertRenderedPage(HomePage.class); - tester.setupRequestAndResponse(); assertFalse(Session.get().isTemporary()); - tester.processRequestCycle(LoginPage.class); + tester.startPage(LoginPage.class); } }