[CMF-checkins] SVN: CMF/branches/1.6/CMFTopic/ * added, registered GenericSetup profile; change func tests to use

Rob Miller ra at burningman.com
Tue Nov 22 04:33:58 EST 2005


Log message for revision 40312:
  * added, registered GenericSetup profile; change func tests to use
    new CMFDefault factory
  
  

Changed:
  U   CMF/branches/1.6/CMFTopic/__init__.py
  A   CMF/branches/1.6/CMFTopic/profiles/
  U   CMF/branches/1.6/CMFTopic/tests/test_DateC.py

-=-
Modified: CMF/branches/1.6/CMFTopic/__init__.py
===================================================================
--- CMF/branches/1.6/CMFTopic/__init__.py	2005-11-22 09:24:25 UTC (rev 40311)
+++ CMF/branches/1.6/CMFTopic/__init__.py	2005-11-22 09:33:57 UTC (rev 40312)
@@ -21,6 +21,8 @@
 
 from Products.CMFCore.utils import ContentInit
 from Products.CMFCore.DirectoryView import registerDirectory
+from Products.GenericSetup import EXTENSION
+from Products.GenericSetup import profile_registry
 
 import Topic
 import SimpleStringCriterion
@@ -55,5 +57,11 @@
                , content_types = (Topic.Topic,)
                , permission = AddTopics
                , extra_constructors = (Topic.addTopic,)
-               , fti = Topic.factory_type_information
                ).initialize( context )
+
+    profile_registry.registerProfile('default',
+                                     'CMFTopic',
+                                     'Adds topic portal type.',
+                                     'profiles/default',
+                                     'CMFTopic',
+                                     EXTENSION)

Copied: CMF/branches/1.6/CMFTopic/profiles (from rev 40311, CMF/trunk/CMFTopic/profiles)

Modified: CMF/branches/1.6/CMFTopic/tests/test_DateC.py
===================================================================
--- CMF/branches/1.6/CMFTopic/tests/test_DateC.py	2005-11-22 09:24:25 UTC (rev 40311)
+++ CMF/branches/1.6/CMFTopic/tests/test_DateC.py	2005-11-22 09:33:57 UTC (rev 40312)
@@ -17,14 +17,12 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-try:
-    import Zope2
-except ImportError: # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
+import Products
 from DateTime.DateTime import DateTime
-
+from Products.CMFCore.tests.base.testcase import PlacelessSetup
 from Products.CMFCore.tests.base.testcase import RequestTest
 from Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFTopic.Topic import Topic
@@ -152,7 +150,7 @@
         self.assertEqual( expect_now.Date(), DateTime().Date() )
         self.assertEqual( result[0][1]['range'], 'min:max' )
 
-class FriendlyDateCriterionFunctionalTests(RequestTest):
+class FriendlyDateCriterionFunctionalTests(PlacelessSetup, RequestTest):
     # Test the date criterion using a "real CMF" with catalog etc.
     selectable_diffs = [0, 1, 2, 5, 7, 14, 31, 93, 186, 365, 730]
     nonzero_diffs = [1, 2, 5, 7, 14, 31, 93, 186, 365, 730]
@@ -160,8 +158,18 @@
     day_diffs.extend(selectable_diffs)
 
     def setUp(self):
+        import Products.CMFCore
+        import Products.Five
+        from Products.Five import zcml
+        import Products.GenericSetup
+        PlacelessSetup.setUp(self)
         RequestTest.setUp(self)
-        self.root.manage_addProduct[ 'CMFDefault' ].manage_addCMFSite( 'site' )
+        zcml.load_config('meta.zcml', Products.Five)
+        zcml.load_config('configure.zcml', Products.GenericSetup)
+        zcml.load_config('configure.zcml', Products.CMFCore)
+
+        factory = self.root.manage_addProduct['CMFDefault'].addConfiguredSite
+        factory('site', 'CMFDefault:default', snapshot=False)
         self.site = self.root.site
         self.site._setObject( 'topic', Topic('topic') )
         self.topic = self.site.topic



More information about the CMF-checkins mailing list