[Erp5-report] r29202 - in /erp5/trunk/bt5/erp5_ui_test: PathTemplateItem/portal_tests/listb...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Sep 28 13:54:09 CEST 2009


Author: mohamadou
Date: Mon Sep 28 13:54:08 2009
New Revision: 29202

URL: http://svn.erp5.org?rev=29202&view=rev
Log:
2009-09-29 mohamadou
* Use checkCurrentPage to check page number

Modified:
    erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPager.xml
    erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml
    erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml
    erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml
    erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml
    erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.xml
    erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.xml
    erp5/trunk/bt5/erp5_ui_test/bt/revision

Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPager.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPager.xml?rev=29202&r1=29201&r2=29202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPager.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPager.xml [utf8] Mon Sep 28 13:54:08 2009
@@ -157,18 +157,13 @@
   <td>id=listbox_item_number</td>\n
   <td> - 0 item(s) selected</td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>1</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>0</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:1;\n
+                       lines_per_pages python:3">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>verifyElementPresent</td>\n
   <td>id=listbox_next_page</td>\n
@@ -205,18 +200,13 @@
   <td>id=listbox_next_page</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>3</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:3">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>verifyElementPresent</td>\n
   <td>id=listbox_next_page</td>\n
@@ -253,18 +243,13 @@
   <td>id=listbox_previous_page</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>1</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>0</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:1;\n
+                       lines_per_pages python:3">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>verifyElementPresent</td>\n
   <td>id=listbox_next_page</td>\n
@@ -307,11 +292,6 @@
   <td>id=listbox_set_page</td>\n
   <td>\\13</td>\n
 </tr>\n
-<tr> \n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>4</td>\n
-</tr>\n
 </tal:block>\n
 <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
 <tr>\n
@@ -319,11 +299,12 @@
   <td>id=listbox_page_selection</td>\n
   <td>4 of 4</td>\n
 </tr>\n
-<tr>\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>9</td>\n
-</tr>\n
+</tal:block>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:4;\n
+                       lines_per_pages python:3">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
 </tal:block>\n
 \n
 <tr>\n
@@ -367,18 +348,13 @@
   <td>id=listbox_item_number</td>\n
   <td> - 0 item(s) selected</td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>3</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>6</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:3;\n
+                       lines_per_pages python:3">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>verifyElementNotPresent</td>\n
   <td>id=listbox_next_page</td>\n

Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml?rev=29202&r1=29201&r2=29202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml [utf8] Mon Sep 28 13:54:08 2009
@@ -51,7 +51,7 @@
 <tr><td rowspan="1" colspan="3">Test ListBox Redirections</td></tr>\n
 </thead><tbody>\n
 <!-- XXX Report tree mode doesn\'t exists in mobile\n
-     So this test is skipped -->\n
+     So this test is skipped in mobile ui tests-->\n
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 \n
 <!--\n

Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml?rev=29202&r1=29201&r2=29202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testViewMode.xml [utf8] Mon Sep 28 13:54:08 2009
@@ -108,18 +108,19 @@
   <td>id=listbox_item_number</td>\n
   <td> - 0 item(s) selected</td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>1</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>0</td>\n
-  </tal:block>\n
-</tr>\n
+<!-- \n
+  To check page number use ListBoxZuite_CommonTemplate/macros/checkCurrentPage to reduce \n
+  "if TestTool_getSkinName()!=\'Mobile\'" statements\n
+  - prefix is gives the prefix of the id of the element containing the page number\n
+  - set_page the number of the page\n
+  - lines_per_page is used in mobile because there isn\'t "listbox_set_page" element\n
+-->\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:1;\n
+                       lines_per_pages python:3">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>verifyElementPresent</td>\n
   <td>id=listbox_next_page</td>\n
@@ -233,18 +234,12 @@
   <td></td>\n
 </tr>\n
 \n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>3</td>\n
-  </tal:block>\n
-</tr>\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:3">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>verifyElementPresent</td>\n
   <td>id=listbox_next_page</td>\n
@@ -364,18 +359,13 @@
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>3</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:3">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>verifyElementPresent</td>\n
   <td>id=listbox_next_page</td>\n

Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml?rev=29202&r1=29201&r2=29202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml [utf8] Mon Sep 28 13:54:08 2009
@@ -118,18 +118,13 @@
   <td>//input[@id="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>10</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>assertValue</td>\n
   <td>title</td>\n
@@ -141,18 +136,13 @@
   <td>//input[@id="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>3</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>20</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:3;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>assertValue</td>\n
   <td>title</td>\n
