[CMF-checkins] CVS: CMF/CMFCore/tests - test_Expression.py:1.5 test_PortalFolder.py:1.25

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv21105/CMFCore/tests

Modified Files:
	test_Expression.py test_PortalFolder.py 
Log Message:
Merged yuppie-collector025-branch:
- Creator element no longer depends on Ownership. (Collector #25)
- TypeInfo's _finishConstruction() now calls reindexObject().
- Removed WorkflowMethod wrapper of Document.setFormat().


=== CMF/CMFCore/tests/test_Expression.py 1.4 => 1.5 ===
--- CMF/CMFCore/tests/test_Expression.py:1.4	Thu Nov 27 10:06:50 2003
+++ CMF/CMFCore/tests/test_Expression.py	Tue Dec 23 16:47:24 2003
@@ -1,5 +1,6 @@
 from unittest import TestSuite, makeSuite, main
 
+import Testing
 import Zope
 try:
     Zope.startup()
@@ -40,12 +41,11 @@
         member = ec.global_vars['member']
         self.failIf(member)
 
-
     def test_authenticatedUser_ec(self):
         self.portal.portal_membership = DummyMembershipTool(anon=0)
         ec = createExprContext(self.folder, self.portal, self.object)
         member = ec.global_vars['member']
-        self.assertEqual(member, 'member')
+        self.assertEqual(member.getId(), 'dummy')
 
     def test_ec_context(self):
         self.portal.portal_membership = DummyMembershipTool()


=== CMF/CMFCore/tests/test_PortalFolder.py 1.24 => 1.25 ===
--- CMF/CMFCore/tests/test_PortalFolder.py:1.24	Sun Dec  7 15:44:07 2003
+++ CMF/CMFCore/tests/test_PortalFolder.py	Tue Dec 23 16:47:24 2003
@@ -448,13 +448,13 @@
     def test_Creator( self ):
         cfilter = ContentFilter( Creator='moe' )
         dummy = self.dummy
-        assert not cfilter( dummy )
-        dummy.creator = 'curly'
-        assert not cfilter( dummy )
-        dummy.creator = 'moe'
-        self.failUnless(cfilter( dummy ))
-        dummy.creator = 'shmoe'
-        assert cfilter( dummy )
+        self.failIf( cfilter(dummy) )
+        dummy.creators = ('curly',)
+        self.failIf( cfilter(dummy) )
+        dummy.creators = ('moe',)
+        self.failUnless( cfilter(dummy) )
+        dummy.creators = ('moe', 'curly')
+        self.failUnless( cfilter(dummy) )
         desc = str( cfilter )
         lines = desc.split('; ')
         self.assertEqual(len( lines ),1)