From 583344b791e690c3118ba503aba0b74db6352283 Mon Sep 17 00:00:00 2001 From: Tatuya Kamada <tatuya@nexedi.com> Date: Tue, 9 Apr 2013 18:19:04 +0900 Subject: [PATCH] Follow new listbox sort button style on Functional Tests in relation_field_zuite. --- .../testRelationFieldColumnsSort.xml | 213 ++++++++++++++---- .../testRelationFieldJump.xml | 4 +- bt5/erp5_ui_test/bt/revision | 2 +- 3 files changed, 172 insertions(+), 47 deletions(-) diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldColumnsSort.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldColumnsSort.xml index c2c73a3a95..60dc8823c6 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldColumnsSort.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldColumnsSort.xml @@ -100,12 +100,22 @@ </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[2]/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[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 @@ -115,12 +125,22 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index:asc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index: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-asc-not-selected"]</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 @@ -130,18 +150,28 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:asc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</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 <tr>\n <td>assertElementPresent</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 <!-- click the Title -->\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 \n @@ -152,17 +182,22 @@ </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[2]/img[@title="Ascending Display"]</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.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="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 @@ -172,12 +207,22 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index:asc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index: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-asc-not-selected"]</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 @@ -187,18 +232,23 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:asc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:desc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementNotPresent</td>\n - <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n + <td>//tr[@id="listbox_label_line"]/td[4]/button/img</td>\n <td></td>\n </tr>\n <!-- 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 \n @@ -209,17 +259,22 @@ </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[2]/img[@title="Ascending Display"]</td>\n + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.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="Descending 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>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 @@ -229,12 +284,22 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index: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.int_index: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-asc-not-selected"]</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 @@ -244,18 +309,34 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:asc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</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>assertElementPresent</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-desc-not-selected"]</td>\n <td></td>\n </tr>\n <!-- click the Int index -->\n +<!-- reset tittle sort -->\n <tr>\n <td>clickAndWait</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>clickAndWait</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index:asc\']</td>\n <td></td>\n </tr>\n \n @@ -266,12 +347,22 @@ </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[2]/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[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>//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 @@ -281,17 +372,22 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index:none\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Ascending Display"]</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index:desc\']</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="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 @@ -301,18 +397,23 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:asc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//tr[@class="listbox-label-line"]/th[4]/img[@class="sort-button"]</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</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 <!-- click the Int index again -->\n <tr>\n <td>clickAndWait</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index:desc\']</td>\n <td></td>\n </tr>\n \n @@ -323,12 +424,22 @@ </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>//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[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>//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 @@ -338,17 +449,22 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index: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>assertElementPresent</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.int_index:none\']</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 @@ -358,20 +474,29 @@ </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url\']</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:asc\']</td>\n <td></td>\n </tr>\n <tr>\n <td>assertElementPresent</td>\n - <td>//tr[@class=\'listbox-label-line\']/th[4]/img[@class="sort-button"]</td>\n + <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.relative_url:desc\']</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>assertElementPresent</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>assertElementPresent</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 \n </tbody></table>\n </body>\n -</html>\n - +</html> ]]></unicode> </value> </item> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml index 8c71b2cf2f..83f93f0987 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml @@ -197,7 +197,7 @@ will be shown\n <!-- do sort on the title column default sort bring Title 0 in first place-->\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 <td></td>\n </tr>\n @@ -209,7 +209,7 @@ will be shown\n <!-- do revert sort on the title column, it will bring Title 1 in first place-->\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 <td></td>\n </tr>\n diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index 6bd680a650..3247896b00 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -711 \ No newline at end of file +712 \ No newline at end of file -- 2.30.9