Author: jonl
Date: Thu Apr 5 22:36:00 2007
New Revision: 526064
URL: http://svn.apache.org/viewvc?view=rev&rev=526064
Log:
Fixes for broken unit tests.
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/tester/WicketTester.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java?view=diff&rev=526064&r1=526063&r2=526064
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java
Thu Apr 5 22:36:00 2007
@@ -349,10 +349,8 @@
* Get the output stream for writing binary data from the servlet.
*
* @return The binary output stream.
- * @throws IOException
- * If stream not available
*/
- public ServletOutputStream getOutputStream() throws IOException
+ public ServletOutputStream getOutputStream()
{
if (mode == MODE_TEXT)
{
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java?view=diff&rev=526064&r1=526063&r2=526064
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java
Thu Apr 5 22:36:00 2007
@@ -122,7 +122,7 @@
/** The tester object */
private final WebApplication application;
- private ServletContext context;
+ private final ServletContext context;
private WicketFilter filter;
@@ -140,7 +140,8 @@
{
this.application = application;
- context = newServletContext(path);
+ this.context = newServletContext(path);
+
filter = new WicketFilter()
{
protected IWebApplicationFactory getApplicationFactory()
@@ -193,14 +194,20 @@
Application.set(this.application);
- this.servletSession = new MockHttpSession(context);
- this.servletRequest = new
MockHttpServletRequest(this.application, servletSession, context);
+ // Construct mock session, request and response
+ this.servletSession = new MockHttpSession(this.context);
+ this.servletRequest = new
MockHttpServletRequest(this.application, this.servletSession, this.context);
this.servletResponse = new MockHttpServletResponse();
- this.wicketRequest =
this.application.newWebRequest(servletRequest);
- this.wicketSession = this.application.getSession(wicketRequest,
wicketResponse);
+
+ // Construct request, response and session using factories
+ this.wicketRequest =
this.application.newWebRequest(this.servletRequest);
+ this.wicketResponse =
this.application.newWebResponse(this.servletResponse);
+ this.wicketSession =
this.application.getSession(this.wicketRequest, this.wicketResponse);
+
+ // Get request cycle factory
this.requestCycleFactory =
this.wicketSession.getRequestCycleFactory();
- // set the default context path
+ // Set the default context path
this.application.getApplicationSettings().setContextPath(context.getServletContextName());
this.application.getRequestCycleSettings()
@@ -333,7 +340,7 @@
public void processRequestCycle(final Component component)
{
setupRequestAndResponse();
- WebRequestCycle cycle = createRequestCycle();
+ final WebRequestCycle cycle = createRequestCycle();
cycle.request(component);
if (component instanceof Page)
@@ -351,7 +358,7 @@
public void processRequestCycle(final Class pageClass)
{
setupRequestAndResponse();
- WebRequestCycle cycle = createRequestCycle();
+ final WebRequestCycle cycle = createRequestCycle();
cycle.request(new BookmarkablePageRequestTarget(pageClass));
postProcessRequestCycle(cycle);
}
@@ -481,7 +488,7 @@
servletResponse.initialize();
servletRequest.setParameters(parametersForNextRequest);
parametersForNextRequest.clear();
- this.wicketRequest = this.application.newWebRequest(servletRequest);
+ this.wicketRequest = this.application.newWebRequest(servletRequest);
this.wicketResponse =
this.application.newWebResponse(servletResponse);
this.wicketSession = this.application.getSession(wicketRequest,
wicketResponse);
this.application.getSessionStore().bind(wicketRequest, wicketSession);
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/tester/WicketTester.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/tester/WicketTester.java?view=diff&rev=526064&r1=526063&r2=526064
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/tester/WicketTester.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/tester/WicketTester.java
Thu Apr 5 22:36:00 2007
@@ -21,6 +21,8 @@
import java.util.Iterator;
import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
import junit.framework.Assert;
import junit.framework.AssertionFailedError;
@@ -34,12 +36,13 @@
import wicket.markup.html.form.Form;
import wicket.markup.html.list.ListView;
import wicket.protocol.http.WebApplication;
+import wicket.protocol.http.WebResponse;
import wicket.util.diff.DiffUtil;
/**
* A helper to ease unit testing of Wicket applications without the need for a
* servlet container. To start a test, either use startPage() or startPanel():
- *
+ *
* <pre>
* // production page
* public class MyPage extends WebPage
@@ -57,32 +60,30 @@
* }
* }
* </pre>
- *
+ *
* <pre>
* // test code
* private WicketTester tester;
- *
+ *
* public void setUp()
* {
* tester = new WicketTester();
* }
- *
+ *
* public void testRenderMyPage()
* {
* //start and render the test page
* tester.startPage(MyPage.class);
- *
* //assert rendered page class
* tester.assertRenderedPage(MyPage.class);
- *
* //assert rendered label component
* tester.assertLabel("myMessage", "Hello!");
* }
* </pre>
- *
+ *
* Above example is straight forward: start MyPage.class and assert Label it
* rendered. Next, we try to navigate through link:
- *
+ *
* <pre>
* // production page
* public class YourPage extends WebPage
@@ -93,25 +94,23 @@
* info("Wicket Rocks ;-)");
* }
* }
- *
+ *
* //test code
* public void testLinkToYourPage()
* {
* tester.startPage(MyPage.class);
- *
* //click link and render
* tester.clickLink("toYourPage");
- *
* tester.assertRenderedPage(YourPage.class);
* tester.assertLabel("yourMessage", "Hi!");
* }
* </pre>
- *
+ *
* <code>tester.clickLink(path);</code> will simulate user click on the
* component (in this case, it's a <code>Link</code>) and render the response
* page <code>YourPage</code>. Ok, unit test of <code>MyPage</code> is
* completed. Now we test <code>YourPage</code> standalone:
- *
+ *
* <pre>
* //test code
* public void testRenderYourPage()
@@ -124,15 +123,13 @@
* return new YourPage("mock message");
* }
* });
- *
* tester.assertRenderedPage(YourPage.class);
* tester.assertLabel("yourMessage", "mock message");
- *
* // assert feedback messages in INFO Level
* tester.assertInfoMessages(new String[] { "Wicket Rocks ;-)"
});
* }
* </pre>
- *
+ *
* Instead of <code>tester.startPage(pageClass)</code>, we define a
* [EMAIL PROTECTED] wicket.util.tester.ITestPageSource} to provide testing
page instance
* for WicketTester. This is necessary because <code>YourPage</code> uses a
@@ -140,9 +137,9 @@
* not be instantiated by reflection. Finally, we use
* <code>assertInfoMessages</code> to assert there is a feedback message
* "Wicket Rocks ;-)" in INFO level.
- *
+ *
* TODO General: Example usage of FormTester
- *
+ *
* @author Ingram Chen
* @author Juergen Donnerstag
* @author Frank Bille
@@ -153,28 +150,17 @@
private static final Log log = LogFactory.getLog(WicketTester.class);
/**
- * @author frankbille
- */
- public static class DummyWebApplication extends WebApplication
- {
- public Class getHomePage()
- {
- return DummyHomePage.class;
- }
- }
-
- /**
* Create WicketTester and automatically create a WebApplication, but
the
* tester will have no home page.
*/
public WicketTester()
{
- this(new DummyWebApplication(), null);
+ this(DummyHomePage.class);
}
/**
* Create WicketTester and automatically create a WebApplication.
- *
+ *
* @param homePage
*/
public WicketTester(final Class homePage)
@@ -188,12 +174,17 @@
{
return homePage;
}
+
+ protected WebResponse newWebResponse(final
HttpServletResponse servletResponse)
+ {
+ return new WebResponse(servletResponse);
+ }
}, null);
}
/**
* Create WicketTester
- *
+ *
* @param application
* The wicket tester object
*/
@@ -204,13 +195,13 @@
/**
* Create WicketTester to help unit testing
- *
+ *
* @param application
* The wicket tester object
* @param path
* The absolute path on disk to the web application contents
* (e.g. war root) - may be null
- *
+ *
* @see
wicket.protocol.http.MockWebApplication#MockWebApplication(String)
*/
public WicketTester(final WebApplication application, final String path)
@@ -221,7 +212,7 @@
/**
* assert the text of <code>Label</code> component.
- *
+ *
* @param path
* path to <code>Label</code> component
* @param expectedLabelText
@@ -235,7 +226,7 @@
/**
* assert <code>PageLink</code> link to page class.
- *
+ *
* @param path
* path to <code>PageLink</code> component
* @param expectedPageClass
@@ -248,7 +239,7 @@
/**
* assert component class
- *
+ *
* @param path
* path to component
* @param expectedComponentClass
@@ -261,7 +252,7 @@
/**
* assert component visible.
- *
+ *
* @param path
* path to component
*/
@@ -272,7 +263,7 @@
/**
* assert component invisible.
- *
+ *
* @param path
* path to component
*/
@@ -283,7 +274,7 @@
/**
* assert the content of last rendered page contains(matches) regex
pattern.
- *
+ *
* @param pattern
* reqex pattern to match
*/
@@ -294,7 +285,7 @@
/**
* assert the model of [EMAIL PROTECTED] ListView} use expectedList
- *
+ *
* @param path
* path to [EMAIL PROTECTED] ListView} component
* @param expectedList
@@ -310,7 +301,7 @@
* create a [EMAIL PROTECTED] FormTester} for the form at path, and
fill all child
* [EMAIL PROTECTED] wicket.markup.html.form.FormComponent}s with blank
String
* initially.
- *
+ *
* @param path
* path to [EMAIL PROTECTED] Form} component
* @return FormTester A FormTester instance for testing form
@@ -323,7 +314,7 @@
/**
* create a [EMAIL PROTECTED] FormTester} for the form at path.
- *
+ *
* @param path
* path to [EMAIL PROTECTED] Form} component
* @param fillBlankString
@@ -341,7 +332,7 @@
/**
* assert last rendered Page class
- *
+ *
* @param expectedRenderedPageClass
* expected class of last renered page
*/
@@ -356,7 +347,7 @@
* Use <code>-Dwicket.replace.expected.results=true</code> to
* automatically replace the expected output file.
* </p>
- *
+ *
* @param pageClass
* Used to load the file (relative to clazz package)
* @param filename
@@ -372,7 +363,7 @@
/**
* assert last rendered Page against an expected HTML document as a
String
- *
+ *
* @param expectedDocument
* Expected output
* @throws Exception
@@ -406,7 +397,7 @@
/**
* assert error feedback messages
- *
+ *
* @param expectedErrorMessages
* expected error messages
*/
@@ -423,7 +414,7 @@
/**
* assert info feedback message
- *
+ *
* @param expectedInfoMessages
* expected info messages
*/
@@ -441,7 +432,7 @@
* PLEASE NOTE! This method doesn't actually insert the component in the
* client DOM tree, using javascript. But it shouldn't be needed
because you
* have to trust that the Wicket Ajax Javascript just works.
- *
+ *
* @param componentPath
* The component path to the component to test whether it's
on
* the response.
@@ -459,7 +450,7 @@
* PLEASE NOTE! This method doesn't actually insert the component in the
* client DOM tree, using javascript. But it shouldn't be needed
because you
* have to trust that the Wicket Ajax Javascript just works.
- *
+ *
* @param component
* The component to test whether it's on the response.
*/
@@ -471,7 +462,7 @@
private void assertResult(Result result)
{
- if(result.wasFailed())
+ if (result.wasFailed())
{
throw new AssertionFailedError(result.getMessage());
}
