From 45dd22d0247e683300a3709833166d305fdabef7 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Tue, 7 Sep 2010 10:54:54 +0000
Subject: [PATCH] Listbox uses no longer Ids but CSS classes. Adjust tests
 accordingly after r38122.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38168 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../testMultiRelationFieldProxyListBox.xml    | 59 +++++++++----------
 ...ltiRelationFieldSearchDialogChangePage.xml | 21 +++----
 .../testRelationFieldColumns.xml              | 29 ++++-----
 .../testRelationFieldJump.xml                 | 23 ++++----
 .../testRelationFieldKeepSelection.xml        |  7 +--
 .../testRelationFieldWheelWithListbox.xml     | 25 ++++----
 .../testSimpleRelationFieldPageChange.xml     | 21 +++----
 .../testSimpleRelationFieldSearchDialog.xml   | 11 ++--
 ...pleRelationFieldSearchDialogChangePage.xml | 25 ++++----
 .../testSimpleRelationFieldWheelButton.xml    | 19 +++---
 ...leRelationFieldWheelButtonQuotedFields.xml |  7 +--
 .../testSimpleRelationFieldWithListbox.xml    | 13 ++--
 .../search_zuite/testTopSearchBoxClicking.xml | 13 ++--
 .../testTopSearchBoxHittingEnter.xml          | 13 ++--
 bt5/erp5_ui_test/bt/revision                  |  2 +-
 15 files changed, 123 insertions(+), 165 deletions(-)

diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldProxyListBox.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldProxyListBox.xml
index 004a4f1220..0e21ed81a3 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldProxyListBox.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldProxyListBox.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>
@@ -120,8 +117,8 @@
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>id=listbox_record_number</td>\n
-    <td>15 records</td> <!-- we have 15 Foo and Foo Lines in default template -->\n
+    <td>//span[@class="listbox-current-page-total-number"]</td>\n
+    <td>15</td> <!-- we have 15 Foo and Foo Lines in default template -->\n
 </tr>\n
 \n
 <tr>\n
@@ -131,49 +128,49 @@
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>id=listbox_record_number</td>\n
-    <td>5 records</td> <!-- we have 5 Foo Lines -->\n
+    <td>//span[@class="listbox-current-page-total-number"]</td>\n
+    <td>5</td> <!-- we have 5 Foo Lines -->\n
 </tr>\n
 <tr>\n
     <td>verifyElementPresent</td>\n
-    <td>id=listbox_data_line_0</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']</td>\n
     <td></td>\n
 </tr>\n
 <tr>\n
     <td>verifyElementPresent</td>\n
-    <td>id=listbox_data_line_1</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']</td>\n
     <td></td>\n
 </tr>\n
 <tr>\n
     <td>verifyElementPresent</td>\n
-    <td>id=listbox_data_line_2</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']</td>\n
     <td></td>\n
 </tr>\n
 <!-- Foo Lines listbox only shows 3 lines -->\n
 <tr>\n
     <td>verifyElementNotPresent</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
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[2]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[2]</td>\n
     <td>ID</td>\n
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[3]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[3]</td>\n
     <td>Title</td>\n
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[4]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[4]</td>\n
     <td>Quantity</td>\n
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[5]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[5]</td>\n
     <td>Date</td>\n
 </tr>\n
 </tal:block>\n
@@ -207,43 +204,43 @@
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>id=listbox_record_number</td>\n
-    <td>10 records</td> <!-- we have 10 Foos -->\n
+    <td>//span[@class="listbox-current-page-total-number"]</td>\n
+    <td>10</td> <!-- we have 10 Foos -->\n
 </tr>\n
 <tr>\n
     <td>verifyElementPresent</td>\n
-    <td>id=listbox_data_line_0</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']</td>\n
     <td></td>\n
 </tr>\n
 <tr>\n
     <td>verifyElementPresent</td>\n
