Mercurial > personas_backend
changeset 45:cf6b5f26e902
Fixed a TODO.
| author | Atul Varma <varmaa@toolness.com> |
|---|---|
| date | Tue, 04 Mar 2008 11:35:02 -0600 |
| parents | 9e11c9374822 |
| children | f92d5de36a4d |
| files | PersonasBackend/personas/models.py PersonasBackend/personas/tests.py |
| diffstat | 2 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/PersonasBackend/personas/models.py Tue Mar 04 11:15:10 2008 -0600 +++ b/PersonasBackend/personas/models.py Tue Mar 04 11:35:02 2008 -0600 @@ -77,13 +77,10 @@ 'http://blah.com/personas/headers/blah.jpg' """ - # TODO: Consider uncommenting the following assertions; they may - # make some tests break, though. - # - #assert external or media, \ - # "one parameter must be non-null" - #assert (not external and media), \ - # "both paramaters cannot be be non-null" + assert external or media, \ + "one parameter must be non-null" + assert not (external and media), \ + "both paramaters cannot be be non-null" if external: return external
--- a/PersonasBackend/personas/tests.py Tue Mar 04 11:15:10 2008 -0600 +++ b/PersonasBackend/personas/tests.py Tue Mar 04 11:35:02 2008 -0600 @@ -5,10 +5,16 @@ class JsonTests( unittest.TestCase ): def setUp( self ): + for persona in models.Persona.objects.all(): + persona.delete() self.cat = models.Category( name = "Random Things" ) self.cat.save() - self.persona = models.Persona( name = "Test Persona", - category = self.cat ) + self.persona = models.Persona( + name = "Test Persona", + category = self.cat, + header_img_url = "http://www.blarg.com/myheader.png", + footer_img_file = "footers/myfooter.png" + ) self.persona.save() def tearDown( self ):