You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/11/06 16:24:50 UTC
svn commit: r1406173 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet:
sheet-selector.selenium.html sheet-sort.selenium.html
Author: lofwyr
Date: Tue Nov 6 15:24:49 2012
New Revision: 1406173
URL: http://svn.apache.org/viewvc?rev=1406173&view=rev
Log:
TOBAGO-1202: Sheet-Header: Support for grouped column-headers and multiline-headers
- fixing tests
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.selenium.html
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-sort.selenium.html
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.selenium.html
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.selenium.html?rev=1406173&r1=1406172&r2=1406173&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.selenium.html (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.selenium.html Tue Nov 6 15:24:49 2012
@@ -81,32 +81,32 @@
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[1]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[1]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[2]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[2]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[3]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[3]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[4]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[4]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[5]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[5]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[20]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[20]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
<tr>
@@ -156,32 +156,32 @@
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[1]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[1]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[2]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[2]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[3]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[3]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[4]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[4]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[5]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[5]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[20]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[20]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even</td>
</tr>
<tr>
@@ -236,32 +236,32 @@
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[1]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[1]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[2]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[2]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[3]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[3]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[4]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[4]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[5]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[5]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[20]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[20]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even</td>
</tr>
<tr>
@@ -311,32 +311,32 @@
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[1]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[1]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[2]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[2]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[3]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[3]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[4]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[4]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[5]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[5]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[20]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[20]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
<tr>
@@ -346,7 +346,7 @@
</tr>
<tr>
<td>waitForAttribute</td>
- <td>//table/tbody/tr@rowindexinmodel</td>
+ <td>//div[@class='tobago-sheet']@data-tobago-first</td>
<td>20</td>
</tr>
<tr>
@@ -356,7 +356,7 @@
</tr>
<tr>
<td>waitForAttribute</td>
- <td>//table/tbody/tr@rowindexinmodel</td>
+ <td>//div[@class='tobago-sheet']@data-tobago-first</td>
<td>0</td>
</tr>
<tr>
@@ -396,32 +396,32 @@
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[1]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[1]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[2]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[2]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[3]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[3]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[4]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[4]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[5]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[5]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-odd</td>
</tr>
<tr>
<td>assertAttribute</td>
- <td>//table/tbody/tr[20]@class</td>
+ <td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[20]@class</td>
<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
</tr>
</tbody></table>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-sort.selenium.html
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-sort.selenium.html?rev=1406173&r1=1406172&r2=1406173&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-sort.selenium.html (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-sort.selenium.html Tue Nov 6 15:24:49 2012
@@ -36,7 +36,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_0</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[1]/div/span</td>
<td></td>
</tr>
<tr>
@@ -51,7 +51,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_0</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[1]/div/span</td>
<td></td>
</tr>
<tr>
@@ -66,7 +66,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_1</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[2]/div/span</td>
<td></td>
</tr>
<tr>
@@ -81,7 +81,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_1</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[2]/div/span</td>
<td></td>
</tr>
<tr>
@@ -96,7 +96,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_2</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[3]/div/span</td>
<td></td>
</tr>
<tr>
@@ -111,7 +111,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_2</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[3]/div/span</td>
<td></td>
</tr>
<tr>
@@ -126,7 +126,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_3</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[4]/div/span</td>
<td></td>
</tr>
<tr>
@@ -141,7 +141,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_3</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[4]/div/span</td>
<td></td>
</tr>
<tr>
@@ -156,7 +156,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_4</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[5]/div/span</td>
<td></td>
</tr>
<tr>
@@ -171,7 +171,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_4</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[5]/div/span</td>
<td></td>
</tr>
<tr>
@@ -186,7 +186,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_5</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[6]/div/span</td>
<td></td>
</tr>
<tr>
@@ -201,7 +201,7 @@
</tr>
<tr>
<td>click</td>
- <td>id=page:sheet::header_box_5</td>
+ <td>//table[@class='tobago-sheet-headerTable']/tbody/tr/td[6]/div/span</td>
<td></td>
</tr>
<tr>