Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 0741fb6507420653e8cb2533c823f221f1529242 1 parent 901b60e
@jbronn jbronn authored
Showing with 8 additions and 7 deletions.
  1. +8 −7 django/contrib/gis/tests/geoapp/test_feeds.py
View
15 django/contrib/gis/tests/geoapp/test_feeds.py
@@ -18,14 +18,15 @@ def test_geofeed_rss(self):
# 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 <rss> element.
@@ -33,7 +34,7 @@ def test_geofeed_rss(self):
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 @@ def test_geofeed_atom(self):
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 <feed> 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'])
Please sign in to comment.
Something went wrong with that request. Please try again.