From e420429a5f61e840ec53b3400781d44294c36003 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 19 Nov 2010 21:50:07 +0000 Subject: [PATCH] more precise assertions. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40429 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../testSelectionPreviousNextButtons.xml | 17 ++++++++------ ...electionPreviousNextButtonsKeepsFormId.xml | 22 +++++++++---------- bt5/erp5_ui_test/bt/revision | 2 +- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml index 85031a3cd3..27364f8ec2 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml @@ -34,7 +34,7 @@ </item> <item> <key> <string>_text</string> </key> - <value> <string encoding="cdata"><![CDATA[ + <value> <unicode encoding="cdata"><![CDATA[ <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n @@ -70,7 +70,7 @@ </tr>\n <tr>\n <td>open</td>\n - <td>${base_url}/foo_module/view</td>\n + <td>${base_url}/foo_module</td>\n <td></td>\n </tr>\n <tr>\n @@ -128,7 +128,7 @@ </tr>\n <tr>\n <td>assertAbsoluteLocation</td>\n - <td tal:content="string:glob:${here/portal_url}/foo_module/FooModule_viewFooList*" />\n + <td>regexp:${base_url}/foo_module/FooModule_viewFooList(\\?|$)</td>\n <td></td>\n </tr>\n <tr>\n @@ -139,10 +139,9 @@ \n </tbody></table>\n </body>\n -</html>\n +</html> - -]]></string> </value> +]]></unicode> </value> </item> <item> <key> <string>content_type</string> </key> @@ -156,9 +155,13 @@ <key> <string>id</string> </key> <value> <string>testSelectionPreviousNextButtons</string> </value> </item> + <item> + <key> <string>output_encoding</string> </key> + <value> <string>utf-8</string> </value> + </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <unicode></unicode> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml index a946467bd4..9a67ae9055 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -37,7 +34,7 @@ </item> <item> <key> <string>_text</string> </key> - <value> <string encoding="cdata"><![CDATA[ + <value> <unicode encoding="cdata"><![CDATA[ <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n @@ -74,7 +71,7 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n </tr>\n <tr>\n <td>open</td>\n - <td>${base_url}/foo_module/view</td>\n + <td>${base_url}/foo_module</td>\n <td></td>\n </tr>\n <tr>\n @@ -95,16 +92,15 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n </tr>\n <tr>\n <td>assertAbsoluteLocation</td>\n - <td tal:content="string:glob:${here/portal_url}/foo_module/0/Base_viewHistory*" />\n + <td>regexp:${base_url}/foo_module/0/Base_viewHistory(\\?|$)</td>\n <td></td>\n </tr>\n \n </tbody></table>\n </body>\n -</html>\n +</html> - -]]></string> </value> +]]></unicode> </value> </item> <item> <key> <string>content_type</string> </key> @@ -118,9 +114,13 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n <key> <string>id</string> </key> <value> <string>testSelectionPreviousNextButtonsKeepsFormId</string> </value> </item> + <item> + <key> <string>output_encoding</string> </key> + <value> <string>utf-8</string> </value> + </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <unicode></unicode> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index c3282600a4..a557316495 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -640 \ No newline at end of file +641 \ No newline at end of file -- 2.30.9