Skip to content

erp5-Boxiang
erp5-Boxiang
Commit 8341aa8c authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

more pricise assertion using regexp. 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40412 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 15433aaa
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 46 deletions
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
View file @ 8341aa8c
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -37,7 +34,7 @@ ...@@ -37,7 +34,7 @@
</item> </item>
<item> <item>
<key> <string>_text</string> </key> <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 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
...@@ -67,7 +64,7 @@ ...@@ -67,7 +64,7 @@
have id "2". This is probably a bit too stupid. -->\n have id "2". This is probably a bit too stupid. -->\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertAbsoluteLocation</td>\n
<td tal:content="string:glob:${here/portal_url}/foo_module/2*" />\n <td tal:content="string:regexp:${here/portal_url}/foo_module/2(\\?|$$)" />\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -88,7 +85,7 @@ have id "2". This is probably a bit too stupid. -->\n ...@@ -88,7 +85,7 @@ have id "2". This is probably a bit too stupid. -->\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertAbsoluteLocation</td>\n
<td tal:content="string:glob:${here/portal_url}/foo_module/2/1*" />\n <td tal:content="string:regexp:${here/portal_url}/foo_module/2/1(\\?|$$)" />\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -116,7 +113,7 @@ have id "2". This is probably a bit too stupid. -->\n ...@@ -116,7 +113,7 @@ have id "2". This is probably a bit too stupid. -->\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertAbsoluteLocation</td>\n
<td tal:content="string:glob:${here/portal_url}/foo_module/3*" />\n <td tal:content="string:regexp:${here/portal_url}/foo_module/3(\\?|$$)" />\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -153,10 +150,9 @@ another object of the same type. -->\n ...@@ -153,10 +150,9 @@ another object of the same type. -->\n
</tr>\n </tr>\n
\n \n
</body>\n </body>\n
</html>\n </html>
]]></unicode> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -170,9 +166,13 @@ another object of the same type. -->\n ...@@ -170,9 +166,13 @@ another object of the same type. -->\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>testAddObject</string> </value> <value> <string>testAddObject</string> </value>
</item> </item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <unicode></unicode> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
View file @ 8341aa8c
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</item> </item>
<item> <item>
<key> <string>_text</string> </key> <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 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
have id "2". This is probably a bit too stupid. -->\n have id "2". This is probably a bit too stupid. -->\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertAbsoluteLocation</td>\n
<td tal:content="string:glob:${here/portal_url}/foo_module/2*" />\n <td tal:content="string:regexp:${here/portal_url}/foo_module/2(\\?|$$)" />\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -85,7 +85,7 @@ have id "2". This is probably a bit too stupid. -->\n ...@@ -85,7 +85,7 @@ have id "2". This is probably a bit too stupid. -->\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertAbsoluteLocation</td>\n
<td tal:content="string:glob:${here/portal_url}/foo_module/2/1*" />\n <td tal:content="string:regexp:${here/portal_url}/foo_module/2/1(\\?|$$)" />\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -167,10 +167,9 @@ another object of the same type. -->\n ...@@ -167,10 +167,9 @@ another object of the same type. -->\n
<td tal:content="string:regexp:Object copied from /.*/foo_module/2$$"/>\n <td tal:content="string:regexp:Object copied from /.*/foo_module/2$$"/>\n
</tr>\n </tr>\n
</body>\n </body>\n
</html>\n </html>
]]></unicode> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -184,9 +183,13 @@ another object of the same type. -->\n ...@@ -184,9 +183,13 @@ another object of the same type. -->\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>testCloneObject</string> </value> <value> <string>testCloneObject</string> </value>
</item> </item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <unicode></unicode> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsDoesNotKeepBogusFormId.xml
View file @ 8341aa8c
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -37,7 +34,7 @@ ...@@ -37,7 +34,7 @@
</item> </item>
<item> <item>
<key> <string>_text</string> </key> <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 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
...@@ -95,16 +92,15 @@ does not keep bogus `form_id`.</td></tr>\n ...@@ -95,16 +92,15 @@ does not keep bogus `form_id`.</td></tr>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertAbsoluteLocation</td>\n
<td tal:content="string:glob:${here/portal_url}/foo_bar_module/bar_0*" />\n <td tal:content="string:regexp:${here/portal_url}/foo_bar_module/bar_0(\\?|$$)" />\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
\n \n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html>\n </html>
]]></unicode> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -118,9 +114,13 @@ does not keep bogus `form_id`.</td></tr>\n ...@@ -118,9 +114,13 @@ does not keep bogus `form_id`.</td></tr>\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>testSelectionPreviousNextButtonsDoesNotKeepBogusFormId</string> </value> <value> <string>testSelectionPreviousNextButtonsDoesNotKeepBogusFormId</string> </value>
</item> </item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <unicode></unicode> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml
View file @ 8341aa8c
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</item> </item>
<item> <item>
<key> <string>_text</string> </key> <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 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
...@@ -176,7 +176,7 @@ will be shown\n ...@@ -176,7 +176,7 @@ will be shown\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertAbsoluteLocation</td>\n
<td tal:content="string:glob:${here/portal_url}/foo_module/1*"/>\n <td tal:content="string:regexp:${here/portal_url}/foo_module/1(\\?|$$)"/>\n
<td></td>\n <td></td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
...@@ -220,10 +220,9 @@ will be shown\n ...@@ -220,10 +220,9 @@ will be shown\n
</tr>\n </tr>\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html>\n </html>
]]></unicode> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -237,9 +236,13 @@ will be shown\n ...@@ -237,9 +236,13 @@ will be shown\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>testRelationFieldJump</string> </value> <value> <string>testRelationFieldJump</string> </value>
</item> </item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <unicode></unicode> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml
View file @ 8341aa8c
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -37,7 +34,7 @@ ...@@ -37,7 +34,7 @@
</item> </item>
<item> <item>
<key> <string>_text</string> </key> <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 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n
...@@ -119,15 +116,14 @@ button</td></tr>\n ...@@ -119,15 +116,14 @@ button</td></tr>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertAbsoluteLocation</td>\n
<td tal:content="string:glob:${here/portal_url}/portal_categories/foo_category/a/a1*" />\n <td tal:content="string:regexp:${here/portal_url}/portal_categories/foo_category/a/a1(\\?|$$)" />\n
<td/>\n <td/>\n
</tr>\n </tr>\n
</tbody></table>\n </tbody></table>\n
</body>\n </body>\n
</html>\n </html>
]]></unicode> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -141,9 +137,13 @@ button</td></tr>\n ...@@ -141,9 +137,13 @@ button</td></tr>\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>testSimpleRelationFieldSaveButton</string> </value> <value> <string>testSimpleRelationFieldSaveButton</string> </value>
</item> </item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <unicode></unicode> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_ui_test/bt/revision
View file @ 8341aa8c
637 638
\ 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