[Erp5-report] r28492 - in /erp5/trunk/bt5/erp5_ui_test: PathTemplateItem/portal_tests/listb...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 20 14:08:29 CEST 2009
Author: kazuhiko
Date: Thu Aug 20 14:08:29 2009
New Revision: 28492
URL: http://svn.erp5.org?rev=28492&view=rev
Log:
modify for mobile skin, by Mohamadou.
Modified:
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testDelete.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPagerInViewMode.xml
erp5/trunk/bt5/erp5_ui_test/bt/revision
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testDelete.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testDelete.xml?rev=28492&r1=28491&r2=28492&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testDelete.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testDelete.xml [utf8] Thu Aug 20 14:08:29 2009
@@ -88,7 +88,7 @@
</tr>\n
<tr>\n
<td>click</td>\n
- <td>//tr[@id="listbox_data_line_0"]/td[1]/input</td>\n
+ <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -104,6 +104,7 @@
<!-- The listbox used to confirm deletion is a proxy to the previous listbox.\n
It contains the same columns\n
-->\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
<tr>\n
<td>assertText</td>\n
<td>//tr[@id=\'listbox_label_line\']/td[1]</td>\n
@@ -125,6 +126,25 @@
<td>//tr[@id=\'listbox_label_line\']/td[4]</td>\n
<td>Number of Related Objects</td>\n
</tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+ <td>assertText</td>\n
+ <td>//*[@id="listbox_data_line_0"]/div[2]//span[1]</td>\n
+ <td>Title</td>\n
+</tr>\n
+<tr>\n
+ <td>assertText</td>\n
+ <td>//*[@id="listbox_data_line_0"]/div[3]//span[1]</td>\n
+ <td>Quantity</td>\n
+</tr>\n
+<!-- And an extra column to display the number of related objects. -->\n
+<tr>\n
+ <td>assertText</td>\n
+ <td>//*[@id="listbox_data_line_0"]/div[4]//span[1]</td>\n
+ <td>Number of Related Objects</td>\n
+</tr>\n
+</tal:block>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_callDialogMethod:method</td>\n
@@ -142,18 +162,18 @@
</tr>\n
<tr>\n
<td>verifyText</td>\n
- <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+ <td>//*[@id="listbox_data_line_0"]//a[not(@title)]</td>\n
<td>0</td>\n
<td>We suppose here that the workflow is configured in such way that deleted items can still be viewed.</td>\n
</tr>\n
<tr>\n
<td>verifyText</td>\n
- <td>//tr[@id="listbox_data_line_1"]/td[2]</td>\n
+ <td>//*[@id="listbox_data_line_1"]//a[not(@title)]</td>\n
<td>1</td>\n
</tr>\n
<tr>\n
<td>verifyText</td>\n
- <td>//tr[@id="listbox_data_line_2"]/td[2]</td>\n
+ <td>//*[@id="listbox_data_line_2"]//a[not(@title)]</td>\n
<td>2</td>\n
</tr>\n
<tr>\n
@@ -188,12 +208,12 @@
</tr>\n
<tr>\n
<td>verifyText</td>\n
- <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+ <td>//*[@id="listbox_data_line_0"]//a[not(@title)]</td>\n
<td>0</td>\n
</tr>\n
<tr>\n
<td>click</td>\n
- <td>//tr[@id="listbox_data_line_0"]/td[1]/input</td>\n
+ <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -246,6 +266,7 @@
<td>link=0</td>\n
<td></td>\n
</tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
<tr>\n
<td>clickAndWait</td>\n
<td>link=Foo Lines:</td>\n
@@ -256,6 +277,19 @@
<td>uids:list</td>\n
<td></td>\n
</tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+ <td>clickAndWait</td>\n
+ <td>link=Foos</td>\n
+ <td></td>\n
+</tr>\n
+<tr>\n
+ <td>click</td>\n
+ <td>uids:list</td>\n
+ <td></td>\n
+</tr>\n
+</tal:block>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Folder_deleteObjectList:method</td>\n
@@ -271,10 +305,18 @@
<td>Deleted.</td>\n
<td></td>\n
</tr>\n
-<tr>\n
+\n
+<tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
<td>clickAndWait</td>\n
<td>link=Title 0</td>\n
<td></td>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+ <td>clickAndWait</td>\n
+ <td>link=0</td>\n
+ <td></td>\n
+</tal:block>\n
</tr>\n
<tr>\n
<td>open</td>\n
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPagerInViewMode.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPagerInViewMode.xml?rev=28492&r1=28491&r2=28492&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPagerInViewMode.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testPagerInViewMode.xml [utf8] Thu Aug 20 14:08:29 2009
@@ -86,10 +86,16 @@
<td>${base_url}/foo_module/0/Foo_viewListBoxInReportMode</td>\n
<td></td>\n
</tr>\n
-<tal:block tal:define="prefix string:x0_listbox;\n
- set_page python:1">\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
+\t tal:define="prefix string:x0_listbox; set_page python:1">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="prefix string:x0_listbox; set_page python:0">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+\n
<tal:block tal:repeat="prefix python:range(3)">\n
<tr>\n
<td>verifyElementPresent</td>\n
@@ -107,18 +113,40 @@
<td>id=x0_listbox_next_page</td>\n
<td></td>\n
</tr>\n
-<tal:block tal:define="prefix string:x0_listbox;\n
- set_page python:2">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
-</tal:block>\n
-<tal:block tal:define="prefix string:x1_listbox;\n
- set_page python:1">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
-</tal:block>\n
-<tal:block tal:define="prefix string:x2_listbox;\n
- set_page python:1">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
-</tal:block>\n
+<tal:block tal:define="prefix string:x0_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:2">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:3">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+</tal:block>\n
+\n
+<tal:block tal:define="prefix string:x1_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:1">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:0">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+</tal:block>\n
+\n
+<tal:block tal:define="prefix string:x2_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:1">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:0">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+</tal:block>\n
+\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
<tr>\n
<td>type</td>\n
<td>id=x1_listbox_set_page</td>\n
@@ -129,34 +157,78 @@
<td>id=x1_listbox_set_page</td>\n
<td>\\13</td>\n
</tr>\n
-<tal:block tal:define="prefix string:x0_listbox;\n
- set_page python:2">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
-</tal:block>\n
-<tal:block tal:define="prefix string:x1_listbox;\n
- set_page python:5">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
-</tal:block>\n
-<tal:block tal:define="prefix string:x2_listbox;\n
- set_page python:1">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+ <td>select</td>\n
+ <td>id=listbox_page_selection</td>\n
+ <td>5 of 10</td>\n
+</tr>\n
+</tal:block>\n
+\n
+<tal:block tal:define="prefix string:x0_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:2">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:3">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+</tal:block>\n
+<tal:block tal:define="prefix string:x1_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:5">\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:12">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+</tal:block>\n
+<tal:block tal:define="prefix string:x2_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:1">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:0">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
</tal:block>\n
<tr>\n
<td>clickAndWait</td>\n
<td>id=x1_listbox_previous_page</td>\n
<td></td>\n
</tr>\n
-<tal:block tal:define="prefix string:x0_listbox;\n
- set_page python:2">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
-</tal:block>\n
-<tal:block tal:define="prefix string:x1_listbox;\n
- set_page python:4">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
-</tal:block>\n
-<tal:block tal:define="prefix string:x2_listbox;\n
- set_page python:1">\n
- <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+<tal:block tal:define="prefix string:x0_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:2">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:3">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+</tal:block>\n
+<tal:block tal:define="prefix string:x1_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:4">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:9">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+</tal:block>\n
+<tal:block tal:define="prefix string:x2_listbox;">\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'"\n
+\t tal:define="set_page python:1">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'"\n
+\t tal:define="set_page python:0">\n
+ <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/checkCurrentPage" />\n
+ </tal:block>\n
</tal:block>\n
<tr>\n
<td>clickAndWait</td>\n
Modified: erp5/trunk/bt5/erp5_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/bt/revision?rev=28492&r1=28491&r2=28492&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/bt/revision [utf8] Thu Aug 20 14:08:29 2009
@@ -1,1 +1,1 @@
-465
+466
More information about the Erp5-report
mailing list