Changeset 5731

Timestamp:

07/20/07 09:32:20 (1 year ago)

Author:

russellm

Message:

Fixed #4901 -- Modified assertContains to provide a default check of 'any instances of text in content'. Thanks for the suggestion, nis@superlativ.dk.

Files:

• django/trunk/django/test/testcases.py (modified) (2 diffs)
• django/trunk/docs/testing.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/views.py (modified) (1 diff)

django/trunk/django/test/testcases.py

@@ -74 +74 @@
-                (path, redirect_response.status_code, target_status_code))
-    
-1
+None
-        """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``
-
+
+
-        
-        """
@@ -84 +85 @@
-                (response.status_code, status_code))
-        real_count = response.content.count(text)
-
-
-
+
+
+
+
+
+
-    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

@@ -482 +482 @@
-that can be useful in testing the behavior of web sites.
-
-1
+None
-    Assert that a response indicates that a page could be retrieved and
-
-
+
+
+
-
-``assertFormError(response, form, field, errors)``

django/trunk/tests/regressiontests/test_client_regress/models.py

@@ -7 +7 @@
-import os
-
+class AssertContainsTests(TestCase):
+    def test_contains(self):
+        "Reponses can be inspected for content, including counting repeated substrings"
+        response = self.client.get('/test_client_regress/no_template_view/')
+        
+        self.assertContains(response, 'once')
+        self.assertContains(response, 'once', 1)
+        self.assertContains(response, 'twice')
+        self.assertContains(response, 'twice', 2)
+
+        try:
+            self.assertContains(response, 'once', 2)
+        except AssertionError, e:
+            self.assertEquals(str(e), "Found 1 instances of 'once' in response (expected 2)")
+        
+        try:
+            self.assertContains(response, 'twice', 1)
+        except AssertionError, e:
+            self.assertEquals(str(e), "Found 2 instances of 'twice' in response (expected 1)")
+        
+        try:
+            self.assertContains(response, 'thrice')
+        except AssertionError, e:
+            self.assertEquals(str(e), "Couldn't find 'thrice' in response")
+
+        try:
+            self.assertContains(response, 'thrice', 3)
+        except AssertionError, e:
+            self.assertEquals(str(e), "Found 0 instances of 'thrice' in response (expected 3)")
+        
-class AssertTemplateUsedTests(TestCase):
-    fixtures = ['testdata.json']

django/trunk/tests/regressiontests/test_client_regress/views.py

@@ -5 +5 @@
-def no_template_view(request):
-    "A simple view that expects a GET request, and returns a rendered template"
-
+. Sample content: twice once twice. Content ends.
-
-def file_upload_view(request):