From 63bb11acebf4fc935f730581bffe6545014ee960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 13 Sep 2006 16:13:39 +0000 Subject: [PATCH] add hour and minutes for payment transaction dates in AccountingZuite_createAccountingTransactionListSalesAndPayments, so that we can guess the ordering in a deterministic way. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9890 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...sation_transaction_list_from_date.html.xml | 26 +++++++++---------- ...ountingTransactionListSalesAndPayments.xml | 4 +-- bt5/erp5_accounting_ui_test/bt/change_log | 3 +++ bt5/erp5_accounting_ui_test/bt/revision | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml index bfa0f6b9f3..17f4b651ad 100644 --- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml +++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml @@ -89,7 +89,7 @@ Test Transactions related to an Organisation, with start date\n <tr>\n <td>type</td>\n <td>subfield_field_my_preferred_accounting_transaction_from_date_day</td>\n - <td>11</td>\n + <td>12</td>\n </tr>\n <tr>\n <td>clickAndWait</td>\n @@ -140,13 +140,13 @@ Test Transactions related to an Organisation, with start date\n <tr>\n <td>verifyText</td>\n <td>//div[preceding-sibling::label[contains(text(),\'From Date\')]]</td>\n - <td>2005/01/11</td>\n + <td>2005/01/12</td>\n </tr>\n <!-- The summary line is counted here. -->\n <tr>\n <td>verifyText</td>\n <td>listbox_record_number</td>\n - <td>47 record(s)</td>\n + <td>45 record(s)</td>\n </tr>\n <!-- }}} -->\n \n @@ -159,7 +159,7 @@ Test Transactions related to an Organisation, with start date\n <tr>\n <td>verifyText</td>\n <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n - <td>2005/01/11</td>\n + <td>2005/01/12</td>\n </tr>\n <tr>\n <td>verifyFloat</td>\n @@ -192,7 +192,7 @@ Test Transactions related to an Organisation, with start date\n <tr>\n <td>verifyText</td>\n <td>//tr[@id=\'listbox_data_line_1\']/td[3]</td>\n - <td>2005/01/11</td>\n + <td>2005/01/12</td>\n </tr>\n <tr>\n <td>verifyText</td>\n @@ -202,7 +202,7 @@ Test Transactions related to an Organisation, with start date\n <tr>\n <td>verifyFloat</td>\n <td>//tr[@id=\'listbox_data_line_1\']/td[9]</td>\n - <td>12100.00</td>\n + <td>13200.0</td>\n </tr>\n <tr>\n <td>verifyFloat</td>\n @@ -212,12 +212,12 @@ Test Transactions related to an Organisation, with start date\n <tr>\n <td>verifyFloat</td>\n <td>//tr[@id=\'listbox_data_line_1\']/td[12]</td>\n - <td>12100.00</td>\n + <td>13200.00</td>\n </tr>\n <tr>\n <td>verifyFloat</td>\n <td>//tr[@id=\'listbox_data_line_1\']/td[13]</td>\n - <td>83600.00</td>\n + <td>84700.00</td>\n </tr>\n <!-- }}} -->\n \n @@ -248,27 +248,27 @@ Test Transactions related to an Organisation, with start date\n <tr>\n <td>verifyText</td>\n <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n - <td>Client 1 Sale Invoice</td>\n + <td>Payment from Client 1 Sale Invoice</td>\n </tr>\n <tr>\n <td>verifyText</td>\n <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n - <td>2005/01/20</td>\n + <td>2005/01/21*</td>\n </tr>\n <tr>\n <td>verifyFloat</td>\n <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n - <td>22000</td>\n + <td>0</td>\n </tr>\n <tr>\n <td>verifyFloat</td>\n <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n - <td>0</td>\n + <td>12100</td>\n </tr>\n <tr>\n <td>verifyFloat</td>\n <td>//tr[@id=\'listbox_data_line_0\']/td[12]</td>\n - <td>22000</td>\n + <td>-12100</td>\n </tr>\n <tr>\n <td>verifyFloat</td>\n diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml index e66540b8d9..d1f01aa4ac 100644 --- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml +++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml @@ -176,8 +176,8 @@ for month in range(1, month_count + 1):\n source_payment=getBankAccountByTitle(\'My default bank account\'),\n destination_section=getOrganisationByTitle(client_title),\n created_by_builder=1,\n - start_date=DateTime(year, month, day) + 10,\n - stop_date=DateTime(year, month, day) + 10,\n + start_date=DateTime(year, month, day, 01, 01) + 10,\n + stop_date=DateTime(year, month, day, 01, 01) + 10,\n causality_value=tr,\n resource=euro_resource,\n immediate_reindex=immediate_reindex,\n diff --git a/bt5/erp5_accounting_ui_test/bt/change_log b/bt5/erp5_accounting_ui_test/bt/change_log index ebace22d9d..fdc4595208 100644 --- a/bt5/erp5_accounting_ui_test/bt/change_log +++ b/bt5/erp5_accounting_ui_test/bt/change_log @@ -1,2 +1,5 @@ +2006-09-13 jerome +* Fix tests for organisations. + 2006-08-14 jerome * Initial revision \ No newline at end of file diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision index 8e2afd3427..25bf17fc5a 100644 --- a/bt5/erp5_accounting_ui_test/bt/revision +++ b/bt5/erp5_accounting_ui_test/bt/revision @@ -1 +1 @@ -17 \ No newline at end of file +18 \ No newline at end of file -- 2.30.9