Author: jdonnerstag
Date: Sun Aug 15 10:01:36 2010
New Revision: 985646
URL: http://svn.apache.org/viewvc?rev=985646&view=rev
Log:
moved some methods from WicketTestCase to WicketTester and remove extra
parameter from executeListener and executeBehavior
Issue: WICKET-574
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=985646&r1=985645&r2=985646&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
Sun Aug 15 10:01:36 2010
@@ -29,6 +29,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.feedback.IFeedback;
import org.apache.wicket.markup.html.WebPage;
@@ -526,4 +527,121 @@ public class WicketTester extends BaseWi
"One or more of the parameters associated with the
BookmarkablePageLink: " + id +
" do not match", new
PageParameters(parameters), pageLink.getPageParameters());
}
+
+ /**
+ * Use <code>-Dwicket.replace.expected.results=true</code> to
automatically replace the expected
+ * output file.
+ *
+ * @param <T>
+ * @param testClass
+ * @param pageClass
+ * @param filename
+ * @throws Exception
+ */
+ public <T extends Page> void executeTest(final Class<?> testClass,
final Class<T> pageClass,
+ final String filename) throws Exception
+ {
+ log.info("=== " + pageClass.getName() + " ===");
+
+ startPage(pageClass);
+ assertRenderedPage(pageClass);
+ assertResultPage(testClass, filename);
+ }
+
+ /**
+ * Use <code>-Dwicket.replace.expected.results=true</code> to
automatically replace the expected
+ * output file.
+ *
+ * @param <T>
+ * @param testClass
+ * @param page
+ * @param filename
+ * @throws Exception
+ */
+ public <T extends Page> void executeTest(final Class<?> testClass,
final Page page,
+ final String filename) throws Exception
+ {
+ log.info("=== " + page.getClass().getName() + " ===");
+
+ startPage(page);
+ assertRenderedPage(page.getClass());
+ assertResultPage(testClass, filename);
+ }
+
+ /**
+ * Use <code>-Dwicket.replace.expected.results=true</code> to
automatically replace the expected
+ * output file.
+ *
+ * @param <T>
+ * @param testClass
+ * @param pageClass
+ * @param parameters
+ * @param filename
+ * @throws Exception
+ */
+ public <T extends Page> void executeTest(final Class<?> testClass,
final Class<T> pageClass,
+ PageParameters parameters, final String filename) throws
Exception
+ {
+ log.info("=== " + pageClass.getName() + " ===");
+
+ startPage(pageClass, parameters);
+ assertRenderedPage(pageClass);
+ assertResultPage(testClass, filename);
+ }
+
+ /**
+ *
+ * @param testClass
+ * @param component
+ * @param filename
+ * @throws Exception
+ */
+ public void executeListener(final Class<?> testClass, final Component
component,
+ final String filename) throws Exception
+ {
+ Assert.assertNotNull(component);
+
+ log.info("=== " + testClass.getName() + " : " +
component.getPageRelativePath() + " ===");
+
+ executeListener(component);
+ assertResultPage(testClass, filename);
+ }
+
+ /**
+ *
+ * @param testClass
+ * @param behavior
+ * @param filename
+ * @throws Exception
+ */
+ public void executeBehavior(final Class<?> testClass, final
AbstractAjaxBehavior behavior,
+ final String filename) throws Exception
+ {
+ Assert.assertNotNull(behavior);
+
+ log.info("=== " + testClass.getName() + " : " +
behavior.toString() + " ===");
+
+ executeBehavior(behavior);
+ assertResultPage(testClass, filename);
+ }
+
+ /**
+ * Returns the current Maven build directory taken from the
<tt>basedir</tt> system property, or
+ * null if not set
+ *
+ * @return path with a trailing slash
+ */
+ public static String getBasedir()
+ {
+ String basedir = System.getProperty("basedir");
+ if (basedir != null)
+ {
+ basedir = basedir + "/";
+ }
+ else
+ {
+ basedir = "";
+ }
+ return basedir;
+ }
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentTest.java?rev=985646&r1=985645&r2=985646&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentTest.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentTest.java Sun
Aug 15 10:01:36 2010
@@ -76,7 +76,7 @@ public class ComponentTest extends Wicke
assertTrue(page.getNrAjaxBehaviorDetachModelCalls() > 0);
AjaxEventBehavior behavior = page.getAjaxBehavior();
- executedBehavior(TestDetachPage.class, behavior,
"TestDetachPageAjaxResult.html");
+ executeBehavior(behavior, "TestDetachPageAjaxResult.html");
assertTrue(1 <= page.getNrComponentDetachModelCalls());
assertTrue(1 <= page.getNrComponentDetachModelsCalls());
assertTrue(1 <= page.getNrComponentOnDetachCalls());
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentTest.java?rev=985646&r1=985645&r2=985646&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentTest.java
Sun Aug 15 10:01:36 2010
@@ -41,7 +41,7 @@ public class DisabledComponentTest exten
{
executeTest(DisabledComponentPage1.class,
"DisabledComponentPage1a_result.html");
Link link =
((DisabledComponentPage1)tester.getLastRenderedPage()).link;
- executedListener(DisabledComponentPage2.class, link,
"DisabledComponentPage2_result.html");
+ executeListener(link, "DisabledComponentPage2_result.html");
}
/**
@@ -52,6 +52,6 @@ public class DisabledComponentTest exten
executeTest(DisabledComponentPage1.class,
"DisabledComponentPage1a_result.html");
Link link =
((DisabledComponentPage1)tester.getLastRenderedPage()).link;
link.setEnabled(false);
- executedListener(DisabledComponentPage1.class, link,
"DisabledComponentPage1b_result.html");
+ executeListener(link, "DisabledComponentPage1b_result.html");
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java?rev=985646&r1=985645&r2=985646&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java Sun
Aug 15 10:01:36 2010
@@ -27,36 +27,47 @@ import org.apache.wicket.util.tester.Wic
* <p>
* To create/replace the expected result file with the new content, define the
system property like
* -Dwicket.replace.expected.results=true
- *
*/
public abstract class WicketTestCase extends TestCase
{
/** */
public WicketTester tester;
+ /**
+ * Construct.
+ */
public WicketTestCase()
{
}
+ /**
+ * Construct.
+ *
+ * @param name
+ */
public WicketTestCase(String name)
{
super(name);
}
-
+ /**
+ * @see junit.framework.TestCase#setUp()
+ */
@Override
protected void setUp() throws Exception
{
tester = new WicketTester();
}
+ /**
+ * @see junit.framework.TestCase#tearDown()
+ */
@Override
protected void tearDown() throws Exception
{
tester.destroy();
}
-
/**
* Use <code>-Dwicket.replace.expected.results=true</code> to
automatically replace the expected
* output file.
@@ -70,11 +81,7 @@ public abstract class WicketTestCase ext
protected <T extends Page> void executeTest(final Class<T> pageClass,
final String filename)
throws Exception
{
- System.out.println("=== " + pageClass.getName() + " ===");
-
- tester.startPage(pageClass);
- tester.assertRenderedPage(pageClass);
- tester.assertResultPage(getClass(), filename);
+ tester.executeTest(getClass(), pageClass, filename);
}
/**
@@ -83,18 +90,14 @@ public abstract class WicketTestCase ext
*
* @param <T>
*
- * @param pageClass
+ * @param page
* @param filename
* @throws Exception
*/
protected <T extends Page> void executeTest(final Page page, final
String filename)
throws Exception
{
- System.out.println("=== " + page.getClass().getName() + " ===");
-
- tester.startPage(page);
- tester.assertRenderedPage(page.getClass());
- tester.assertResultPage(getClass(), filename);
+ tester.executeTest(getClass(), page, filename);
}
/**
@@ -111,11 +114,7 @@ public abstract class WicketTestCase ext
protected <T extends Page> void executeTest(final Class<T> pageClass,
PageParameters parameters, final String filename) throws
Exception
{
- System.out.println("=== " + pageClass.getName() + " ===");
-
- tester.startPage(pageClass, parameters);
- tester.assertRenderedPage(pageClass);
- tester.assertResultPage(getClass(), filename);
+ tester.executeTest(getClass(), pageClass, parameters, filename);
}
/**
@@ -125,16 +124,10 @@ public abstract class WicketTestCase ext
* @param filename
* @throws Exception
*/
- protected void executedListener(final Class<?> clazz, final Component
component,
- final String filename) throws Exception
+ protected void executeListener(final Component component, final String
filename)
+ throws Exception
{
- assertNotNull(component);
-
- System.out.println("=== " + clazz.getName() + " : " +
component.getPageRelativePath() +
- " ===");
-
- tester.executeListener(component);
- tester.assertResultPage(clazz, filename);
+ tester.executeListener(getClass(), component, filename);
}
/**
@@ -144,15 +137,10 @@ public abstract class WicketTestCase ext
* @param filename
* @throws Exception
*/
- protected void executedBehavior(final Class<?> clazz, final
AbstractAjaxBehavior behavior,
- final String filename) throws Exception
+ protected void executeBehavior(final AbstractAjaxBehavior behavior,
final String filename)
+ throws Exception
{
- assertNotNull(behavior);
-
- System.out.println("=== " + clazz.getName() + " : " +
behavior.toString() + " ===");
-
- tester.executeBehavior(behavior);
- tester.assertResultPage(clazz, filename);
+ tester.executeBehavior(getClass(), behavior, filename);
}
/**
@@ -161,17 +149,8 @@ public abstract class WicketTestCase ext
*
* @return path with a trailing slash
*/
- public static String getBasedir()
+ public String getBasedir()
{
- String basedir = System.getProperty("basedir");
- if (basedir != null)
- {
- basedir = basedir + "/";
- }
- else
- {
- basedir = "";
- }
- return basedir;
+ return WicketTester.getBasedir();
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java?rev=985646&r1=985645&r2=985646&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
Sun Aug 15 10:01:36 2010
@@ -91,10 +91,9 @@ public class AjaxLinkTest extends Wicket
Component ajaxLink =
page.get("pageLayout:pageLayout_body:ajaxLink");
AbstractAjaxBehavior behavior =
(AbstractAjaxBehavior)ajaxLink.getBehaviors().get(0);
- executedBehavior(AjaxPage2.class, behavior,
"AjaxPage2-1_ExpectedResult.html");
+ executeBehavior(behavior, "AjaxPage2-1_ExpectedResult.html");
}
-
/**
*
* @throws Exception
@@ -116,6 +115,6 @@ public class AjaxLinkTest extends Wicket
Component ajaxLink = page.get("border:border_body:ajaxLink");
AbstractAjaxBehavior behavior =
(AbstractAjaxBehavior)ajaxLink.getBehaviors().get(0);
- executedBehavior(AjaxPage2.class, behavior,
"AjaxLinkWithBorderPage-1ExpectedResult.html");
+ executeBehavior(behavior,
"AjaxLinkWithBorderPage-1ExpectedResult.html");
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java?rev=985646&r1=985645&r2=985646&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java
Sun Aug 15 10:01:36 2010
@@ -44,6 +44,6 @@ public class HeaderTest extends WicketTe
executeTest(TestPage.class, "TestPage_ExpectedResult-1.html");
TestPage page = (TestPage)tester.getLastRenderedPage();
- executedListener(TestPage.class, page.get("link"),
"TestPage_ExpectedResult-2.html");
+ executeListener(page.get("link"),
"TestPage_ExpectedResult-2.html");
}
}
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=985646&r1=985645&r2=985646&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
Sun Aug 15 10:01:36 2010
@@ -49,11 +49,9 @@ public class IncrementalTableNavigationT
Page page = tester.getLastRenderedPage();
Link link = (Link)page.get("nextNext");
- executedListener(IncrementalTableNavigationPage.class, link,
-
"IncrementalTableNavigationPage_ExpectedResult_1-1.html");
+ executeListener(link,
"IncrementalTableNavigationPage_ExpectedResult_1-1.html");
link = (Link)page.get("prev");
- executedListener(IncrementalTableNavigationPage.class, link,
-
"IncrementalTableNavigationPage_ExpectedResult_1-2.html");
+ executeListener(link,
"IncrementalTableNavigationPage_ExpectedResult_1-2.html");
}
}
