Django

Code

Changeset 7780

Show
Ignore:
Timestamp:
06/28/08 22:07:45 (5 months ago)
Author:
mtredinnick
Message:

Use create() to create objects in the query regression tests, like all the Cool
Kids are doing these days.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/tests/regressiontests/queries/models.py

    r7779 r7780  
    175175 
    176176__test__ = {'API_TESTS':""" 
    177 >>> t1 = Tag(name='t1') 
    178 >>> t1.save() 
    179 >>> t2 = Tag(name='t2', parent=t1) 
    180 >>> t2.save() 
    181 >>> t3 = Tag(name='t3', parent=t1) 
    182 >>> t3.save() 
    183 >>> t4 = Tag(name='t4', parent=t3) 
    184 >>> t4.save() 
    185 >>> t5 = Tag(name='t5', parent=t3) 
    186 >>> t5.save() 
    187  
    188 >>> n1 = Note(note='n1', misc='foo') 
    189 >>> n1.save() 
    190 >>> n2 = Note(note='n2', misc='bar') 
    191 >>> n2.save() 
    192 >>> n3 = Note(note='n3', misc='foo') 
    193 >>> n3.save() 
     177>>> t1 = Tag.objects.create(name='t1') 
     178>>> t2 = Tag.objects.create(name='t2', parent=t1) 
     179>>> t3 = Tag.objects.create(name='t3', parent=t1) 
     180>>> t4 = Tag.objects.create(name='t4', parent=t3) 
     181>>> t5 = Tag.objects.create(name='t5', parent=t3) 
     182 
     183>>> n1 = Note.objects.create(note='n1', misc='foo') 
     184>>> n2 = Note.objects.create(note='n2', misc='bar') 
     185>>> n3 = Note.objects.create(note='n3', misc='foo') 
    194186 
    195187Create these out of order so that sorting by 'id' will be different to sorting 
    196188by 'info'. Helps detect some problems later. 
    197 >>> e2 = ExtraInfo(info='e2', note=n2) 
    198 >>> e2.save() 
    199 >>> e1 = ExtraInfo(info='e1', note=n1) 
    200 >>> e1.save() 
    201  
    202 >>> a1 = Author(name='a1', num=1001, extra=e1) 
    203 >>> a1.save() 
    204 >>> a2 = Author(name='a2', num=2002, extra=e1) 
    205 >>> a2.save() 
    206 >>> a3 = Author(name='a3', num=3003, extra=e2) 
    207 >>> a3.save() 
    208 >>> a4 = Author(name='a4', num=4004, extra=e2) 
    209 >>> a4.save() 
     189>>> e2 = ExtraInfo.objects.create(info='e2', note=n2) 
     190>>> e1 = ExtraInfo.objects.create(info='e1', note=n1) 
     191 
     192>>> a1 = Author.objects.create(name='a1', num=1001, extra=e1) 
     193>>> a2 = Author.objects.create(name='a2', num=2002, extra=e1) 
     194>>> a3 = Author.objects.create(name='a3', num=3003, extra=e2) 
     195>>> a4 = Author.objects.create(name='a4', num=4004, extra=e2) 
    210196 
    211197>>> time1 = datetime.datetime(2007, 12, 19, 22, 25, 0) 
    …… 
    213199>>> time3 = datetime.datetime(2007, 12, 20, 22, 25, 0) 
    214200>>> time4 = datetime.datetime(2007, 12, 20, 21, 0, 0) 
    215 >>> i1 = Item(name='one', created=time1, modified=time1, creator=a1, note=n3) 
    216 >>> i1.save() 
     201>>> i1 = Item.objects.create(name='one', created=time1, modified=time1, creator=a1, note=n3) 
    217202>>> i1.tags = [t1, t2] 
    218 >>> i2 = Item(name='two', created=time2, creator=a2, note=n2) 
    219 >>> i2.save() 
     203>>> i2 = Item.objects.create(name='two', created=time2, creator=a2, note=n2) 
    220204>>> i2.tags = [t1, t3] 
    221 >>> i3 = Item(name='three', created=time3, creator=a2, note=n3) 
    222 >>> i3.save() 
    223 >>> i4 = Item(name='four', created=time4, creator=a4, note=n3) 
    224 >>> i4.save() 
     205>>> i3 = Item.objects.create(name='three', created=time3, creator=a2, note=n3) 
     206>>> i4 = Item.objects.create(name='four', created=time4, creator=a4, note=n3) 
    225207>>> i4.tags = [t4] 
    226208 
    227 >>> r1 = Report(name='r1', creator=a1) 
    228 >>> r1.save() 
    229 >>> r2 = Report(name='r2', creator=a3) 
    230 >>> r2.save() 
    231 >>> r3 = Report(name='r3') 
    232 >>> r3.save() 
     209>>> r1 = Report.objects.create(name='r1', creator=a1) 
     210>>> r2 = Report.objects.create(name='r2', creator=a3) 
     211>>> r3 = Report.objects.create(name='r3') 
    233212 
    234213Ordering by 'rank' gives us rank2, rank1, rank3. Ordering by the Meta.ordering 
    235214will be rank3, rank2, rank1. 
    236 >>> rank1 = Ranking(rank=2, author=a2) 
    237 >>> rank1.save() 
    238 >>> rank2 = Ranking(rank=1, author=a3) 
    239 >>> rank2.save() 
    240 >>> rank3 = Ranking(rank=3, author=a1) 
    241 >>> rank3.save() 
    242  
    243 >>> c1 = Cover(title="first", item=i4) 
    244 >>> c1.save() 
    245 >>> c2 = Cover(title="second", item=i2) 
    246 >>> c2.save() 
    247  
    248 >>> num1 = Number(num=4) 
    249 >>> num1.save() 
    250 >>> num2 = Number(num=8) 
    251 >>> num2.save() 
    252 >>> num3 = Number(num=12) 
    253 >>> num3.save() 
     215>>> rank1 = Ranking.objects.create(rank=2, author=a2) 
     216>>> rank2 = Ranking.objects.create(rank=1, author=a3) 
     217>>> rank3 = Ranking.objects.create(rank=3, author=a1) 
     218 
     219>>> c1 = Cover.objects.create(title="first", item=i4) 
     220>>> c2 = Cover.objects.create(title="second", item=i2) 
     221 
     222>>> num1 = Number.objects.create(num=4) 
     223>>> num2 = Number.objects.create(num=8) 
     224>>> num3 = Number.objects.create(num=12) 
    254225 
    255226Bug #1050