[Erp5-report] r39025 ivan - in /erp5/trunk/bt5/erp5_dms_ui_test: SkinTemplateItem/portal_sk...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Oct 11 15:57:41 2010
New Revision: 39025

URL: http://svn.erp5.org?rev=39025&view=rev
Log:
Play as well with existing preferences left from previous tests (especially with user levelpreferences created from accounting tests)

Modified:
    erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_setupDMS.xml
    erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_tearDownDMS.xml
    erp5/trunk/bt5/erp5_dms_ui_test/bt/revision

Modified: erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_setupDMS.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_setupDMS.xml?rev=39025&r1=39024&r2=39025&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_setupDMS.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_setupDMS.xml [utf8] Mon Oct 11 15:57:41 2010
@@ -55,12 +55,10 @@
 # Setup System Preference\n
 dms_system_preference_id = \'dms_system_preference_ui_tests\'\n
 portal_preferences = context.portal_preferences\n
-if dms_system_preference_id not in portal_preferences.objectIds():\n
+dms_preference = portal_preferences.getActiveSystemPreference()\n
+if dms_preference is None:\n
   dms_preference = portal_preferences.newContent(id = dms_system_preference_id,\n
                                                  portal_type = \'System Preference\')\n
-else:\n
-  dms_preference = getattr(portal_preferences, dms_system_preference_id)\n
-\n
 kw = dict(priority = 1,\n
           preferred_document_reference_regular_expression = \'(?P<reference>[a-zA-Z0-9-_.]+-[a-zA-Z0-9-_.]+)(|-(?P<version>[0-9a-zA-Z.]+))(|-(?P<language>[a-z]{2})[^-]*)?\',\n
           preferred_document_file_name_regular_expression = \'(?P<node_reference>[a-zA-Z0-9_-]+)-(?P<local_reference>[a-zA-Z0-9_.]+)-(?P<version>[0-9a-zA-Z.]+)-(?P<language>[a-z]{2})[^-]*?\',\n
@@ -69,22 +67,21 @@ kw = dict(priority = 1,\n
           preferred_ooodoc_server_address = \'localhost\',\n
           preferred_ooodoc_server_port_number = 8008)\n
 dms_preference.edit(**kw)\n
-if dms_preference.getPreferenceState()!=\'global\':\n
+if dms_preference.getPreferenceState()==\'disabled\':\n
   dms_preference.enable()\n
 \n
 # Setup Preference so we can setup Access Tab\n
 dms_preference_id = \'dms_preference_ui_tests\'\n
-if dms_preference_id not in portal_preferences.objectIds():\n
+dms_preference = portal_preferences.getActivePreference()\n
+if dms_preference is None:\n
   dms_preference = portal_preferences.newContent(\n
                     id = dms_preference_id,\n
                     portal_type = \'Preference\')\n
-else:\n
-  dms_preference = getattr(portal_preferences, dms_preference_id)\n
 kw=dict(priority = 1,\n
         preferred_html_style_access_tab=1,\n
         preferred_listbox_list_mode_line_count=10)\n
 dms_preference.edit(**kw)\n
-if dms_preference.getPreferenceState()!=\'global\':\n
+if dms_preference.getPreferenceState()==\'disabled\':\n
   dms_preference.enable()\n
 \n
 # Publish all knowledge pad gadgets\n
@@ -148,7 +145,7 @@ return printed\n
                             <string>context</string>
                             <string>portal_preferences</string>
                             <string>dms_preference</string>
-                            <string>getattr</string>
+                            <string>None</string>
                             <string>dict</string>
                             <string>True</string>
                             <string>kw</string>

Modified: erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_tearDownDMS.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_tearDownDMS.xml?rev=39025&r1=39024&r2=39025&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_tearDownDMS.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_tearDownDMS.xml [utf8] Mon Oct 11 15:57:41 2010
@@ -51,9 +51,9 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string># Delete System Preference\n
-portal_preferences = context.portal_preferences\n
-portal_preferences.manage_delObjects([\'dms_system_preference_ui_tests\', \'dms_preference_ui_tests\'])\n
-context.portal_caches.clearAllCache()\n
+#portal_preferences = context.portal_preferences\n
+#portal_preferences.manage_delObjects([\'dms_system_preference_ui_tests\', \'dms_preference_ui_tests\'])\n
+#context.portal_caches.clearAllCache()\n
 print "Done"\n
 return printed\n
 </string> </value>
@@ -102,9 +102,6 @@ return printed\n
                           <tuple>
                             <string>_print_</string>
                             <string>_print</string>
-                            <string>_getattr_</string>
-                            <string>context</string>
-                            <string>portal_preferences</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_dms_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms_ui_test/bt/revision?rev=39025&r1=39024&r2=39025&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms_ui_test/bt/revision [utf8] Mon Oct 11 15:57:41 2010
@@ -1 +1 @@
-16
\ No newline at end of file
+17
\ No newline at end of file