[Erp5-report] r29843 - /erp5/trunk/products/ERP5/tests/testSupply.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Oct 20 12:36:07 2009
New Revision: 29843

URL: http://svn.erp5.org?rev=29843&view=rev
Log:
move 'clean up' part to beforeTearDown() that supports Purchase Supply too.

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

Modified: erp5/trunk/products/ERP5/tests/testSupply.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testSupply.py?rev=29843&r1=29842&r2=29843&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testSupply.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testSupply.py [utf8] Tue Oct 20 12:36:07 2009
@@ -34,11 +34,6 @@
 from DateTime import DateTime
 
 class TestSupplyMixin:
-
-  supply_portal_type = 'Sale Supply'
-  supply_line_portal_type = 'Sale Supply Line'
-  supply_cell_portal_type = 'Sale Supply Cell'
-
   def getBusinessTemplateList(self):
     """
       List of needed Business Templates
@@ -57,11 +52,20 @@
                             id='testing_folder')
     self.folder = self.portal.testing_folder
 
+  def beforeTearDown(self):
+    module = self.portal.getDefaultModule(self.supply_portal_type)
+    module.manage_delObjects(list(module.objectIds()))
+    self.stepTic()
+
 class TestSaleSupply(TestSupplyMixin, ERP5TypeTestCase):
   """
     Test Supplies usage
   """
   run_all_test = 1
+
+  supply_portal_type = 'Sale Supply'
+  supply_line_portal_type = 'Sale Supply Line'
+  supply_cell_portal_type = 'Sale Supply Cell'
 
   def getTitle(self):
     return "Sale Supply"
@@ -187,10 +191,6 @@
 
     portal = self.portal
     original_date = DateTime().earliestTime()
-
-    # clean up
-    portal.sale_supply_module.manage_delObjects(list(portal.sale_supply_module.objectIds()))
-    self.stepTic()
 
     supply = self._makeSupply(start_date_range_min=original_date)
     supply_line = self._makeSupplyLine(supply)