Skip to content

Commit 896ebdc

Browse files
committed
[1.2.X] Migrated reserved_names doctests. Thanks to Eric Florenzano.
Backport of r13830 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent 11f77de commit 896ebdc

File tree

2 files changed

+49
-30
lines changed

2 files changed

+49
-30
lines changed

tests/modeltests/reserved_names/models.py

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,4 @@ class Meta:
2222
db_table = 'select'
2323

2424
def __unicode__(self):
25-
return self.when
26-
27-
__test__ = {'API_TESTS':"""
28-
>>> import datetime
29-
>>> day1 = datetime.date(2005, 1, 1)
30-
>>> day2 = datetime.date(2006, 2, 2)
31-
>>> t = Thing(when='a', join='b', like='c', drop='d', alter='e', having='f', where=day1, has_hyphen='h')
32-
>>> t.save()
33-
>>> print t.when
34-
a
35-
36-
>>> u = Thing(when='h', join='i', like='j', drop='k', alter='l', having='m', where=day2)
37-
>>> u.save()
38-
>>> print u.when
39-
h
40-
41-
>>> Thing.objects.order_by('when')
42-
[<Thing: a>, <Thing: h>]
43-
>>> v = Thing.objects.get(pk='a')
44-
>>> print v.join
45-
b
46-
>>> print v.where
47-
2005-01-01
48-
49-
>>> Thing.objects.dates('where', 'year')
50-
[datetime.datetime(2005, 1, 1, 0, 0), datetime.datetime(2006, 1, 1, 0, 0)]
51-
52-
>>> Thing.objects.filter(where__month=1)
53-
[<Thing: a>]
54-
"""}
25+
return self.when
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import datetime
2+
3+
from django.test import TestCase
4+
5+
from models import Thing
6+
7+
class ReservedNameTests(TestCase):
8+
def generate(self):
9+
day1 = datetime.date(2005, 1, 1)
10+
t = Thing.objects.create(when='a', join='b', like='c', drop='d',
11+
alter='e', having='f', where=day1, has_hyphen='h')
12+
day2 = datetime.date(2006, 2, 2)
13+
u = Thing.objects.create(when='h', join='i', like='j', drop='k',
14+
alter='l', having='m', where=day2)
15+
16+
def test_simple(self):
17+
day1 = datetime.date(2005, 1, 1)
18+
t = Thing.objects.create(when='a', join='b', like='c', drop='d',
19+
alter='e', having='f', where=day1, has_hyphen='h')
20+
self.assertEqual(t.when, 'a')
21+
22+
day2 = datetime.date(2006, 2, 2)
23+
u = Thing.objects.create(when='h', join='i', like='j', drop='k',
24+
alter='l', having='m', where=day2)
25+
self.assertEqual(u.when, 'h')
26+
27+
def test_order_by(self):
28+
self.generate()
29+
things = [t.when for t in Thing.objects.order_by('when')]
30+
self.assertEqual(things, ['a', 'h'])
31+
32+
def test_fields(self):
33+
self.generate()
34+
v = Thing.objects.get(pk='a')
35+
self.assertEqual(v.join, 'b')
36+
self.assertEqual(v.where, datetime.date(year=2005, month=1, day=1))
37+
38+
def test_dates(self):
39+
self.generate()
40+
resp = Thing.objects.dates('where', 'year')
41+
self.assertEqual(list(resp), [
42+
datetime.datetime(2005, 1, 1, 0, 0),
43+
datetime.datetime(2006, 1, 1, 0, 0),
44+
])
45+
46+
def test_month_filter(self):
47+
self.generate()
48+
self.assertEqual(Thing.objects.filter(where__month=1)[0].when, 'a')

0 commit comments

Comments
 (0)