-    <td>id=listbox_data_line_1</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']</td>\n
     <td></td>\n
 </tr>\n
 <tr>\n
     <td>verifyElementPresent</td>\n
-    <td>id=listbox_data_line_2</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']</td>\n
     <td></td>\n
 </tr>\n
 <tr>\n
     <td>verifyElementNotPresent</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
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[2]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[2]</td>\n
     <td>ID</td>\n
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[3]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[3]</td>\n
     <td>Title</td>\n
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[4]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[4]</td>\n
     <td>Quantity</td>\n
 </tr>\n
 </tal:block>\n
@@ -272,33 +269,33 @@
 </tr>\n
 <tr>\n
     <td>verifyElementPresent</td>\n
-    <td>id=listbox_data_line_1</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']</td>\n
     <td></td>\n
 </tr>\n
 <tr>\n
     <td>verifyElementPresent</td>\n
-    <td>id=listbox_data_line_2</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']</td>\n
     <td></td>\n
 </tr>\n
 <tr>\n
     <td>verifyElementNotPresent</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
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[2]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[2]</td>\n
     <td>ID</td>\n
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[3]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[3]</td>\n
     <td>Title</td>\n
 </tr>\n
 <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id="listbox_label_line"]/td[4]</td>\n
+    <td>//tr[@class="listbox-label-line"]/th[4]</td>\n
     <td>Quantity</td>\n
 </tr>\n
 </tal:block>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml
index b168c0d508..00e5e81c27 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.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>
@@ -109,7 +106,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -127,7 +124,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -145,7 +142,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_previous_page"]</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -158,12 +155,12 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 </tal:block>\n
@@ -190,12 +187,12 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 </tal:block>\n
@@ -221,7 +218,7 @@
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldColumns.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldColumns.xml
index b7a75d6969..9d5431b919 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldColumns.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldColumns.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>
@@ -96,43 +93,43 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\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
   <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
   <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
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>2</td>\n
 </tr>\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
   <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
   <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
 \n
@@ -148,17 +145,17 @@
 </tr>\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
   <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
   <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
 </tal:block>\n
@@ -237,7 +234,7 @@
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
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 f98d8779c2..b980912972 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
@@ -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>
@@ -147,33 +144,33 @@ will be shown\n
 <!-- this is the jump listbox -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 \n
 <!-- the title of the listbox is the title of the relation field -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>id=listbox_title</td>\n
-  <td>exact:Bar Titles:</td>\n
+  <td>//a[@class="listbox_title"]</td>\n
+  <td>exact:Bar Titles</td>\n
 </tr>\n
 \n
 <!-- the columns are the one defined in the relation field. -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[1]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[1]</td>\n
   <td>Title</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]</td>\n
+  <td>//tr[@class="listbox-label-line"]/th[2]</td>\n
   <td>Quantity</td>\n
 </tr>\n
 \n
 <!-- it has links to the related objects -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n
   <td></td>\n
   <td></td>\n
 </tr>\n
@@ -206,7 +203,7 @@ will be shown\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Title 0</td>\n
 </tr>\n
 <!-- do revert sort on the title column, it will bring Title 1 in first place-->\n
@@ -218,7 +215,7 @@ will be shown\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Title 1</td>\n
 </tr>\n
 </tbody></table>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldKeepSelection.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldKeepSelection.xml
index caf41fff14..b9e7960e27 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldKeepSelection.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldKeepSelection.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 @@
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml
index e945f34270..50bf63964a 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.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>
@@ -91,7 +88,7 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/input</td>\n
   <td>y</td>\n
 </tr>\n
 </tal:block>\n
