[CMF-checkins] CVS: Products/CMFCore/tests - test_PortalContent.py:1.8

[Jens Vagelpohl]

Update of /cvs-repository/Products/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv20505

Modified Files:
	test_PortalContent.py 
Log Message:
- replace unseemly dependence on CMFSetup in the CMFCore tests with
  a dependence on CMFDefault, which is slightly less terrible


=== Products/CMFCore/tests/test_PortalContent.py 1.7 => 1.8 ===
--- Products/CMFCore/tests/test_PortalContent.py:1.7	Mon Feb 28 16:30:40 2005
+++ Products/CMFCore/tests/test_PortalContent.py	Mon Feb 28 17:07:37 2005
@@ -10,6 +10,7 @@
 from AccessControl.SecurityManagement import noSecurityManager
 from AccessControl.User import UnrestrictedUser
 from Products.CMFCore.PortalContent import PortalContent
+from Products.CMFDefault.Portal import PortalGenerator
 
 
 class PortalContentTests(TestCase):
@@ -32,8 +33,8 @@
         RequestTest.setUp(self)
         try:
             newSecurityManager(None, UnrestrictedUser('manager', '', ['Manager'], []))
-            factory = self.root.manage_addProduct['CMFSetup'].addConfiguredSite
-            factory('cmf', 'default', snapshot=False)
+            site_generator = PortalGenerator()
+            site_generator.create(self.root, 'cmf', 1)
             self.site = self.root.cmf
             get_transaction().commit(1) # Make sure we have _p_jars
         except: