Adjust due to changes in listbox page navigation.

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

Adjust due to changes in listbox page navigation.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38032 20353a03-c40f-0410-a6d1-a30d3c3de9de
b7e2aa09 · Ivan Tyagov · c9b638e5 · b7e2aa09 · b7e2aa09 · b7e2aa09
Commit b7e2aa09 authored Aug 26, 2010 by Ivan Tyagov
6 changed files
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPagerInViewMode.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPagerInViewMode.xml
@@ -2,10 +2,7 @@
 <ZopeData>
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
-      <tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
    </pickle>
    <pickle>
      <dictionary>
@@ -97,18 +94,18 @@
 <tal:block tal:repeat="prefix python:range(3)">\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td tal:content="python: \'id=x%s_listbox_next_page\' % (prefix, )"></td>\n
+  <td tal:content="string: //button[@class=&quot;x${prefix}_listbox_next_page&quot;]"></td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyElementNotPresent</td>\n
-  <td tal:content="python: \'id=x%s_listbox_previous_page\' % (prefix, )"></td>\n
+  <td tal:content="string: //button[@class=&quot;x${prefix}_listbox_previous_page&quot;]"></td>\n
  <td></td>\n
 </tr>\n
 </tal:block>\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=x0_listbox_next_page</td>\n
+  <td>//button[@class="x0_listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tal:block tal:define="prefix string:x0_listbox; \n
@@ -132,12 +129,12 @@
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
  <td>type</td>\n
-  <td>id=x1_listbox_set_page</td>\n
+  <td>//input[@class="x1_listbox_set_page"]</td>\n
  <td>5</td>\n
 </tr>\n
 <tr>\n
  <td>keyPressAndWait</td>\n
-  <td>id=x1_listbox_set_page</td>\n
+  <td>//input[@class="x1_listbox_set_page"]</td>\n
  <td>\\13</td>\n
 </tr>\n
 </tal:block>\n
@@ -168,7 +165,7 @@
 </tal:block>\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=x1_listbox_previous_page</td>\n
+  <td>//button[@class="x1_listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 \n
@@ -191,7 +188,7 @@
 </tal:block>\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=x1_listbox_last_page</td>\n
+  <td>//button[@class="x1_listbox_last_page"]</td>\n
  <td></td>\n
 </tr>\n
 \n
@@ -203,7 +200,7 @@
 \n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=x1_listbox_first_page</td>\n
+  <td>//button[@class="x1_listbox_first_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tal:block tal:define="prefix string:x0_listbox;\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
@@ -2,10 +2,7 @@
 <ZopeData>
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
-      <tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
    </pickle>
    <pickle>
      <dictionary>
@@ -148,7 +145,7 @@
 </tr>\n
 <tr>\n
  <td>verifyValue</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
@@ -168,17 +165,17 @@
 </tr>\n
 <tr>\n
  <td>verifyElementNotPresent</td>\n
-  <td>id=listbox_previous_page</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
@@ -194,7 +191,7 @@
 </tr>\n
 <tr>\n
  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
  <td>2</td>\n
 </tr>\n
 <tr>\n
@@ -214,22 +211,22 @@
 </tr>\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_previous_page</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
  <td>4</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
@@ -245,7 +242,7 @@
 </tr>\n
 <tr>\n
  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
  <td>4</td>\n
 </tr>\n
 <tr>\n
@@ -255,17 +252,17 @@
 </tr>\n
 <tr>\n
  <td>verifyElementNotPresent</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_previous_page</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=listbox_previous_page</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
@@ -281,7 +278,7 @@
 </tr>\n
 <tr>\n
  <td>verifyValue</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
@@ -301,22 +298,22 @@
 </tr>\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_previous_page</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\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
@@ -331,7 +328,7 @@
 </tr>\n
 <tr>\n
  <td>verifyValue</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

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testReportTree.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testReportTree.xml
@@ -2,10 +2,7 @@
 <ZopeData>
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
-      <tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
    </pickle>
    <pickle>
      <dictionary>
@@ -249,7 +246,7 @@
 <!-- Go to next page -->\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
@@ -381,7 +378,7 @@
 <!-- Go to next page -->\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testReportTreeWithStatMethod.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testReportTreeWithStatMethod.xml
@@ -2,10 +2,7 @@
 <ZopeData>
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
-      <tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
    </pickle>
    <pickle>
      <dictionary>
@@ -238,7 +235,7 @@
 <!-- Go to next page -->\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
@@ -370,7 +367,7 @@
 <!-- Go to next page -->\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml
@@ -2,10 +2,7 @@
 <ZopeData>
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
-      <tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
    </pickle>
    <pickle>
      <dictionary>
@@ -123,12 +120,12 @@
 \n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyElementNotPresent</td>\n
-  <td>id=listbox_previous_page</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
@@ -230,7 +227,7 @@
 <!-- Go to next page -->\n
 <tr>\n
  <td>clickAndWait</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 \n
@@ -242,12 +239,12 @@
 \n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_previous_page</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
@@ -368,12 +365,12 @@
 \n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>verifyElementPresent</td>\n
-  <td>id=listbox_previous_page</td>\n
+  <td>//button[@class="listbox_previous_page"]</td>\n
  <td></td>\n
 </tr>\n
 <tr>\n

--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
-588
+589
\ No newline at end of file