[Checkins] SVN: five.globalrequest/trunk/five/globalrequest/ Tidy up + tests

[Martin Aspeli]

Log message for revision 107801:
  Tidy up + tests

Changed:
  U   five.globalrequest/trunk/five/globalrequest/configure.zcml
  U   five.globalrequest/trunk/five/globalrequest/hooks.py
  A   five.globalrequest/trunk/five/globalrequest/tests.py

-=-
Modified: five.globalrequest/trunk/five/globalrequest/configure.zcml
===================================================================
--- five.globalrequest/trunk/five/globalrequest/configure.zcml	2010-01-08 15:31:34 UTC (rev 107800)
+++ five.globalrequest/trunk/five/globalrequest/configure.zcml	2010-01-08 15:35:45 UTC (rev 107801)
@@ -4,7 +4,7 @@
 
     <subscriber
         for="ZPublisher.interfaces.IPubStart"
-        handler=".hooks.set"
+        handler=".hooks.set_"
         />
     
     <subscriber

Modified: five.globalrequest/trunk/five/globalrequest/hooks.py
===================================================================
--- five.globalrequest/trunk/five/globalrequest/hooks.py	2010-01-08 15:31:34 UTC (rev 107800)
+++ five.globalrequest/trunk/five/globalrequest/hooks.py	2010-01-08 15:35:45 UTC (rev 107801)
@@ -1,6 +1,6 @@
 from zope.globalrequest import setRequest, clearRequest
 
-def set(event):
+def set_(event):
     setRequest(event.request)
 
 def clear(event):

Added: five.globalrequest/trunk/five/globalrequest/tests.py
===================================================================
--- five.globalrequest/trunk/five/globalrequest/tests.py	                        (rev 0)
+++ five.globalrequest/trunk/five/globalrequest/tests.py	2010-01-08 15:35:45 UTC (rev 107801)
@@ -0,0 +1,41 @@
+import unittest
+
+class TestHooks(unittest.TestCase):
+    
+    def test_set(self):
+        
+        class FauxRequest(object):
+            pass
+        
+        class FauxEvent(object):
+            request = FauxRequest()
+        
+        event = FauxEvent()
+        
+        from five.globalrequest.hooks import set_
+        set_(event)
+        
+        from zope.globalrequest import getRequest
+        self.assertEquals(getRequest(), event.request)
+    
+    def test_clear(self):
+        
+        class FauxRequest(object):
+            pass
+        
+        class FauxEvent(object):
+            request = FauxRequest()
+        
+        event = FauxEvent()
+        
+        from zope.globalrequest import setRequest
+        setRequest(event.request)
+        
+        from five.globalrequest.hooks import clear
+        clear(event)
+        
+        from zope.globalrequest import getRequest
+        self.assertEquals(getRequest(), None)
+
+def test_suite():
+    return unittest.defaultTestLoader.loadTestsFromName(__name__)
\ No newline at end of file