fix listbox tests according to new sort column on listbox

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18738 20353a03-c40f-0410-a6d1-a30d3c3de9de

fix listbox tests according to new sort column on listbox
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18738 20353a03-c40f-0410-a6d1-a30d3c3de9de
63d9577c · Aurel · 3469d2c4 · 63d9577c · 63d9577c · 63d9577c
Commit 63d9577c authored Jan 16, 2008 by Aurel
7 changed files
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>
@@ -221,7 +218,8 @@
 <!-- Sort by id -->\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>link=ID</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
+<!--\t<td>link=ID</td> -->\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -241,7 +239,8 @@
 </tr>\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>link=ID</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
+<!--\t<td>link=ID</td> -->\n
 \t<td></td>\n
 </tr>\n
 <tr>\n

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickSort.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testQuickSort.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>
@@ -97,17 +94,17 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
 \t<td>assertElementNotPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[3]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
 \t<td>assertElementNotPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[4]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -127,7 +124,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -137,7 +134,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[3]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -147,7 +144,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementNotPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[4]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -178,12 +175,12 @@
 <!-- click the ID -->\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>link=ID</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -198,7 +195,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[3]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -208,7 +205,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementNotPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[4]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -239,12 +236,12 @@
 <!-- click the ID again -->\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>link=ID</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -259,7 +256,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[3]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -269,7 +266,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementNotPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[4]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -300,12 +297,12 @@
 <!-- click the Title -->\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>link=Title</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -315,7 +312,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[3]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -330,7 +327,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementNotPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[4]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -361,12 +358,12 @@
 <!-- click the Title again -->\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>link=Title</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -376,7 +373,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[3]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -391,7 +388,7 @@
 </tr>\n
 <tr>\n
 \t<td>assertElementNotPresent</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[4]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.quantity\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>
@@ -108,19 +105,14 @@
 </tr>\n
 <tr>\n
  <td>assertElementPresent</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.id\']</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyText</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+  <td>//tr[@id="listbox_label_line"]/td[2]/button/span</td>\n
  <td>Title</td>\n
 </tr>\n
-<tr>\n
-  <td>verifyAttribute</td>\n
-  <td>//tr[@id="listbox_label_line"]/td[2]/a@href</td>\n
-  <td>setSelectionQuickSortOrder?selection_name=foo_line_selection&amp;sort_on=title&amp;form_id=Foo_viewRelationField</td>\n
-</tr>\n
 <tr>\n
  <td>open</td>\n
  <td>${base_url}/foo_module/0/setSelectionQuickSortOrder?selection_name=foo_line_selection&amp;sort_on=title&amp;form_id=Foo_viewRelationField</td>\n

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testSearchAndSortOnDateColumn.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testSearchAndSortOnDateColumn.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>
@@ -147,7 +144,7 @@
 <!-- ASC -->\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.delivery.start_date\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n
@@ -168,7 +165,7 @@
 <!-- DESC -->\n
 <tr>\n
 \t<td>clickAndWait</td>\n
-\t<td>//tr[@id="listbox_label_line"]/td[2]/a</td>\n
+    <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.delivery.start_date\']</td>\n
 \t<td></td>\n
 </tr>\n
 <tr>\n

--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
-315
\ No newline at end of file
+316
\ No newline at end of file
--- a/bt5/erp5_ui_test/bt/template_catalog_datetime_key_list
+++ b/bt5/erp5_ui_test/bt/template_catalog_datetime_key_list
--- a/bt5/erp5_ui_test/bt/template_catalog_scriptable_key_list
+++ b/bt5/erp5_ui_test/bt/template_catalog_scriptable_key_list