@@ -111,7 +108,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -123,7 +120,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -135,7 +132,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_previous_page"]</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -148,12 +145,12 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 </tal:block>\n
@@ -173,7 +170,7 @@
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -205,12 +202,12 @@
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/input</td>\n
   <td>y</td>\n
 </tr>\n
 <tr>\n
   <td>verifyElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/span[@class=\'error\']</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/span[@class=\'error\']</td>\n
   <td/>\n
 </tr>\n
 </tal:block>\n
@@ -242,7 +239,7 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/input</td>\n
   <td>2</td>\n
 </tr>\n
 </tal:block>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.xml
index 016200f42b..0a28db1cfb 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.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>
@@ -94,7 +91,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -106,7 +103,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -118,7 +115,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_previous_page"]</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -131,12 +128,12 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 </tal:block>\n
@@ -157,12 +154,12 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 </tal:block>\n
@@ -182,7 +179,7 @@
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialog.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialog.xml
index 3e8e5f2eeb..d620ea610e 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialog.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialog.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>
@@ -116,8 +113,8 @@
 <!-- this might not be true on a site with real document -->\n
 <tr>\n
   <td>assertText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
@@ -127,7 +124,7 @@
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.xml
index 9004ba617b..955c181692 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.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>
@@ -104,7 +101,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -122,7 +119,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_next_page"]</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -140,7 +137,7 @@
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id="listbox_previous_page"]</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -153,17 +150,17 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
@@ -174,17 +171,17 @@
 \n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>3</td>\n
 </tr>\n
 </tal:block>\n
@@ -225,7 +222,7 @@
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWheelButton.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWheelButton.xml
index 2d02b9a2ea..943ca51006 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWheelButton.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWheelButton.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>
@@ -105,19 +102,19 @@
 <!-- the title of the listbox is the title of the relation field -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>id=listbox_title</td>\n
-  <td>exact:Foo Category:</td>\n
+  <td>//span[@class="listbox_title"]</td>\n
+  <td>exact:Foo Category</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
   <!-- XXX this will probably fail ... -->\n
-  <td>1 records</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -157,9 +154,9 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
   <!-- XXX this will probably fail ... -->\n
-  <td>0 records</td>\n
+  <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWheelButtonQuotedFields.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWheelButtonQuotedFields.xml
index 487f0b9b86..de99593cdf 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWheelButtonQuotedFields.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWheelButtonQuotedFields.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>
@@ -104,7 +101,7 @@
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
+  <td>//*[@class=\'listbox-data-line-0 DataA\']//input[@type="checkbox"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWithListbox.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWithListbox.xml
index 2e82bf45ce..73d2c03394 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWithListbox.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldWithListbox.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>
@@ -91,7 +88,7 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/input</td>\n
   <td>y</td>\n
 </tr>\n
 </tal:block>\n
@@ -133,12 +130,12 @@
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/input</td>\n
   <td>y</td>\n
 </tr>\n
 <tr>\n
   <td>verifyElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/span[@class=\'error\']</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/span[@class=\'error\']</td>\n
   <td/>\n
 </tr>\n
 </tal:block>\n
@@ -170,7 +167,7 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/input</td>\n
   <td>2</td>\n
 </tr>\n
 </tal:block>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/search_zuite/testTopSearchBoxClicking.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/search_zuite/testTopSearchBoxClicking.xml
index ebefb89eb0..a0dd599f96 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/search_zuite/testTopSearchBoxClicking.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/search_zuite/testTopSearchBoxClicking.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>
@@ -69,17 +66,17 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']//td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']//td[3]</td>\n
   <td>Title 1</td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']//a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']//a</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/search_zuite/testTopSearchBoxHittingEnter.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/search_zuite/testTopSearchBoxHittingEnter.xml
index b00294ffee..b7d3c0424c 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/search_zuite/testTopSearchBoxHittingEnter.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/search_zuite/testTopSearchBoxHittingEnter.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>
@@ -69,17 +66,17 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']//td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']//td[3]</td>\n
   <td>Title 1</td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']//a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']//a</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision
index 73623d101c..e88ff725aa 100644
--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
@@ -1 +1 @@
-600
\ No newline at end of file
+602
\ No newline at end of file
-- 
2.30.9