Skip to content

erp5
erp5
Commit 59d87a1d authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

writing tear-down like logic at the bottom of test is bad, because if a test... 

writing tear-down like logic at the bottom of test is bad, because if a test fails in progress, such a part will not be invoked. use AccountingZuite_reset instead.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26272 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d31300e9
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 367 deletions
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml
View file @ 59d87a1d
...@@ -260,39 +260,6 @@ Test display of Account Module, with at_date parameter\n ...@@ -260,39 +260,6 @@ Test display of Account Module, with at_date parameter\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ Tear down -->\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_module</td>\n
<td>Accounts</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_jump</td>\n
<td>Accounting Preference</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_year</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_month</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_day</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_edit:method</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.xml
View file @ 59d87a1d
...@@ -302,29 +302,6 @@ Test domain tree of Account Module\n ...@@ -302,29 +302,6 @@ Test domain tree of Account Module\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- tear down: reset selection in the tree {{{ -->\n
<tr>\n
<td>selectAndWait</td>\n
<td>//select[@name=\'domain_root_url\']</td>\n
<td>Account Type</td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>listbox_flat_list_mode</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Folder_show:method</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyText</td>\n
<td>listbox_record_number</td>\n
<td>10 record(s)</td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml
View file @ 59d87a1d
...@@ -548,39 +548,6 @@ Test display of Account Module, with from_date parameter (which has no impact)\n ...@@ -548,39 +548,6 @@ Test display of Account Module, with from_date parameter (which has no impact)\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ Tear down -->\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_module</td>\n
<td>Accounts</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_jump</td>\n
<td>Accounting Preference</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_year</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_month</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_day</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_edit:method</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml
View file @ 59d87a1d
...@@ -147,44 +147,6 @@ Test Transactions related to an account, with at date parameter\n ...@@ -147,44 +147,6 @@ Test Transactions related to an account, with at date parameter\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ Tear down -->\n
<tr>\n
<td>open</td>\n
<td>${base_url}</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_module</td>\n
<td>Accounts</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_jump</td>\n
<td>Accounting Preference</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_year</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_month</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_day</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_edit:method</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml
View file @ 59d87a1d
...@@ -195,45 +195,6 @@ client 1 invoice or client 2 invoice will have the first uid. -->\n ...@@ -195,45 +195,6 @@ client 1 invoice or client 2 invoice will have the first uid. -->\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ Tear down -->\n
<tr>\n
<td>open</td>\n
<td>${base_url}</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_module</td>\n
<td>Accounts</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_jump</td>\n
<td>Accounting Preference</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_year</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_month</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_day</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_edit:method</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_bank_accounts/test_bank_account_transaction_list_at_date.html.xml
View file @ 59d87a1d
...@@ -150,44 +150,6 @@ balance. -->\n ...@@ -150,44 +150,6 @@ balance. -->\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ Tear down -->\n
<tr>\n
<td>open</td>\n
<td>${base_url}</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_module</td>\n
<td>Accounts</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_jump</td>\n
<td>Accounting Preference</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_year</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_month</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_day</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_edit:method</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_bank_accounts/test_organisation_transaction_list_from_date.html.xml
View file @ 59d87a1d
...@@ -278,54 +278,6 @@ Test Transactions related to an Organisation, with start date\n ...@@ -278,54 +278,6 @@ Test Transactions related to an Organisation, with start date\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ Tear down -->\n
<tr>\n
<td>assertSelected</td>\n
<td>listbox_page_selection</td>\n
<td>2 of 3</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>listbox_page_selection</td>\n
<td>label=1 of 3</td>\n
</tr>\n
<tr>\n
<td>open</td>\n
<td>${base_url}</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_module</td>\n
<td>Accounts</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_jump</td>\n
<td>Accounting Preference</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_year</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_month</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_day</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_edit:method</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_bank_accounts/test_organisation_transaction_list_multipage.html.xml
View file @ 59d87a1d
...@@ -206,19 +206,6 @@ Test Transactions related to an Organisation, with multiple pages and date range ...@@ -206,19 +206,6 @@ Test Transactions related to an Organisation, with multiple pages and date range
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ tear down -->\n
<tr>\n
<td>assertSelected</td>\n
<td>listbox_page_selection</td>\n
<td>2 of 3</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>listbox_page_selection</td>\n
<td>1 of 3</td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml
View file @ 59d87a1d
...@@ -150,44 +150,6 @@ balance. -->\n ...@@ -150,44 +150,6 @@ balance. -->\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ Tear down -->\n
<tr>\n
<td>open</td>\n
<td>${base_url}</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_module</td>\n
<td>Accounts</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_jump</td>\n
<td>Accounting Preference</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_year</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_month</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_at_date_day</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_edit:method</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml
View file @ 59d87a1d
...@@ -279,54 +279,6 @@ Test Transactions related to an Organisation, with start date\n ...@@ -279,54 +279,6 @@ Test Transactions related to an Organisation, with start date\n
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ Tear down -->\n
<tr>\n
<td>assertSelected</td>\n
<td>listbox_page_selection</td>\n
<td>label=2 of 3</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>listbox_page_selection</td>\n
<td>label=1 of 3</td>\n
</tr>\n
<tr>\n
<td>open</td>\n
<td>${base_url}</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_module</td>\n
<td>Accounts</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>select_jump</td>\n
<td>Accounting Preference</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_year</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_month</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_preferred_accounting_transaction_from_date_day</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>Base_edit:method</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.xml
View file @ 59d87a1d
...@@ -206,19 +206,6 @@ Test Transactions related to an Organisation, with multiple pages and date range ...@@ -206,19 +206,6 @@ Test Transactions related to an Organisation, with multiple pages and date range
</tr>\n </tr>\n
<!-- }}} -->\n <!-- }}} -->\n
\n \n
<!-- {{{ tear down -->\n
<tr>\n
<td>assertSelected</td>\n
<td>listbox_page_selection</td>\n
<td>2 of 3</td>\n
</tr>\n
<tr>\n
<td>selectAndWait</td>\n
<td>listbox_page_selection</td>\n
<td>1 of 3</td>\n
</tr>\n
<!-- }}} -->\n
\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n </html> <!-- vim: syntax=html foldmethod=marker\n
......
bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.xml
View file @ 59d87a1d
...@@ -84,7 +84,8 @@ if pref.owner_info()[\'id\'] != str(context.REQUEST.AUTHENTICATED_USER):\n ...@@ -84,7 +84,8 @@ if pref.owner_info()[\'id\'] != str(context.REQUEST.AUTHENTICATED_USER):\n
cb = ptool.manage_copyObjects([\'accounting_zuite_preference\'])\n cb = ptool.manage_copyObjects([\'accounting_zuite_preference\'])\n
# FIXME: how could this work ???\n # FIXME: how could this work ???\n
ptool.manage_pasteObjects(cb)\n ptool.manage_pasteObjects(cb)\n
\n pref.edit(preferred_accounting_transaction_at_date=None)\n
pref.edit(preferred_accounting_transaction_from_date=None)\n
pref.enable()\n pref.enable()\n
\n \n
# reset selections\n # reset selections\n
...@@ -99,6 +100,8 @@ stool.setSelectionFor(\'person_selection\', None)\n ...@@ -99,6 +100,8 @@ stool.setSelectionFor(\'person_selection\', None)\n
stool.setSelectionFor(\'organisation_selection\', None)\n stool.setSelectionFor(\'organisation_selection\', None)\n
stool.setSelectionFor(\'grouping_reference_fast_input_selection\', None)\n stool.setSelectionFor(\'grouping_reference_fast_input_selection\', None)\n
stool.setSelectionFor(\'accounting_transaction_module_grouping_reference_fast_input\', None)\n stool.setSelectionFor(\'accounting_transaction_module_grouping_reference_fast_input\', None)\n
stool.setSelectionFor(\'entity_transaction_selection\', None)\n
stool.setSelectionFor(\'account_module_selection\', None)\n
\n \n
# delete the "dummy account" we create in test_account_gap_parallel_list_field\n # delete the "dummy account" we create in test_account_gap_parallel_list_field\n
dummy_account_list = portal.account_module.searchFolder(\n dummy_account_list = portal.account_module.searchFolder(\n
...@@ -156,10 +159,10 @@ return "Reset Successfully."\n ...@@ -156,10 +159,10 @@ return "Reset Successfully."\n
<string>str</string> <string>str</string>
<string>ptool</string> <string>ptool</string>
<string>cb</string> <string>cb</string>
<string>None</string>
<string>stool</string> <string>stool</string>
<string>form</string> <string>form</string>
<string>getattr</string> <string>getattr</string>
<string>None</string>
<string>listbox</string> <string>listbox</string>
<string>dummy_account_list</string> <string>dummy_account_list</string>
</tuple> </tuple>
......
bt5/erp5_accounting_ui_test/bt/revision
View file @ 59d87a1d
119 120
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7