Updated Branches: refs/heads/master 14508526f -> aa30a00e9
WICKET-4690 DataTable - use <div> for the content Do not check for exact content because the data is re-generated for each run. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aa30a00e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aa30a00e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aa30a00e Branch: refs/heads/master Commit: aa30a00e90e6ec0659feff4e9f931da73bf3fcbf Parents: 1450852 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Aug 2 14:25:03 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Aug 2 14:25:03 2012 +0300 ---------------------------------------------------------------------- .../data/table/DataTablePage_ExpectedResult.html | 169 --------------- .../html/repeater/data/table/DataTableTest.java | 3 +- 2 files changed, 2 insertions(+), 170 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/aa30a00e/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage_ExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage_ExpectedResult.html b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage_ExpectedResult.html deleted file mode 100644 index dcddef4..0000000 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTablePage_ExpectedResult.html +++ /dev/null @@ -1,169 +0,0 @@ -<html xmlns:wicket> -<body> - <table class="dataview" cellspacing="0" wicket:id="table"><wicket:panel xmlns:wicket="http://wicket.apache.org";> - -<thead wicket:id="topToolbars"> - <wicket:container wicket:id="toolbars"><wicket:panel xmlns:wicket="http://wicket.apache.org";> - <tr class="navigation"> - <td wicket:id="span" colspan="6"> - <div class="navigatorLabel"><div wicket:id="navigatorLabel">Showing 1 to 8 of 50</div></div> - <div class="navigator"><div wicket:id="navigator"><wicket:panel> - <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span> - <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span> - <span wicket:id="navigation" class="goto"> - <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span> - </span><span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./?0-1.ILinkListener-table-topToolbars-toolbars-0-span-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a> - </span><span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./?0-1.ILinkListener-table-topToolbars-toolbars-0-span-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a> - </span><span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./?0-1.ILinkListener-table-topToolbars-toolbars-0-span-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a> - </span><span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./?0-1.ILinkListener-table-topToolbars-toolbars-0-span-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a> - </span><span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./?0-1.ILinkListener-table-topToolbars-toolbars-0-span-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a> - </span><span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./?0-1.ILinkListener-table-topToolbars-toolbars-0-span-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">7</span></a> - </span> - <a wicket:id="next" class="next" href="./?0-1.ILinkListener-table-topToolbars-toolbars-0-span-navigator-next" title="Go to next page">></a> - <a wicket:id="last" class="last" href="./?0-1.ILinkListener-table-topToolbars-toolbars-0-span-navigator-last" title="Go to last page">>></a> -</wicket:panel></div></div> - </td> - </tr> -</wicket:panel></wicket:container><wicket:container wicket:id="toolbars"><wicket:panel xmlns:wicket="http://wicket.apache.org";> - <tr class="headers"> - - <th wicket:id="header"><div wicket:id="label">Actions</div></th> - - <th wicket:id="header" class="numeric"><div wicket:id="label">ID</div></th> - - <th wicket:id="header" class="wicket_orderUp"><wicket:border xmlns:wicket="http://wicket.apache.org";><a href="./?0-1.ILinkListener-table-topToolbars-toolbars-1-headers-3-header-orderByLink" wicket:id="orderByLink"><wicket:body><div wicket:id="label">First Name</div></wicket:body></a></wicket:border></th> - - <th wicket:id="header" class="wicket_orderNone last-name"><wicket:border xmlns:wicket="http://wicket.apache.org";><a href="./?0-1.ILinkListener-table-topToolbars-toolbars-1-headers-4-header-orderByLink" wicket:id="orderByLink"><wicket:body><div wicket:id="label">Last Name</div></wicket:body></a></wicket:border></th> - - <th wicket:id="header"><div wicket:id="label">Home Phone</div></th> - - <th wicket:id="header"><div wicket:id="label">Cell Phone</div></th> - - </tr> -</wicket:panel></wicket:container> -</thead> - -<tbody wicket:id="body"> - <tr wicket:id="rows" class="even"> - <td wicket:id="cells"> - <div wicket:id="cell">[cell]</div> - </td><td wicket:id="cells" class="numeric"> - <div wicket:id="cell">40</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">Abby</div> - </td><td wicket:id="cells" class="last-name"> - <div wicket:id="cell">Cruz</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">847-555-3322</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">281-555-8005</div> - </td> - </tr><tr wicket:id="rows" class="odd"> - <td wicket:id="cells"> - <div wicket:id="cell">[cell]</div> - </td><td wicket:id="cells" class="numeric"> - <div wicket:id="cell">25</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">Abner</div> - </td><td wicket:id="cells" class="last-name"> - <div wicket:id="cell">Donahue</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">841-555-3685</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">436-555-1466</div> - </td> - </tr><tr wicket:id="rows" class="even"> - <td wicket:id="cells"> - <div wicket:id="cell">[cell]</div> - </td><td wicket:id="cells" class="numeric"> - <div wicket:id="cell">21</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">Brianna</div> - </td><td wicket:id="cells" class="last-name"> - <div wicket:id="cell">Johnson</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">585-555-6887</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">222-555-1324</div> - </td> - </tr><tr wicket:id="rows" class="odd"> - <td wicket:id="cells"> - <div wicket:id="cell">[cell]</div> - </td><td wicket:id="cells" class="numeric"> - <div wicket:id="cell">31</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">Brianna</div> - </td><td wicket:id="cells" class="last-name"> - <div wicket:id="cell">Lee</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">263-555-4722</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">614-555-5638</div> - </td> - </tr><tr wicket:id="rows" class="even"> - <td wicket:id="cells"> - <div wicket:id="cell">[cell]</div> - </td><td wicket:id="cells" class="numeric"> - <div wicket:id="cell">4</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">Christopher</div> - </td><td wicket:id="cells" class="last-name"> - <div wicket:id="cell">Cruz</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">348-555-7235</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">621-555-3774</div> - </td> - </tr><tr wicket:id="rows" class="odd"> - <td wicket:id="cells"> - <div wicket:id="cell">[cell]</div> - </td><td wicket:id="cells" class="numeric"> - <div wicket:id="cell">24</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">Christopher</div> - </td><td wicket:id="cells" class="last-name"> - <div wicket:id="cell">Gonzalez</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">787-555-4681</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">231-555-5542</div> - </td> - </tr><tr wicket:id="rows" class="even"> - <td wicket:id="cells"> - <div wicket:id="cell">[cell]</div> - </td><td wicket:id="cells" class="numeric"> - <div wicket:id="cell">38</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">Christopher</div> - </td><td wicket:id="cells" class="last-name"> - <div wicket:id="cell">Jones</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">473-555-3670</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">556-555-2704</div> - </td> - </tr><tr wicket:id="rows" class="odd"> - <td wicket:id="cells"> - <div wicket:id="cell">[cell]</div> - </td><td wicket:id="cells" class="numeric"> - <div wicket:id="cell">45</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">Christopher</div> - </td><td wicket:id="cells" class="last-name"> - <div wicket:id="cell">Gonzalez</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">876-555-1154</div> - </td><td wicket:id="cells"> - <div wicket:id="cell">427-555-2635</div> - </td> - </tr> -</tbody> -</wicket:panel></table> -</body> -</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/aa30a00e/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java index 49b2681..2749a7d 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java @@ -58,7 +58,8 @@ public class DataTableTest extends WicketTestCase @Test public void test_1() throws Exception { - executeTest(DataTablePage.class, "DataTablePage_ExpectedResult.html"); + tester.startPage(DataTablePage.class); + tester.assertRenderedPage(DataTablePage.class); String document = tester.getLastResponseAsString(); int index = document.indexOf("<thead");
