[CMF-checkins] CVS: Products/CMFDefault/tests - test_DiscussionReply.py:1.5 test_Image.py:1.11 test_Portal.py:1.9 test_join.py:1.14

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFDefault/tests
In directory cvs.zope.org:/tmp/cvs-serv7748/CMFDefault/tests

Modified Files:
	test_DiscussionReply.py test_Image.py test_Portal.py 
	test_join.py 
Log Message:
- made profile ID a combination of profile name and product ID
- removed product name from existing profile names


=== Products/CMFDefault/tests/test_DiscussionReply.py 1.4 => 1.5 ===
--- Products/CMFDefault/tests/test_DiscussionReply.py:1.4	Mon Feb 28 16:34:44 2005
+++ Products/CMFDefault/tests/test_DiscussionReply.py	Sun Mar 20 16:19:47 2005
@@ -20,7 +20,7 @@
         RequestTest.setUp(self)
         try:
             factory = self.root.manage_addProduct['CMFSetup'].addConfiguredSite
-            factory('cmf', 'default', snapshot=False)
+            factory('cmf', 'CMFDefault:default', snapshot=False)
             self.portal = self.root.cmf
             # Become a Manager
             self.uf = self.portal.acl_users


=== Products/CMFDefault/tests/test_Image.py 1.10 => 1.11 ===
--- Products/CMFDefault/tests/test_Image.py:1.10	Mon Feb 28 16:34:44 2005
+++ Products/CMFDefault/tests/test_Image.py	Sun Mar 20 16:19:47 2005
@@ -1,3 +1,20 @@
+##############################################################################
+#
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for Image module.
+
+$Id$
+"""
+
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
 import Zope
@@ -73,7 +90,7 @@
         try:
             newSecurityManager(None, UnrestrictedUser('manager', '', ['Manager'], []))
             factory = self.root.manage_addProduct['CMFSetup'].addConfiguredSite
-            factory('cmf', 'default', snapshot=False)
+            factory('cmf', 'CMFDefault:default', snapshot=False)
             self.site = self.root.cmf
             self.site.invokeFactory('File', id='file')
             self.site.portal_workflow.doActionFor(self.site.file, 'publish')


=== Products/CMFDefault/tests/test_Portal.py 1.8 => 1.9 ===
--- Products/CMFDefault/tests/test_Portal.py:1.8	Mon Feb 28 16:34:44 2005
+++ Products/CMFDefault/tests/test_Portal.py	Sun Mar 20 16:19:47 2005
@@ -31,7 +31,7 @@
 
         from Products.CMFSetup.factory import addConfiguredSite
 
-        addConfiguredSite(self.root, id, 'default', snapshot=False)
+        addConfiguredSite(self.root, id, 'CMFDefault:default', snapshot=False)
         return getattr( self.root, id )
 
     def _makeContent( self, site, portal_type, id='document', **kw ):


=== Products/CMFDefault/tests/test_join.py 1.13 => 1.14 ===
--- Products/CMFDefault/tests/test_join.py:1.13	Mon Feb 28 16:34:44 2005
+++ Products/CMFDefault/tests/test_join.py	Sun Mar 20 16:19:47 2005
@@ -1,3 +1,20 @@
+##############################################################################
+#
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for adding members.
+
+$Id$
+"""
+
 from unittest import TestSuite, makeSuite, main
 import Testing
 import Zope
@@ -10,7 +27,7 @@
 
     def test_join( self ):
         factory = self.root.manage_addProduct['CMFSetup'].addConfiguredSite
-        factory('site', 'default', snapshot=False)
+        factory('site', 'CMFDefault:default', snapshot=False)
         site = self.root.site
         member_id = 'test_user'
         site.portal_registration.addMember( member_id
@@ -24,7 +41,7 @@
 
     def test_join_without_email( self ):
         factory = self.root.manage_addProduct['CMFSetup'].addConfiguredSite
-        factory('site', 'default', snapshot=False)
+        factory('site', 'CMFDefault:default', snapshot=False)
         site = self.root.site
         self.assertRaises(ValueError,
                           site.portal_registration.addMember,
@@ -35,7 +52,7 @@
 
     def test_join_with_variable_id_policies( self ):
         factory = self.root.manage_addProduct['CMFSetup'].addConfiguredSite
-        factory('site', 'default', snapshot=False)
+        factory('site', 'CMFDefault:default', snapshot=False)
         site = self.root.site
         member_id = 'test.user'