Fixed the unittests
git-svn-id: https://svn.apache.org/repos/asf/incubator/wicket/trunk@457956 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_1.html b/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_1.html
index 65e8ba4..47281c2 100644
--- a/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_1.html
+++ b/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_1.html
@@ -21,10 +21,10 @@
<thead wicket:id="header">
<tr>
<th class="sortable" wicket:id="id"><wicket:border>
- <a href="/MockWebApplication/MockWebApplication?path=0:header:id:actionLink&interface=ILinkListener" wicket:id="actionLink"><wicket:body>ID</wicket:body></a>
+ <a href="/MockWebApplication/MockWebApplication?path=0:header:id:actionLink&version=1&interface=ILinkListener" wicket:id="actionLink"><wicket:body>ID</wicket:body></a>
</wicket:border></th>
<th class="sortable" wicket:id="name"><wicket:border>
- <a href="/MockWebApplication/MockWebApplication?path=0:header:name:actionLink&interface=ILinkListener" wicket:id="actionLink"><wicket:body>Name</wicket:body></a>
+ <a href="/MockWebApplication/MockWebApplication?path=0:header:name:actionLink&version=1&interface=ILinkListener" wicket:id="actionLink"><wicket:body>Name</wicket:body></a>
</wicket:border></th>
<th >Email</th> <!-- this column will not be sortable -->
</tr>
diff --git a/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_2.html b/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_2.html
index f6490b3..57155ec 100644
--- a/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_2.html
+++ b/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_2.html
@@ -18,54 +18,54 @@
</head>
<body>
<table>
- <thead wicket:id = "header">
+ <thead wicket:id="header">
<tr>
- <th class = "sortable" wicket:id = "id"><wicket:border>
- <a href = "/MockWebApplication/MockWebApplication?component=0.header.id.actionLink&version=1&interface=ILinkListener" wicket:id = "actionLink"><wicket:body/>ID</a>
+ <th class="sortable" wicket:id="id"><wicket:border>
+ <a href="/MockWebApplication/MockWebApplication?path=0:header:id:actionLink&version=3&interface=ILinkListener" wicket:id="actionLink"><wicket:body>ID</wicket:body></a>
</wicket:border></th>
- <th class = "order2 sortable sorted" wicket:id = "name"><wicket:border>
- <a href = "/MockWebApplication/MockWebApplication?component=0.header.name.actionLink&version=1&interface=ILinkListener" wicket:id = "actionLink"><wicket:body/>Name</a>
+ <th class="order2 sortable sorted" wicket:id="name"><wicket:border>
+ <a href="/MockWebApplication/MockWebApplication?path=0:header:name:actionLink&version=3&interface=ILinkListener" wicket:id="actionLink"><wicket:body>Name</wicket:body></a>
</wicket:border></th>
<th >Email</th> <!-- this column will not be sortable -->
</tr>
</thead>
<tbody>
- <tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">1</span></td>
- <td><span wicket:id = "name">Name-aaa</span></td>
- <td><span wicket:id = "email">mail-1</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">6</span></td>
- <td><span wicket:id = "name">Name-aba</span></td>
- <td><span wicket:id = "email">mail-6</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">7</span></td>
- <td><span wicket:id = "name">Name-bab</span></td>
- <td><span wicket:id = "email">mail-7</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">2</span></td>
- <td><span wicket:id = "name">Name-bbb</span></td>
- <td><span wicket:id = "email">mail-2</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">3</span></td>
- <td><span wicket:id = "name">Name-ccc</span></td>
- <td><span wicket:id = "email">mail-3</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">8</span></td>
- <td><span wicket:id = "name">Name-dca</span></td>
- <td><span wicket:id = "email">mail-8</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">4</span></td>
- <td><span wicket:id = "name">Name-ddd</span></td>
- <td><span wicket:id = "email">mail-4</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">9</span></td>
- <td><span wicket:id = "name">Name-eaa</span></td>
- <td><span wicket:id = "email">mail-9</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">5</span></td>
- <td><span wicket:id = "name">Name-eee</span></td>
- <td><span wicket:id = "email">mail-5</span></td>
+ <tr class="even" wicket:id="table">
+ <td><span wicket:id="id">1</span></td>
+ <td><span wicket:id="name">Name-aaa</span></td>
+ <td><span wicket:id="email">mail-1</span></td>
+ </tr><tr class="even" wicket:id="table">
+ <td><span wicket:id="id">6</span></td>
+ <td><span wicket:id="name">Name-aba</span></td>
+ <td><span wicket:id="email">mail-6</span></td>
+ </tr><tr class="even" wicket:id="table">
+ <td><span wicket:id="id">7</span></td>
+ <td><span wicket:id="name">Name-bab</span></td>
+ <td><span wicket:id="email">mail-7</span></td>
+ </tr><tr class="even" wicket:id="table">
+ <td><span wicket:id="id">2</span></td>
+ <td><span wicket:id="name">Name-bbb</span></td>
+ <td><span wicket:id="email">mail-2</span></td>
+ </tr><tr class="even" wicket:id="table">
+ <td><span wicket:id="id">3</span></td>
+ <td><span wicket:id="name">Name-ccc</span></td>
+ <td><span wicket:id="email">mail-3</span></td>
+ </tr><tr class="even" wicket:id="table">
+ <td><span wicket:id="id">8</span></td>
+ <td><span wicket:id="name">Name-dca</span></td>
+ <td><span wicket:id="email">mail-8</span></td>
+ </tr><tr class="even" wicket:id="table">
+ <td><span wicket:id="id">4</span></td>
+ <td><span wicket:id="name">Name-ddd</span></td>
+ <td><span wicket:id="email">mail-4</span></td>
+ </tr><tr class="even" wicket:id="table">
+ <td><span wicket:id="id">9</span></td>
+ <td><span wicket:id="name">Name-eaa</span></td>
+ <td><span wicket:id="email">mail-9</span></td>
+ </tr><tr class="even" wicket:id="table">
+ <td><span wicket:id="id">5</span></td>
+ <td><span wicket:id="name">Name-eee</span></td>
+ <td><span wicket:id="email">mail-5</span></td>
</tr>
</tbody>
</table>
diff --git a/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_3.html b/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_3.html
index 28e6692..a7bbed5 100644
--- a/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_3.html
+++ b/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersExpectedResult_3.html
@@ -18,54 +18,54 @@
</head>
<body>
<table>
- <thead wicket:id = "header">
+ <thead>
<tr>
- <th class = "sortable" wicket:id = "id">
- <a href = "/MockWebApplication/MockWebApplication?component=0.header.id.actionLink&version=2&interface=ILinkListener" wicket:id = "actionLink">ID</a>
+ <th class="sortable">
+ <a href="/MockWebApplication/MockWebApplication?path=0:header:id:actionLink&version=5&interface=ILinkListener">ID</a>
</th>
- <th class = "order1 sortable sorted" wicket:id = "name">
- <a href = "/MockWebApplication/MockWebApplication?component=0.header.name.actionLink&version=2&interface=ILinkListener" wicket:id = "actionLink">Name</a>
+ <th class="order1 sortable sorted">
+ <a href="/MockWebApplication/MockWebApplication?path=0:header:name:actionLink&version=5&interface=ILinkListener">Name</a>
</th>
<th >Email</th> <!-- this column will not be sortable -->
</tr>
</thead>
<tbody>
- <tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">5</span></td>
- <td><span wicket:id = "name">Name-eee</span></td>
- <td><span wicket:id = "email">mail-5</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">9</span></td>
- <td><span wicket:id = "name">Name-eaa</span></td>
- <td><span wicket:id = "email">mail-9</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">4</span></td>
- <td><span wicket:id = "name">Name-ddd</span></td>
- <td><span wicket:id = "email">mail-4</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">8</span></td>
- <td><span wicket:id = "name">Name-dca</span></td>
- <td><span wicket:id = "email">mail-8</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">3</span></td>
- <td><span wicket:id = "name">Name-ccc</span></td>
- <td><span wicket:id = "email">mail-3</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">2</span></td>
- <td><span wicket:id = "name">Name-bbb</span></td>
- <td><span wicket:id = "email">mail-2</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">7</span></td>
- <td><span wicket:id = "name">Name-bab</span></td>
- <td><span wicket:id = "email">mail-7</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">6</span></td>
- <td><span wicket:id = "name">Name-aba</span></td>
- <td><span wicket:id = "email">mail-6</span></td>
- </tr><tr class = "even" wicket:id = "table">
- <td><span wicket:id = "id">1</span></td>
- <td><span wicket:id = "name">Name-aaa</span></td>
- <td><span wicket:id = "email">mail-1</span></td>
+ <tr class="even">
+ <td><span>5</span></td>
+ <td><span>Name-eee</span></td>
+ <td><span>mail-5</span></td>
+ </tr><tr class="even">
+ <td><span>9</span></td>
+ <td><span>Name-eaa</span></td>
+ <td><span>mail-9</span></td>
+ </tr><tr class="even">
+ <td><span>4</span></td>
+ <td><span>Name-ddd</span></td>
+ <td><span>mail-4</span></td>
+ </tr><tr class="even">
+ <td><span>8</span></td>
+ <td><span>Name-dca</span></td>
+ <td><span>mail-8</span></td>
+ </tr><tr class="even">
+ <td><span>3</span></td>
+ <td><span>Name-ccc</span></td>
+ <td><span>mail-3</span></td>
+ </tr><tr class="even">
+ <td><span>2</span></td>
+ <td><span>Name-bbb</span></td>
+ <td><span>mail-2</span></td>
+ </tr><tr class="even">
+ <td><span>7</span></td>
+ <td><span>Name-bab</span></td>
+ <td><span>mail-7</span></td>
+ </tr><tr class="even">
+ <td><span>6</span></td>
+ <td><span>Name-aba</span></td>
+ <td><span>mail-6</span></td>
+ </tr><tr class="even">
+ <td><span>1</span></td>
+ <td><span>Name-aaa</span></td>
+ <td><span>mail-1</span></td>
</tr>
</tbody>
</table>
diff --git a/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersTest.java b/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersTest.java
index 50cde57..57b9a9f 100644
--- a/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersTest.java
+++ b/wicket-examples/src/test/wicket/examples/displaytag/list/SortableTableHeadersTest.java
@@ -30,6 +30,8 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import wicket.ApplicationSettings;
+import wicket.ApplicationSettings.RenderStrategy;
import wicket.markup.html.link.Link;
import wicket.protocol.http.MockHttpServletResponse;
import wicket.protocol.http.MockWebApplication;
@@ -71,14 +73,12 @@
public void testPagedTable() throws Exception
{
MockWebApplication application = new MockWebApplication(null);
+ application.getSettings().setRenderStrategy(ApplicationSettings.REDIRECT_TO_BUFFER);
application.getPages().setHomePage(SortableTableHeadersPage.class);
application.setupRequestAndResponse();
application.processRequestCycle();
SortableTableHeadersPage page = (SortableTableHeadersPage)application.getLastRenderedPage();
String document = application.getServletResponse().getDocument();
- FileWriter writer = new FileWriter("SortableTableHeadersExcpetedResult_1.html");
- writer.write(document);
- writer.close();
assertTrue(validatePage(document, "SortableTableHeadersExpectedResult_1.html"));
Link link = (Link)page.get("header:id:actionLink");
@@ -97,6 +97,7 @@
// Check that redirect was set as expected and invoke it
MockHttpServletResponse redirectResponse = application.getServletResponse();
+
Assert.assertTrue("Response should be a redirect", redirectResponse.isRedirect());
String redirect = application.getServletResponse().getRedirectLocation();
application.setupRequestAndResponse();
@@ -104,10 +105,11 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
+
assertTrue(validatePage(document, "SortableTableHeadersExpectedResult_2.html"));
// reverse sorting
- link = (Link)page.get("header.name.actionLink");
+ link = (Link)page.get("header:name:actionLink");
application.setupRequestAndResponse();
application.getServletRequest().setRequestToComponent(link);
application.processRequestCycle();
@@ -123,6 +125,11 @@
application.processRequestCycle();
document = application.getServletResponse().getDocument();
+
+ FileWriter writer = new FileWriter("SortableTableHeadersExcpetedResult_1.html");
+ writer.write(document);
+ writer.close();
+
assertTrue(validatePage(document, "SortableTableHeadersExpectedResult_3.html"));
}