You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/04/15 22:22:25 UTC
svn commit: r765341 [6/7] - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/ajax/form/
main/java/org/apache/wicket/application/ main...
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java Wed Apr 15 20:22:01 2009
@@ -69,7 +69,7 @@
*
* @throws Exception
*/
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings( { "unchecked" })
public void test3() throws Exception
{
executeTest(BoxBorderTestPage_3.class, "BoxBorderTestPage_ExpectedResult_3.html");
@@ -78,7 +78,8 @@
assertNotNull(border);
Form<?> form = (Form<?>)tester.getLastRenderedPage().get("border:myForm");
- TextField<String> input = (TextField<String>)tester.getLastRenderedPage().get("border:name");
+ TextField<String> input = (TextField<String>)tester.getLastRenderedPage()
+ .get("border:name");
assertEquals("", input.getDefaultModelObjectAsString());
tester.setupRequestAndResponse();
@@ -116,7 +117,7 @@
}
assertNotNull("Markup does not match component hierarchy, but exception not thrown.",
- markupException);
+ markupException);
}
/**
@@ -127,7 +128,7 @@
public void testRenderWrapped() throws Exception
{
executeTest(BorderRenderWrappedTestPage_1.class,
- "BorderRenderWrappedTestPage_ExpectedResult_1.html");
+ "BorderRenderWrappedTestPage_ExpectedResult_1.html");
}
/**
@@ -204,7 +205,7 @@
}
}
assertNotNull(
- "Expected a WicketRuntimeException. Border tag must be open tags. Open-close tags are not allowed",
- e);
+ "Expected a WicketRuntimeException. Border tag must be open tags. Open-close tags are not allowed",
+ e);
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/FormBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/FormBorder.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/FormBorder.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/FormBorder.java Wed Apr 15 20:22:01 2009
@@ -40,8 +40,8 @@
{
super(id);
- this.form = new Form("myForm");
- add(this.form);
+ form = new Form("myForm");
+ add(form);
// Due to BorderBodyResolver it works without the following line. But
// for clarity reasons it is recommended to use it.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java Wed Apr 15 20:22:01 2009
@@ -48,6 +48,6 @@
tester.getApplication().getDebugSettings().setComponentUseCheck(false);
this.executeTest(WicketComponentTreeTestPage.class,
- "WicketComponentTreeTestPage_ExpectedResult.html");
+ "WicketComponentTreeTestPage_ExpectedResult.html");
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java Wed Apr 15 20:22:01 2009
@@ -46,7 +46,8 @@
{
Form<?> form = new Form<Void>("form");
- CheckGroup<String> group = new CheckGroup<String>("group", new CollectionModel<String>(list));
+ CheckGroup<String> group = new CheckGroup<String>("group",
+ new CollectionModel<String>(list));
WebMarkupContainer container = new WebMarkupContainer("container");
Check<String> check1 = new Check<String>("check1", new Model<String>("check1"));
Check<String> check2 = new Check<String>("check2", new Model<String>("check2"));
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java Wed Apr 15 20:22:01 2009
@@ -36,7 +36,8 @@
public CheckGroupDisabledTestPage()
{
Form<Void> form = new Form<Void>("form");
- CheckGroup<String> group = new CheckGroup<String>("group", new CollectionModel<String>(Arrays.asList("check1", "check2")));
+ CheckGroup<String> group = new CheckGroup<String>("group", new CollectionModel<String>(
+ Arrays.asList("check1", "check2")));
group.setRenderBodyOnly(false);
WebMarkupContainer container = new WebMarkupContainer("container");
Check<String> check1 = new Check<String>("check1", new Model<String>("check1"));
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java Wed Apr 15 20:22:01 2009
@@ -128,19 +128,20 @@
// set up necessary objects to emulate a form submission
- tester.createRequestCycle();
+ tester.createRequestCycle();
// this could have been any page it seems. see comment at method
MockPage page = new MockPage();
// create component hierarchy
- final Form<MockModelObject> form = new Form<MockModelObject>("form", new CompoundPropertyModel<MockModelObject>(modelObject))
+ final Form<MockModelObject> form = new Form<MockModelObject>("form",
+ new CompoundPropertyModel<MockModelObject>(modelObject))
{
private static final long serialVersionUID = 1L;
@Override
- public String getMarkupId()
+ public String getMarkupId()
{
// hack for the fact that this test doesn't relate to any markup
return "foo";
@@ -151,7 +152,8 @@
final WebMarkupContainer container = new WebMarkupContainer("container");
- final Check<Serializable> choice1 = new Check<Serializable>("check1", new Model<Serializable>(check1));
+ final Check<Serializable> choice1 = new Check<Serializable>("check1",
+ new Model<Serializable>(check1));
final Check<String> choice2 = new Check<String>("prop2");
page.add(form);
@@ -166,34 +168,34 @@
form.onFormSubmitted();
assertTrue("running with nothing selected - model must be empty", modelObject.getProp1()
- .size() == 0);
+ .size() == 0);
tester.getServletRequest().setParameter(group.getInputName(),
- String.valueOf(choice1.getValue()));
+ String.valueOf(choice1.getValue()));
form.onFormSubmitted();
assertTrue("running with choice1 selected - model must only contain value of check1",
- modelObject.getProp1().size() == 1 && modelObject.getProp1().contains(check1));
+ modelObject.getProp1().size() == 1 && modelObject.getProp1().contains(check1));
tester.getServletRequest().setParameter(group.getInputName(),
- String.valueOf(choice2.getValue()));
+ String.valueOf(choice2.getValue()));
form.onFormSubmitted();
assertTrue("running with choice2 selected - model must only contain value of check2",
- modelObject.getProp1().size() == 1 && modelObject.getProp1().contains(check2));
+ modelObject.getProp1().size() == 1 && modelObject.getProp1().contains(check2));
// throw in some nulls into the request param to make sure they are
// ignored
tester.getServletRequest().getParameterMap().put(
- group.getInputName(),
- new String[] { null, String.valueOf(choice1.getValue()), null,
- String.valueOf(choice2.getValue()) });
+ group.getInputName(),
+ new String[] { null, String.valueOf(choice1.getValue()), null,
+ String.valueOf(choice2.getValue()) });
form.onFormSubmitted();
assertTrue(
- "running with choice1 and choice2 selected - model must only contain values of check1 and check2",
- modelObject.getProp1().size() == 2 && modelObject.getProp1().contains(check2) &&
- modelObject.getProp1().contains(check1));
+ "running with choice1 and choice2 selected - model must only contain values of check1 and check2",
+ modelObject.getProp1().size() == 2 && modelObject.getProp1().contains(check2) &&
+ modelObject.getProp1().contains(check1));
tester.getServletRequest().getParameterMap().put(group.getInputName(),
- new String[] { "some weird choice uuid to test error" });
+ new String[] { "some weird choice uuid to test error" });
try
{
form.onFormSubmitted();
@@ -226,7 +228,7 @@
catch (WicketRuntimeException e)
{
if (e.getMessage().indexOf(
- "Check component [4:form:check2] cannot find its parent CheckGroup") < 0)
+ "Check component [4:form:check2] cannot find its parent CheckGroup") < 0)
{
fail("failed with wrong exception");
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java Wed Apr 15 20:22:01 2009
@@ -40,7 +40,8 @@
{
List<String> list = new ArrayList<String>();
Form<Void> form = new Form<Void>("form");
- CheckGroup<String> group = new CheckGroup<String>("group", new CollectionModel<String>(list));
+ CheckGroup<String> group = new CheckGroup<String>("group",
+ new CollectionModel<String>(list));
WebMarkupContainer container = new WebMarkupContainer("container");
Check<String> check1 = new Check<String>("check1", new Model<String>("check1"));
Check<String> check2 = new Check<String>("check2", new Model<String>("check2"));
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java Wed Apr 15 20:22:01 2009
@@ -96,11 +96,8 @@
public enum MyEnum {
A("a"), B("b"), C("c"), D("d"), E("e");
- private String text;
-
MyEnum(String text)
{
- this.text = text;
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage.java Wed Apr 15 20:22:01 2009
@@ -37,6 +37,7 @@
/** Serialization */
private static final long serialVersionUID = 1L;
+ @Override
protected String getMethod()
{
return Form.METHOD_GET;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormTest.java Wed Apr 15 20:22:01 2009
@@ -38,11 +38,13 @@
super(name);
}
+ @Override
protected void setUp() throws Exception
{
super.setUp();
visitor = new Form.ValidationVisitor()
{
+ @Override
public void validate(FormComponent formComponent)
{
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.java Wed Apr 15 20:22:01 2009
@@ -77,7 +77,7 @@
* Construct.
*
* @param id
- * the form's id
+ * the form's id
*/
public NestableForm(String id)
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java Wed Apr 15 20:22:01 2009
@@ -117,12 +117,13 @@
// create component hierarchy
- final Form<MockModelObject> form = new Form<MockModelObject>("form", new CompoundPropertyModel<MockModelObject>(modelObject))
+ final Form<MockModelObject> form = new Form<MockModelObject>("form",
+ new CompoundPropertyModel<MockModelObject>(modelObject))
{
private static final long serialVersionUID = 1L;
@Override
- public String getMarkupId()
+ public String getMarkupId()
{
// hack for the fact that this test doesn't relate to any markup
return "foo";
@@ -153,24 +154,24 @@
modelObject.setProp1(radio1);
form.onFormSubmitted();
- assertTrue("group: running with nothing selected - model must be set to null", modelObject
- .getProp1() == null);
- assertTrue("group2: running with nothing selected - model must be set to null", model
- .getObject() == null);
+ assertTrue("group: running with nothing selected - model must be set to null",
+ modelObject.getProp1() == null);
+ assertTrue("group2: running with nothing selected - model must be set to null",
+ model.getObject() == null);
tester.getServletRequest().setParameter(group.getInputName(), choice1.getValue());
tester.getServletRequest().setParameter(group2.getInputName(), choice3.getValue());
form.onFormSubmitted();
assertEquals("group: running with choice1 selected - model must be set to value of radio1",
- modelObject.getProp1(), choice1.getDefaultModelObject());
+ modelObject.getProp1(), choice1.getDefaultModelObject());
assertEquals(
- "group2: running with choice3 selected - model must be set to value of radio1",
- model.getObject(), choice3.getDefaultModelObject());
+ "group2: running with choice3 selected - model must be set to value of radio1",
+ model.getObject(), choice3.getDefaultModelObject());
tester.getServletRequest().setParameter(group.getInputName(), choice2.getValue());
form.onFormSubmitted();
assertEquals("group: running with choice2 selected - model must be set to value of radio2",
- modelObject.getProp1(), choice2.getDefaultModelObject());
+ modelObject.getProp1(), choice2.getDefaultModelObject());
tester.getServletRequest().setParameter(group2.getInputName(), choice1.getValue());
try
@@ -201,7 +202,7 @@
catch (WicketRuntimeException e)
{
if (e.getMessage().indexOf(
- "Radio component [1:form:radio2] cannot find its parent RadioGroup") < 0)
+ "Radio component [1:form:radio2] cannot find its parent RadioGroup") < 0)
{
fail("failed with wrong exception");
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java Wed Apr 15 20:22:01 2009
@@ -255,7 +255,7 @@
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false);
tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
+ tester.createRequestCycle();
String str = tester.getApplication().getResourceSettings().getLocalizer().getString("XXX",
null);
@@ -269,7 +269,7 @@
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(true);
tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
+ tester.createRequestCycle();
boolean hit = false;
try
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java Wed Apr 15 20:22:01 2009
@@ -43,7 +43,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit()
+ protected void onSubmit()
{
tf.error("an error");
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java Wed Apr 15 20:22:01 2009
@@ -36,7 +36,8 @@
*/
public FeedbackIndicatorFormPage()
{
- final TextField<Serializable> tf = new TextField<Serializable>("input", new Model<Serializable>());
+ final TextField<Serializable> tf = new TextField<Serializable>("input",
+ new Model<Serializable>());
final FormComponentFeedbackIndicator feedback = new FormComponentFeedbackIndicator(
"feedback");
@@ -45,7 +46,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit()
+ protected void onSubmit()
{
tf.error("an error");
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java Wed Apr 15 20:22:01 2009
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java Wed Apr 15 20:22:01 2009
@@ -16,15 +16,21 @@
*/
package org.apache.wicket.markup.html.form.persistence;
-import javax.servlet.http.Cookie;
import java.util.List;
+import javax.servlet.http.Cookie;
+
import junit.framework.TestCase;
+
import org.apache.wicket.Page;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.persistence.CookieValuePersisterTestPage.TestForm;
-import org.apache.wicket.protocol.http.*;
+import org.apache.wicket.protocol.http.MockHttpServletRequest;
+import org.apache.wicket.protocol.http.MockHttpServletResponse;
+import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.protocol.http.WebRequestCycle;
+import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.util.tester.WicketTester;
/**
@@ -66,7 +72,7 @@
*
* @throws Exception
*/
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings( { "unchecked" })
public void test1() throws Exception
{
// How does the test work: Make sure you have a page, form and form
@@ -102,10 +108,10 @@
persister.save(textField);
assertNull(getRequestCookies(cycle));
assertEquals(1, getResponseCookies(cycle).size());
- assertEquals("test", ((Cookie)getResponseCookies(cycle).get(0)).getValue());
- assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
+ assertEquals("test", (getResponseCookies(cycle).get(0)).getValue());
+ assertEquals("form.input", (getResponseCookies(cycle).get(0)).getName());
assertEquals("/WicketTester$DummyWebApplication",
- ((Cookie)getResponseCookies(cycle).get(0)).getPath());
+ (getResponseCookies(cycle).get(0)).getPath());
// To clear in the context of cookies means to add a special cookie
// (maxAge=0) to the response, provided a cookie with
@@ -114,10 +120,10 @@
persister.clear(textField);
assertNull(getRequestCookies(cycle));
assertEquals(1, getResponseCookies(cycle).size());
- assertEquals("test", ((Cookie)getResponseCookies(cycle).get(0)).getValue());
- assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
+ assertEquals("test", (getResponseCookies(cycle).get(0)).getValue());
+ assertEquals("form.input", (getResponseCookies(cycle).get(0)).getName());
assertEquals("/WicketTester$DummyWebApplication",
- ((Cookie)getResponseCookies(cycle).get(0)).getPath());
+ (getResponseCookies(cycle).get(0)).getPath());
// Try to load it. Because there is no Cookie matching the textfield's name
// it remains unchanged
@@ -150,13 +156,13 @@
persister.clear(textField);
assertEquals(1, getRequestCookies(cycle).length);
assertEquals(2, getResponseCookies(cycle).size());
- assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(1)).getName());
- assertEquals(0, ((Cookie)getResponseCookies(cycle).get(1)).getMaxAge());
+ assertEquals("form.input", (getResponseCookies(cycle).get(1)).getName());
+ assertEquals(0, (getResponseCookies(cycle).get(1)).getMaxAge());
}
private void copyCookieFromResponseToRequest(final RequestCycle cycle)
{
- ((MockHttpServletRequest)((WebRequest)cycle.getRequest()).getHttpServletRequest()).addCookie((Cookie)getResponseCookies(
+ ((MockHttpServletRequest)((WebRequest)cycle.getRequest()).getHttpServletRequest()).addCookie(getResponseCookies(
cycle).get(0));
}
@@ -167,7 +173,7 @@
private List<Cookie> getResponseCookies(final RequestCycle cycle)
{
- MockHttpServletResponse response = (MockHttpServletResponse) ((WebResponse) cycle.getResponse()).getHttpServletResponse();
- return (List<Cookie>) response.getCookies();
+ MockHttpServletResponse response = (MockHttpServletResponse)((WebResponse)cycle.getResponse()).getHttpServletResponse();
+ return (List<Cookie>)response.getCookies();
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java Wed Apr 15 20:22:01 2009
@@ -71,7 +71,7 @@
* Dummy
*/
@Override
- public final void onSubmit()
+ public final void onSubmit()
{
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/HomePage.java Wed Apr 15 20:22:01 2009
@@ -42,6 +42,7 @@
*/
private static final long serialVersionUID = 1L;
+ @Override
protected void onSubmit()
{
submitted = true;
@@ -56,6 +57,7 @@
*/
private static final long serialVersionUID = 1L;
+ @Override
public void onSubmit()
{
submittedViaLink = true;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadTest.java Wed Apr 15 20:22:01 2009
@@ -51,7 +51,7 @@
public void testGetInputStream() throws Exception
{
FileItem fileItem = new DiskFileItemFactory().createItem("dummyFieldName", "text/java",
- false, "FileUploadTest.java");
+ false, "FileUploadTest.java");
// Initialize the upload
fileItem.getOutputStream();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java Wed Apr 15 20:22:01 2009
@@ -46,7 +46,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit()
+ protected void onSubmit()
{
fileUpload = fileUploadField.getFileUpload();
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java Wed Apr 15 20:22:01 2009
@@ -75,7 +75,7 @@
}
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return ConcretePage2.class;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java Wed Apr 15 20:22:01 2009
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_3.java Wed Apr 15 20:22:01 2009
@@ -42,6 +42,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
public void onClick()
{
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java Wed Apr 15 20:22:01 2009
@@ -40,7 +40,7 @@
public void testTestLinks() throws Exception
{
executeTest(BookmarkableHomePageLinksPage.class,
- "BookmarkableHomePageLinksPage_result.html");
+ "BookmarkableHomePageLinksPage_result.html");
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java Wed Apr 15 20:22:01 2009
@@ -52,7 +52,7 @@
{
tester.startPage(DownloadPage.class);
((MockServletContext)tester.getApplication().getServletContext()).addMimeType("custom",
- APPLICATION_X_CUSTOM);
+ APPLICATION_X_CUSTOM);
tester.clickLink(DownloadPage.CUSTOM_DOWNLOAD_LINK);
log.debug("Content-Type: " + tester.getContentTypeFromResponseHeader());
assertTrue(tester.getContentTypeFromResponseHeader().startsWith(APPLICATION_X_CUSTOM));
@@ -78,7 +78,7 @@
tester.clickLink(DownloadPage.TEXT_DOWNLOAD_LINK);
assertTrue(tester.getContentTypeFromResponseHeader().startsWith("text/plain"));
assertTrue(tester.getContentDispositionFromResponseHeader().startsWith(
- "attachment; filename="));
+ "attachment; filename="));
assertEquals(0, tester.getContentLengthFromResponseHeader());
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java Wed Apr 15 20:22:01 2009
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 1L;
@Override
- public boolean isVisible()
+ public boolean isVisible()
{
return getDefaultModelObject() != null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/XmlPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/XmlPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/XmlPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/XmlPage.java Wed Apr 15 20:22:01 2009
@@ -40,6 +40,7 @@
*
* @return string
*/
+ @Override
public String getMarkupType()
{
return "xml";
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage.java Wed Apr 15 20:22:01 2009
@@ -51,6 +51,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void populateItem(ListItem listItem)
{
String txt = (String)listItem.getDefaultModelObject();
@@ -62,7 +63,7 @@
PagingNavigationIncrementLink prev = new PagingNavigationIncrementLink("prev", table, -1);
add(prev);
PagingNavigationIncrementLink nextNext = new PagingNavigationIncrementLink("nextNext",
- table, +2);
+ table, +2);
add(nextNext);
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java Wed Apr 15 20:22:01 2009
@@ -45,15 +45,15 @@
public void testPagedTable() throws Exception
{
executeTest(IncrementalTableNavigationPage.class,
- "IncrementalTableNavigationPage_ExpectedResult_1.html");
+ "IncrementalTableNavigationPage_ExpectedResult_1.html");
Page page = tester.getLastRenderedPage();
Link link = (Link)page.get("nextNext");
executedListener(IncrementalTableNavigationPage.class, link,
- "IncrementalTableNavigationPage_ExpectedResult_1-1.html");
+ "IncrementalTableNavigationPage_ExpectedResult_1-1.html");
link = (Link)page.get("prev");
executedListener(IncrementalTableNavigationPage.class, link,
- "IncrementalTableNavigationPage_ExpectedResult_1-2.html");
+ "IncrementalTableNavigationPage_ExpectedResult_1-2.html");
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java Wed Apr 15 20:22:01 2009
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import junit.framework.TestCase;
+
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.tester.WicketTester;
@@ -32,8 +33,8 @@
/**
* Create a predefined ListView
*
- * @param modelListSize #
- * of elements to go into the list
+ * @param modelListSize
+ * # of elements to go into the list
* @return list view
*/
private ListView<Integer> createListView(final int modelListSize)
@@ -49,7 +50,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(final ListItem<Integer> listItem)
+ protected void populateItem(final ListItem<Integer> listItem)
{
// do nothing
}
@@ -61,7 +62,7 @@
*/
public void testListView()
{
- WicketTester tester = new WicketTester();
+ new WicketTester();
ListView<Integer> lv = createListView(4);
assertEquals(4, lv.getList().size());
@@ -99,7 +100,7 @@
*/
public void testEmptyListView()
{
- WicketTester tester = new WicketTester();
+ new WicketTester();
// Empty tables
ListView<?> lv = createListView(0);
@@ -114,7 +115,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(final ListItem<Void> listItem)
+ protected void populateItem(final ListItem<Void> listItem)
{
// do nothing
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorPage.java Wed Apr 15 20:22:01 2009
@@ -51,6 +51,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void populateItem(ListItem listItem)
{
String txt = (String)listItem.getDefaultModelObject();
@@ -65,6 +66,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
// for testing we set versioning off, because it gets too difficult to maintain otherwise
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java Wed Apr 15 20:22:01 2009
@@ -62,7 +62,7 @@
String document = application.getServletResponse().getDocument();
application.setupRequestAndResponse();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorExpectedResult_1.html", true);
+ "PagedTableNavigatorExpectedResult_1.html", true);
Link link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -82,7 +82,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorExpectedResult_2.html", true);
+ "PagedTableNavigatorExpectedResult_2.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -102,7 +102,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorExpectedResult_3.html", true);
+ "PagedTableNavigatorExpectedResult_3.html", true);
link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -122,7 +122,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorExpectedResult_4.html", true);
+ "PagedTableNavigatorExpectedResult_4.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -142,7 +142,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorExpectedResult_5.html", true);
+ "PagedTableNavigatorExpectedResult_5.html", true);
link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -162,7 +162,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorExpectedResult_6.html", true);
+ "PagedTableNavigatorExpectedResult_6.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -182,7 +182,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorExpectedResult_7.html", true);
+ "PagedTableNavigatorExpectedResult_7.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -208,7 +208,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorExpectedResult_8.html", true);
+ "PagedTableNavigatorExpectedResult_8.html", true);
application.destroy();
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderPage.java Wed Apr 15 20:22:01 2009
@@ -62,6 +62,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void populateItem(ListItem listItem)
{
String txt = (String)listItem.getDefaultModelObject();
@@ -95,6 +96,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
// for testing we set versioning off, because it gets too difficult to
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java Wed Apr 15 20:22:01 2009
@@ -56,11 +56,10 @@
{
WicketTester application = new WicketTester();
application.startPage(PagedTableNavigatorWithLabelProviderPage.class);
- PagedTableNavigatorWithLabelProviderPage page = (PagedTableNavigatorWithLabelProviderPage)application
- .getLastRenderedPage();
+ PagedTableNavigatorWithLabelProviderPage page = (PagedTableNavigatorWithLabelProviderPage)application.getLastRenderedPage();
String document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithLabelProviderExpectedResult_1.html", true);
+ "PagedTableNavigatorWithLabelProviderExpectedResult_1.html", true);
Link link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -80,7 +79,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithLabelProviderExpectedResult_2.html", true);
+ "PagedTableNavigatorWithLabelProviderExpectedResult_2.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -100,7 +99,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithLabelProviderExpectedResult_3.html", true);
+ "PagedTableNavigatorWithLabelProviderExpectedResult_3.html", true);
link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -120,7 +119,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithLabelProviderExpectedResult_4.html", true);
+ "PagedTableNavigatorWithLabelProviderExpectedResult_4.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -140,7 +139,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithLabelProviderExpectedResult_5.html", true);
+ "PagedTableNavigatorWithLabelProviderExpectedResult_5.html", true);
link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -160,7 +159,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithLabelProviderExpectedResult_6.html", true);
+ "PagedTableNavigatorWithLabelProviderExpectedResult_6.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -180,7 +179,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithLabelProviderExpectedResult_7.html", true);
+ "PagedTableNavigatorWithLabelProviderExpectedResult_7.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginPage.java Wed Apr 15 20:22:01 2009
@@ -60,6 +60,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void populateItem(ListItem listItem)
{
String txt = (String)listItem.getDefaultModelObject();
@@ -76,8 +77,9 @@
* @see org.apache.wicket.markup.html.navigation.paging.PagingNavigator#newNavigation(org.apache.wicket.markup.html.navigation.paging.IPageable,
* org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider)
*/
+ @Override
protected PagingNavigation newNavigation(IPageable pageable,
- IPagingLabelProvider labelProvider)
+ IPagingLabelProvider labelProvider)
{
PagingNavigation nav = new PagingNavigation("navigation", pageable);
nav.setMargin(2);
@@ -95,6 +97,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
// for testing we set versioning off, because it gets too difficult to maintain otherwise
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java Wed Apr 15 20:22:01 2009
@@ -56,11 +56,10 @@
{
WicketTester application = new WicketTester();
application.startPage(PagedTableNavigatorWithMarginPage.class);
- PagedTableNavigatorWithMarginPage page = (PagedTableNavigatorWithMarginPage)application
- .getLastRenderedPage();
+ PagedTableNavigatorWithMarginPage page = (PagedTableNavigatorWithMarginPage)application.getLastRenderedPage();
String document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithMarginExpectedResult_1.html", true);
+ "PagedTableNavigatorWithMarginExpectedResult_1.html", true);
Link link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -80,7 +79,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithMarginExpectedResult_2.html", true);
+ "PagedTableNavigatorWithMarginExpectedResult_2.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -100,7 +99,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithMarginExpectedResult_3.html", true);
+ "PagedTableNavigatorWithMarginExpectedResult_3.html", true);
link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -120,7 +119,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithMarginExpectedResult_4.html", true);
+ "PagedTableNavigatorWithMarginExpectedResult_4.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -140,7 +139,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithMarginExpectedResult_5.html", true);
+ "PagedTableNavigatorWithMarginExpectedResult_5.html", true);
link = (Link)page.get("navigator:first");
assertFalse(link.isEnabled());
@@ -160,7 +159,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithMarginExpectedResult_6.html", true);
+ "PagedTableNavigatorWithMarginExpectedResult_6.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
@@ -180,7 +179,7 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
- "PagedTableNavigatorWithMarginExpectedResult_7.html", true);
+ "PagedTableNavigatorWithMarginExpectedResult_7.html", true);
link = (Link)page.get("navigator:first");
assertTrue(link.isEnabled());
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java Wed Apr 15 20:22:01 2009
@@ -45,6 +45,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void populateItem(ListItem listItem)
{
String txt = (String)listItem.getDefaultModelObject();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java Wed Apr 15 20:22:01 2009
@@ -93,19 +93,18 @@
html.addExpectedChild(body);
Tag ulTable = new Tag("ul");
- ulTable.addExpectedChild(new Tag("li").addExpectedChild(new Tag("span")
- .addExpectedChild(new TextContent("one"))));
- ulTable.addExpectedChild(new Tag("li").addExpectedChild(new Tag("span")
- .addExpectedChild(new TextContent("two"))));
+ ulTable.addExpectedChild(new Tag("li").addExpectedChild(new Tag("span").addExpectedChild(new TextContent(
+ "one"))));
+ ulTable.addExpectedChild(new Tag("li").addExpectedChild(new Tag("span").addExpectedChild(new TextContent(
+ "two"))));
// note that we DO NOT expect the third element as this is not on the current page
body.addExpectedChild(ulTable);
Tag ulNav = new Tag("ul");
- ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("span")
- .addExpectedChild(new Tag("em").addExpectedChild(new Tag("span")
- .addExpectedChild(new TextContent("1"))))));
- ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("a")
- .addExpectedChild(new Tag("span").addExpectedChild(new TextContent("2")))));
+ ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("span").addExpectedChild(new Tag(
+ "em").addExpectedChild(new Tag("span").addExpectedChild(new TextContent("1"))))));
+ ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("a").addExpectedChild(new Tag(
+ "span").addExpectedChild(new TextContent("2")))));
body.addExpectedChild(ulNav);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_1.java Wed Apr 15 20:22:01 2009
@@ -44,6 +44,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void populateItem(ListItem listItem)
{
String txt = (String)listItem.getDefaultModelObject();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePage_2.java Wed Apr 15 20:22:01 2009
@@ -44,6 +44,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void populateItem(ListItem listItem)
{
String txt = (String)listItem.getDefaultModelObject();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java Wed Apr 15 20:22:01 2009
@@ -52,8 +52,8 @@
assertNotNull(document);
assertFalse("".equals(document));
assertEquals(
- "<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>",
- document);
+ "<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>",
+ document);
// Does re-render do as well ??
ListItem item = (ListItem)tester.getLastRenderedPage().get("table:0");
@@ -91,8 +91,8 @@
assertNotNull(document);
assertFalse("".equals(document));
assertEquals(
- "<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>",
- document);
+ "<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>",
+ document);
// Does re-render do as well ??
view = (ListView)tester.getLastRenderedPage().get("table");
@@ -102,7 +102,7 @@
assertNotNull(document);
assertFalse("".equals(document));
assertEquals(
- "<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>",
- document);
+ "<li wicket:id=\"table\"><span wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span wicket:id=\"txt\">three</span></li>",
+ document);
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/TableTest.java Wed Apr 15 20:22:01 2009
@@ -61,7 +61,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(final ListItem<Integer> listItem)
+ protected void populateItem(final ListItem<Integer> listItem)
{
// do nothing
}
@@ -119,7 +119,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(final ListItem<Void> listItem)
+ protected void populateItem(final ListItem<Void> listItem)
{
// do nothing
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java Wed Apr 15 20:22:01 2009
@@ -43,6 +43,7 @@
*
* @throws Exception
*/
+ @Override
public void setUp() throws Exception
{
super.setUp();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestCase.java Wed Apr 15 20:22:01 2009
@@ -27,12 +27,14 @@
{
private WicketTester tester;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
tester = new WicketTester();
}
+ @Override
protected void tearDown() throws Exception
{
super.tearDown();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java Wed Apr 15 20:22:01 2009
@@ -57,6 +57,7 @@
super(id, markupId);
}
+ @Override
protected MarkupStream chooseMarkupStream(MarkupStream markupStream)
{
return getAssociatedMarkupStream(false);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java Wed Apr 15 20:22:01 2009
@@ -146,7 +146,7 @@
public void testPanelWithAttributeModifier() throws Exception
{
executeTest(PanelWithAttributeModifierPage.class,
- "PanelWithAttributeModifierPageExpectedResult_1.html");
+ "PanelWithAttributeModifierPageExpectedResult_1.html");
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java Wed Apr 15 20:22:01 2009
@@ -38,6 +38,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception
{
super.setUp();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java Wed Apr 15 20:22:01 2009
@@ -129,39 +129,37 @@
public final void testEncoding() throws Exception
{
final XmlPullParser parser = new XmlPullParser();
- parser.parse(new StringResourceStream("<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>")
- .getInputStream(), null);
+ parser.parse(
+ new StringResourceStream("<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>").getInputStream(),
+ null);
assertEquals("iso-8859-1", parser.getEncoding());
XmlTag tag = (XmlTag)parser.nextTag();
assertNull(tag);
parser.parse(new StringResourceStream(
- "<?xml version=\"1.0\" encoding='iso-8859-1' ?> test test").getInputStream(), null);
+ "<?xml version=\"1.0\" encoding='iso-8859-1' ?> test test").getInputStream(), null);
assertEquals("iso-8859-1", parser.getEncoding());
tag = (XmlTag)parser.nextTag();
assertNull(tag);
// re-order and move close (remove whitespaces
- parser
- .parse(new StringResourceStream(
- " <?xml encoding='iso-8859-1'version=\"1.0\"?> test test")
- .getInputStream(), null);
+ parser.parse(new StringResourceStream(
+ " <?xml encoding='iso-8859-1'version=\"1.0\"?> test test").getInputStream(), null);
assertEquals("iso-8859-1", parser.getEncoding());
tag = (XmlTag)parser.nextTag();
assertNull(tag);
// attribute value must be enclosed by ""
- parser.parse(new StringResourceStream("<?xml encoding=iso-8859-1 ?> test test")
- .getInputStream(), null);
+ parser.parse(
+ new StringResourceStream("<?xml encoding=iso-8859-1 ?> test test").getInputStream(),
+ null);
assertEquals("iso-8859-1", parser.getEncoding());
// Invaluid encoding
Exception ex = null;
try
{
- parser
- .parse(new StringResourceStream("<?xml encoding='XXX' ?>").getInputStream(),
- null);
+ parser.parse(new StringResourceStream("<?xml encoding='XXX' ?>").getInputStream(), null);
}
catch (UnsupportedEncodingException e)
{
@@ -171,16 +169,17 @@
// no extra characters allowed before <?xml>
// TODO General: I'd certainly prefer an exception
- parser.parse(new StringResourceStream("xxxx <?xml encoding='iso-8859-1' ?>")
- .getInputStream(), null);
+ parser.parse(
+ new StringResourceStream("xxxx <?xml encoding='iso-8859-1' ?>").getInputStream(), null);
assertNull(parser.getEncoding());
tag = (XmlTag)parser.nextTag();
assertNull(tag);
// no extra characters allowed before <?xml>
// Are comments allowed preceding the encoding string?
- parser.parse(new StringResourceStream("<!-- Comment --> <?xml encoding='iso-8859-1' ?>")
- .getInputStream(), null);
+ parser.parse(
+ new StringResourceStream("<!-- Comment --> <?xml encoding='iso-8859-1' ?>").getInputStream(),
+ null);
assertNull(parser.getEncoding());
tag = (XmlTag)parser.nextTag();
assertNull(tag);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java Wed Apr 15 20:22:01 2009
@@ -148,7 +148,7 @@
{
executeTest(HeaderSectionPage_12.class, "HeaderSectionPageExpectedResult_12.html");
PackageResource res = (PackageResource)tester.getApplication().getSharedResources().get(
- "org.apache.wicket.markup.parser.filter.sub.HeaderSectionBorder/cborder.css");
+ "org.apache.wicket.markup.parser.filter.sub.HeaderSectionBorder/cborder.css");
assertNotNull(res);
String absPath = res.getAbsolutePath();
assertNotNull(absPath);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/PropertyModelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/PropertyModelTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/PropertyModelTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/PropertyModelTest.java Wed Apr 15 20:22:01 2009
@@ -67,8 +67,8 @@
}
/**
- * Tests setting a value on a {@link PropertyModel} when a property is <code>null</code> and
- * an interface type. This should end in an exception because Wicket can't decide what to
+ * Tests setting a value on a {@link PropertyModel} when a property is <code>null</code> and an
+ * interface type. This should end in an exception because Wicket can't decide what to
* instantiate on behalf of the program.
*/
public void testSetWithNullPathInterface()
@@ -87,8 +87,8 @@
}
/**
- * Tests setting a value on a {@link PropertyModel} when a property is <code>null</code> and
- * an abstract class type. This should end in an exception because Wicket can't decide what to
+ * Tests setting a value on a {@link PropertyModel} when a property is <code>null</code> and an
+ * abstract class type. This should end in an exception because Wicket can't decide what to
* instantiate on behalf of the program.
*/
public void testSetWithNullPathAbstract()
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ResourceModelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ResourceModelTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ResourceModelTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ResourceModelTest.java Wed Apr 15 20:22:01 2009
@@ -28,7 +28,8 @@
/**
* Test page.
*/
- public static class TestPage extends WebPage {
+ public static class TestPage extends WebPage
+ {
private static final long serialVersionUID = 1L;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java Wed Apr 15 20:22:01 2009
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Wed Apr 15 20:22:01 2009
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java Wed Apr 15 20:22:01 2009
@@ -39,11 +39,13 @@
super(name);
}
+ @Override
protected void setUp() throws Exception
{
tester = new WicketTester(new MyApplication());
}
+ @Override
protected void tearDown() throws Exception
{
tester.destroy();
@@ -81,6 +83,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
public String getVariation()
{
return "mystyle";
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java Wed Apr 15 20:22:01 2009
@@ -32,10 +32,12 @@
*/
public class FilePageStoreTest extends WicketTestCase
{
+ @Override
protected void setUp() throws Exception
{
tester = new WicketTester(new DummyApplication()
{
+ @Override
protected ISessionStore newSessionStore()
{
return new SecondLevelCacheSessionStore(this, new DiskPageStore());
@@ -54,7 +56,7 @@
tester.setupRequestAndResponse();
- Session session = Session.get();
+ Session.get();
a.getPageMap().put(a);
a.getPageMap().put(b);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java Wed Apr 15 20:22:01 2009
@@ -20,6 +20,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+
import org.apache.wicket.Application;
import org.apache.wicket.Session;
import org.apache.wicket.feedback.FeedbackMessage;
@@ -36,7 +37,7 @@
/**
* Simple application that demonstrates the mock http application code (and checks that it is
* working)
- *
+ *
* @author Chris Turner
*/
public class MockWebApplicationTest extends TestCase
@@ -58,8 +59,9 @@
/**
* Create the test.
- *
- * @param name The test name
+ *
+ * @param name
+ * The test name
*/
public MockWebApplicationTest(String name)
{
@@ -90,7 +92,7 @@
DiffUtil.validatePage(document, getClass(), "MockPage_expectedResult.html", true);
// Inspect the page & model
- MockPage p = (MockPage) application.getLastRenderedPage();
+ MockPage p = (MockPage)application.getLastRenderedPage();
Assert.assertEquals("Link should have been clicked 0 times", 0, p.getLinkClickCount());
}
@@ -124,8 +126,8 @@
// Now request that we click the link
application.setupRequestAndResponse();
- MockPage p = (MockPage) application.getLastRenderedPage();
- Link<?> link = (Link<?>) p.get("actionLink");
+ MockPage p = (MockPage)application.getLastRenderedPage();
+ Link<?> link = (Link<?>)p.get("actionLink");
application.getServletRequest().setRequestToComponent(link);
application.processRequestCycle();
@@ -143,7 +145,7 @@
DiffUtil.validatePage(document, getClass(), "MockPage_expectedResult2.html", true);
// Inspect the page & model
- p = (MockPage) application.getLastRenderedPage();
+ p = (MockPage)application.getLastRenderedPage();
Assert.assertEquals("Link should have been clicked 1 time", 1, p.getLinkClickCount());
}
@@ -177,7 +179,9 @@
}
};
new MockWebApplication(wicketApplication, "foo");
- IResourceFinder resourceFinderInApplication = Application.get().getResourceSettings().getResourceFinder();
+ IResourceFinder resourceFinderInApplication = Application.get()
+ .getResourceSettings()
+ .getResourceFinder();
Assert.assertSame(customResourceFinder, resourceFinderInApplication);
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java Wed Apr 15 20:22:01 2009
@@ -35,6 +35,7 @@
*/
public class WebExternalResourceTest extends WicketTestCase
{
+ @Override
protected void setUp() throws Exception
{
File tempDir = new File("target/webapp");
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java Wed Apr 15 20:22:01 2009
@@ -42,12 +42,11 @@
params.add("a", "1");
params.add("a", "2");
BookmarkablePageRequestTarget requestTarget = new BookmarkablePageRequestTarget(
- MockPage.class, params);
+ MockPage.class, params);
app.setupRequestAndResponse();
CharSequence cs = wrcs.encode(app.createRequestCycle(), requestTarget);
- assertEquals(
- "?wicket:bookmarkablePage=:org.apache.wicket.protocol.http.MockPage&a=1&a=2", cs
- .toString());
+ assertEquals("?wicket:bookmarkablePage=:org.apache.wicket.protocol.http.MockPage&a=1&a=2",
+ cs.toString());
app.destroy();
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java Wed Apr 15 20:22:01 2009
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.protocol.http;
-import junit.framework.TestCase;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
-import java.util.Locale;
+
+import junit.framework.TestCase;
+
+import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
/**
* @author Timo Rantalaiho
@@ -32,6 +34,7 @@
final Locale locale = Locale.TRADITIONAL_CHINESE;
HttpServletRequest request = new MockHttpServletRequest(null, null, null)
{
+ @Override
public Locale getLocale()
{
return locale;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java Wed Apr 15 20:22:01 2009
@@ -49,12 +49,14 @@
super(name);
}
+ @Override
protected void setUp() throws Exception
{
super.setUp();
application = new WicketTester();
}
+ @Override
protected void tearDown() throws Exception
{
application.destroy();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketURLTest.java Wed Apr 15 20:22:01 2009
@@ -23,27 +23,27 @@
*/
public class WicketURLTest extends TestCase
{
- public void testPathEncoder()
- {
- assertEquals("+", WicketURLEncoder.PATH_INSTANCE.encode("+", "UTF-8"));
- assertEquals("%20", WicketURLEncoder.PATH_INSTANCE.encode(" ", "UTF-8"));
- }
+ public void testPathEncoder()
+ {
+ assertEquals("+", WicketURLEncoder.PATH_INSTANCE.encode("+", "UTF-8"));
+ assertEquals("%20", WicketURLEncoder.PATH_INSTANCE.encode(" ", "UTF-8"));
+ }
- public void testQueryEncoder()
- {
- assertEquals("+", WicketURLEncoder.QUERY_INSTANCE.encode(" ", "UTF-8"));
- assertEquals("%2B", WicketURLEncoder.QUERY_INSTANCE.encode("+", "UTF-8"));
- }
+ public void testQueryEncoder()
+ {
+ assertEquals("+", WicketURLEncoder.QUERY_INSTANCE.encode(" ", "UTF-8"));
+ assertEquals("%2B", WicketURLEncoder.QUERY_INSTANCE.encode("+", "UTF-8"));
+ }
- public void testPathDecoder()
- {
- assertEquals("+", WicketURLDecoder.PATH_INSTANCE.decode("+", "UTF-8"));
- assertEquals(" ", WicketURLDecoder.PATH_INSTANCE.decode("%20", "UTF-8"));
- }
+ public void testPathDecoder()
+ {
+ assertEquals("+", WicketURLDecoder.PATH_INSTANCE.decode("+", "UTF-8"));
+ assertEquals(" ", WicketURLDecoder.PATH_INSTANCE.decode("%20", "UTF-8"));
+ }
- public void testQueryDecoder()
- {
- assertEquals(" ", WicketURLDecoder.QUERY_INSTANCE.decode("+", "UTF-8"));
- assertEquals("+", WicketURLDecoder.QUERY_INSTANCE.decode("%2B", "UTF-8"));
- }
+ public void testQueryDecoder()
+ {
+ assertEquals(" ", WicketURLDecoder.QUERY_INSTANCE.decode("+", "UTF-8"));
+ assertEquals("+", WicketURLDecoder.QUERY_INSTANCE.decode("%2B", "UTF-8"));
+ }
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/PageWindowManagerTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/PageWindowManagerTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/PageWindowManagerTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/PageWindowManagerTest.java Wed Apr 15 20:22:01 2009
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.protocol.http.pagestore;
-import org.apache.wicket.protocol.http.pagestore.PageWindowManager.PageWindow;
-
import junit.framework.TestCase;
+import org.apache.wicket.protocol.http.pagestore.PageWindowManager.PageWindow;
+
/**
* @author Matej Knopp
*/
@@ -177,20 +177,20 @@
}
private void assertWindow(PageWindow window, int pageId, int versionNumber,
- int ajaxVersionNumber, int filePartOffset, int filePartSize)
+ int ajaxVersionNumber, int filePartOffset, int filePartSize)
{
assertTrue(window.getPageId() == pageId && window.getVersionNumber() == versionNumber &&
- window.getAjaxVersionNumber() == ajaxVersionNumber &&
- window.getFilePartOffset() == filePartOffset &&
- window.getFilePartSize() == filePartSize);
+ window.getAjaxVersionNumber() == ajaxVersionNumber &&
+ window.getFilePartOffset() == filePartOffset &&
+ window.getFilePartSize() == filePartSize);
}
private void assertWindow(PageWindow window, int pageId, int versionNumber,
- int ajaxVersionNumber)
+ int ajaxVersionNumber)
{
assertTrue(window.getPageId() == pageId && window.getVersionNumber() == versionNumber &&
- window.getAjaxVersionNumber() == ajaxVersionNumber);
+ window.getAjaxVersionNumber() == ajaxVersionNumber);
}
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=765341&r1=765340&r2=765341&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 Apr 15 20:22:01 2009
@@ -46,7 +46,7 @@
public void testWithMountedPackage()
{
tester.getApplication().mount("/test",
- PackageName.forPackage(ProtectedPage.class.getPackage()));
+ PackageName.forPackage(ProtectedPage.class.getPackage()));
tester.startPage(ProtectedPage.class);
tester.assertRenderedPage(LoginPage.class);
}
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=765341&r1=765340&r2=765341&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 Apr 15 20:22:01 2009
@@ -41,7 +41,9 @@
final boolean triggerError = parameters.getBoolean("trigger");
if (!triggerError)
+ {
throw new AbortWithWebErrorCodeException(1234, "this error will be rendered");
+ }
IModel<List<Object>> model = new LoadableDetachableModel<List<Object>>()
{
@@ -51,10 +53,14 @@
protected List<Object> load()
{
if (triggerError)
+ {
throw new AbortWithWebErrorCodeException(1234,
"this error will NOT be rendered");
+ }
else
+ {
return Collections.emptyList();
+ }
}
};