From 0741fb6507420653e8cb2533c823f221f1529242 Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Fri, 29 Jan 2010 18:07:49 +0000 Subject: [PATCH] Fixed geographic feed test failure due to `Rss201rev2Feed` additions in r12338. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12357 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/gis/tests/geoapp/test_feeds.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/django/contrib/gis/tests/geoapp/test_feeds.py b/django/contrib/gis/tests/geoapp/test_feeds.py index fba424c606..eb039145e4 100644 --- a/django/contrib/gis/tests/geoapp/test_feeds.py +++ b/django/contrib/gis/tests/geoapp/test_feeds.py @@ -18,14 +18,15 @@ class GeoFeedTest(unittest.TestCase): # Uses `GEOSGeometry` in `item_geometry` doc1 = minidom.parseString(self.client.get('/geoapp/feeds/rss1/').content) # Uses a 2-tuple in `item_geometry` - doc2 = minidom.parseString(self.client.get('/geoapp/feeds/rss2/').content) + doc2 = minidom.parseString(self.client.get('/geoapp/feeds/rss2/').content) feed1, feed2 = doc1.firstChild, doc2.firstChild # Making sure the box got added to the second GeoRSS feed. - self.assertChildNodes(feed2.getElementsByTagName('channel')[0], - ['title', 'link', 'description', 'language', 'lastBuildDate', 'item', 'georss:box'] + self.assertChildNodes(feed2.getElementsByTagName('channel')[0], + ['title', 'link', 'description', 'language', + 'lastBuildDate', 'item', 'georss:box', 'atom:link'] ) - + # Incrementing through the feeds. for feed in [feed1, feed2]: # Ensuring the georss namespace was added to the element. @@ -33,7 +34,7 @@ class GeoFeedTest(unittest.TestCase): chan = feed.getElementsByTagName('channel')[0] items = chan.getElementsByTagName('item') self.assertEqual(len(items), City.objects.count()) - + # Ensuring the georss element was added to each item in the feed. for item in items: self.assertChildNodes(item, ['title', 'link', 'description', 'guid', 'georss:point']) @@ -45,14 +46,14 @@ class GeoFeedTest(unittest.TestCase): feed1, feed2 = doc1.firstChild, doc2.firstChild # Making sure the box got added to the second GeoRSS feed. - self.assertChildNodes(feed2, ['title', 'link', 'id', 'updated', 'entry', 'georss:box']) + self.assertChildNodes(feed2, ['title', 'link', 'id', 'updated', 'entry', 'georss:box']) for feed in [feed1, feed2]: # Ensuring the georsss namespace was added to the element. self.assertEqual(feed.getAttribute(u'xmlns:georss'), u'http://www.georss.org/georss') entries = feed.getElementsByTagName('entry') self.assertEqual(len(entries), City.objects.count()) - + # Ensuring the georss element was added to each entry in the feed. for entry in entries: self.assertChildNodes(entry, ['title', 'link', 'id', 'summary', 'georss:point'])