for the content
Updated Branches:
refs/heads/master 103dc19c4 -> 14508526f
WICKET-4690 DataTable - use <div> for the content
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/14508526
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/14508526
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/14508526
Branch: refs/heads/master
Commit: 14508526f697985d037dd7f31fa4467762f4075d
Parents: 103dc19
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Aug 2 14:16:03 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 2 14:16:03 2012 +0300
----------------------------------------------------------------------
.../markup/html/repeater/data/table/DataTable.html | 2 +-
.../html/repeater/data/table/HeadersToolbar.html | 2 +-
.../repeater/data/table/NavigationToolbar.html | 4 +-
.../html/repeater/data/table/NoRecordsToolbar.html | 2 +-
.../data/table/DataTablePage_ExpectedResult.html | 207 +++++++++++----
.../html/repeater/data/table/DataTableTest.java | 45 +---
6 files changed, 159 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/14508526/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html
index 24a2c52..0be6c56 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.html
@@ -26,7 +26,7 @@
<tbody wicket:id="body">
<tr wicket:id="rows">
<td wicket:id="cells">
- <wicket:container wicket:id="cell">[cell]</wicket:container>
+ <div wicket:id="cell">[cell]</div>
</td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/wicket/blob/14508526/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html
index 93c93da..dfa7849 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html
@@ -18,7 +18,7 @@
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<tr class="headers">
<wicket:container wicket:id="headers">
- <th wicket:id="header"><wicket:container wicket:id="label">[header-label]</wicket:container></th>
+ <th wicket:id="header"><div wicket:id="label">[header-label]</div></th>
</wicket:container>
</tr>
</wicket:panel>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/14508526/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
index 8fe0db7..5a6e918 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
@@ -18,8 +18,8 @@
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<tr class="navigation">
<td wicket:id="span">
- <div class="navigatorLabel"><span wicket:id="navigatorLabel">[navigator-label]</span></div>
- <div class="navigator"><span wicket:id="navigator">[navigator]</span></div>
+ <div class="navigatorLabel"><div wicket:id="navigatorLabel">[navigator-label]</div></div>
+ <div class="navigator"><div wicket:id="navigator">[navigator]</div></div>
</td>
</tr>
</wicket:panel>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/14508526/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html
index 1018dd8..50b0fb7 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html
@@ -18,7 +18,7 @@
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<tr class="norecords-tr">
<td wicket:id="td" class="norecords-td">
- <wicket:container wicket:id="msg">[no records found message]</wicket:container>
+ <div wicket:id="msg">[no records found message]</div>
</td>
</tr>
</wicket:panel>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/14508526/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
index 3093a06..dcddef4 100644
--- 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
@@ -1,74 +1,169 @@
<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">
- <x/>
- <x/></td><x/></tr><x/></wicket:panel></wicket:container><wicket:container wicket:id="toolbars"><wicket:panel xmlns:wicket="http://wicket.apache.org">
+ <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"><x/></th>
- <th wicket:id="header" class="numeric"><x/></th>
- <th wicket:id="header" class="wicket_orderUp"><wicket:border xmlns:wicket="http://wicket.apache.org"><x/></wicket:border></th>
- <th wicket:id="header" class="wicket_orderNone last-name"><wicket:border xmlns:wicket="http://wicket.apache.org"><x/></wicket:border></th>
- <th wicket:id="header"><x/></th>
- <th wicket:id="header"><x/></th><x/></tr><x/></wicket:panel></wicket:container><x/></thead>
+
+ <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">
- <x/></td><td wicket:id="cells" class="numeric">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells" class="last-name">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells">
- <x/></td><x/></tr><tr wicket:id="rows" class="odd">
+ <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">
- <x/></td><td wicket:id="cells" class="numeric">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells" class="last-name">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells">
- <x/></td><x/></tr><tr wicket:id="rows" class="even">
+ <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">
- <x/></td><td wicket:id="cells" class="numeric">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells" class="last-name">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells">
- <x/></td><x/></tr><tr wicket:id="rows" class="odd">
+ <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">
- <x/></td><td wicket:id="cells" class="numeric">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells" class="last-name">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells">
- <x/></td><x/></tr><tr wicket:id="rows" class="even">
+ <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">
- <x/></td><td wicket:id="cells" class="numeric">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells" class="last-name">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells">
- <x/></td><x/></tr><tr wicket:id="rows" class="odd">
+ <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">
- <x/></td><td wicket:id="cells" class="numeric">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells" class="last-name">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells">
- <x/></td><x/></tr><tr wicket:id="rows" class="even">
+ <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">
- <x/></td><td wicket:id="cells" class="numeric">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells" class="last-name">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells">
- <x/></td><x/></tr><tr wicket:id="rows" class="odd">
+ <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">
- <x/></td><td wicket:id="cells" class="numeric">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells" class="last-name">
- <x/></td><td wicket:id="cells">
- <x/></td><td wicket:id="cells">
- <x/></td><x/></tr><x/></tbody><x/></wicket:panel></table><x/></body><x/></html>
+ <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/14508526/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 8409ef8..49b2681 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
@@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.repeater.data.IDataProvider;
@@ -32,25 +33,16 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.string.StringValue;
-import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*
*/
-public class DataTableTest extends Assert
+public class DataTableTest extends WicketTestCase
{
- /** Log for reporting. */
- private static final Logger log = LoggerFactory.getLogger(DataTableTest.class);
-
- private WicketTester tester;
-
/**
*
*/
@@ -61,22 +53,12 @@ public class DataTableTest extends Assert
}
/**
- *
- */
- @After
- public void after()
- {
- tester.destroy();
- }
-
- /**
* @throws Exception
*/
@Test
public void test_1() throws Exception
{
- tester.startPage(DataTablePage.class);
- tester.assertRenderedPage(DataTablePage.class);
+ executeTest(DataTablePage.class, "DataTablePage_ExpectedResult.html");
String document = tester.getLastResponseAsString();
int index = document.indexOf("<thead");
@@ -91,27 +73,6 @@ public class DataTableTest extends Assert
index = document.indexOf("<caption", index + 1);
assertTrue("There must be not be <caption>", index == -1);
-
-// log.error(document);
-// log.error("==============================================");
-// log.error("==============================================");
-// log.error(removeFillers(document));
-
- DiffUtil.validatePage(removeFillers(document), getClass(),
- "DataTablePage_ExpectedResult.html", true);
- }
-
- private String removeFillers(String doc)
- {
- doc = doc.replaceAll("<wicket:container .*?>.*?</wicket:container>", "<x/>");
- doc = doc.replaceAll("(?s)<span .*?>.*?</span>", "<x/>");
- doc = doc.replaceAll("(?s)<div .*?>.*?</div>", "<x/>");
- doc = doc.replaceAll("(?s)<a .*?>.*?</a>", "<x/>");
- doc = doc.replaceAll("(?s)>\\s*?[\\n\\r]+\\s*?</", "><x/></");
- doc = doc.replaceAll("(?s)[\\n\\r]+\\s*?([\\n\\r]+)", "\r\n");
- doc = doc.replaceAll("(<x/>)+", "<x/>");
-
- return doc;
}
/**