[Checkins] SVN: PluggableAuthService/branches/z3-events/ Some renaming

[Wichert Akkerman]

Log message for revision 76542:
  Some renaming

Changed:
  U   PluggableAuthService/branches/z3-events/events.py
  U   PluggableAuthService/branches/z3-events/tests/test_UserFolder.py

-=-
Modified: PluggableAuthService/branches/z3-events/events.py
===================================================================
--- PluggableAuthService/branches/z3-events/events.py	2007-06-09 11:29:22 UTC (rev 76541)
+++ PluggableAuthService/branches/z3-events/events.py	2007-06-09 11:31:50 UTC (rev 76542)
@@ -1,5 +1,5 @@
 from zope.interface import implements
-from interfaces.events import *
+from Products.PluggableAuthService.interfaces.events import *
 
 class PASEvent(object):
     implements(IPASEvent)
@@ -10,7 +10,7 @@
 
 
 class UserCreated(PASEvent):
-    implements(IUserCreated)
+    implements(IUserCreatedEvent)
 
     def __init__(self, acl_users, userid, login):
         self.acl_users=acl_users
@@ -19,11 +19,11 @@
 
 
 class UserDeleted(PASEvent):
-    implements(IUserDeleted)
+    implements(IUserDeletedEvent)
 
 
 class UserCredentialsUpdated(PASEvent):
-    implements(IUserCredentialsUpdated)
+    implements(IUserCredentialsUpdatedEvent)
 
     def __init__(self, acl_users, userid, password):
         self.acl_users=acl_users
@@ -32,7 +32,7 @@
 
 
 class UserPropertiesUpdated(PASEvent):
-    implements(IUserPropertiesUpdated)
+    implements(IUserPropertiesUpdatedEvent)
 
     def __init__(self, acl_users, userid, properties):
         self.acl_users=acl_users

Modified: PluggableAuthService/branches/z3-events/tests/test_UserFolder.py
===================================================================
--- PluggableAuthService/branches/z3-events/tests/test_UserFolder.py	2007-06-09 11:29:22 UTC (rev 76541)
+++ PluggableAuthService/branches/z3-events/tests/test_UserFolder.py	2007-06-09 11:31:50 UTC (rev 76542)
@@ -26,9 +26,9 @@
 
 from zope.component import adapter
 from zope.component import provideHandler
-from Products.PluggableAuthService.interfaces.events import IUserCreated
+from Products.PluggableAuthService.interfaces.events import IUserCreatedEvent
 
- at adapter(IUserCreated)
+ at adapter(IUserCreatedEvent)
 def userCreatedHandler(event):
     if not hasattr(event.acl_users, 'events'):
         event.acl_users.events= []
@@ -60,18 +60,6 @@
         # Make sure we are not logged in
         self.logout()
 
-    def testUserCreationEvent(self):
-        provideHandler(userCreatedHandler)
-        self.uf.events = []
-
-        self.uf._doAddUser('event1', 'secret', ['role1'], [])
-
-        self.assertEqual(len(self.uf.events), 1)
-        event = self.uf.events[0]
-        self.failUnless(IUserCreated.providedBy(event))
-        self.assertEqual(event.login, 'event1')
-        self.assertEqual(event.userid, 'event1')
-
     def testGetUser(self):
         self.failIfEqual(self.uf.getUser('user1'), None)
 
@@ -299,10 +287,36 @@
         self.assertEqual(f.getDomains(), ())
 
 
+class UserEvents(pastc.PASTestCase):
+
+    def afterSetUp(self):
+        # Set up roles and a user
+        self.uf = self.folder.acl_users
+        self.folder._addRole('role1')
+        self.folder.manage_role('role1', [View])
+        self.uf.roles.addRole('role1')
+        self.folder._addRole('role2')
+        self.uf._doAddUser('user1', 'secret', ['role1'], [])
+
+    def testUserCreationEvent(self):
+        provideHandler(userCreatedHandler)
+        self.uf.events = []
+
+        self.uf._doAddUser('event1', 'secret', ['role1'], [])
+
+        self.assertEqual(len(self.uf.events), 1)
+        event = self.uf.events[0]
+        self.failUnless(IUserCreatedEvent.providedBy(event))
+        self.assertEqual(event.login, 'event1')
+        self.assertEqual(event.userid, 'event1')
+
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(UserFolderTests))
     suite.addTest(unittest.makeSuite(UserTests))
+    suite.addTest(unittest.makeSuite(UserEvents))
     return suite
 
 if __name__ == '__main__':