Migrated datatypes doctests. Thanks to Sebastian Hillig.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13886 bcc190cf-cafb-0310-a4f2-bffc1f526a37

tests/regressiontests/datatypes/models.py

@@ -3,8 +3,7 @@ This is a basic model to test saving and loading boolean and date-related
 types, which in the past were problematic for some database backends.
 """
 
-from django.db import models, DEFAULT_DB_ALIAS
+from django.db import models
-from django.conf import settings
 
 class Donut(models.Model):
     name = models.CharField(max_length=100)
@@ -20,95 +19,3 @@ class Donut(models.Model):
 
     def __str__(self):
         return self.name
-
-__test__ = {'API_TESTS': """
-# No donuts are in the system yet.
->>> Donut.objects.all()
-[]
-
->>> d = Donut(name='Apple Fritter')
-
-# Ensure we're getting True and False, not 0 and 1
->>> d.is_frosted
-False
->>> d.has_sprinkles
->>> d.has_sprinkles = True
->>> d.has_sprinkles == True
-True
->>> d.save()
->>> d2 = Donut.objects.all()[0]
->>> d2
-<Donut: Apple Fritter>
->>> d2.is_frosted == False
-True
->>> d2.has_sprinkles == True
-True
-
->>> import datetime
->>> d2.baked_date = datetime.date(year=1938, month=6, day=4)
->>> d2.baked_time = datetime.time(hour=5, minute=30)
->>> d2.consumed_at = datetime.datetime(year=2007, month=4, day=20, hour=16, minute=19, second=59)
->>> d2.save()
-
->>> d3 = Donut.objects.all()[0]
->>> d3.baked_date
-datetime.date(1938, 6, 4)
->>> d3.baked_time
-datetime.time(5, 30)
->>> d3.consumed_at
-datetime.datetime(2007, 4, 20, 16, 19, 59)
-
-# Test for ticket #12059: TimeField wrongly handling datetime.datetime object.
-
->>> d2.baked_time = datetime.datetime(year=2007, month=4, day=20, hour=16, minute=19, second=59)
->>> d2.save()
-
->>> d3 = Donut.objects.all()[0]
->>> d3.baked_time
-datetime.time(16, 19, 59)
-
-# Year boundary tests (ticket #3689)
-
->>> d = Donut(name='Date Test 2007', baked_date=datetime.datetime(year=2007, month=12, day=31), consumed_at=datetime.datetime(year=2007, month=12, day=31, hour=23, minute=59, second=59))
->>> d.save()
->>> d1 = Donut(name='Date Test 2006', baked_date=datetime.datetime(year=2006, month=1, day=1), consumed_at=datetime.datetime(year=2006, month=1, day=1))
->>> d1.save()
-
->>> Donut.objects.filter(baked_date__year=2007)
-[<Donut: Date Test 2007>]
-
->>> Donut.objects.filter(baked_date__year=2006)
-[<Donut: Date Test 2006>]
-
->>> Donut.objects.filter(consumed_at__year=2007).order_by('name')
-[<Donut: Apple Fritter>, <Donut: Date Test 2007>]
-
->>> Donut.objects.filter(consumed_at__year=2006)
-[<Donut: Date Test 2006>]
-
->>> Donut.objects.filter(consumed_at__year=2005)
-[]
-
->>> Donut.objects.filter(consumed_at__year=2008)
-[]
-
-# Regression test for #10238: TextField values returned from the database
-# should be unicode.
->>> d2 = Donut.objects.create(name=u'Jelly Donut', review=u'Outstanding')
->>> Donut.objects.get(id=d2.id).review
-u'Outstanding'
-
-"""}
-
-# Regression test for #8354: the MySQL backend should raise an error if given
-# a timezone-aware datetime object.
-if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] == 'django.db.backends.mysql':
-    __test__['API_TESTS'] += """
->>> from django.utils import tzinfo
->>> dt = datetime.datetime(2008, 8, 31, 16, 20, tzinfo=tzinfo.FixedOffset(0))
->>> d = Donut(name='Bear claw', consumed_at=dt)
->>> d.save()
-Traceback (most recent call last):
-    ....
-ValueError: MySQL backend does not support timezone-aware datetimes.
-"""

tests/regressiontests/datatypes/tests.py

@@ -0,0 +1,83 @@
+import datetime
+from django.db import DEFAULT_DB_ALIAS
+from django.test import TestCase
+from django.utils import tzinfo
+
+from models import Donut
+from django.conf import settings
+
+class DataTypesTestCase(TestCase):
+
+    def test_boolean_type(self):
+        d = Donut(name='Apple Fritter')
+        self.assertFalse(d.is_frosted)
+        self.assertTrue(d.has_sprinkles is None)
+        d.has_sprinkles = True
+        self.assertTrue(d.has_sprinkles)
+
+        d.save()
+
+        d2 = Donut.objects.get(name='Apple Fritter')
+        self.assertFalse(d2.is_frosted)
+        self.assertTrue(d2.has_sprinkles)
+
+    def test_date_type(self):
+        d = Donut(name='Apple Fritter')
+        d.baked_date = datetime.date(year=1938, month=6, day=4)
+        d.baked_time = datetime.time(hour=5, minute=30)
+        d.consumed_at = datetime.datetime(year=2007, month=4, day=20, hour=16, minute=19, second=59)
+        d.save()
+
+        d2 = Donut.objects.get(name='Apple Fritter')
+        self.assertEqual(d2.baked_date, datetime.date(1938, 6, 4))
+        self.assertEqual(d2.baked_time, datetime.time(5, 30))
+        self.assertEqual(d2.consumed_at, datetime.datetime(2007, 4, 20, 16, 19, 59))
+
+    def test_time_field(self):
+        #Test for ticket #12059: TimeField wrongly handling datetime.datetime object.
+        d = Donut(name='Apple Fritter')
+        d.baked_time = datetime.datetime(year=2007, month=4, day=20, hour=16, minute=19, second=59)
+        d.save()
+
+        d2 = Donut.objects.get(name='Apple Fritter')
+        self.assertEqual(d2.baked_time, datetime.time(16, 19, 59))
+
+    def test_year_boundaries(self):
+        # Year boundary tests (ticket #3689)
+        d = Donut.objects.create(name='Date Test 2007',
+             baked_date=datetime.datetime(year=2007, month=12, day=31),
+             consumed_at=datetime.datetime(year=2007, month=12, day=31, hour=23, minute=59, second=59))
+        d1 = Donut.objects.create(name='Date Test 2006',
+            baked_date=datetime.datetime(year=2006, month=1, day=1),
+            consumed_at=datetime.datetime(year=2006, month=1, day=1))
+
+        self.assertEqual("Date Test 2007",
+                         Donut.objects.filter(baked_date__year=2007)[0].name)
+
+        self.assertEqual("Date Test 2006",
+                         Donut.objects.filter(baked_date__year=2006)[0].name)
+
+        d2 = Donut.objects.create(name='Apple Fritter',
+            consumed_at = datetime.datetime(year=2007, month=4, day=20, hour=16, minute=19, second=59))
+
+        self.assertEqual([u'Apple Fritter', u'Date Test 2007'],
+            list(Donut.objects.filter(consumed_at__year=2007).order_by('name').values_list('name', flat=True)))
+
+        self.assertEqual(0, Donut.objects.filter(consumed_at__year=2005).count())
+        self.assertEqual(0, Donut.objects.filter(consumed_at__year=2008).count())
+
+    def test_textfields_unicode(self):
+        # Regression test for #10238: TextField values returned from the database
+        # should be unicode.
+        d = Donut.objects.create(name=u'Jelly Donut', review=u'Outstanding')
+        newd = Donut.objects.get(id=d.id)
+        self.assert_(isinstance(newd.review, unicode))
+
+    def test_tz_awareness_mysql(self):
+        # Regression test for #8354: the MySQL backend should raise an error if given
+        # a timezone-aware datetime object.
+        if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] == 'django.db.backends.mysql':
+            dt = datetime.datetime(2008, 8, 31, 16, 20, tzinfo=tzinfo.FixedOffset(0))
+            d = Donut(name='Bear claw', consumed_at=dt)
+            self.assertRaises(ValueError, d.save)
+            # ValueError: MySQL backend does not support timezone-aware datetimes.