Author: ivaynberg
Date: Sun Feb 28 08:38:15 2010
New Revision: 917143
URL: http://svn.apache.org/viewvc?rev=917143&view=rev
Log:
test fixes
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockWebResponse.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockWebResponse.java?rev=917143&r1=917142&r2=917143&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockWebResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockWebResponse.java
Sun Feb 28 08:38:15 2010
@@ -160,6 +160,10 @@
public void setHeader(String name, String value)
{
headers.put(name, value);
+ if (name.equals("Content-Type"))
+ {
+ setContentType(value);
+ }
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java?rev=917143&r1=917142&r2=917143&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
Sun Feb 28 08:38:15 2010
@@ -23,6 +23,7 @@
import org.apache.wicket.ng.ThreadContext;
import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.protocol.http.MockServletContext;
import org.apache.wicket.resource.loader.BundleStringResourceLoader;
import org.apache.wicket.resource.loader.ClassStringResourceLoader;
import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
@@ -141,9 +142,11 @@
*/
public void testLocalizer()
{
- Application dummy = new MockApplication();
+ MockApplication dummy = new MockApplication();
+ dummy.setName("test-app");
+ dummy.setServletContext(new MockServletContext(dummy, ""));
dummy.set();
- dummy.internalInit();
+ dummy.initApplication();
Localizer localizer =
dummy.getResourceSettings().getLocalizer();
Assert.assertNotNull("Localizer should be available",
localizer);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=917143&r1=917142&r2=917143&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
Sun Feb 28 08:38:15 2010
@@ -16,23 +16,18 @@
*/
package org.apache.wicket.markup.html.form.login;
-import javax.servlet.http.HttpServletResponse;
-
import junit.framework.TestCase;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
-import org.apache.wicket.protocol.http.BufferedWebResponse;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.ng.mock.MockApplication;
import org.apache.wicket.protocol.http.WebSession;
-import org.apache.wicket.session.HttpSessionStore;
-import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
@@ -46,15 +41,6 @@
{
private WicketTester application;
- /**
- * Constructor for InterceptTest.
- *
- * @param arg0
- */
- public InterceptTest(String arg0)
- {
- super(arg0);
- }
/**
* @see TestCase#setUp()
@@ -79,17 +65,8 @@
*/
public void testFormSubmit()
{
- application = new WicketTester(new MyMockWebApplication()
- {
- @Override
- protected WebResponse
newWebResponse(HttpServletResponse response)
- {
- return new BufferedWebResponse(response);
- }
- });
// same as above but uses different technique to login
- application.setupRequestAndResponse();
- application.processRequestCycle();
+
application.startPage(application.getApplication().getHomePage());
MockLoginPage loginPage =
(MockLoginPage)application.getLastRenderedPage();
assertEquals(((MyMockWebApplication)application.getApplication()).getLoginPage(),
loginPage.getClass());
@@ -105,25 +82,19 @@
*/
public void testClickLink()
{
- application.setupRequestAndResponse();
- application.processRequestCycle();
+
application.startPage(application.getApplication().getHomePage());
MockLoginPage loginPage =
(MockLoginPage)application.getLastRenderedPage();
assertEquals(((MyMockWebApplication)application.getApplication()).getLoginPage(),
loginPage.getClass());
- application.setupRequestAndResponse();
-
application.getServletRequest().setRequestToComponent(loginPage.getForm());
-
application.getServletRequest().setParameter(loginPage.getTextField().getInputName(),
- "admin");
- application.processRequestCycle();
+ FormTester form = application.newFormTester("form");
+ form.setValue("username", "admin");
+ form.submit();
assertEquals(application.getApplication().getHomePage(),
application.getLastRenderedPage()
.getClass());
- application.setupRequestAndResponse();
- application.getServletRequest().setRequestToComponent(
- application.getLastRenderedPage().get("link"));
- application.processRequestCycle();
+
application.clickLink(application.getLastRenderedPage().get("link"));
assertEquals(PageA.class,
application.getLastRenderedPage().getClass());
}
@@ -133,25 +104,19 @@
public void testClickLink2()
{
// same as above but uses different technique to login
- application.setupRequestAndResponse();
- application.processRequestCycle();
+
application.startPage(application.getApplication().getHomePage());
MockLoginPage loginPage =
(MockLoginPage)application.getLastRenderedPage();
assertEquals(((MyMockWebApplication)application.getApplication()).getLoginPage(),
loginPage.getClass());
// bypass form completely to login but continue to intercept
page
- application.setupRequestAndResponse();
- WebRequestCycle requestCycle = application.createRequestCycle();
assertTrue(((MockLoginPage)application.getLastRenderedPage()).login("admin"));
- application.processRequestCycle(requestCycle);
+
application.startPage(application.getApplication().getHomePage());
assertEquals(application.getApplication().getHomePage(),
application.getLastRenderedPage()
.getClass());
- application.setupRequestAndResponse();
- application.getServletRequest().setRequestToComponent(
- application.getLastRenderedPage().get("link"));
- application.processRequestCycle();
+
application.clickLink(application.getLastRenderedPage().get("link"));
assertEquals(PageA.class,
application.getLastRenderedPage().getClass());
}
@@ -159,7 +124,7 @@
*
* @author
*/
- private static class MyMockWebApplication extends WebApplication
+ private static class MyMockWebApplication extends MockApplication
{
private static final long serialVersionUID = 1L;
@@ -172,6 +137,7 @@
@Override
protected void init()
{
+ super.init();
getSecuritySettings().setAuthorizationStrategy(new
MyAuthorizationStrategy());
}
@@ -194,24 +160,6 @@
return new MySession(request);
}
- @Override
- protected WebResponse newWebResponse(HttpServletResponse
servletResponse)
- {
- return new WebResponse(servletResponse);
- }
-
- @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();
- }
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java?rev=917143&r1=917142&r2=917143&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java
Sun Feb 28 08:38:15 2010
@@ -21,7 +21,7 @@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.ng.request.component.PageParameters;
-
+import org.apache.wicket.ng.resource.PackageResourceReference;
/**
* Demonstrates localization.
@@ -41,8 +41,8 @@
*/
public Home(final PageParameters parameters)
{
- add(new Image("logo"));
- add(new Image("beer"));
+ add(new Image("logo", new PackageResourceReference(Home.class,
"../../border/logo.gif")));
+ add(new Image("beer", new PackageResourceReference(Home.class,
"Beer.gif")));
// Add a couple of links to be able to play around with the
session
// locale
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java?rev=917143&r1=917142&r2=917143&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java
Sun Feb 28 08:38:15 2010
@@ -25,15 +25,6 @@
*/
public class ImageTest extends WicketTestCase
{
- /**
- * Construct.
- *
- * @param name
- */
- public ImageTest(String name)
- {
- super(name);
- }
/**
*
@@ -45,28 +36,28 @@
tester.startPage(Home.class);
tester.clickLink("goCanadian");
-
tester.assertContains("src=\"resources/org.apache.wicket.markup.html.image.Home/Beer_en_CA.gif\"");
+
tester.assertContains("resource/org.apache.wicket.markup.html.image.Home/Beer.gif\\?en_CA\"");
tester.clickLink("goChinese");
-
tester.assertContains("src=\"resources/org.apache.wicket.markup.html.image.Home/Beer_zh_CN.gif\"");
+
tester.assertContains("resource/org.apache.wicket.markup.html.image.Home/Beer.gif\\?zh_CN\"");
tester.clickLink("goDanish");
-
tester.assertContains("src=\"resources/org.apache.wicket.markup.html.image.Home/Beer_da_DK.gif\"");
+
tester.assertContains("resource/org.apache.wicket.markup.html.image.Home/Beer.gif\\?da_DK\"");
tester.clickLink("goDutch");
-
tester.assertContains("src=\"resources/org.apache.wicket.markup.html.image.Home/Beer_nl_NL.gif\"");
+
tester.assertContains("resource/org.apache.wicket.markup.html.image.Home/Beer.gif\\?nl_NL\"");
tester.clickLink("goGerman");
-
tester.assertContains("src=\"resources/org.apache.wicket.markup.html.image.Home/Beer_de_DE.gif\"");
+
tester.assertContains("resource/org.apache.wicket.markup.html.image.Home/Beer.gif\\?de_DE\"");
tester.clickLink("goUS");
-
tester.assertContains("src=\"resources/org.apache.wicket.markup.html.image.Home/Beer.gif\"");
+
tester.assertContains("resource/org.apache.wicket.markup.html.image.Home/Beer.gif\"");
}
public void testParentRelativeImage()
{
tester.getApplication().getResourceSettings().setParentFolderPlaceholder("$up$");
tester.startPage(Home.class);
-
tester.assertContains("src=\"resources/org.apache.wicket.markup.html.image.Home/[$]up[$]/border/test.png\"");
+
tester.assertContains("resource/org.apache.wicket.markup.html.image.Home/[$]up[$]/border/test.png\"");
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java?rev=917143&r1=917142&r2=917143&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
Sun Feb 28 08:38:15 2010
@@ -34,15 +34,6 @@
{
private boolean linkClicked;
- /**
- * Construct.
- */
- public AjaxSubmitLinkClickTest()
- {
- super("Ajax submit link click test");
- }
-
-
@Override
protected void setUp() throws Exception
{
@@ -78,20 +69,13 @@
}
});
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
+ tester.startPage(page);
tester.assertRenderedPage(MockPageWithFormAndContainedLink.class);
// Change the name in the textfield
- page.getNameField().setModelValue(new String[] { "new mock
value" });
+ tester.getRequest().getPostParameters().setParameterValue(
+ page.getNameField().getInputName(), "new mock value");
// Click the submit link
tester.clickLink("form:link");
@@ -143,7 +127,8 @@
tester.assertRenderedPage(MockPageWithFormAndLink.class);
// Change the name in the textfield
- page.getNameField().setModelValue(new String[] { "new mock
value" });
+ tester.getRequest().getPostParameters().setParameterValue(
+ page.getNameField().getInputName(), "new mock value");
// Click the submit link
tester.clickLink("link");
