[Erp5-report] r40412 kazuhiko - in /erp5/trunk/bt5/erp5_ui_test: PathTemplateItem/portal_te...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Nov 19 13:52:59 CET 2010
Author: kazuhiko
Date: Fri Nov 19 13:52:58 2010
New Revision: 40412
URL: http://svn.erp5.org?rev=40412&view=rev
Log:
more pricise assertion using regexp.
Modified:
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsDoesNotKeepBogusFormId.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml
erp5/trunk/bt5/erp5_ui_test/bt/revision
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml?rev=40412&r1=40411&r2=40412&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml [utf8] Fri Nov 19 13:52:58 2010
@@ -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
@@ -67,7 +64,7 @@
have id "2". This is probably a bit too stupid. -->\n
<tr>\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
</tr>\n
<tr>\n
@@ -88,7 +85,7 @@ have id "2". This is probably a bit too
</tr>\n
<tr>\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
</tr>\n
<tr>\n
@@ -116,7 +113,7 @@ have id "2". This is probably a bit too
</tr>\n
<tr>\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
</tr>\n
<tr>\n
@@ -153,10 +150,9 @@ another object of the same type. -->\n
</tr>\n
\n
</body>\n
-</html>\n
+</html>
-
-]]></string> </value>
+]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
@@ -171,8 +167,12 @@ another object of the same type. -->\n
<value> <string>testAddObject</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>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml?rev=40412&r1=40411&r2=40412&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml [utf8] Fri Nov 19 13:52:58 2010
@@ -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
@@ -64,7 +64,7 @@
have id "2". This is probably a bit too stupid. -->\n
<tr>\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
</tr>\n
<tr>\n
@@ -85,7 +85,7 @@ have id "2". This is probably a bit too
</tr>\n
<tr>\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
</tr>\n
<tr>\n
@@ -167,10 +167,9 @@ another object of the same type. -->\n
<td tal:content="string:regexp:Object copied from /.*/foo_module/2$$"/>\n
</tr>\n
</body>\n
-</html>\n
+</html>
-
-]]></string> </value>
+]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
@@ -185,8 +184,12 @@ another object of the same type. -->\n
<value> <string>testCloneObject</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>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsDoesNotKeepBogusFormId.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsDoesNotKeepBogusFormId.xml?rev=40412&r1=40411&r2=40412&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsDoesNotKeepBogusFormId.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsDoesNotKeepBogusFormId.xml [utf8] Fri Nov 19 13:52:58 2010
@@ -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
@@ -95,16 +92,15 @@ does not keep bogus `form_id`.</td></tr>
</tr>\n
<tr>\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
</tr>\n
\n
</tbody></table>\n
</body>\n
-</html>\n
+</html>
-
-]]></string> </value>
+]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
@@ -119,8 +115,12 @@ does not keep bogus `form_id`.</td></tr>
<value> <string>testSelectionPreviousNextButtonsDoesNotKeepBogusFormId</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>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml?rev=40412&r1=40411&r2=40412&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml [utf8] Fri Nov 19 13:52:58 2010
@@ -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
@@ -176,7 +176,7 @@ will be shown\n
</tr>\n
<tr>\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
</tr>\n
@@ -220,10 +220,9 @@ will be shown\n
</tr>\n
</tbody></table>\n
</body>\n
-</html>\n
+</html>
-
-]]></string> </value>
+]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
@@ -238,8 +237,12 @@ will be shown\n
<value> <string>testRelationFieldJump</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>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml?rev=40412&r1=40411&r2=40412&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml [utf8] Fri Nov 19 13:52:58 2010
@@ -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
@@ -119,15 +116,14 @@ button</td></tr>\n
</tr>\n
<tr>\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
</tr>\n
</tbody></table>\n
</body>\n
-</html>\n
+</html>
-
-]]></string> </value>
+]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
@@ -142,8 +138,12 @@ button</td></tr>\n
<value> <string>testSimpleRelationFieldSaveButton</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>
Modified: erp5/trunk/bt5/erp5_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/bt/revision?rev=40412&r1=40411&r2=40412&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ui_test/bt/revision [utf8] Fri Nov 19 13:52:58 2010
@@ -1 +1 @@
-637
\ No newline at end of file
+638
\ No newline at end of file
More information about the Erp5-report
mailing list