[Erp5-report] r31442 aurel - /erp5/trunk/products/ERP5/tests/testBusinessTemplate.py

[nobody at svn.erp5.org]

Author: aurel
Date: Wed Dec 23 16:54:29 2009
New Revision: 31442

URL: http://svn.erp5.org?rev=31442&view=rev
Log:
fix a typo
check preinstall more precisely
don't install using force, to be sure that only stuff returned by
preinstall in installed

Modified:
    erp5/trunk/products/ERP5/tests/testBusinessTemplate.py

Modified: erp5/trunk/products/ERP5/tests/testBusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBusinessTemplate.py?rev=31442&r1=31441&r2=31442&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testBusinessTemplate.py [utf8] Wed Dec 23 16:54:29 2009
@@ -248,7 +248,7 @@
     bt = sequence.get('import_bt')
     sequence.edit(current_bt=bt)
 
-  def stepCheckPreinstalReturnSomething(self, sequence=None,
+  def stepCheckPreinstallReturnSomething(self, sequence=None,
                                         sequence_list=None, **kw):
     """
     In case of upgrade preinstall call must return at least one element
@@ -256,6 +256,15 @@
     """
     bt = sequence.get('current_bt', None)
     self.assertNotEquals(len(bt.preinstall()), 0)
+
+  def stepCheckCatalogPreinstallReturnCatalogMethod(self, sequence=None,
+                                        sequence_list=None, **kw):
+    """
+    In case of upgrade preinstall call must return at least one element
+    which is marked as new/updated/removed
+    """
+    bt = sequence.get('current_bt', None)
+    self.assertEquals(bt.preinstall(), {'portal_catalog/erp5_mysql_innodb/z_fake_method': ['Modified', 'CatalogMethod']})
 
   def stepCheckInstalledInstallationState(self, sequence=None,
                                         sequence_list=None, **kw):
@@ -3515,8 +3524,9 @@
                        UseImportBusinessTemplate \
                        CheckBuiltBuildingState \
                        CheckNotInstalledInstallationState \
-                       CheckPreinstalReturnSomething \
-                       InstallBusinessTemplate \
+                       CheckPreinstallReturnSomething \
+                       CheckCatalogPreinstallReturnCatalogMethod \
+                       InstallWithoutForceBusinessTemplate \
                        Tic \
                        CheckInstalledInstallationState \
                        CheckBuiltBuildingState \