diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testCustomSort.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testCustomSort.xml index 2a3b10a0138067531d1c5aabf7765dc204c8f293..c614c5a814933fafdad2aee9c165bbb7293d1952 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testCustomSort.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testCustomSort.xml @@ -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> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml index 1173ec9ec95b670d4e0b8017a1da1b2f62740a39..c838bbde600ea05f24062d7e2f3721227a015b3f 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml @@ -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 diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickTranslationSort.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickTranslationSort.xml index cc0dc865843dfb6a54f1dee5a0e97a63d271f3ad..a4a452af5777fed3a67300267cbeae09f622a6f2 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickTranslationSort.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickTranslationSort.xml @@ -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> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml index 50beeb5f08482874db707b6483e97e74c980ee0b..1c74900099e33f525629cde4623e1a7124eb638e 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml @@ -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 diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testSearchAndSortOnDateColumn.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testSearchAndSortOnDateColumn.xml index cbacbec76a5d57b2cf0071205e2b1602cedcef1d..84eb5af5d7df44ecc7d443ec86d52bae28219299 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testSearchAndSortOnDateColumn.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testSearchAndSortOnDateColumn.xml @@ -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> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml index 3e4dbb4077e6034c178db88df827860bf6c6275e..172fde372e1b01c3b05a45aa5b8a4232e1872467 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml @@ -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 diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index 20f3ba5854e8d64eeaaf3ec9e70bda106317866f..6bd680a650ae04a8c4c21984c9267c37dcd331f4 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -710 \ No newline at end of file +711 \ No newline at end of file