From 3ad462a9fc6e50b74134c2a3becb10aa8f507959 Mon Sep 17 00:00:00 2001 From: Tatuya Kamada <tatuya@nexedi.com> Date: Mon, 8 Apr 2013 19:11:47 +0900 Subject: [PATCH] Follow new listbox sort button style in several functional tests. --- .../testDialogLinesField.xml | 7 +- .../testQuickSort.xml | 30 ++-- .../listbox_zuite/testQuickSort.xml | 134 +++++++++++++----- bt5/erp5_ui_test/bt/revision | 2 +- 4 files changed, 123 insertions(+), 50 deletions(-) diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/lines_field_zuite/testDialogLinesField.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/lines_field_zuite/testDialogLinesField.xml index a58c5469b2..004ef9c008 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/lines_field_zuite/testDialogLinesField.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/lines_field_zuite/testDialogLinesField.xml @@ -61,7 +61,7 @@ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n <tr>\n <td>clickAndWait</td>\n - <td>//button[@value=\'listbox.title\']</td>\n + <td>//button[@value=\'listbox.title:desc\']</td>\n <td></td>\n </tr>\n </tal:block>\n @@ -93,7 +93,7 @@ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n <tr>\n <td>clickAndWait</td>\n - <td>//button[@value=\'listbox.title\']</td>\n + <td>//button[@value=\'listbox.title:asc\']</td>\n <td></td>\n </tr>\n </tal:block>\n @@ -118,8 +118,7 @@ <td>foo bar</td>\n </tr>\n </body>\n -</html>\n - +</html> ]]></unicode> </value> </item> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_dialog_mode_zuite/testQuickSort.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_dialog_mode_zuite/testQuickSort.xml index fb58dae76d..08648284fc 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_dialog_mode_zuite/testQuickSort.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_dialog_mode_zuite/testQuickSort.xml @@ -53,29 +53,34 @@ <tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/init" />\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>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:desc\']</td>\n <td></td>\n </tr>\n <!-- click the ID -->\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></td>\n </tr>\n <tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" />\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:desc\']</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>//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 @@ -102,22 +107,22 @@ <tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" />\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></td>\n </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>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[@title="Descending Display"]</td>\n <td></td>\n </tr>\n <tr>\n @@ -143,8 +148,7 @@ </tal:block>\n </tbody></table>\n </body>\n -</html>\n - +</html> ]]></unicode> </value> </item> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickSort.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickSort.xml index 98796b0e9d..07880dab0c 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickSort.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickSort.xml @@ -88,12 +88,22 @@ </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>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementNotPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementNotPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n <td></td>\n </tr>\n <tr>\n @@ -118,22 +128,37 @@ </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>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:desc\']</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-asc-not-selected"]</td>\n <td></td>\n </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-desc-not-selected"]</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</td>\n + <td>//tr[@class="listbox-label-line"]/th[3]/button/img[@class="sort-button sort-button-arrow sort-button-desc-not-selected"]</td>\n <td></td>\n </tr>\n <tr>\n @@ -169,32 +194,37 @@ <!-- click the ID -->\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></td>\n </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:desc\']</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>//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 + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n <td></td>\n </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-desc-not-selected"]</td>\n <td></td>\n </tr>\n <tr>\n @@ -230,32 +260,37 @@ <!-- click the ID again -->\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></td>\n </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>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>assertElementPresent</td>\n - <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n <td></td>\n </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-desc-not-selected"]</td>\n <td></td>\n </tr>\n <tr>\n @@ -289,28 +324,54 @@ <td></td>\n </tr>\n <!-- click the Title -->\n +<!-- reset id sort -->\n +<tr>\n + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:none\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>clickAndWait</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:none\']</td>\n + <td></td>\n +</tr>\n <tr>\n <td>clickAndWait</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n <td></td>\n </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>assertElementPresent</td>\n - <td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementNotPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:none\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</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>assertElementNotPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementNotPresent</td>\n <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Ascending Display"]</td>\n <td></td>\n </tr>\n @@ -352,32 +413,42 @@ <!-- click the Title again -->\n <tr>\n <td>clickAndWait</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id:asc\']</td>\n <td></td>\n </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:desc\']</td>\n <td></td>\n </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>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementNotPresent</td>\n - <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Ascending Display"]</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Descending 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>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 @@ -414,8 +485,7 @@ \n </tbody></table>\n </body>\n -</html>\n - +</html> ]]></unicode> </value> </item> diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index c5321a6e72..20f3ba5854 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -709 \ No newline at end of file +710 \ No newline at end of file -- 2.30.9