Changeset 5179

Timestamp:

05/10/07 06:27:59 (2 years ago)

Author:

russellm

Message:

Added configurable arguments to assertRedirects and assertContains to allow for other response status codes. Thanks for the suggestion, Jiri Barton.

Files:

• django/trunk/django/test/testcases.py (modified) (1 diff)
• django/trunk/docs/testing.txt (modified) (2 diffs)
• django/trunk/tests/modeltests/test_client/models.py (modified) (3 diffs)
• django/trunk/tests/modeltests/test_client/urls.py (modified) (2 diffs)
• django/trunk/tests/modeltests/test_client/views.py (modified) (2 diffs)

django/trunk/django/test/testcases.py

@@ -57 +57 @@
-        super(TestCase, self).run(result)
-
-
- 
+, status_code=302, target_status_code=200
+
-        redirect URL can be loaded.
-        
-        """
-
-
+
+
+
-        scheme, netloc, path, params, query, fragment = urlparse(response['Location'])
-        self.assertEqual(path, expected_path, 
-            "Response redirected to '%s', expected '%s'" % (path, expected_path))
-        redirect_response = self.client.get(path)
-
-
+
+
+
-    
-
+, status_code=200
-        """Assert that a response indicates that a page was retreived successfully,
-200), and that ``text`` occurs ``count`` 
+as expected), and that ``text`` occurs ``count``
-        times in the content of the response.
-        
-        """
-
-
+
+
+
-        real_count = response.content.count(text)
-        self.assertEqual(real_count, count,
-Could only find %d of %d instances of '%s' in response" % (real_count, count, tex
-
+Found %d instances of '%s' in response (expected %d)" % (real_count, text, coun
+
-    def assertFormError(self, response, form, field, errors):
-        "Assert that a form used to render the response has a specific field error"

django/trunk/docs/testing.txt

@@ -473 +473 @@
-that can be useful in testing the behavior of web sites.
-
-
-was retrieved successfully,
-(i.e., the HTTP status code was 200)
+, status_code=200
+could be retrieved and
+produced the nominated status code
-    times in the content of the response.
-
@@ -494 +494 @@
-    the response.
-
-
-
-
+
+
+
+
-
-``assertTemplateUsed(response, template_name)``

django/trunk/tests/modeltests/test_client/models.py

@@ -36 +36 @@
-
-    def test_no_template_view(self):
-Check that template usage assers
+Template usage assert
-        response = self.client.get('/test_client/no_template_view/')
-
@@ -76 +76 @@
-        
-    def test_raw_post(self):
+        "POST raw data (with a content type) to a view"
-        test_doc = """<?xml version="1.0" encoding="utf-8"?><library><book><title>Blink</title><author>Malcolm Gladwell</author></book></library>"""
-        response = self.client.post("/test_client/raw_post_view/", test_doc,
@@ -89 +90 @@
-        # Check that the response was a 302 (redirect)
-        self.assertRedirects(response, '/test_client/get_view/')
+
+    def test_permanent_redirect(self):
+        "GET a URL that redirects permanently elsewhere"
+        response = self.client.get('/test_client/permanent_redirect_view/')
+        
+        # Check that the response was a 301 (permanent redirect)
+        self.assertRedirects(response, '/test_client/get_view/', status_code=301)
+
+    def test_redirect_to_strange_location(self):
+        "GET a URL that redirects to a non-200 page"
+        response = self.client.get('/test_client/double_redirect_view/')
+        
+        # Check that the response was a 302, and that
+        # the attempt to get the redirection location returned 301 when retrieved
+        self.assertRedirects(response, '/test_client/permanent_redirect_view/', target_status_code=301)
+
+    def test_notfound_response(self):
+        "GET a URL that responds as '404:Not Found'"
+        response = self.client.get('/test_client/bad_view/')
+        
+        # Check that the response was a 404, and that the content contains MAGIC
+        self.assertContains(response, 'MAGIC', status_code=404)
-
-    def test_valid_form(self):

django/trunk/tests/modeltests/test_client/urls.py

@@ -1 +1 @@
-from django.conf.urls.defaults import *
+from django.views.generic.simple import redirect_to
-import views
-
@@ -8 +9 @@
-    (r'^raw_post_view/$', views.raw_post_view),
-    (r'^redirect_view/$', views.redirect_view),
+    (r'^permanent_redirect_view/$', redirect_to, { 'url': '/test_client/get_view/' }),
+    (r'^double_redirect_view/$', views.double_redirect_view),
+    (r'^bad_view/$', views.bad_view),
-    (r'^form_view/$', views.form_view),
-    (r'^form_view_with_template/$', views.form_view_with_template),

django/trunk/tests/modeltests/test_client/views.py

@@ -2 +2 @@
-from django.core.mail import EmailMessage, SMTPConnection
-from django.template import Context, Template
-
+, HttpResponseNotFound
-from django.contrib.auth.decorators import login_required
-from django.newforms.forms import Form
@@ -54 +54 @@
-    "A view that redirects all requests to the GET view"
-    return HttpResponseRedirect('/test_client/get_view/')
+
+def double_redirect_view(request):
+    "A view that redirects all requests to a redirection view"
+    return HttpResponseRedirect('/test_client/permanent_redirect_view/')
+
+def bad_view(request):
+    "A view that returns a 404 with some error content"
+    return HttpResponseNotFound('Not found!. This page contains some MAGIC content')
-
-TestChoices = (