From 52719dba7fdeb446980c526f2d10b04491068885 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Thu, 21 Oct 2010 11:53:50 +0000
Subject: [PATCH] Group all "Anonymous User" like tests. Organise proper order
 of test zuites.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39440 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_km_zuite/anonymous_user.xml          | 26 +++++++++++++++++++
 .../testAnonymousRegisterAccount.xml          |  0
 .../testDefaultPadAnonymousMode.xml           |  0
 .../testListboxToolBarAddNewContent.xml       | 10 ++++---
 .../testListboxToolBarCopyPaste.xml           | 10 ++++---
 .../testListboxToolBarDelete.xml              | 10 ++++---
 .../testListboxToolBarResetSelection.xml      | 10 ++++---
 .../erp5_km_zuite/testAdvancedSearch.xml      | 10 ++++---
 .../erp5_km_zuite/testCheckPDFThumbnail.xml   | 10 ++++---
 .../erp5_km_zuite/testCreateNewFile.xml       | 15 ++++++-----
 .../erp5_km_zuite/testCreateNewLink.xml       | 10 ++++---
 .../erp5_km_zuite/testCreatePerson.xml        | 15 ++++++-----
 .../testDocumentDownloadWidget.xml            | 15 ++++++-----
 .../portal_tests/erp5_km_zuite/testFooter.xml | 15 ++++++-----
 .../testKMWebSiteDefaultView.xml              | 10 ++++---
 .../testKMWebSiteRedirectUserPreferences.xml  | 10 ++++---
 .../testKMWebSiteRedirectUserProfile.xml      | 10 ++++---
 .../erp5_km_zuite/testLatestContentGadget.xml | 15 ++++++-----
 .../erp5_km_zuite/testMyDocumentsGadget.xml   | 15 ++++++-----
 ...testSetUnSetDefaultWebPageOnWebSection.xml | 10 ++++---
 .../testTopSearchBoxClicking.xml              | 10 ++++---
 .../testTopSearchBoxHittingEnter.xml          | 10 ++++---
 .../testWebSiteBrowserGadget.xml              | 15 ++++++-----
 .../web_toolbar/testWebToolBarCloneObject.xml | 10 ++++---
 bt5/erp5_km_ui_test/bt/revision               |  2 +-
 25 files changed, 181 insertions(+), 92 deletions(-)
 create mode 100644 bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/anonymous_user.xml
 rename bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/{ => anonymous_user}/testAnonymousRegisterAccount.xml (100%)
 rename bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/{ => anonymous_user}/testDefaultPadAnonymousMode.xml (100%)

diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/anonymous_user.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/anonymous_user.xml
new file mode 100644
index 0000000000..542a0d514e
--- /dev/null
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/anonymous_user.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Zuite" module="Products.Zelenium.zuite"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>anonymous_user</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAnonymousRegisterAccount.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/anonymous_user/testAnonymousRegisterAccount.xml
similarity index 100%
rename from bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAnonymousRegisterAccount.xml
rename to bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/anonymous_user/testAnonymousRegisterAccount.xml
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDefaultPadAnonymousMode.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/anonymous_user/testDefaultPadAnonymousMode.xml
similarity index 100%
rename from bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDefaultPadAnonymousMode.xml
rename to bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/anonymous_user/testDefaultPadAnonymousMode.xml
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarAddNewContent.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarAddNewContent.xml
index 999f7e7b96..c77585df7e 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarAddNewContent.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarAddNewContent.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
@@ -92,7 +92,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -106,9 +106,13 @@
             <key> <string>id</string> </key>
             <value> <string>testListboxToolBarAddNewContent</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarCopyPaste.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarCopyPaste.xml
index 220fac89fd..1b2899cfb0 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarCopyPaste.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarCopyPaste.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
@@ -106,7 +106,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -120,9 +120,13 @@
             <key> <string>id</string> </key>
             <value> <string>testListboxToolBarCopyPaste</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarDelete.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarDelete.xml
index e1ea4939c6..a4255d2423 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarDelete.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarDelete.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
@@ -101,7 +101,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -115,9 +115,13 @@
             <key> <string>id</string> </key>
             <value> <string>testListboxToolBarDelete</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarResetSelection.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarResetSelection.xml
index e2295de8ef..75e4533bb8 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarResetSelection.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/listbox_toolbar/testListboxToolBarResetSelection.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
@@ -95,7 +95,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -109,9 +109,13 @@
             <key> <string>id</string> </key>
             <value> <string>testListboxToolBarResetSelection</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAdvancedSearch.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAdvancedSearch.xml
index b5f9cdefd9..e09694a262 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAdvancedSearch.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAdvancedSearch.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
@@ -213,7 +213,7 @@
 \n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -227,9 +227,13 @@
             <key> <string>id</string> </key>
             <value> <string>testAdvancedSearch</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCheckPDFThumbnail.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCheckPDFThumbnail.xml
index 44638e01f8..6d370364cc 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCheckPDFThumbnail.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCheckPDFThumbnail.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
@@ -288,7 +288,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -302,9 +302,13 @@
             <key> <string>id</string> </key>
             <value> <string>testCheckPDFThumbnail</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewFile.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewFile.xml
