You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/12/20 11:04:29 UTC
svn commit: r1221177 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/markup/html/link/
wicket-core/src/main/java/org/apache/wicket/util/tester/
wicket-examples/src/main/java/org/apache/wicket/examples/library/
wicket-examples/src/main/j...
Author: mgrigorov
Date: Tue Dec 20 10:04:28 2011
New Revision: 1221177
URL: http://svn.apache.org/viewvc?rev=1221177&view=rev
Log:
Remove deprecated classes and methods.
ITestPanelSource, ITestPageSource and BookmarkablePageLink#setParameter()
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPageSource.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=1221177&r1=1221176&r2=1221177&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java Tue Dec 20 10:04:28 2011
@@ -139,62 +139,6 @@ public class BookmarkablePageLink<T> ext
// Instead they are dispatched by the request handling servlet.
}
- private void setParameterImpl(String key, Object value)
- {
- getPageParameters().set(key, value);
- }
-
- /**
- * Adds a given page property value to this link.
- *
- * @param property
- * The property
- * @param value
- * The value
- * @return This
- * @deprecated Use {@link #getPageParameters()}.set() instead
- */
- @Deprecated
- public BookmarkablePageLink<T> setParameter(final String property, final int value)
- {
- setParameterImpl(property, Integer.toString(value));
- return this;
- }
-
- /**
- * Adds a given page property value to this link.
- *
- * @param property
- * The property
- * @param value
- * The value
- * @return This
- * @deprecated Use {@link #getPageParameters()}.set() instead
- */
- @Deprecated
- public BookmarkablePageLink<T> setParameter(final String property, final long value)
- {
- setParameterImpl(property, Long.toString(value));
- return this;
- }
-
- /**
- * Adds a given page property value to this link.
- *
- * @param property
- * The property
- * @param value
- * The value
- * @return This
- * @deprecated Use {@link #getPageParameters()}.set() instead
- */
- @Deprecated
- public BookmarkablePageLink<T> setParameter(final String property, final String value)
- {
- setParameterImpl(property, value);
- return this;
- }
-
/**
* Gets the url to use for this link.
*
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1221177&r1=1221176&r2=1221177&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Tue Dec 20 10:04:28 2011
@@ -952,35 +952,6 @@ public class BaseWicketTester
}
/**
- * Renders a <code>Page</code> defined in <code>TestPageSource</code>. This is usually used when
- * a page does not have default constructor. For example, a <code>ViewBook</code> page requires
- * a <code>Book</code> instance:
- *
- * <pre>
- * tester.startPage(new TestPageSource()
- * {
- * public Page getTestPage()
- * {
- * Book mockBook = new Book("myBookName");
- * return new ViewBook(mockBook);
- * }
- * });
- * </pre>
- *
- * @param testPageSource
- * a <code>Page</code> factory that creates a test page instance
- * @return the rendered Page
- * @deprecated since 1.5 use {@link #startPage(Page)} instead
- */
- @Deprecated
- public final Page startPage(final ITestPageSource testPageSource)
- {
- Args.notNull(testPageSource, "testPageResource");
-
- return startPage(testPageSource.getTestPage());
- }
-
- /**
* Simulates processing URL that invokes specified {@link RequestListenerInterface} on
* component.
*
@@ -1181,39 +1152,6 @@ public class BaseWicketTester
}
/**
- * Renders a <code>Panel</code> defined in <code>TestPanelSource</code>. The usage is similar to
- * {@link #startPage(ITestPageSource)}. Please note that testing <code>Panel</code> must use the
- * supplied <code>panelId<code> as a <code>Component</code> id.
- *
- * <pre>
- * tester.startPanel(new TestPanelSource()
- * {
- * public Panel getTestPanel(String panelId)
- * {
- * MyData mockMyData = new MyData();
- * return new MyPanel(panelId, mockMyData);
- * }
- * });
- * </pre>
- *
- * Note that when try to access a component, e.g. via accessLabel(), the 'path' parameter must
- * be relative to the panel. Not relative to the Page which will automatically be added for you.
- *
- * @param testPanelSource
- * a <code>Panel</code> factory that creates test <code>Panel</code> instances
- * @return a rendered <code>Panel</code>
- * @deprecated since 1.5 use {@link #startComponentInPage(Class, IMarkupFragment)} instead
- */
- @Deprecated
- public final Panel startPanel(final ITestPanelSource testPanelSource)
- {
- Args.notNull(testPanelSource, "testPanelSource");
-
- return startComponentInPage(testPanelSource.getTestPanel(DummyPanelPage.TEST_PANEL_ID),
- null);
- }
-
- /**
* Renders a <code>Panel</code> from a <code>Panel(String id)</code> constructor.
* <p>
* Note that when try to access a component, e.g. via accessLabel(), the 'path' parameter must
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java?rev=1221177&r1=1221176&r2=1221177&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java Tue Dec 20 10:04:28 2011
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.util.tester;
+import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.Link;
@@ -29,8 +30,6 @@ public class DummyHomePage extends WebPa
{
private static final long serialVersionUID = 1L;
- private transient ITestPageSource testPageSource;
-
private final Link<?> testPageLink;
/**
@@ -44,17 +43,6 @@ public class DummyHomePage extends WebPa
}
/**
- * Sets the <code>TestPageSource</code> for this <code>DummyHomePage</code>.
- *
- * @param testPageSource
- * an <code>ITestPageSource</code> instance
- */
- public void setTestPageSource(ITestPageSource testPageSource)
- {
- this.testPageSource = testPageSource;
- }
-
- /**
* Retrieves the test page <code>Link</code>.
*
* @return the test page <code>Link</code>
@@ -64,6 +52,10 @@ public class DummyHomePage extends WebPa
return testPageLink;
}
+ protected Page getTestPage() {
+ throw new UnsupportedOperationException("To use DummyHomePage.TestLink you need to implement DummyHomePage#getTestPage() method.");
+ }
+
/**
* <code>TestLink</code> class.
*/
@@ -85,7 +77,7 @@ public class DummyHomePage extends WebPa
@Override
public void onClick()
{
- setResponsePage(testPageSource.getTestPage());
+ setResponsePage(getTestPage());
}
}
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java?rev=1221177&r1=1221176&r2=1221177&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java Tue Dec 20 10:04:28 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.util.tester;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.panel.Panel;
/**
* A dummy <code>Panel</code> Component.
@@ -31,14 +32,23 @@ public class DummyPanelPage extends WebP
/** The dummy <code>Panel</code> <code>Component</code> id */
public static final String TEST_PANEL_ID = "panel";
+ @Override
+ protected void onInitialize()
+ {
+ super.onInitialize();
+
+ add(getTestPanel(TEST_PANEL_ID));
+ }
+
/**
- * Constructor.
- *
- * @param testPanelSource
- * a <code>ITestPanelSource</code>
+ * Creates the panel under test
+ *
+ * @param id
+ * the component id to use
+ * @return an instance of the Panel to test
*/
- public DummyPanelPage(final ITestPanelSource testPanelSource)
+ protected Panel getTestPanel(String id)
{
- add(testPanelSource.getTestPanel(TEST_PANEL_ID));
+ throw new UnsupportedOperationException("To use DummyPanelPage you need to implement DummyPanelPage#getTestPanel() method.");
}
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=1221177&r1=1221176&r2=1221177&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java Tue Dec 20 10:04:28 2011
@@ -139,14 +139,7 @@ import org.slf4j.LoggerFactory;
* tester.assertInfoMessages(new String[] { "Wicket Rocks ;-)" });
* }
* </pre>
- *
- * Instead of <code>tester.startPage(pageClass)</code>, we define a
- * {@link org.apache.wicket.util.tester.ITestPageSource} to provide testing page instance for
- * <code>WicketTester</code>. This is necessary because <code>YourPage</code> uses a custom
- * constructor, which is very common for transferring model data, but cannot be instantiated by
- * reflection. Finally, we use <code>assertInfoMessages</code> to assert there is a feedback message
- * "Wicket Rocks ;-)" at the INFO level.
- *
+ *
* Many methods require a 'path' parameter. E.g. the page relative path can be obtained via
* {@link Component#getPageRelativePath()}. Since each Component has an ID/name, any Component can
* also be referenced by its ID {@link MarkupContainer#get(String)}. And since MarkupContainer's and
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java?rev=1221177&r1=1221176&r2=1221177&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java Tue Dec 20 10:04:28 2011
@@ -117,7 +117,7 @@ public final class BookDetails extends A
if (book != null)
{
- link.setParameter("id", book.getId());
+ link.getPageParameters().add("id", book.getId());
link.add(new Label("title", new Model<Book>(book)));
}
else
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=1221177&r1=1221176&r2=1221177&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java Tue Dec 20 10:04:28 2011
@@ -97,8 +97,10 @@ public class Home extends WicketExampleP
// Link to Page2 is automaticLink, so no code
// Link to Page3 is an external link which takes a parameter
- add(new BookmarkablePageLink<Void>("page3Link", Page3.class).setParameter(
- "bookmarkparameter", "3++2 & 5 � >< space + �"));
+ BookmarkablePageLink<Void> page3Link = new BookmarkablePageLink<Void>("page3Link", Page3.class);
+ page3Link.getPageParameters()
+ .add("bookmarkparameter", "3++2 & 5 � >< space + �");
+ add(page3Link);
// Link to BookDetails page
add(new Link<Void>("bookDetailsLink")