Author: lukeplant
Date: 2010-10-09 20:06:56 -0500 (Sat, 09 Oct 2010)
New Revision: 14101

Modified:
   django/trunk/django/contrib/webdesign/tests.py
Log:
Converted contrib/webdesign doctests to unittests.  We thoroughly deplore those 
doctests.

Modified: django/trunk/django/contrib/webdesign/tests.py
===================================================================
--- django/trunk/django/contrib/webdesign/tests.py      2010-10-10 01:06:42 UTC 
(rev 14100)
+++ django/trunk/django/contrib/webdesign/tests.py      2010-10-10 01:06:56 UTC 
(rev 14101)
@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 
-r"""
->>> words(7)
-u'lorem ipsum dolor sit amet consectetur adipisicing'
+import unittest
 
->>> paragraphs(1)
-['Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod 
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo 
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse 
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non 
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.']
+from django.contrib.webdesign.lorem_ipsum import *
+from django.template import loader, Context
 
->>> from django.template import loader, Context
->>> t = loader.get_template_from_string("{% load webdesign %}{% lorem 3 w %}")
->>> t.render(Context({}))
-u'lorem ipsum dolor'
-"""
 
-from django.contrib.webdesign.lorem_ipsum import *
+class WebdesignTest(unittest.TestCase):
 
-if __name__ == '__main__':
-    import doctest
-    doctest.testmod()
+    def test_words(self):
+        self.assertEqual(words(7), u'lorem ipsum dolor sit amet consectetur 
adipisicing')
+
+    def test_paragraphs(self):
+        self.assertEqual(paragraphs(1),
+                         ['Lorem ipsum dolor sit amet, consectetur adipisicing 
elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut 
enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip 
ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate 
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat 
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est 
laborum.'])
+
+    def test_lorem_tag(self):
+        t = loader.get_template_from_string("{% load webdesign %}{% lorem 3 w 
%}")
+        self.assertEqual(t.render(Context({})),
+                         u'lorem ipsum dolor')

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to