Merged regressiontests and modeltests into the test root.

tests/conditional_processing/__init__.py

@@ -0,0 +1 @@
+# -*- coding:utf-8 -*-

tests/conditional_processing/models.py

@@ -0,0 +1,129 @@
+# -*- coding:utf-8 -*-
+from __future__ import unicode_literals
+
+from datetime import datetime
+
+from django.test import TestCase
+
+
+FULL_RESPONSE = 'Test conditional get response'
+LAST_MODIFIED = datetime(2007, 10, 21, 23, 21, 47)
+LAST_MODIFIED_STR = 'Sun, 21 Oct 2007 23:21:47 GMT'
+LAST_MODIFIED_NEWER_STR = 'Mon, 18 Oct 2010 16:56:23 GMT'
+LAST_MODIFIED_INVALID_STR = 'Mon, 32 Oct 2010 16:56:23 GMT'
+EXPIRED_LAST_MODIFIED_STR = 'Sat, 20 Oct 2007 23:21:47 GMT'
+ETAG = 'b4246ffc4f62314ca13147c9d4f76974'
+EXPIRED_ETAG = '7fae4cd4b0f81e7d2914700043aa8ed6'
+
+class ConditionalGet(TestCase):
+    urls = 'regressiontests.conditional_processing.urls'
+
+    def assertFullResponse(self, response, check_last_modified=True, check_etag=True):
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, FULL_RESPONSE.encode())
+        if check_last_modified:
+            self.assertEqual(response['Last-Modified'], LAST_MODIFIED_STR)
+        if check_etag:
+            self.assertEqual(response['ETag'], '"%s"' % ETAG)
+
+    def assertNotModified(self, response):
+        self.assertEqual(response.status_code, 304)
+        self.assertEqual(response.content, b'')
+
+    def testWithoutConditions(self):
+        response = self.client.get('/condition/')
+        self.assertFullResponse(response)
+
+    def testIfModifiedSince(self):
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR
+        response = self.client.get('/condition/')
+        self.assertNotModified(response)
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_NEWER_STR
+        response = self.client.get('/condition/')
+        self.assertNotModified(response)
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_INVALID_STR
+        response = self.client.get('/condition/')
+        self.assertFullResponse(response)
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR
+        response = self.client.get('/condition/')
+        self.assertFullResponse(response)
+
+    def testIfNoneMatch(self):
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG
+        response = self.client.get('/condition/')
+        self.assertNotModified(response)
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG
+        response = self.client.get('/condition/')
+        self.assertFullResponse(response)
+
+        # Several etags in If-None-Match is a bit exotic but why not?
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s", "%s"' % (ETAG, EXPIRED_ETAG)
+        response = self.client.get('/condition/')
+        self.assertNotModified(response)
+
+    def testIfMatch(self):
+        self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % ETAG
+        response = self.client.put('/condition/etag/')
+        self.assertEqual(response.status_code, 200)
+        self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % EXPIRED_ETAG
+        response = self.client.put('/condition/etag/')
+        self.assertEqual(response.status_code, 412)
+
+    def testBothHeaders(self):
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG
+        response = self.client.get('/condition/')
+        self.assertNotModified(response)
+
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG
+        response = self.client.get('/condition/')
+        self.assertFullResponse(response)
+
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG
+        response = self.client.get('/condition/')
+        self.assertFullResponse(response)
+
+    def testSingleCondition1(self):
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR
+        response = self.client.get('/condition/last_modified/')
+        self.assertNotModified(response)
+        response = self.client.get('/condition/etag/')
+        self.assertFullResponse(response, check_last_modified=False)
+
+    def testSingleCondition2(self):
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG
+        response = self.client.get('/condition/etag/')
+        self.assertNotModified(response)
+        response = self.client.get('/condition/last_modified/')
+        self.assertFullResponse(response, check_etag=False)
+
+    def testSingleCondition3(self):
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR
+        response = self.client.get('/condition/last_modified/')
+        self.assertFullResponse(response, check_etag=False)
+
+    def testSingleCondition4(self):
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG
+        response = self.client.get('/condition/etag/')
+        self.assertFullResponse(response, check_last_modified=False)
+
+    def testSingleCondition5(self):
+        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR
+        response = self.client.get('/condition/last_modified2/')
+        self.assertNotModified(response)
+        response = self.client.get('/condition/etag2/')
+        self.assertFullResponse(response, check_last_modified=False)
+
+    def testSingleCondition6(self):
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG
+        response = self.client.get('/condition/etag2/')
+        self.assertNotModified(response)
+        response = self.client.get('/condition/last_modified2/')
+        self.assertFullResponse(response, check_etag=False)
+
+    def testInvalidETag(self):
+        self.client.defaults['HTTP_IF_NONE_MATCH'] = r'"\"'
+        response = self.client.get('/condition/etag/')
+        self.assertFullResponse(response, check_last_modified=False)

tests/conditional_processing/urls.py

@@ -0,0 +1,12 @@
+from django.conf.urls import patterns
+
+from . import views
+
+
+urlpatterns = patterns('',
+    ('^condition/$', views.index),
+    ('^condition/last_modified/$', views.last_modified_view1),
+    ('^condition/last_modified2/$', views.last_modified_view2),
+    ('^condition/etag/$', views.etag_view1),
+    ('^condition/etag2/$', views.etag_view2),
+)

tests/conditional_processing/views.py

@@ -0,0 +1,29 @@
+# -*- coding:utf-8 -*-
+from __future__ import absolute_import
+
+from django.views.decorators.http import condition, etag, last_modified
+from django.http import HttpResponse
+
+from .models import FULL_RESPONSE, LAST_MODIFIED, ETAG
+
+
+def index(request):
+    return HttpResponse(FULL_RESPONSE)
+index = condition(lambda r: ETAG, lambda r: LAST_MODIFIED)(index)
+
+def last_modified_view1(request):
+    return HttpResponse(FULL_RESPONSE)
+last_modified_view1 = condition(last_modified_func=lambda r: LAST_MODIFIED)(last_modified_view1)
+
+def last_modified_view2(request):
+    return HttpResponse(FULL_RESPONSE)
+last_modified_view2 = last_modified(lambda r: LAST_MODIFIED)(last_modified_view2)
+
+def etag_view1(request):
+    return HttpResponse(FULL_RESPONSE)
+etag_view1 = condition(etag_func=lambda r: ETAG)(etag_view1)
+
+def etag_view2(request):
+    return HttpResponse(FULL_RESPONSE)
+etag_view2 = etag(lambda r: ETAG)(etag_view2)
+