[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - modified tests to make sure things still work if getUserName doesn't return the user id

[Yvo Schubbe]

Log message for revision 119027:
  - modified tests to make sure things still work if getUserName doesn't return the user id
  - adjusted userFolderEditUser call in MemberData

Changed:
  UU  Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py
  UU  Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py
  UU  Products.CMFCore/trunk/Products/CMFCore/tests/base/security.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_MemberDataTool.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py	2010-12-21 08:30:51 UTC (rev 119026)
+++ Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py	2010-12-21 10:18:11 UTC (rev 119027)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Basic member data tool.
-
-$Id$
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
@@ -366,7 +364,7 @@
         if domains is None:
             domains = u.getDomains()
 
-        u.userFolderEditUser(u.getUserName(), password, roles, domains)
+        u.userFolderEditUser(u.getId(), password, roles, domains)
 
     def __str__(self):
         return self.getMemberId()


Property changes on: Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py	2010-12-21 08:30:51 UTC (rev 119026)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py	2010-12-21 10:18:11 UTC (rev 119027)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Unit test dummies.
-
-$Id$
 """
 
 from Acquisition import Implicit, aq_base, aq_inner, aq_parent
@@ -324,7 +322,8 @@
     def getId(self):
         return self.id
 
-    getUserName = getId
+    def getUserName(self):
+        return 'name of %s' % self.getId()
 
     def allowed(self, object, object_roles=None):
         if object_roles is None or 'Anonymous' in object_roles:


Property changes on: Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/security.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/security.py	2010-12-21 08:30:51 UTC (rev 119026)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/security.py	2010-12-21 10:18:11 UTC (rev 119027)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Unit test security.
-
-$Id$
 """
 
 from AccessControl.PermissionRole import rolesForPermissionOn
@@ -58,7 +56,8 @@
     def getId( self ):
         return 'all_powerful_Oz'
 
-    getUserName = getId
+    def getUserName(self):
+        return 'All Powerful Oz'
 
     def getRoles(self):
         return ('Manager',)
@@ -84,7 +83,8 @@
     def getId( self ):
         return 'high_roller'
 
-    getUserName = getId
+    def getUserName(self):
+        return 'High Roller'
 
     def getRoles(self):
         return self._roles
@@ -97,15 +97,17 @@
                 return 1
         return 0
 
+
 class AnonymousUser( Implicit ):
     """
       Anonymous USer for unit testing purposes.
     """
     def getId( self ):
+        return None
+
+    def getUserName(self):
         return 'Anonymous User'
 
-    getUserName = getId
-
     def has_permission(self, permission, obj):
         # For types tool tests dealing with filtered_meta_types
         return 1


Property changes on: Products.CMFCore/trunk/Products/CMFCore/tests/base/security.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_MemberDataTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_MemberDataTool.py	2010-12-21 08:30:51 UTC (rev 119026)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_MemberDataTool.py	2010-12-21 10:18:11 UTC (rev 119027)
@@ -29,7 +29,7 @@
         self._users = {}
 
     def _addUser(self, user):
-        self._users[user.getUserName()] = user
+        self._users[user.getId()] = user
 
     def userFolderEditUser(self, name, password, roles, domains):
         user = self._users[name]
@@ -55,7 +55,7 @@
         return self.name
 
     def getUserName(self):
-        return self.name
+        return 'name of %s' % self.getId()
 
     def getRoles(self):
         return self.roles + ('Authenticated',)

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py	2010-12-21 08:30:51 UTC (rev 119026)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py	2010-12-21 10:18:11 UTC (rev 119027)
@@ -914,7 +914,8 @@
     def getId( self ):
         return 'unit_tester'
 
-    getUserName = getId
+    def getUserName(self):
+        return 'Unit Tester'
 
     def allowed( self, object, object_roles=None ):
         return self._lambdas[ 0 ]( object, object_roles )