[Erp5-report] r45103 gabriel - in /erp5/trunk/bt5/erp5_configurator_ung: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: gabriel
Date: Tue Apr  5 18:37:39 2011
New Revision: 45103

URL: http://svn.erp5.org?rev=45103&view=rev
Log:
Add step to check if preferences were configured correctly

Modified:
    erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_afterUNGConfiguration.xml
    erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py
    erp5/trunk/bt5/erp5_configurator_ung/bt/revision

Modified: erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_afterUNGConfiguration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_afterUNGConfiguration.xml?rev=45103&r1=45102&r2=45103&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_afterUNGConfiguration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_afterUNGConfiguration.xml [utf8] Tue Apr  5 18:37:39 2011
@@ -69,7 +69,7 @@ if ung_web_site is not None and isTransi
     ung_web_site.publish()\n
 \n
 language = context.getGlobalConfigurationAttr("default_available_language")\n
-context.log(language)\n
+\n
 ung_web_site.setDefaultAvailableLanguage(language)\n
 for web_section in ung_web_site.contentValues(portal_types=\'Web Section\'):\n
   if isTransitionPossible(web_section, \'publish\', None):\n

Modified: erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py?rev=45103&r1=45102&r2=45103&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py [utf8] Tue Apr  5 18:37:39 2011
@@ -64,7 +64,6 @@ class TestUNGConfiguratorWorkflowMixin(E
                        'erp5_web_ung_role')
 
   DEFAULT_SEQUENCE_LIST = """
-     stepSetupConversionServer
      stepCreateBusinessConfiguration
      stepSetUNGWorkflow
      stepConfiguratorNext
@@ -101,6 +100,8 @@ class TestUNGConfiguratorWorkflowMixin(E
      stepTic
      stepCheckUNGWebSiteAfterInstallation
      stepCheckSystemPreferenceAfterInstallation
+     stepCheckUserPreferenceAfterInstallation
+     stepTic
   """
 
   def getBusinessTemplateList(self):
@@ -114,13 +115,13 @@ class TestUNGConfiguratorWorkflowMixin(E
   def afterSetUp(self):
     self.portal.portal_templates.updateRepositoryBusinessTemplateList(
                            ['http://www.erp5.org/dists/snapshot/bt5/'])
-
-  def stepSetupConversionServer(self, sequence=None, sequence_list=None, **kw):
-    """ Setup conversion server in portal_preference """
-    preference = self.portal.portal_preferences.newContent(portal_type="System Preference")
-    preference.setPreferredOoodocServerAddress("localhost")
-    preference.setPreferredOoodocServerPortNumber(8011)
-    preference.enable()
+    if not self.portal.portal_catalog.getResultValue(portal_types="System Preference",
+                                                     title="global_system_preference"):
+      preference = self.portal.portal_preferences.newContent(portal_type="System Preference")
+      preference.setTitle("global_system_preference")
+      preference.setPreferredOoodocServerAddress("localhost")
+      preference.setPreferredOoodocServerPortNumber(8011)
+      preference.enable()
 
   def stepCreateBusinessConfiguration(self, sequence=None, sequence_list=None, **kw):
     """ Create one Business Configuration """
@@ -310,10 +311,26 @@ class TestUNGConfiguratorWorkflowMixin(E
 
   def stepCheckSystemPreferenceAfterInstallation(self, sequence=None, sequence_list=None, **kw):
     """ Check System Preference"""
+    import ipdb;ipdb.set_trace()
     system_preference = self.portal.portal_catalog.getResultValue(portal_type="System Preference")
     self.assertEquals(system_preference.getPreferredOoodocServerPortNumber(), 8011)
     self.assertEquals(system_preference.getPreferredOoodocServerAddress(), "localhost")
 
+  def stepCheckUserPreferenceAfterInstallation(self, sequence=None, sequence_list=None, **kw):
+    """ Check System Preference"""
+    portal_catalog = portal.portal_catalog
+    preference = portal_catalog.getResultValue(portal_type="Preference",
+                                               reference='Preference for Person Assignor')
+    self.assertEquals(preference.getPreferenceState(), "enabled")
+    preference = portal_catalog.getResultValue(portal_type="Preference",
+                                               title='Preference for Person Assignee')
+    self.assertEquals(preference.getPreferenceState(), "enabled")
+    preference = portal_catalog.getResultValue(portal_type="Preference",
+                                               title='Preference for Person Creator')
+    self.assertEquals(preference.getPreferenceState(), "enabled")
+    preference = portal_catalog.getResultValue(portal_type="Preference",
+                                               id='ung_reference')
+    self.assertEquals(preference.getPreferenceState(), "enabled")
 
 class TestUNGConfiguratorWorkflowFranceLanguage(TestUNGConfiguratorWorkflowMixin):
   """
@@ -396,6 +413,7 @@ class TestUNGConfiguratorWorkflowFranceL
     self.assertEquals(assignment.getValidationState(), "open")
     self.assertEquals(assignment.getFunction(), "function/ung_user")
 
+
 class TestUNGConfiguratorWorkflowBrazilLanguage(TestUNGConfiguratorWorkflowMixin):
   """
     Test UNG Configuration Workflow
@@ -445,7 +463,7 @@ class TestUNGConfiguratorWorkflowBrazilL
     self._stepSetupMultipleUserAccountThree(sequence, user_list)
 
   def stepCheckUNGWebSiteAfterInstallation(self, sequence=None, sequence_list=None, **kw):
-    """ Check if UNG Web Site is published and your language"""
+    """ Check if UNG Web Site is published and your language """
     ung_web_site = self.portal.web_site_module.ung
     portal_catalog = self.portal.portal_catalog
     self.assertEquals(ung_web_site.getValidationState(),

Modified: erp5/trunk/bt5/erp5_configurator_ung/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_ung/bt/revision?rev=45103&r1=45102&r2=45103&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_ung/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_ung/bt/revision [utf8] Tue Apr  5 18:37:39 2011
@@ -1 +1 @@
-33
\ No newline at end of file
+34
\ No newline at end of file