@@ -164,18 +154,12 @@
   <td>//input[@id="listbox_previous_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>10</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
@@ -197,18 +181,12 @@
 </tr>\n
 </tal:block>\n
 \n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>1</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>0</td>\n
-  </tal:block>\n
-</tr>\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:1;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>assertValue</td>\n
   <td>title</td>\n
@@ -225,11 +203,6 @@
   <td>keyPressAndWait</td>\n
   <td>id=listbox_set_page</td>\n
   <td>\\13</td>\n
-</tr>\n
-<tr>\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>3</td>\n
 </tr>\n
 </tal:block>\n
 <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
@@ -238,11 +211,12 @@
   <td>id=listbox_page_selection</td>\n
   <td>3 of 3</td>\n
 </tr>\n
-<tr>\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>20</td>\n
-</tr>\n
+</tal:block>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:3;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
 </tal:block>\n
 \n
 <tr>\n

Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml?rev=29202&r1=29201&r2=29202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldWheelWithListbox.xml [utf8] Mon Sep 28 13:54:08 2009
@@ -114,54 +114,36 @@
   <td>//input[@id="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>10</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//input[@id="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>3</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>20</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:3;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//input[@id="listbox_previous_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>10</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
@@ -174,11 +156,6 @@
   <td>id=listbox_set_page</td>\n
   <td>\\13</td>\n
 </tr>\n
-<tr>\n
-  <td>verifyValue</td>\n
-  <td>id=listbox_set_page</td>\n
-  <td>1</td>\n
-</tr>\n
 </tal:block>\n
 <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
 <tr>\n
@@ -186,13 +163,13 @@
   <td>id=listbox_page_selection</td>\n
   <td>1 of 19</td>\n
 </tr>\n
-<tr>\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>0</td>\n
-</tr>\n
-</tal:block>\n
-\n
+</tal:block>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:1;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tr>\n
   <td>click</td>\n

Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.xml?rev=29202&r1=29201&r2=29202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldPageChange.xml [utf8] Mon Sep 28 13:54:08 2009
@@ -97,54 +97,36 @@
   <td>//input[@id="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>10</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//input[@id="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>3</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>20</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:3;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//input[@id="listbox_previous_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>10</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
@@ -156,11 +138,6 @@
   <td>keyPressAndWait</td>\n
   <td>id=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>1</td>\n
 </tr>\n
 </tal:block>\n
 <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
@@ -169,11 +146,12 @@
   <td>id=listbox_page_selection</td>\n
   <td>1 of 135</td>\n
 </tr>\n
-<tr>\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>0</td>\n
-</tr>\n
+</tal:block>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:1;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
 </tal:block>\n
 \n
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
@@ -186,11 +164,6 @@
   <td>keyPressAndWait</td>\n
   <td>id=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>3</td>\n
 </tr>\n
 </tal:block>\n
 <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
@@ -199,11 +172,12 @@
   <td>id=listbox_page_selection</td>\n
   <td>3 of 135</td>\n
 </tr>\n
-<tr>\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>20</td>\n
-</tr>\n
+</tal:block>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:3;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
 </tal:block>\n
 \n
 <tr>\n

Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.xml?rev=29202&r1=29201&r2=29202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSearchDialogChangePage.xml [utf8] Mon Sep 28 13:54:08 2009
@@ -107,18 +107,13 @@
   <td>//input[@id="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>10</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>assertValue</td>\n
   <td>title</td>\n
@@ -130,18 +125,13 @@
   <td>//input[@id="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>3</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>20</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:3;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>assertValue</td>\n
   <td>title</td>\n
@@ -153,18 +143,12 @@
   <td>//input[@id="listbox_previous_page"]</td>\n
   <td></td>\n
 </tr>\n
-<tr>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>//input[@id="listbox_set_page"]</td>\n
-  <td>2</td>\n
-  </tal:block>\n
-  <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
-  <td>assertValue</td>\n
-  <td>id=listbox_page_selection</td>\n
-  <td>10</td>\n
-  </tal:block>\n
-</tr>\n
+\n
+<tal:block tal:define="prefix string:listbox; \n
+                       set_page python:2;\n
+                       lines_per_pages python:10">\n
+  <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
 \n
 <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n

Modified: erp5/trunk/bt5/erp5_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/bt/revision?rev=29202&r1=29201&r2=29202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/bt/revision [utf8] Mon Sep 28 13:54:08 2009
@@ -1,1 +1,1 @@
-490
+492




More information about the Erp5-report mailing list