index 3a885fa549..1686b2f318 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewFile.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewFile.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
@@ -188,7 +185,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -202,9 +199,13 @@
             <key> <string>id</string> </key>
             <value> <string>testCreateNewFile</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewLink.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewLink.xml
index 88d1cebf33..5cd1eaef3e 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewLink.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewLink.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
@@ -160,7 +160,7 @@
 </html>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -174,9 +174,13 @@
             <key> <string>id</string> </key>
             <value> <string>testCreateNewLink</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreatePerson.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreatePerson.xml
index c8d82b4b70..277aad5a92 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreatePerson.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreatePerson.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
@@ -193,7 +190,7 @@
 \n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -207,9 +204,13 @@
             <key> <string>id</string> </key>
             <value> <string>testCreatePerson</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDocumentDownloadWidget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDocumentDownloadWidget.xml
index f34858b4ff..777265d0db 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDocumentDownloadWidget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDocumentDownloadWidget.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
@@ -95,7 +92,7 @@
 \n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -109,9 +106,13 @@
             <key> <string>id</string> </key>
             <value> <string>testDocumentDownloadWidget</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testFooter.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testFooter.xml
index b3dc75943a..a0750ced89 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testFooter.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testFooter.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
@@ -91,7 +88,7 @@
 \n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -105,9 +102,13 @@
             <key> <string>id</string> </key>
             <value> <string>testFooter</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteDefaultView.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteDefaultView.xml
index e339268fad..b44ee3daff 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteDefaultView.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteDefaultView.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
@@ -125,7 +125,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -139,9 +139,13 @@
             <key> <string>id</string> </key>
             <value> <string>testKMWebSiteDefaultView</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteRedirectUserPreferences.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteRedirectUserPreferences.xml
index 1b336db1be..2ce9415411 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteRedirectUserPreferences.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteRedirectUserPreferences.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
@@ -75,7 +75,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -89,9 +89,13 @@
             <key> <string>id</string> </key>
             <value> <string>testKMWebSiteRedirectUserPreferences</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteRedirectUserProfile.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteRedirectUserProfile.xml
index c6d82f2d37..ff94fb401e 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteRedirectUserProfile.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteRedirectUserProfile.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
@@ -75,7 +75,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -89,9 +89,13 @@
             <key> <string>id</string> </key>
             <value> <string>testKMWebSiteRedirectUserProfile</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testLatestContentGadget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testLatestContentGadget.xml
index 626ec780ab..1b4e11c1b0 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testLatestContentGadget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testLatestContentGadget.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
@@ -190,7 +187,7 @@
 \n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -204,9 +201,13 @@
             <key> <string>id</string> </key>
             <value> <string>testLatestContentGadget</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testMyDocumentsGadget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testMyDocumentsGadget.xml
index b0ba40beb3..6819a09bd0 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testMyDocumentsGadget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testMyDocumentsGadget.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
@@ -166,7 +163,7 @@
 </html>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -180,9 +177,13 @@
             <key> <string>id</string> </key>
             <value> <string>testMyDocumentsGadget</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml
index d783182477..e00b24e657 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.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
@@ -173,7 +173,7 @@
 \n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -187,9 +187,13 @@
             <key> <string>id</string> </key>
             <value> <string>testSetUnSetDefaultWebPageOnWebSection</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.xml
index 5bd9b7716e..04a9670284 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.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
@@ -136,7 +136,7 @@
 </html>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -150,9 +150,13 @@
             <key> <string>id</string> </key>
             <value> <string>testTopSearchBoxClicking</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.xml
index 5833022007..3a7c01c88b 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.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
@@ -118,7 +118,7 @@
 \n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -132,9 +132,13 @@
             <key> <string>id</string> </key>
             <value> <string>testTopSearchBoxHittingEnter</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testWebSiteBrowserGadget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testWebSiteBrowserGadget.xml
index b8693698c1..804e10bd0f 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testWebSiteBrowserGadget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testWebSiteBrowserGadget.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
@@ -214,7 +211,7 @@
 \n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -228,9 +225,13 @@
             <key> <string>id</string> </key>
             <value> <string>testWebSiteBrowserGadget</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_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testWebToolBarCloneObject.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testWebToolBarCloneObject.xml
index 98b789f43c..ee3c0b1e63 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testWebToolBarCloneObject.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/web_toolbar/testWebToolBarCloneObject.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
@@ -170,7 +170,7 @@
 </body>\n
 </html>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -184,9 +184,13 @@
             <key> <string>id</string> </key>
             <value> <string>testWebToolBarCloneObject</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_km_ui_test/bt/revision b/bt5/erp5_km_ui_test/bt/revision
index 8bc6583717..5a396e28e8 100644
--- a/bt5/erp5_km_ui_test/bt/revision
+++ b/bt5/erp5_km_ui_test/bt/revision
@@ -1 +1 @@
-120
\ No newline at end of file
+121
\ No newline at end of file
-- 
2.30.9