Commit 6d1170f2 authored by Tatuya Kamada's avatar Tatuya Kamada Committed by Arnaud Fontaine

Follow new listbox sort button style on Functional Tests in listbox_zuite.

parent c14c44b3
......@@ -94,7 +94,12 @@
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@class="sort-button sort-button-arrow sort-button-asc-not-selected"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@class="sort-button sort-button-arrow sort-button-desc-not-selected"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -104,7 +109,7 @@
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n
<td>//tr[@class="listbox-label-line"]/th[3]/button/img[@class="sort-button sort-button-arrow sort-button-asc-not-selected"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -114,7 +119,12 @@
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[4]/img[@class="sort-button"]</td>\n
<td>//tr[@class="listbox-label-line"]/th[4]/button/img[@class="sort-button sort-button-arrow sort-button-asc-not-selected"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[4]/button/img[@class="sort-button sort-button-arrow sort-button-desc-not-selected"]</td>\n
<td></td>\n
</tr>\n
</tal:block>\n
......@@ -195,13 +205,23 @@
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Ascending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@class="sort-button sort-button-arrow sort-button-asc-not-selected"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@class="sort-button sort-button-arrow sort-button-desc-selected"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -211,12 +231,12 @@
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Ascending Display"]</td>\n
<td>//tr[@class="listbox-label-line"]/th[3]/button/img[@title="Ascending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Descending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[3]/button/img[@title="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -272,8 +292,7 @@
</tr>\n
</tbody></table>\n
</body>\n
</html>\n
</html>
]]></unicode> </value>
</item>
......
......@@ -206,7 +206,7 @@
<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:asc\']</td>\n
<!-- <td>link=ID</td> -->\n
<td></td>\n
</tr>\n
......@@ -229,7 +229,7 @@
<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:desc\']</td>\n
<!-- <td>link=ID</td> -->\n
<td></td>\n
</tr>\n
......
......@@ -133,17 +133,22 @@
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Ascending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/td[2]/img[@alt="Descending Display"]</td>\n
<td>//tr[@class="listbox-label-line"]/td[2]/button/img[@alt="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -164,22 +169,27 @@
<!-- click the state -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Ascending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -195,22 +205,27 @@
<!-- click the state again -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Ascending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -280,17 +295,17 @@
</tr> \n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Ascending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -311,22 +326,27 @@
<!-- click the state -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Ascending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -342,22 +362,27 @@
<!-- click the state again -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementNotPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_simulation_state_title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Ascending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button/img[@title="Descending Display"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -380,8 +405,7 @@
\n
</tbody></table>\n
</body>\n
</html>\n
</html>
]]></unicode> </value>
</item>
......
......@@ -92,12 +92,12 @@
</tr>\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyText</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/button</td>\n
<td>//tr[@class="listbox-label-line"]/th[2]/span</td>\n
<td>Title</td>\n
</tr>\n
<tr>\n
......
......@@ -132,7 +132,7 @@
<!-- ASC -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.delivery.start_date\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.delivery.start_date:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -153,7 +153,7 @@
<!-- DESC -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.delivery.start_date\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.delivery.start_date:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -245,8 +245,7 @@
\n
</tbody></table>\n
</body>\n
</html>\n
</html>
]]></unicode> </value>
</item>
......
......@@ -634,22 +634,22 @@
</tr>\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>//button[@title="ID"]</td>\n
<td>//tr[@class="listbox-label-line"]/th/span[normalize-space(.)="ID"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>//button[@title="Title"]</td>\n
<td>//tr[@class="listbox-label-line"]/th/span[normalize-space(.)="Title"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>//button[@title="Quantity"]</td>\n
<td>//tr[@class="listbox-label-line"]/th/span[normalize-space(.)="Quantity"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>//button[@title="Date"]</td>\n
<td>//tr[@class="listbox-label-line"]/th/span[normalize-space(.)="Date"]</td>\n
<td></td>\n
</tr>\n
</tbody></table>\n
......
710
\ No newline at end of file
711
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment