Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Cleaned up some imports.

Fixed long lines.
Changed some docstrings to use "action words".


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 53372fcb07191941cb021bd1545933115407e6c2 1 parent 1da7b5c
Gary Wilson Jr. gdub authored
Showing with 86 additions and 61 deletions.
  1. +84 −60 django/test/testcases.py
  2. +2 −1  tests/modeltests/test_client/views.py
144 django/test/testcases.py
View
@@ -1,10 +1,11 @@
-import re, unittest
+import re
+import unittest
from urlparse import urlsplit
+
from django.http import QueryDict
from django.db import transaction
from django.core import mail
from django.core.management import call_command
-from django.db.models import get_apps
from django.test import _doctest as doctest
from django.test.client import Client
@@ -33,28 +34,27 @@ def check_output(self, want, got, optionflags):
if not ok:
return normalize_long_ints(want) == normalize_long_ints(got)
return ok
-
+
class DocTestRunner(doctest.DocTestRunner):
def __init__(self, *args, **kwargs):
doctest.DocTestRunner.__init__(self, *args, **kwargs)
self.optionflags = doctest.ELLIPSIS
-
+
def report_unexpected_exception(self, out, test, example, exc_info):
- doctest.DocTestRunner.report_unexpected_exception(self,out,test,example,exc_info)
-
+ doctest.DocTestRunner.report_unexpected_exception(self, out, test,
+ example, exc_info)
# Rollback, in case of database errors. Otherwise they'd have
# side effects on other tests.
- from django.db import transaction
transaction.rollback_unless_managed()
-class TestCase(unittest.TestCase):
+class TestCase(unittest.TestCase):
def _pre_setup(self):
- """Perform any pre-test setup. This includes:
-
- * If the Test Case class has a 'fixtures' member, clearing the
- database and installing the named fixtures at the start of each test.
+ """Performs any pre-test setup. This includes:
+
+ * If the Test Case class has a 'fixtures' member, clearing the
+ database and installing the named fixtures at the start of each
+ test.
* Clearing the mail test outbox.
-
"""
call_command('flush', verbosity=0, interactive=False)
if hasattr(self, 'fixtures'):
@@ -73,96 +73,120 @@ def __call__(self, result=None):
self._pre_setup()
super(TestCase, self).__call__(result)
- def assertRedirects(self, response, expected_url, status_code=302, target_status_code=200):
- """Assert that a response redirected to a specific URL, and that the
+ def assertRedirects(self, response, expected_url, status_code=302,
+ target_status_code=200):
+ """Asserts that a response redirected to a specific URL, and that the
redirect URL can be loaded.
-
- Note that assertRedirects won't work for external links since it uses
+
+ Note that assertRedirects won't work for external links since it uses
TestClient to do a request.
"""
- self.assertEqual(response.status_code, status_code,
- "Response didn't redirect as expected: Response code was %d (expected %d)" %
- (response.status_code, status_code))
+ self.assertEqual(response.status_code, status_code,
+ ("Response didn't redirect as expected: Response code was %d"
+ " (expected %d)" % (response.status_code, status_code)))
scheme, netloc, path, query, fragment = urlsplit(response['Location'])
url = path
if query:
url += '?' + query
if fragment:
url += '#' + fragment
- self.assertEqual(url, expected_url,
+ self.assertEqual(url, expected_url,
"Response redirected to '%s', expected '%s'" % (url, expected_url))
-
+
# Get the redirection page, using the same client that was used
# to obtain the original response.
redirect_response = response.client.get(path, QueryDict(query))
- self.assertEqual(redirect_response.status_code, target_status_code,
- "Couldn't retrieve redirection page '%s': response code was %d (expected %d)" %
- (path, redirect_response.status_code, target_status_code))
-
+ self.assertEqual(redirect_response.status_code, target_status_code,
+ ("Couldn't retrieve redirection page '%s': response code was %d"
+ " (expected %d)") %
+ (path, redirect_response.status_code, target_status_code))
+
def assertContains(self, response, text, count=None, status_code=200):
- """Assert that a response indicates that a page was retreived successfully,
- (i.e., the HTTP status code was as expected), and that ``text`` occurs ``count``
- times in the content of the response. If ``count`` is None, the count doesn't
- matter - the assertion is true if the text occurs at least once in the response.
-
+ """
+ Asserts that a response indicates that a page was retreived
+ successfully, (i.e., the HTTP status code was as expected), and that
+ ``text`` occurs ``count`` times in the content of the response.
+ If ``count`` is None, the count doesn't matter - the assertion is true
+ if the text occurs at least once in the response.
"""
self.assertEqual(response.status_code, status_code,
- "Couldn't retrieve page: Response code was %d (expected %d)'" %
+ "Couldn't retrieve page: Response code was %d (expected %d)'" %
(response.status_code, status_code))
real_count = response.content.count(text)
if count is not None:
self.assertEqual(real_count, count,
- "Found %d instances of '%s' in response (expected %d)" % (real_count, text, count))
+ "Found %d instances of '%s' in response (expected %d)" %
+ (real_count, text, count))
else:
- self.failUnless(real_count != 0, "Couldn't find '%s' in response" % text)
-
+ self.failUnless(real_count != 0,
+ "Couldn't find '%s' in response" % text)
+
def assertFormError(self, response, form, field, errors):
- "Assert that a form used to render the response has a specific field error"
+ """
+ Asserts that a form used to render the response has a specific field
+ error.
+ """
# Put context(s) into a list to simplify processing.
- contexts = to_list(response.context)
+ contexts = to_list(response.context)
if not contexts:
self.fail('Response did not use any contexts to render the'
' response')
# Put error(s) into a list to simplify processing.
errors = to_list(errors)
-
+
# Search all contexts for the error.
found_form = False
for i,context in enumerate(contexts):
- if form in context:
- found_form = True
- for err in errors:
- if field:
- if field in context[form].errors:
- self.failUnless(err in context[form].errors[field],
- "The field '%s' on form '%s' in context %d does not contain the error '%s' (actual errors: %s)" %
- (field, form, i, err, list(context[form].errors[field])))
- elif field in context[form].fields:
- self.fail("The field '%s' on form '%s' in context %d contains no errors" %
- (field, form, i))
- else:
- self.fail("The form '%s' in context %d does not contain the field '%s'" % (form, i, field))
+ if form not in context:
+ continue
+ found_form = True
+ for err in errors:
+ if field:
+ if field in context[form].errors:
+ field_errors = context[form].errors[field]
+ self.failUnless(err in field_errors,
+ "The field '%s' on form '%s' in"
+ " context %d does not contain the"
+ " error '%s' (actual errors: %s)" %
+ (field, form, i, err,
+ list(field_errors)))
+ elif field in context[form].fields:
+ self.fail("The field '%s' on form '%s' in context %d"
+ " contains no errors" % (field, form, i))
else:
- self.failUnless(err in context[form].non_field_errors(),
- "The form '%s' in context %d does not contain the non-field error '%s' (actual errors: %s)" %
- (form, i, err, list(context[form].non_field_errors())))
+ self.fail("The form '%s' in context %d does not"
+ " contain the field '%s'" %
+ (form, i, field))
+ else:
+ non_field_errors = context[form].non_field_errors()
+ self.failUnless(err in non_field_errors,
+ "The form '%s' in context %d does not contain the"
+ " non-field error '%s' (actual errors: %s)" %
+ (form, i, err, non_field_errors))
if not found_form:
- self.fail("The form '%s' was not used to render the response" % form)
-
+ self.fail("The form '%s' was not used to render the response" %
+ form)
+
def assertTemplateUsed(self, response, template_name):
- "Assert that the template with the provided name was used in rendering the response"
+ """
+ Asserts that the template with the provided name was used in rendering
+ the response.
+ """
template_names = [t.name for t in to_list(response.template)]
if not template_names:
self.fail('No templates used to render the response')
self.failUnless(template_name in template_names,
(u"Template '%s' was not a template used to render the response."
- " Actual template(s) used: %s") % (template_name,
+ u" Actual template(s) used: %s") % (template_name,
u', '.join(template_names)))
def assertTemplateNotUsed(self, response, template_name):
- "Assert that the template with the provided name was NOT used in rendering the response"
+ """
+ Asserts that the template with the provided name was NOT used in
+ rendering the response.
+ """
template_names = [t.name for t in to_list(response.template)]
self.failIf(template_name in template_names,
(u"Template '%s' was used unexpectedly in rendering the"
- " response") % template_name)
+ u" response") % template_name)
3  tests/modeltests/test_client/views.py
View
@@ -1,10 +1,11 @@
from xml.dom.minidom import parseString
+
from django.core.mail import EmailMessage, SMTPConnection
from django.template import Context, Template
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound
from django.contrib.auth.decorators import login_required
from django.newforms.forms import Form
-from django.newforms import fields
+from django.newforms import fields, ValidationError
from django.shortcuts import render_to_response
def get_view(request):
Please sign in to comment.
Something went wrong with that request. Please try again.