[Erp5-report] r43213 arnaud.fontaine - /erp5/trunk/products/ERP5Type/tests/

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Wed Feb  9 09:47:39 2011
New Revision: 43213

URL: http://svn.erp5.org?rev=43213&view=rev
Log:
Filesystem Property Sheets are now in ERP5PropertySheetLegacy, so
update TestZodbImportFilesystemPropertySheet accordingly


Modified:
    erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py

Modified: erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py?rev=43213&r1=43212&r2=43213&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py [utf8] Wed Feb  9 09:47:39 2011
@@ -1227,12 +1227,21 @@ class TestZodbImportFilesystemPropertySh
     """
     portal = self.getPortalObject().portal_property_sheets
 
-    from Products.ERP5Type import PropertySheet
-    # Get all the property sheets defined on the filesystem
-    for name, klass in PropertySheet.__dict__.iteritems():
-      if name[0] == '_' or isinstance(klass, basestring):
+    from Products.ERP5PropertySheetLegacy import PropertySheet
+    import os
+
+    property_sheet_legacy_class_dict = {}
+    for module in os.listdir(os.path.dirname(PropertySheet.__file__)):
+      if module == '__init__.py' or module[-3:] != '.py':
         continue
 
+      filename = module[:-3]
+
+      property_sheet_legacy_class_dict[filename] = \
+        getattr(__import__(filename, locals(), globals()), filename)
+
+    # Get all the property sheets defined on the filesystem
+    for name, klass in property_sheet_legacy_class_dict.iteritems():
       filesystem_property_sheet = klass
       property_sheet_name = name
 
@@ -1244,6 +1253,9 @@ class TestZodbImportFilesystemPropertySh
       zodb_property_sheet = portal.createPropertySheetFromFilesystemClass(
         filesystem_property_sheet)
 
+      self.assertTrue(filesystem_property_sheet.__name__ in \
+                      self.portal.portal_property_sheets.objectIds())
+
       zodb_property_tuple, zodb_category_tuple, zodb_constraint_class_tuple = \
           portal.exportPropertySheetToFilesystemDefinitionTuple(
               zodb_property_sheet)