[Zope-Checkins] CVS: Zope/lib/python/Products/Sessions/tests - testBrowserIdManager.py:1.4

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/Sessions/tests
In directory cvs.zope.org:/tmp/cvs-serv11439/tests

Modified Files:
	testBrowserIdManager.py 
Log Message:
Added 'setBrowserIdCookieByForce' method (thanks to Richard Jones).


=== Zope/lib/python/Products/Sessions/tests/testBrowserIdManager.py 1.3 => 1.4 ===
         assert a == b['value'], (a, b)
 
-    def testHasToken(self):
+    def testHasBrowserId(self):
         assert not self.m.hasBrowserId()
         a = self.m.getBrowserId()
         assert self.m.hasBrowserId()
         
-    def testTokenIsNew(self):
+    def testBrowserIdIsNew(self):
         a = self.m.getBrowserId()
         assert self.m.isBrowserIdNew()
 
@@ -287,7 +287,7 @@
         a = self.m.getBrowserId()
         assert self.m.isBrowserIdFromForm()
 
-    def testIsTokenFromCookieOnly(self):
+    def testIsBrowserIdFromCookieOnly(self):
         token = self.m.getBrowserId()
         self.m.REQUEST.browser_id_ = token
         self.m.REQUEST.browser_id_ns_ = 'cookies'
@@ -298,7 +298,7 @@
         assert self.m.isBrowserIdFromCookie()
         assert not self.m.isBrowserIdFromForm()
  
-    def testIsTokenFromFormOnly(self):
+    def testIsBrowserIdFromFormOnly(self):
         token = self.m.getBrowserId()
         self.m.REQUEST.browser_id_ = token
         self.m.REQUEST.browser_id_ns_ = 'form'
@@ -309,7 +309,7 @@
         assert not self.m.isBrowserIdFromCookie()
         assert self.m.isBrowserIdFromForm()
 
-    def testFlushTokenCookie(self):
+    def testFlushBrowserIdCookie(self):
         token = self.m.getBrowserId()
         self.m.REQUEST.browser_id_ = token
         self.m.REQUEST.browser_id_ns_ = 'cookies'
@@ -322,6 +322,20 @@
         c = self.m.REQUEST.RESPONSE.cookies[tokenkey]
         assert c['value'] == 'deleted', c
         
+    def testSetBrowserIdCookieByForce(self):
+        token = self.m.getBrowserId()
+        self.m.REQUEST.browser_id_ = token
+        self.m.REQUEST.browser_id_ns_ = 'cookies'
+        tokenkey = self.m.getBrowserIdName()
+        self.m.REQUEST.cookies[tokenkey] = token
+        a = self.m.getBrowserId()
+        assert a == token, repr(a)
+        assert self.m.isBrowserIdFromCookie()
+        token = 'abcdefghijk'
+        self.m.setBrowserIdCookieByForce(token)
+        c = self.m.REQUEST.RESPONSE.cookies[tokenkey]
+        assert c['value'] == token, c
+
     def testEncodeUrl(self):
         keystring = self.m.getBrowserIdName()
         key = self.m.getBrowserId()