Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java Mon May 19 05:56:56 2008 @@ -24,11 +24,11 @@ /** * */ -public class Provider extends Panel +public class Provider extends Panel<Void> { private static final long serialVersionUID = 1L; - private Label fragmentContent; + private Label<String> fragmentContent; /** * Construct. @@ -38,10 +38,11 @@ public Provider(String id) { super(id); - add(new AjaxLink("ajaxRefresh") + add(new AjaxLink<Void>("ajaxRefresh") { private static final long serialVersionUID = 1L; + @Override public void onClick(AjaxRequestTarget target) { target.addComponent(fragmentContent); @@ -54,10 +55,10 @@ * @param container * @param id */ - public void addFragment(WebMarkupContainer container, String id) + public void addFragment(WebMarkupContainer<?> container, String id) { - Fragment fragment = new Fragment(id, "fragment", this); - fragmentContent = new Label("fragmentContent", "foo"); + Fragment<?> fragment = new Fragment<Void>(id, "fragment", this); + fragmentContent = new Label<String>("fragmentContent", "foo"); fragmentContent.setOutputMarkupId(true); fragment.add(fragmentContent); container.add(fragment);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java Mon May 19 05:56:56 2008 @@ -45,18 +45,19 @@ */ public Page_1() { - add(new Label("myLabel", "Test Label")); + add(new Label<String>("myLabel", "Test Label")); - MarkupContainer container = new NoopOutputTransformerContainer("test"); + MarkupContainer<?> container = new NoopOutputTransformerContainer<Void>("test"); add(container); - container.add(new Label("myLabel2", "Test Label2")); + container.add(new Label<String>("myLabel2", "Test Label2")); - MarkupContainer panelContainer = new AbstractOutputTransformerContainer("test2") + MarkupContainer<?> panelContainer = new AbstractOutputTransformerContainer<Void>("test2") { private static final long serialVersionUID = 1L; - public CharSequence transform(Component component, CharSequence output) + @Override + public CharSequence transform(Component<?> component, CharSequence output) { // replace the generated String return "Whatever"; @@ -64,15 +65,16 @@ }; add(panelContainer); - Panel panel = new Panel_1("myPanel"); + Panel<?> panel = new Panel_1("myPanel"); panel.setRenderBodyOnly(true); panelContainer.add(panel); - MarkupContainer borderContainer = new AbstractOutputTransformerContainer("test3") + MarkupContainer<?> borderContainer = new AbstractOutputTransformerContainer<Void>("test3") { private static final long serialVersionUID = 1L; - public CharSequence transform(Component component, CharSequence output) + @Override + public CharSequence transform(Component<?> component, CharSequence output) { // Convert all text to uppercase return output.toString().toUpperCase(); @@ -80,24 +82,24 @@ }; add(borderContainer); - Border border = new SimpleBorder("myBorder"); + Border<?> border = new SimpleBorder("myBorder"); borderContainer.add(border); - MarkupContainer xsltContainer = new XsltOutputTransformerContainer("test4"); + MarkupContainer<?> xsltContainer = new XsltOutputTransformerContainer<Void>("test4"); add(xsltContainer); - Border border2 = new SimpleBorder("myBorder2"); + Border<?> border2 = new SimpleBorder("myBorder2"); border2.setRenderBodyOnly(false); - border2.add(new AttributeModifier("testAttr", true, new Model("myValue"))); + border2.add(new AttributeModifier("testAttr", true, new Model<String>("myValue"))); xsltContainer.add(border2); - MarkupContainer xsltContainer2 = new XsltOutputTransformerContainer("test5", null, - "org/apache/wicket/markup/outputTransformer/anyName.xsl"); + MarkupContainer<?> xsltContainer2 = new XsltOutputTransformerContainer<Void>("test5", null, + "org/apache/wicket/markup/outputTransformer/anyName.xsl"); add(xsltContainer2); - Border border3 = new SimpleBorder("myBorder3"); + Border<?> border3 = new SimpleBorder("myBorder3"); border3.setRenderBodyOnly(false); - border3.add(new AttributeModifier("testAttr", true, new Model("myValue"))); + border3.add(new AttributeModifier("testAttr", true, new Model<String>("myValue"))); xsltContainer2.add(border3); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java Mon May 19 05:56:56 2008 @@ -45,18 +45,19 @@ */ public Page_2() { - add(new Label("myLabel", "Test Label")); + add(new Label<String>("myLabel", "Test Label")); - MarkupContainer container = new NoopOutputTransformerContainer("test"); + MarkupContainer<?> container = new NoopOutputTransformerContainer<Void>("test"); add(container); - container.add(new Label("myLabel2", "Test Label2")); + container.add(new Label<String>("myLabel2", "Test Label2")); - MarkupContainer panelContainer = new AbstractOutputTransformerContainer("test2") + MarkupContainer<?> panelContainer = new AbstractOutputTransformerContainer<Void>("test2") { private static final long serialVersionUID = 1L; - public CharSequence transform(Component component, CharSequence output) + @Override + public CharSequence transform(Component<?> component, CharSequence output) { // replace the generated String return "Whatever"; @@ -64,15 +65,16 @@ }; add(panelContainer); - Panel panel = new Panel_1("myPanel"); + Panel<?> panel = new Panel_1("myPanel"); panel.setRenderBodyOnly(true); panelContainer.add(panel); - MarkupContainer borderContainer = new AbstractOutputTransformerContainer("test3") + MarkupContainer<?> borderContainer = new AbstractOutputTransformerContainer<Void>("test3") { private static final long serialVersionUID = 1L; - public CharSequence transform(Component component, CharSequence output) + @Override + public CharSequence transform(Component<?> component, CharSequence output) { // Convert all text to uppercase return output.toString().toUpperCase(); @@ -80,12 +82,12 @@ }; add(borderContainer); - Border border = new SimpleBorder("myBorder"); + Border<?> border = new SimpleBorder("myBorder"); borderContainer.add(border); - Border border2 = new SimpleBorder("myBorder2"); + Border<?> border2 = new SimpleBorder("myBorder2"); border2.setRenderBodyOnly(false); - border2.add(new AttributeModifier("testAttr", true, new Model("myValue"))); + border2.add(new AttributeModifier("testAttr", true, new Model<String>("myValue"))); add(border2); border2.add(new XsltTransformerBehavior()); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java Mon May 19 05:56:56 2008 @@ -42,7 +42,7 @@ public void testCompoundPropertyModelDetach() { Detachable detachable = new Detachable(); - IModel model = new CompoundPropertyModel(detachable); + IModel<Detachable> model = new CompoundPropertyModel<Detachable>(detachable); model.detach(); assertTrue(detachable.detached); } @@ -50,10 +50,11 @@ /** * Performs the nested test for BoundCompoundPropertyModel. */ + @SuppressWarnings("deprecation") public void testBoundCompoundPropertyModelDetach() { Detachable detachable = new Detachable(); - IModel model = new BoundCompoundPropertyModel(detachable); + IModel<Detachable> model = new BoundCompoundPropertyModel<Detachable>(detachable); model.detach(); assertTrue(detachable.detached); } @@ -64,10 +65,11 @@ public void testAbstractPropertyModelDetach() { Detachable detachable = new Detachable(); - IModel model = new AbstractPropertyModel(detachable) + IModel<?> model = new AbstractPropertyModel<Void>(detachable) { private static final long serialVersionUID = 1L; + @Override protected String propertyExpression() { return null; @@ -83,7 +85,7 @@ public void testPropertyModelDetach() { Detachable detachable = new Detachable(); - IModel model = new PropertyModel(detachable, "foo"); + IModel<?> model = new PropertyModel<Void>(detachable, "foo"); model.detach(); assertTrue(detachable.detached); } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java Mon May 19 05:56:56 2008 @@ -33,6 +33,7 @@ */ private static class InnerPOJO { + @Override public String toString() { return "pojo"; @@ -42,24 +43,26 @@ /** * Test stub for testing AbstractReadOnlyModel.toString() */ - private static class MyAbstractReadOnlyModel extends AbstractReadOnlyModel + private static class MyAbstractReadOnlyModel extends AbstractReadOnlyModel<String> { private static final long serialVersionUID = 1L; /** * @see AbstractReadOnlyModel#getObject() */ - public Object getObject() + @Override + public String getObject() { return "FOO"; } } - private static final class MyLoadableDetachableModel extends LoadableDetachableModel + private static final class MyLoadableDetachableModel extends LoadableDetachableModel<String> { private static final long serialVersionUID = 1L; - protected Object load() + @Override + protected String load() { return "foo"; } @@ -80,7 +83,7 @@ */ public void testAbstractReadOnlyModel() { - AbstractReadOnlyModel model = new MyAbstractReadOnlyModel(); + AbstractReadOnlyModel<String> model = new MyAbstractReadOnlyModel(); String expected = "Model:classname=[" + model.getClass().getName() + "]"; assertEquals(expected, model.toString()); } @@ -88,15 +91,17 @@ /** * Tests the BoundCompoundPropertyModel.toString() method. */ + @SuppressWarnings("deprecation") public void testBoundCompoundPropertyModel() { - BoundCompoundPropertyModel emptyModel = new BoundCompoundPropertyModel(""); + BoundCompoundPropertyModel<String> emptyModel = new BoundCompoundPropertyModel<String>(""); String expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[]:bindings=[]"; assertEquals(expected, emptyModel.toString()); Properties properties = new Properties(); properties.put("name", "foo"); - BoundCompoundPropertyModel stringProperty = new BoundCompoundPropertyModel(properties); + BoundCompoundPropertyModel<String> stringProperty = new BoundCompoundPropertyModel<String>( + properties); expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[{name=foo}]:bindings=[]"; assertEquals(expected, stringProperty.toString()); @@ -106,18 +111,16 @@ assertEquals(expected, stringProperty.toString()); InnerPOJO innerPOJO = new InnerPOJO(); - BoundCompoundPropertyModel pojoProperty = new BoundCompoundPropertyModel(innerPOJO); + BoundCompoundPropertyModel<InnerPOJO> pojoProperty = new BoundCompoundPropertyModel<InnerPOJO>( + innerPOJO); expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" + - innerPOJO + "]:bindings=[]"; + innerPOJO + "]:bindings=[]"; assertEquals(expected, pojoProperty.toString()); - Component component1 = pojoProperty.bind(new Label("label")); + Component<?> component1 = pojoProperty.bind(new Label<Object>("label")); expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" + - innerPOJO + - "]:bindings=[Binding(:component=[" + - component1 + - "]:expression=[label])]"; + innerPOJO + "]:bindings=[Binding(:component=[" + component1 + "]:expression=[label])]"; assertEquals(expected, pojoProperty.toString()); } @@ -126,13 +129,14 @@ */ public void testCompoundPropertyModel() { - CompoundPropertyModel emptyModel = new CompoundPropertyModel(""); + CompoundPropertyModel<?> emptyModel = new CompoundPropertyModel<String>(""); String expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[]"; assertEquals(expected, emptyModel.toString()); Properties properties = new Properties(); properties.put("name", "foo"); - CompoundPropertyModel stringProperty = new CompoundPropertyModel(properties); + CompoundPropertyModel<Properties> stringProperty = new CompoundPropertyModel<Properties>( + properties); expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[{name=foo}]"; assertEquals(expected, stringProperty.toString()); @@ -142,10 +146,11 @@ assertEquals(expected, stringProperty.toString()); InnerPOJO innerPOJO = new InnerPOJO(); - CompoundPropertyModel pojoProperty = new CompoundPropertyModel(innerPOJO); + CompoundPropertyModel<InnerPOJO> pojoProperty = new CompoundPropertyModel<InnerPOJO>( + innerPOJO); expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[" + - innerPOJO + "]"; + innerPOJO + "]"; assertEquals(expected, pojoProperty.toString()); } @@ -154,19 +159,19 @@ */ public void testLoadableDetachableModel() { - LoadableDetachableModel model = new MyLoadableDetachableModel(); + LoadableDetachableModel<String> model = new MyLoadableDetachableModel(); String expected = "Model:classname=[" + model.getClass().getName() + "]" + - ":attached=false" + ":tempModelObject=[null]"; + ":attached=false" + ":tempModelObject=[null]"; assertEquals(expected, model.toString()); model.getObject(); expected = "Model:classname=[" + model.getClass().getName() + "]" + ":attached=true" + - ":tempModelObject=[foo]"; + ":tempModelObject=[foo]"; assertEquals(expected, model.toString()); model.detach(); expected = "Model:classname=[" + model.getClass().getName() + "]" + ":attached=false" + - ":tempModelObject=[null]"; + ":tempModelObject=[null]"; assertEquals(expected, model.toString()); } @@ -176,11 +181,11 @@ */ public void testModel() { - Model emptyModel = new Model(); + Model<?> emptyModel = new Model<String>(); String expected = "Model:classname=[org.apache.wicket.model.Model]:object=[null]"; assertEquals(expected, emptyModel.toString()); - Model stringModel = new Model("foo"); + Model<String> stringModel = new Model<String>("foo"); expected = "Model:classname=[org.apache.wicket.model.Model]:object=[foo]"; assertEquals(expected, stringModel.toString()); } @@ -190,13 +195,13 @@ */ public void testPropertyModel() { - PropertyModel emptyModel = new PropertyModel("", null); + PropertyModel<Void> emptyModel = new PropertyModel<Void>("", null); String expected = "Model:classname=[org.apache.wicket.model.PropertyModel]:nestedModel=[]:expression=[null]"; assertEquals(expected, emptyModel.toString()); Properties properties = new Properties(); properties.put("name", "foo"); - PropertyModel stringProperty = new PropertyModel(properties, "name"); + PropertyModel<String> stringProperty = new PropertyModel<String>(properties, "name"); expected = "Model:classname=[org.apache.wicket.model.PropertyModel]:nestedModel=[{name=foo}]:expression=[name]"; assertEquals(expected, stringProperty.toString()); @@ -206,7 +211,7 @@ assertEquals(expected, stringProperty.toString()); InnerPOJO innerPOJO = new InnerPOJO(); - PropertyModel pojoProperty = new PropertyModel(innerPOJO, "pojo"); + PropertyModel<?> pojoProperty = new PropertyModel<Object>(innerPOJO, "pojo"); expected = "Model:classname=[org.apache.wicket.model.PropertyModel]:nestedModel=[pojo]:expression=[pojo]"; assertEquals(expected, pojoProperty.toString()); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.java Mon May 19 05:56:56 2008 @@ -35,16 +35,18 @@ public TestErrorPage() { - add(new AjaxLink("link") + add(new AjaxLink<Void>("link") { private static final long serialVersionUID = 1L; + @Override public void onClick(AjaxRequestTarget target) { clicked = true; target.addComponent(this); } + @Override protected void onAfterRender() { super.onAfterRender(); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/TestExpirePage.java Mon May 19 05:56:56 2008 @@ -33,10 +33,11 @@ public TestExpirePage() { - add(new AjaxLink("link") + add(new AjaxLink<Void>("link") { private static final long serialVersionUID = 1L; + @Override public void onClick(AjaxRequestTarget target) { target.addComponent(this); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java Mon May 19 05:56:56 2008 @@ -36,9 +36,9 @@ public void testBufferedExceptionErrorPage() { tester.getApplication().getRequestCycleSettings().setRenderStrategy( - IRequestCycleSettings.REDIRECT_TO_BUFFER); + IRequestCycleSettings.REDIRECT_TO_BUFFER); tester.getApplication().getExceptionSettings().setUnexpectedExceptionDisplay( - IExceptionSettings.SHOW_EXCEPTION_PAGE); + IExceptionSettings.SHOW_EXCEPTION_PAGE); testInternalErrorPage(); } @@ -48,7 +48,7 @@ public void testExceptionErrorPage() { tester.getApplication().getExceptionSettings().setUnexpectedExceptionDisplay( - IExceptionSettings.SHOW_EXCEPTION_PAGE); + IExceptionSettings.SHOW_EXCEPTION_PAGE); testInternalErrorPage(); } @@ -58,7 +58,7 @@ public void testExpirePage() { tester.startPage(TestExpirePage.class); - AjaxLink link = (AjaxLink)tester.getComponentFromLastRenderedPage("link"); + AjaxLink<?> link = (AjaxLink<?>)tester.getComponentFromLastRenderedPage("link"); // Cannot use executeAjaxEvent or onClick because WicketTester creates // an AjaxRequestTarget from scratch @@ -73,7 +73,7 @@ // Invoke the call back URL of the ajax event behavior String callbackUrl = ((AjaxEventBehavior)link.getBehaviors().get(0)).getCallbackUrl() - .toString(); + .toString(); tester.setupRequestAndResponse(); // Fake an Ajax request @@ -97,7 +97,7 @@ public void testInternalErrorPage() { tester.startPage(TestErrorPage.class); - AjaxLink link = (AjaxLink)tester.getComponentFromLastRenderedPage("link"); + AjaxLink<?> link = (AjaxLink<?>)tester.getComponentFromLastRenderedPage("link"); // Cannot use executeAjaxEvent or onClick because WicketTester creates // an AjaxRequestTarget from scratch @@ -109,7 +109,8 @@ // Invoke the call back URL of the ajax event behavior String callbackUrl = ((AjaxEventBehavior)link.getBehaviors().get(0)).getCallbackUrl() - .toString().replaceAll("&", "&"); + .toString() + .replaceAll("&", "&"); tester.setupRequestAndResponse(); // Fake an Ajax request (tester.getServletRequest()).addHeader("Wicket-Ajax", "Yes"); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java Mon May 19 05:56:56 2008 @@ -50,13 +50,13 @@ private boolean block = true; - public boolean isActionAuthorized(Component< ? > component, Action action) + public boolean isActionAuthorized(Component<?> component, Action action) { return true; } public boolean isInstantiationAuthorized( - Class< ? extends Component> componentClass) + Class<? extends Component<?>> componentClass) { if (block && (componentClass == TargetPage.class || componentClass == HomePage.class)) @@ -71,7 +71,7 @@ } @Override - public Class< ? extends Page< ? >> getHomePage() + public Class<? extends Page<?>> getHomePage() { return HomePage.class; } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java Mon May 19 05:56:56 2008 @@ -47,20 +47,22 @@ */ public TestPage(PageParameters pars) { - add(new AjaxLink("ajax") + add(new AjaxLink<Void>("ajax") { private static final long serialVersionUID = 1L; + @Override public void onClick(AjaxRequestTarget target) { getSession().bind(); target.addComponent(this); } }.setOutputMarkupId(true)); - add(new Link("link") + add(new Link<Void>("link") { private static final long serialVersionUID = 1L; + @Override public void onClick() { getSession().invalidate(); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndCheckGroup.java Mon May 19 05:56:56 2008 @@ -17,6 +17,7 @@ package org.apache.wicket.util.tester; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -38,28 +39,30 @@ { private static final long serialVersionUID = 1L; - private List selected = new ArrayList(); + private List<Integer> selected = new ArrayList<Integer>(); /** * Construct. */ public MockPageWithFormAndCheckGroup() { - Form form = new Form("form"); + Form<?> form = new Form<Void>("form"); add(form); - CheckGroup checkGroup = new CheckGroup("checkGroup", new PropertyModel(this, "selected")); + CheckGroup<Integer> checkGroup = new CheckGroup<Integer>("checkGroup", + new PropertyModel<Collection<Integer>>(this, "selected")); form.add(checkGroup); - checkGroup.add(new Check("check1", new Model(new Integer(1)))); - checkGroup.add(new Check("check2", new Model(new Integer(2)))); + checkGroup.add(new Check<Integer>("check1", new Model<Integer>(1))); + checkGroup.add(new Check<Integer>("check2", new Model<Integer>(2))); - add(new AjaxSubmitLink("submitLink", form) + add(new AjaxSubmitLink<Void>("submitLink", form) { private static final long serialVersionUID = 1L; - protected void onSubmit(AjaxRequestTarget target, Form form) + @Override + protected void onSubmit(AjaxRequestTarget target, Form<?> form) { } }); @@ -68,7 +71,7 @@ /** * @return selected */ - public List getSelected() + public List<Integer> getSelected() { return selected; } @@ -76,7 +79,7 @@ /** * @param selected */ - public void setSelected(List selected) + public void setSelected(List<Integer> selected) { this.selected = selected; } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Mon May 19 05:56:56 2008 @@ -51,12 +51,14 @@ private boolean eventExecuted; private WicketTester tester; + @Override protected void setUp() throws Exception { eventExecuted = false; tester = new WicketTester(new MyMockApplication()); } + @Override protected void tearDown() throws Exception { tester.destroy(); @@ -74,7 +76,7 @@ { private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { Book mockBook = new Book("xxId", "xxName"); return new ViewBook(mockBook); @@ -143,7 +145,7 @@ { private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { Book mockBook = new Book("xxId", "xxName"); return new ViewBook(mockBook); @@ -162,7 +164,7 @@ public void testPageConstructor() throws Exception { Book mockBook = new Book("xxId", "xxName"); - Page page = new ViewBook(mockBook); + Page<?> page = new ViewBook(mockBook); tester.startPage(page); // assertion @@ -191,18 +193,20 @@ */ public void testAssertComponentOnAjaxResponse() { - final Page page = new MockPageWithLink(); - AjaxLink ajaxLink = new AjaxLink(MockPageWithLink.LINK_ID) + final Page<?> page = new MockPageWithLink(); + AjaxLink<?> ajaxLink = new AjaxLink<Void>(MockPageWithLink.LINK_ID) { private static final long serialVersionUID = 1L; + @Override public void onClick(AjaxRequestTarget target) { // Replace the link with a normal Link - Link link = new Link(MockPageWithLink.LINK_ID) + Link<?> link = new Link<Void>(MockPageWithLink.LINK_ID) { private static final long serialVersionUID = 1L; + @Override public void onClick() { // Do nothing @@ -223,7 +227,7 @@ { private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { return page; } @@ -237,7 +241,7 @@ tester.assertComponent(MockPageWithLink.LINK_ID, Link.class); // Get the new link component - Component component = tester.getComponentFromLastRenderedPage(MockPageWithLink.LINK_ID); + Component<?> component = tester.getComponentFromLastRenderedPage(MockPageWithLink.LINK_ID); // This must not fail tester.assertComponentOnAjaxResponse(component); @@ -251,11 +255,12 @@ // Setup mocks final MockPageWithOneComponent page = new MockPageWithOneComponent(); - Label label = new Label("component", "Dblclick This To See Magick"); + Label<String> label = new Label<String>("component", "Dblclick This To See Magick"); label.add(new AjaxEventBehavior("ondblclick") { private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { eventExecuted = true; @@ -268,7 +273,7 @@ { private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { return page; } @@ -299,26 +304,25 @@ tester.startPage(MockPageWithFormAndAjaxFormSubmitBehavior.class); // Get the page - MockPageWithFormAndAjaxFormSubmitBehavior page = (MockPageWithFormAndAjaxFormSubmitBehavior)tester - .getLastRenderedPage(); + MockPageWithFormAndAjaxFormSubmitBehavior page = (MockPageWithFormAndAjaxFormSubmitBehavior)tester.getLastRenderedPage(); Pojo pojo = page.getPojo(); assertEquals("Mock name", pojo.getName()); - assertEquals("Mock name", ((TextField)tester.getComponentFromLastRenderedPage("form" + - Component.PATH_SEPARATOR + "name")).getValue()); + assertEquals("Mock name", ((TextField<?>)tester.getComponentFromLastRenderedPage("form" + + Component.PATH_SEPARATOR + "name")).getValue()); assertFalse(page.isExecuted()); // Execute the ajax event tester.executeAjaxEvent(MockPageWithFormAndAjaxFormSubmitBehavior.EVENT_COMPONENT, - "onclick"); + "onclick"); assertTrue("AjaxFormSubmitBehavior.onSubmit() has not been executed in " + - MockPageWithFormAndAjaxFormSubmitBehavior.class, page.isExecuted()); + MockPageWithFormAndAjaxFormSubmitBehavior.class, page.isExecuted()); - assertEquals("Mock name", ((TextField)tester.getComponentFromLastRenderedPage("form" + - Component.PATH_SEPARATOR + "name")).getValue()); + assertEquals("Mock name", ((TextField<?>)tester.getComponentFromLastRenderedPage("form" + + Component.PATH_SEPARATOR + "name")).getValue()); // The name of the pojo should still be the same. If the // executeAjaxEvent weren't submitting the form the name would have been @@ -359,7 +363,7 @@ { tester.startPage(BlockedResourceLinkPage.class); fail("Accessing " + BlockedResourceLinkPage.class + " should have raised a " + - PackageResourceBlockedException.class); + PackageResourceBlockedException.class); } catch (PackageResourceBlockedException e) { @@ -374,9 +378,11 @@ IRequestTargetUrlCodingStrategy getRequestCodingStrategy() { String relativePath = tester.getApplication().getWicketFilter().getRelativePath( - tester.getServletRequest()); - return tester.getApplication().getRequestCycleProcessor().getRequestCodingStrategy() - .urlCodingStrategyForPath(relativePath); + tester.getServletRequest()); + return tester.getApplication() + .getRequestCycleProcessor() + .getRequestCodingStrategy() + .urlCodingStrategyForPath(relativePath); } /** @@ -385,7 +391,7 @@ public void testToggleButtonEnabledState() { tester.startPage(MockFormPage.class); - Component submit = tester.getComponentFromLastRenderedPage("form:submit"); + Component<?> submit = tester.getComponentFromLastRenderedPage("form:submit"); assertTrue(submit.isEnabled()); tester.createRequestCycle(); submit.setEnabled(false); @@ -398,7 +404,7 @@ public void testToggleAjaxFormButton() { tester.startPage(new MockAjaxFormPage()); - Button submit = getSubmitButton(); + Button<?> submit = getSubmitButton(); assertFalse(submit.isEnabled()); FormTester form = tester.newFormTester("form"); @@ -419,13 +425,13 @@ private void setTextFieldAndAssertSubmit(boolean expected) { tester.executeAjaxEvent("form:text", "onkeyup"); - Button submit = getSubmitButton(); + Button<?> submit = getSubmitButton(); // System.out.println(Session.get().getFeedbackMessages()); assertEquals(expected, submit.isEnabled()); } - private Button getSubmitButton() + private Button<?> getSubmitButton() { - return (Button)tester.getComponentFromLastRenderedPage("form:submit"); + return (Button<?>)tester.getComponentFromLastRenderedPage("form:submit"); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/ChoicePage.java Mon May 19 05:56:56 2008 @@ -16,6 +16,7 @@ */ package org.apache.wicket.util.tester.apps_3; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -63,22 +64,22 @@ public boolean checkBox; /** test CheckGroup initial value */ - public List initialCheckGroup = new ArrayList(); + public List<Book> initialCheckGroup = new ArrayList<Book>(); /** test ListMultipleChoice initial values */ - public List initialListMultipleChoice = new ArrayList(); + public List<Book> initialListMultipleChoice = new ArrayList<Book>(); /** test CheckBoxMultipleChoice initial values */ - public List initialCheckBoxMultipleChoice = new ArrayList(); + public List<Book> initialCheckBoxMultipleChoice = new ArrayList<Book>(); /** test CheckBoxMultipleChoice */ - public List checkBoxMultipleChoice = new ArrayList(); + public List<Book> checkBoxMultipleChoice = new ArrayList<Book>(); /** test CheckGroup */ - public List checkGroup = new ArrayList(); + public List<Book> checkGroup = new ArrayList<Book>(); /** test ListMultipleChoice */ - public List listMultipleChoice = new ArrayList(); + public List<Book> listMultipleChoice = new ArrayList<Book>(); /** test multiple button */ public boolean anotherButtonPressed; @@ -88,19 +89,19 @@ * * @param candidateChoices */ - public ChoicePage(List candidateChoices) + public ChoicePage(List<Book> candidateChoices) { - ChoiceRenderer bookChoiceRenderer = new ChoiceRenderer("name", "id"); + ChoiceRenderer<Book> bookChoiceRenderer = new ChoiceRenderer<Book>("name", "id"); - Form form = new Form("choiceForm"); + Form<ChoicePage> form = new Form<ChoicePage>("choiceForm"); add(form); - form.setModel(new CompoundPropertyModel(this)); + form.setModel(new CompoundPropertyModel<ChoicePage>(this)); // setting initial values - dropDownChoice = (Book)candidateChoices.get(1); - listChoice = (Book)candidateChoices.get(3); - radioChoice = (Book)candidateChoices.get(2); + dropDownChoice = candidateChoices.get(1); + listChoice = candidateChoices.get(3); + radioChoice = candidateChoices.get(2); checkBox = true; initialListMultipleChoice.add(candidateChoices.get(1)); initialListMultipleChoice.add(candidateChoices.get(2)); @@ -110,27 +111,28 @@ initialCheckGroup.add(candidateChoices.get(3)); // single select family - form.add(new DropDownChoice("dropDownChoice", candidateChoices, bookChoiceRenderer)); - form.add(new ListChoice("listChoice", candidateChoices, bookChoiceRenderer).setMaxRows(4)); - form.add(new RadioChoice("radioChoice", candidateChoices, bookChoiceRenderer)); + form.add(new DropDownChoice<Book>("dropDownChoice", candidateChoices, bookChoiceRenderer)); + form.add(new ListChoice<Book>("listChoice", candidateChoices, bookChoiceRenderer).setMaxRows(4)); + form.add(new RadioChoice<Book>("radioChoice", candidateChoices, bookChoiceRenderer)); form.add(new CheckBox("checkBox")); form.add(newRadioGroup(candidateChoices)); // multiple select family - form.add(new ListMultipleChoice("initialListMultipleChoice", candidateChoices, - bookChoiceRenderer)); - form.add(new CheckBoxMultipleChoice("initialCheckBoxMultipleChoice", candidateChoices, - bookChoiceRenderer)); + form.add(new ListMultipleChoice<Book>("initialListMultipleChoice", candidateChoices, + bookChoiceRenderer)); + form.add(new CheckBoxMultipleChoice<Book>("initialCheckBoxMultipleChoice", + candidateChoices, bookChoiceRenderer)); form.add(newCheckGroup("initialCheckGroup", candidateChoices)); - form.add(new ListMultipleChoice("listMultipleChoice", candidateChoices, bookChoiceRenderer) - .setMaxRows(4)); - form.add(new CheckBoxMultipleChoice("checkBoxMultipleChoice", candidateChoices, - bookChoiceRenderer)); + form.add(new ListMultipleChoice<Book>("listMultipleChoice", candidateChoices, + bookChoiceRenderer).setMaxRows(4)); + form.add(new CheckBoxMultipleChoice<Book>("checkBoxMultipleChoice", candidateChoices, + bookChoiceRenderer)); form.add(newCheckGroup("checkGroup", candidateChoices)); - form.add(new Button("anotherButton") + form.add(new Button<Void>("anotherButton") { private static final long serialVersionUID = 1L; + @Override public void onSubmit() { anotherButtonPressed = true; @@ -138,16 +140,18 @@ }); } - private CheckGroup newCheckGroup(final String id, List candidateChoices) + private <S extends Serializable> CheckGroup<S> newCheckGroup(final String id, + List<S> candidateChoices) { - CheckGroup checkGroupComponent = new CheckGroup(id); - ListView listView = new ListView("loop", candidateChoices) + CheckGroup<S> checkGroupComponent = new CheckGroup<S>(id); + ListView<S> listView = new ListView<S>("loop", candidateChoices) { private static final long serialVersionUID = 1L; - protected void populateItem(ListItem item) + @Override + protected void populateItem(ListItem<S> item) { - item.add(new Check("check", new Model((Book)item.getModelObject()))); + item.add(new Check<S>("check", new Model<S>(item.getModelObject()))); } }; @@ -155,16 +159,17 @@ return checkGroupComponent; } - private RadioGroup newRadioGroup(List candidateChoices) + private RadioGroup<Book> newRadioGroup(List<Book> candidateChoices) { - RadioGroup radioGroupComponent = new RadioGroup("radioGroup"); - ListView listView = new ListView("loop", candidateChoices) + RadioGroup<Book> radioGroupComponent = new RadioGroup<Book>("radioGroup"); + ListView<Book> listView = new ListView<Book>("loop", candidateChoices) { private static final long serialVersionUID = 1L; - protected void populateItem(ListItem item) + @Override + protected void populateItem(ListItem<Book> item) { - item.add(new Radio("radio", new Model((Book)item.getModelObject()))); + item.add(new Radio<Book>("radio", new Model<Book>(item.getModelObject()))); } }; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java Mon May 19 05:56:56 2008 @@ -47,6 +47,7 @@ * * @see org.apache.wicket.WicketTestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); @@ -61,10 +62,11 @@ public void testBasicAjaxLinkClick() { // Create a link, which we test is actually invoked - final AjaxLink ajaxLink = new AjaxLink("ajaxLink") + final AjaxLink<?> ajaxLink = new AjaxLink<Void>("ajaxLink") { private static final long serialVersionUID = 1L; + @Override public void onClick(AjaxRequestTarget target) { linkClicked = true; @@ -79,9 +81,9 @@ */ private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { - Page page = new MockPageWithLink(); + Page<?> page = new MockPageWithLink(); page.add(ajaxLink); return page; @@ -102,13 +104,14 @@ */ public void testAjaxFallbackLinkClick() { - final Page page = new MockPageWithLink(); + final Page<?> page = new MockPageWithLink(); // Create a link, which we test is actually invoked - page.add(new AjaxFallbackLink("ajaxLink") + page.add(new AjaxFallbackLink<Void>("ajaxLink") { private static final long serialVersionUID = 1L; + @Override public void onClick(AjaxRequestTarget target) { linkClicked = true; @@ -123,7 +126,7 @@ */ private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { return page; } @@ -141,13 +144,14 @@ */ public void testFallbackLinkWithAjaxDisabled() { - final Page page = new MockPageWithLink(); + final Page<?> page = new MockPageWithLink(); // Create a link, which we test is actually invoked - page.add(new AjaxFallbackLink("ajaxLink") + page.add(new AjaxFallbackLink<Void>("ajaxLink") { private static final long serialVersionUID = 1L; + @Override public void onClick(AjaxRequestTarget target) { linkClicked = true; @@ -162,7 +166,7 @@ */ private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { return page; } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java Mon May 19 05:56:56 2008 @@ -43,6 +43,7 @@ } + @Override protected void setUp() throws Exception { super.setUp(); @@ -60,11 +61,12 @@ mockPojo.setName("Mock name"); final MockPageWithFormAndContainedLink page = new MockPageWithFormAndContainedLink(mockPojo); - page.addLink(new AjaxSubmitLink("link") + page.addLink(new AjaxSubmitLink<Void>("link") { private static final long serialVersionUID = 1L; - protected void onSubmit(AjaxRequestTarget target, Form form) + @Override + protected void onSubmit(AjaxRequestTarget target, Form<?> form) { assertNotNull(form); linkClicked = true; @@ -75,7 +77,7 @@ { private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { return page; } @@ -105,11 +107,12 @@ mockPojo.setName("Mock name"); final MockPageWithFormAndLink page = new MockPageWithFormAndLink(mockPojo); - AjaxSubmitLink link = new AjaxSubmitLink("link", page.getForm()) + AjaxSubmitLink<?> link = new AjaxSubmitLink<Void>("link", page.getForm()) { private static final long serialVersionUID = 1L; - protected void onSubmit(AjaxRequestTarget target, Form form) + @Override + protected void onSubmit(AjaxRequestTarget target, Form<?> form) { assertNotNull(form); linkClicked = true; @@ -121,7 +124,7 @@ { private static final long serialVersionUID = 1L; - public Page getTestPage() + public Page<?> getTestPage() { return page; } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndContainedLink.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndContainedLink.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndContainedLink.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndContainedLink.java Mon May 19 05:56:56 2008 @@ -19,9 +19,9 @@ import org.apache.wicket.markup.html.link.AbstractLink; /** - * Contains a form with a textfield on it and a link inside the form. Use the - * [EMAIL PROTECTED] #addLink(AbstractLink)} method to add a link to the form. - * + * Contains a form with a textfield on it and a link inside the form. Use the [EMAIL PROTECTED] + * #addLink(AbstractLink)} method to add a link to the form. + * * @author Gerolf Seitz */ public class MockPageWithFormAndContainedLink extends MockPageWithFormAndLink @@ -29,7 +29,7 @@ /** * Construct. - * + * * @param mockPojo */ public MockPageWithFormAndContainedLink(MockPojo mockPojo) @@ -40,7 +40,7 @@ /** * @param link */ - public void addLink(AbstractLink link) + public void addLink(AbstractLink<?> link) { getForm().add(link); } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndLink.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndLink.java?rev=657815&r1=657814&r2=657815&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndLink.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/MockPageWithFormAndLink.java Mon May 19 05:56:56 2008 @@ -54,9 +54,9 @@ } private static final long serialVersionUID = 1L; - private Form form; + private Form<MockPojo> form; - private TextField nameField; + private TextField<String> nameField; /** @@ -66,9 +66,9 @@ */ public MockPageWithFormAndLink(MockPojo mockPojo) { - form = new Form("form", new CompoundPropertyModel(mockPojo)); + form = new Form<MockPojo>("form", new CompoundPropertyModel<MockPojo>(mockPojo)); add(form); - nameField = new TextField("name"); + nameField = new TextField<String>("name"); form.add(nameField); } @@ -76,7 +76,7 @@ /** * @return the form component */ - public Form getForm() + public Form<MockPojo> getForm() { return form; } @@ -85,7 +85,7 @@ /** * @return the name text field */ - public TextField getNameField() + public TextField<String> getNameField() { return nameField; } @@ -94,7 +94,7 @@ /** * @param form */ - public void setForm(Form form) + public void setForm(Form<MockPojo> form) { this.form = form; } @@ -103,8 +103,8 @@ /** * @param name */ - public void setNameField(TextField name) + public void setNameField(TextField<String> name) { - this.nameField = name; + nameField = name; } }
