[CMF-checkins] CVS: CMF/CMFSetup/tests - test_registry.py:1.17 test_tool.py:1.18

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFSetup/tests
In directory cvs.zope.org:/tmp/cvs-serv7748/CMFSetup/tests

Modified Files:
	test_registry.py test_tool.py 
Log Message:
- made profile ID a combination of profile name and product ID
- removed product name from existing profile names


=== CMF/CMFSetup/tests/test_registry.py 1.16 => 1.17 ===
--- CMF/CMFSetup/tests/test_registry.py:1.16	Wed Mar 16 03:22:35 2005
+++ CMF/CMFSetup/tests/test_registry.py	Sun Mar 20 16:19:47 2005
@@ -1043,15 +1043,16 @@
 
     def test_registerProfile_normal( self ):
 
-        PROFILE_ID = 'one'
+        NAME = 'one'
         TITLE = 'One'
         DESCRIPTION = 'One profile'
         PATH = '/path/to/one'
         PRODUCT = 'TestProduct'
         PROFILE_TYPE = EXTENSION
+        PROFILE_ID = 'TestProduct:one'
 
         registry = self._makeOne()
-        registry.registerProfile( PROFILE_ID
+        registry.registerProfile( NAME
                                 , TITLE
                                 , DESCRIPTION
                                 , PATH


=== CMF/CMFSetup/tests/test_tool.py 1.17 => 1.18 ===
--- CMF/CMFSetup/tests/test_tool.py:1.17	Wed Mar 16 03:22:35 2005
+++ CMF/CMFSetup/tests/test_tool.py	Sun Mar 20 16:19:47 2005
@@ -120,9 +120,9 @@
                      )
 
         profile_registry.registerProfile('foo', 'Foo', '', self._PROFILE_PATH)
-        tool.setImportContext('profile-foo')
+        tool.setImportContext('profile-other:foo')
 
-        self.assertEqual( tool.getImportContextID(), 'profile-foo' )
+        self.assertEqual( tool.getImportContextID(), 'profile-other:foo' )
 
     def test_setImportContext_invalid( self ):
 
@@ -163,9 +163,9 @@
                      )
 
         profile_registry.registerProfile('foo', 'Foo', '', self._PROFILE_PATH)
-        tool.setImportContext('profile-foo')
+        tool.setImportContext('profile-other:foo')
 
-        self.assertEqual( tool.getImportContextID(), 'profile-foo' )
+        self.assertEqual( tool.getImportContextID(), 'profile-other:foo' )
 
         import_registry = tool.getImportStepRegistry()
         self.assertEqual( len( import_registry.listSteps() ), 1 )