From f60c1d4d191387c2aed923b89311226483858207 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Thu, 9 Sep 2010 11:35:08 +0000
Subject: [PATCH] Sort buttons changed in r38214 so adjust tests.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38226 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../project_zuite/testSortByStartDate.xml     | 25 +++--
 bt5/erp5_project_ui_test/bt/revision          |  2 +-
 .../testQuickSort.xml                         |  8 +-
 .../listbox_zuite/testCustomSort.xml          | 20 ++--
 .../listbox_zuite/testQuickSort.xml           | 86 +++++++++---------
 .../testQuickTranslationSort.xml              | 24 ++---
 .../testRelationFieldColumnsSort.xml          | 91 +++++++++----------
 bt5/erp5_ui_test/bt/revision                  |  2 +-
 8 files changed, 126 insertions(+), 132 deletions(-)

diff --git a/bt5/erp5_project_ui_test/PathTemplateItem/portal_tests/project_zuite/testSortByStartDate.xml b/bt5/erp5_project_ui_test/PathTemplateItem/portal_tests/project_zuite/testSortByStartDate.xml
index b84a903eb7..5259c268e3 100644
--- a/bt5/erp5_project_ui_test/PathTemplateItem/portal_tests/project_zuite/testSortByStartDate.xml
+++ b/bt5/erp5_project_ui_test/PathTemplateItem/portal_tests/project_zuite/testSortByStartDate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,27 +73,27 @@ Test quick sort on the project module.\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[6]/img[@alt="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[6]/img[@title="Ascending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[6]/img[@alt="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[6]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]</td>\n
   <td>2010/01/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[6]</td>\n
   <td>2010/02/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_2"]/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[6]</td>\n
   <td>2010/03/01</td>\n
 </tr>\n
 <tr>\n
@@ -111,27 +108,27 @@ Test quick sort on the project module.\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[6]/img[@alt="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[6]/img[@title="Ascending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[6]/img[@alt="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[6]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]</td>\n
   <td>2010/03/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[6]</td>\n
   <td>2010/02/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_2"]/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[6]</td>\n
   <td>2010/01/01</td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_project_ui_test/bt/revision b/bt5/erp5_project_ui_test/bt/revision
index 7813681f5b..62f9457511 100644
--- a/bt5/erp5_project_ui_test/bt/revision
+++ b/bt5/erp5_project_ui_test/bt/revision
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
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 399d92b486..78e27aaf1b 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
@@ -70,12 +70,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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]/button[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -112,12 +112,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
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 474b9d8300..ec69e2bedd 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
@@ -93,8 +93,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -103,8 +103,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[3]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -114,7 +114,7 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[4]/img</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[4]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 </tal:block>\n
@@ -196,12 +196,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -211,12 +211,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[3]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/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]/button[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -267,7 +267,7 @@
 </tal:block>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>id=listbox_data_line_3</td>\n
+  <td>//tr[@class="listbox-data-line-3 DataB"]</td>\n
   <td></td>\n
 </tr>\n
 </tbody></table>\n
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 6ce5b0092d..ab8db1a19e 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
@@ -122,8 +122,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -132,8 +132,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -141,11 +141,11 @@
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
+<tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[3]/button</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[4]/button</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>//tr[@class="listbox-data-line-0 DataA"]/td[2]</td>\n
@@ -179,12 +179,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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]/button[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -192,21 +192,21 @@
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img</td>\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
+<tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n
+  <td>//tr[@class="listbox-label-line"]/td[4]/img</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>//tr[@class="listbox-data-line-0 DataA"]/td[2]</td>\n
@@ -240,12 +240,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -253,21 +253,21 @@
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img</td>\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
+<tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[4]/img</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>//tr[@class="listbox-data-line-0 DataA"]/td[2]</td>\n
@@ -299,11 +299,11 @@
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img</td>\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
@@ -311,12 +311,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[3]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/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]/button[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -324,11 +324,11 @@
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
+<tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[4]/img</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>//tr[@class="listbox-data-line-0 DataA"]/td[2]</td>\n
@@ -360,11 +360,11 @@
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img</td>\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
@@ -372,12 +372,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[3]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/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[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -385,11 +385,11 @@
     <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
   <td></td>\n
 </tr>\n
-<!--<tr>\n
+<tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[4]/img</td>\n
   <td></td>\n
-</tr>-->\n
+</tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>//tr[@class="listbox-data-line-0 DataA"]/td[2]</td>\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 e60bcc642a..8fd33a43e2 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
@@ -138,12 +138,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/td[2]/button[@alt="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/td[2]/img[@alt="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -174,12 +174,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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]/button[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -205,12 +205,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -285,12 +285,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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]/button[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -321,12 +321,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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]/button[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -352,12 +352,12 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@class="listbox-label-line"]/th[2]/button[@title="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/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[@title="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
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 06b4f84aec..5b6c29c545 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
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -98,7 +95,7 @@
 <!-- this field is configured to show title, int_index and relative url -->\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]</td>\n
   <td>Title</td>\n
 </tr>\n
 <tr>\n
@@ -107,13 +104,13 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[3]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]</td>\n
   <td>Sort Index</td>\n
 </tr>\n
 <tr>\n
@@ -122,13 +119,13 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[4]</td>\n
   <td>Relative URL</td>\n
 </tr>\n
 <tr>\n
@@ -137,8 +134,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[4]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <!-- click the Title -->\n
@@ -150,7 +147,7 @@
 \n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]</td>\n
   <td>Title</td>\n
 </tr>\n
 <tr>\n
@@ -160,17 +157,17 @@
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img[@alt="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img[@alt="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[3]</td>\n
   <td>Sort Index</td>\n
 </tr>\n
 <tr>\n
@@ -179,13 +176,13 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[4]</td>\n
   <td>Relative URL</td>\n
 </tr>\n
 <tr>\n
@@ -207,7 +204,7 @@
 \n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]</td>\n
   <td>Title</td>\n
 </tr>\n
 <tr>\n
@@ -217,17 +214,17 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img[@alt="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Ascending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img[@alt="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[3]</td>\n
   <td>Sort Index</td>\n
 </tr>\n
 <tr>\n
@@ -236,13 +233,13 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[4]</td>\n
   <td>Relative URL</td>\n
 </tr>\n
 <tr>\n
@@ -251,8 +248,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[4]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <!-- click the Int index -->\n
@@ -264,7 +261,7 @@
 \n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]</td>\n
   <td>Title</td>\n
 </tr>\n
 <tr>\n
@@ -273,13 +270,13 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[3]</td>\n
   <td>Sort Index</td>\n
 </tr>\n
 <tr>\n
@@ -289,17 +286,17 @@
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img[@alt="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Ascending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img[@alt="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[4]</td>\n
   <td>Relative URL</td>\n
 </tr>\n
 <tr>\n
@@ -308,8 +305,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[4]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <!-- click the Int index again -->\n
@@ -321,7 +318,7 @@
 \n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]</td>\n
   <td>Title</td>\n
 </tr>\n
 <tr>\n
@@ -330,13 +327,13 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[3]</td>\n
   <td>Sort Index</td>\n
 </tr>\n
 <tr>\n
@@ -346,17 +343,17 @@
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img[@alt="Ascending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Ascending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[3]/img[@alt="Descending Display"]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[3]/img[@title="Descending Display"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[4]</td>\n
   <td>Relative URL</td>\n
 </tr>\n
 <tr>\n
@@ -365,8 +362,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertElementNotPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[4]/img</td>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[4]/img[@class="sort-button"]</td>\n
   <td></td>\n
 </tr>\n
 </tal:block>\n
diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision
index fb4abc5b58..0c7f592376 100644
--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
@@ -1 +1 @@
-603
\ No newline at end of file
+604
\ No newline at end of file
-- 
2.30.9