innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Justin Bronn 2010-01-29 18:07:49 +00:00
parent 901b60e7e1
commit 0741fb6507
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/contrib/gis/tests/geoapp/test_feeds.py
View File

@ -18,14 +18,15 @@ class GeoFeedTest(unittest.TestCase):
# Uses `GEOSGeometry` in `item_geometry` # Uses `GEOSGeometry` in `item_geometry`
doc1 = minidom.parseString(self.client.get('/geoapp/feeds/rss1/').content) doc1 = minidom.parseString(self.client.get('/geoapp/feeds/rss1/').content)
# Uses a 2-tuple in `item_geometry` # 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 feed1, feed2 = doc1.firstChild, doc2.firstChild
# Making sure the box got added to the second GeoRSS feed. # Making sure the box got added to the second GeoRSS feed.
self.assertChildNodes(feed2.getElementsByTagName('channel')[0], self.assertChildNodes(feed2.getElementsByTagName('channel')[0],
['title', 'link', 'description', 'language', 'lastBuildDate', 'item', 'georss:box'] ['title', 'link', 'description', 'language',
'lastBuildDate', 'item', 'georss:box', 'atom:link']
) )
# Incrementing through the feeds. # Incrementing through the feeds.
for feed in [feed1, feed2]: for feed in [feed1, feed2]:
# Ensuring the georss namespace was added to the <rss> element. # Ensuring the georss namespace was added to the <rss> element.
@ -33,7 +34,7 @@ class GeoFeedTest(unittest.TestCase):
chan = feed.getElementsByTagName('channel')[0] chan = feed.getElementsByTagName('channel')[0]
items = chan.getElementsByTagName('item') items = chan.getElementsByTagName('item')
self.assertEqual(len(items), City.objects.count()) self.assertEqual(len(items), City.objects.count())
# Ensuring the georss element was added to each item in the feed. # Ensuring the georss element was added to each item in the feed.
for item in items: for item in items:
self.assertChildNodes(item, ['title', 'link', 'description', 'guid', 'georss:point']) self.assertChildNodes(item, ['title', 'link', 'description', 'guid', 'georss:point'])
@ -45,14 +46,14 @@ class GeoFeedTest(unittest.TestCase):
feed1, feed2 = doc1.firstChild, doc2.firstChild feed1, feed2 = doc1.firstChild, doc2.firstChild
# Making sure the box got added to the second GeoRSS feed. # 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]: for feed in [feed1, feed2]:
# Ensuring the georsss namespace was added to the <feed> element. # Ensuring the georsss namespace was added to the <feed> element.
self.assertEqual(feed.getAttribute(u'xmlns:georss'), u'http://www.georss.org/georss') self.assertEqual(feed.getAttribute(u'xmlns:georss'), u'http://www.georss.org/georss')
entries = feed.getElementsByTagName('entry') entries = feed.getElementsByTagName('entry')
self.assertEqual(len(entries), City.objects.count()) self.assertEqual(len(entries), City.objects.count())
# Ensuring the georss element was added to each entry in the feed. # Ensuring the georss element was added to each entry in the feed.
for entry in entries: for entry in entries:
self.assertChildNodes(entry, ['title', 'link', 'id', 'summary', 'georss:point']) self.assertChildNodes(entry, ['title', 'link', 'id', 'summary', 'georss:point'])