Changeset 6696 for django/trunk/tests/regressiontests/cache

Timestamp:

11/18/07 21:12:19 (1 year ago)

Author:

gwilson

Message:

Removed vary_delim_re in django/utils/cache.py in favor of existing cc_delim_re since the latter is more correct in parsing the header (allows whitespace before and after comma separators instead of just after). As a bonus, tests added for patch_vary_headers().

Files:

• django/trunk/tests/regressiontests/cache/tests.py (modified) (2 diffs)

django/trunk/tests/regressiontests/cache/tests.py

@@ -4 +4 @@
-# Uses whatever cache backend is set in the test settings file.
-
+import time, unittest
+
-from django.core.cache import cache
-
+
+
-
-# functions/classes for complex data type tests
@@ -88 +91 @@
-            self.assertEqual(cache.get(key), value)
-
+
+class CacheUtils(unittest.TestCase):
+    """TestCase for django.utils.cache functions."""
+    
+    def test_patch_vary_headers(self):
+        headers = ( 
+            # Initial vary, new headers, resulting vary.
+            (None, ('Accept-Encoding',), 'Accept-Encoding'),
+            ('Accept-Encoding', ('accept-encoding',), 'Accept-Encoding'),
+            ('Accept-Encoding', ('ACCEPT-ENCODING',), 'Accept-Encoding'),
+            ('Cookie', ('Accept-Encoding',), 'Cookie, Accept-Encoding'),
+            ('Cookie, Accept-Encoding', ('Accept-Encoding',), 'Cookie, Accept-Encoding'),
+            ('Cookie, Accept-Encoding', ('Accept-Encoding', 'cookie'), 'Cookie, Accept-Encoding'),
+            (None, ('Accept-Encoding', 'COOKIE'), 'Accept-Encoding, COOKIE'),
+            ('Cookie,     Accept-Encoding', ('Accept-Encoding', 'cookie'), 'Cookie, Accept-Encoding'),
+            ('Cookie    ,     Accept-Encoding', ('Accept-Encoding', 'cookie'), 'Cookie, Accept-Encoding'),
+        )
+        for initial_vary, newheaders, resulting_vary in headers:
+            response = HttpResponse()
+            if initial_vary is not None:
+                response['Vary'] = initial_vary
+            patch_vary_headers(response, newheaders)
+            self.assertEqual(response['Vary'], resulting_vary)
+
+
-if __name__ == '__main__':
-    unittest.main()