summaryrefslogtreecommitdiffstats
path: root/toolkit/components/feeds/test/xml/rss2
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/components/feeds/test/xml/rss2')
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_category.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_category_count.xml15
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_cloud.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_copyright.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_copyright_linebreak.xml15
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_data_outside_channel.xml13
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_dc_contributor.xml14
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_dc_creator.xml13
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_description.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_description_html.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_description_html_cdata.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_docs.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_generator.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_image_desc.xml17
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_image_desc_width_height.xml19
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_image_required.xml16
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_language.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_lastBuildDate.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_linebreak_link.xml14
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_link.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_link_cdata.xml14
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_managingEditor.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_managingEditor_extra_att.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_multiple_categories.xml15
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_pubDate.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_pubDate_invalid.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_1.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_2.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_pubDate_timezoneZ.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_pubDate_utc.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_rating.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_single_quote_stylesheet_pi.xml26
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_skipDays.xml15
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_skipHours.xml18
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_subtitle.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_subtitle_html.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_subtitle_markup_stripped.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_textinput.xml17
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_title.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_title_cdata_mixed.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_title_nesting.xml13
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_ttl.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_updated.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_updated_dcdate.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_updated_lastBuildDate.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_updated_lastBuildDate_priority.xml13
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_webMaster.xml12
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_wfw_commentapi.xml15
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_wfw_commentrss.xml15
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_wiki.xml18
-rw-r--r--toolkit/components/feeds/test/xml/rss2/feed_wiki_unusual_prefix.xml18
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_author.xml15
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_category.xml16
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_comments.xml19
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_content_encoded.xml15
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_count.xml26
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_count2.xml30
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_description.xml18
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_description_2.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_description_cdata.xml20
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_description_decode_entities.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_description_normalized.xml18
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_description_normalized_nohtml.xml18
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_enclosure.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_enclosure_duplicates.xml24
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_enclosure_duplicates2.xml24
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_enclosure_mixed.xml33
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_enclosure_mixed2.xml33
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_bogus_url.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink.xml20
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_default.xml20
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_false.xml20
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_false_uppercase.xml20
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_true_uppercase.xml20
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_unknown_value.xml20
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_normalized.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_guid_with_link.xml22
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_link.xml19
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_link_normalized.xml19
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_plain_desc.xml19
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_populated_enclosures.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_pubDate.xml14
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_published.xml14
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_title.xml14
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_title_normalized.xml14
-rw-r--r--toolkit/components/feeds/test/xml/rss2/item_updated_dcdate.xml14
-rw-r--r--toolkit/components/feeds/test/xml/rss2/items_2_titles.xml17
-rw-r--r--toolkit/components/feeds/test/xml/rss2/mrss_content.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/mrss_content2.xml22
-rw-r--r--toolkit/components/feeds/test/xml/rss2/mrss_content_429049.xml32
-rw-r--r--toolkit/components/feeds/test/xml/rss2/mrss_content_multiple.xml23
-rw-r--r--toolkit/components/feeds/test/xml/rss2/mrss_content_populate_enclosure.xml21
-rw-r--r--toolkit/components/feeds/test/xml/rss2/mrss_group_content.xml26
-rw-r--r--toolkit/components/feeds/test/xml/rss2/mrss_group_content_populate_enclosure.xml26
95 files changed, 0 insertions, 1606 deletions
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_category.xml b/toolkit/components/feeds/test/xml/rss2/feed_category.xml
deleted file mode 100644
index 553825995..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_category.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel category works
-Expect: feed.categories.queryElementAt(0, Components.interfaces.nsIPropertyBag).getProperty('term') == 'hmm'
-
--->
-<rss version="2.0" >
-<channel>
-<category>hmm</category>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_category_count.xml b/toolkit/components/feeds/test/xml/rss2/feed_category_count.xml
deleted file mode 100644
index 881c6e0d9..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_category_count.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel category works w/ domain
-Expect: feed.categories.length == 4
-
--->
-<rss version="2.0" >
-<channel>
-<category>hmm0</category>
-<category>hmm1</category>
-<category domain="http://example.org">hmm2</category>
-<category>hmm3</category>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_cloud.xml b/toolkit/components/feeds/test/xml/rss2/feed_cloud.xml
deleted file mode 100644
index caa033548..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_cloud.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel cloud works
-Expect: ((feed.cloud.getProperty('domain')=="rpc.sys.com") && (feed.cloud.getProperty('port')=="80") && (feed.cloud.getProperty('path')=="/RPC2") && (feed.cloud.getProperty('registerProcedure')=="pingMe") && (feed.cloud.getProperty('protocol')=="soap"))
-
--->
-<rss version="2.0" >
-<channel>
-<cloud domain="rpc.sys.com" port="80" path="/RPC2" registerProcedure="pingMe" protocol="soap"/>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_copyright.xml b/toolkit/components/feeds/test/xml/rss2/feed_copyright.xml
deleted file mode 100644
index 2d00e7a14..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_copyright.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel copyright works
-Expect: feed.fields.getProperty('copyright') == 'copyright 2006'
-
--->
-<rss version="2.0" >
-<channel>
-<copyright>copyright 2006</copyright>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_copyright_linebreak.xml b/toolkit/components/feeds/test/xml/rss2/feed_copyright_linebreak.xml
deleted file mode 100644
index 4b9ca5e71..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_copyright_linebreak.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel copyright works
-Expect: feed.fields.getProperty('copyright') == 'copyright 2005'
-
--->
-<rss version="2.0" >
-<channel>
-<copyright>copyright 2005
-
-
-</copyright>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_data_outside_channel.xml b/toolkit/components/feeds/test/xml/rss2/feed_data_outside_channel.xml
deleted file mode 100644
index bf212760d..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_data_outside_channel.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel copyright works
-Expect: feed.fields.getProperty('copyright') == 'copyright 2006'
-
--->
-<rss version="2.0" >
-<dc:creator xmlns:dc="http://example.org">heynow</dc:creator>
-<channel>
-<copyright>copyright 2006</copyright>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_dc_contributor.xml b/toolkit/components/feeds/test/xml/rss2/feed_dc_contributor.xml
deleted file mode 100644
index cfb514ccd..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_dc_contributor.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel copyright works
-Expect: feed.contributors.queryElementAt(0, Components.interfaces.nsIFeedPerson).name == 'them';
-
--->
-<rss version="2.0" >
-<channel xmlns:dc="http://purl.org/dc/elements/1.1/">
-<copyright>copyright 2006</copyright>
-<dc:creator>me</dc:creator>
-<dc:contributor>them</dc:contributor>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_dc_creator.xml b/toolkit/components/feeds/test/xml/rss2/feed_dc_creator.xml
deleted file mode 100644
index 8ed1aff7f..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_dc_creator.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel copyright works
-Expect: feed.authors.queryElementAt(0, Components.interfaces.nsIFeedPerson).name == 'me'
-
--->
-<rss version="2.0" >
-<channel xmlns:dc="http://purl.org/dc/elements/1.1/">
-<copyright>copyright 2006</copyright>
-<dc:creator>me</dc:creator>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_description.xml b/toolkit/components/feeds/test/xml/rss2/feed_description.xml
deleted file mode 100644
index 11463dfe0..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_description.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel description works
-Expect: var desc = feed.fields.getProperty('description'); desc == 'test';
-
--->
-<rss version="2.0" >
-<channel>
-<description>test</description>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_description_html.xml b/toolkit/components/feeds/test/xml/rss2/feed_description_html.xml
deleted file mode 100644
index ecb544f6c..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_description_html.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel description works w/html
-Expect: feed.fields.getProperty('description') == '<b>test</b>'
-
--->
-<rss version="2.0" >
-<channel>
-<description>&lt;b>test&lt;/b></description>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_description_html_cdata.xml b/toolkit/components/feeds/test/xml/rss2/feed_description_html_cdata.xml
deleted file mode 100644
index 45ee9e92b..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_description_html_cdata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel description works w/ html & CDATA
-Expect: feed.fields.getProperty('description') == '<b>test</b>'
-
--->
-<rss version="2.0" >
-<channel>
-<description><![CDATA[<b>test</b>]]></description>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_docs.xml b/toolkit/components/feeds/test/xml/rss2/feed_docs.xml
deleted file mode 100644
index 20323b22f..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_docs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel docs works
-Expect: feed.fields.getProperty('docs') == 'http://example.org'
-
--->
-<rss version="2.0" >
-<channel>
-<docs>http://example.org</docs>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_generator.xml b/toolkit/components/feeds/test/xml/rss2/feed_generator.xml
deleted file mode 100644
index 91ba579b4..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_generator.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel generator works
-Expect: feed.generator.agent == 'a generator used to make feeds'
-
--->
-<rss version="2.0" >
-<channel>
-<generator>a generator used to make feeds</generator>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_image_desc.xml b/toolkit/components/feeds/test/xml/rss2/feed_image_desc.xml
deleted file mode 100644
index 7f665641b..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_image_desc.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel image description and required fields work
-Expect: ((feed.image.getProperty('title') == 'A picture') && (feed.image.getProperty('link') == 'http://example.org') && (feed.image.getProperty('url') == 'http://example.org/a.jpg') && (feed.image.getProperty('description') == 'Yo!'))
-
--->
-<rss version="2.0" >
-<channel>
-<image>
- <link>http://example.org</link>
- <title>A picture</title>
- <url>http://example.org/a.jpg</url>
- <description>Yo!</description>
-</image>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_image_desc_width_height.xml b/toolkit/components/feeds/test/xml/rss2/feed_image_desc_width_height.xml
deleted file mode 100644
index 2be53e86c..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_image_desc_width_height.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel image required fields work
-Expect: ((feed.image.getProperty('title') == 'A picture') && (feed.image.getProperty('link') == 'http://example.org') && (feed.image.getProperty('url') == 'http://example.org/a.jpg') && (feed.image.getProperty('description') == 'Yo!') && (feed.image.getProperty('width') == '42') && (feed.image.getProperty('height') == '43'))
-
--->
-<rss version="2.0" >
-<channel>
-<image>
- <link>http://example.org</link>
- <title>A picture</title>
- <url>http://example.org/a.jpg</url>
- <description>Yo!</description>
- <width>42</width>
- <height>43</height>
-</image>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_image_required.xml b/toolkit/components/feeds/test/xml/rss2/feed_image_required.xml
deleted file mode 100644
index 9035523a1..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_image_required.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel image required fields work
-Expect: ((feed.image.getProperty('title') == 'A picture') && (feed.image.getProperty('link') == 'http://example.org') && (feed.image.getProperty('url') == 'http://example.org/a.jpg'))
-
--->
-<rss version="2.0" >
-<channel>
-<image>
- <link>http://example.org</link>
- <title>A picture</title>
- <url>http://example.org/a.jpg</url>
-</image>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_language.xml b/toolkit/components/feeds/test/xml/rss2/feed_language.xml
deleted file mode 100644
index d4047a99f..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_language.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel language works
-Expect: feed.fields.getProperty('language') == 'en-us'
-
--->
-<rss version="2.0" >
-<channel>
-<language>en-us</language>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_lastBuildDate.xml b/toolkit/components/feeds/test/xml/rss2/feed_lastBuildDate.xml
deleted file mode 100644
index fee9ff582..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_lastBuildDate.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel lastBuildDate works
-Expect: feed.fields.getProperty('lastBuildDate') == 'Sat, 07 Sep 2002 00:00:01 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<lastBuildDate>Sat, 07 Sep 2002 00:00:01 GMT</lastBuildDate>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_linebreak_link.xml b/toolkit/components/feeds/test/xml/rss2/feed_linebreak_link.xml
deleted file mode 100644
index 1af6550f9..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_linebreak_link.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel link works w/ line break
-Expect: feed.link.spec == 'http://mozilla.org/'
-
--->
-<rss version="2.0" >
-<channel>
-<link>
-http://mozilla.org/
-</link>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_link.xml b/toolkit/components/feeds/test/xml/rss2/feed_link.xml
deleted file mode 100644
index a4874e9ca..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_link.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel link works
-Expect: feed.link.spec == 'http://mozilla.org/'
-
--->
-<rss version="2.0" >
-<channel>
-<link>http://mozilla.org/</link>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_link_cdata.xml b/toolkit/components/feeds/test/xml/rss2/feed_link_cdata.xml
deleted file mode 100644
index 5031ac1c3..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_link_cdata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel link works w/ CDATA
-Expect: feed.link.spec == 'http://mozilla.org/'
-
--->
-<rss version="2.0" >
-<channel>
-<link>
- <![CDATA[http://mozilla.org/]]>
-</link>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_managingEditor.xml b/toolkit/components/feeds/test/xml/rss2/feed_managingEditor.xml
deleted file mode 100644
index 3f7060449..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_managingEditor.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel managingEditor works
-Expect: feed.authors.queryElementAt(0, Components.interfaces.nsIFeedPerson).email == 'example@example.com'
-
--->
-<rss version="2.0" >
-<channel>
-<managingEditor>example@example.com</managingEditor>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_managingEditor_extra_att.xml b/toolkit/components/feeds/test/xml/rss2/feed_managingEditor_extra_att.xml
deleted file mode 100644
index 017a4595f..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_managingEditor_extra_att.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel managingEditor works
-Expect: feed.authors.queryElementAt(0, Components.interfaces.nsIFeedPerson).email == 'example@example.com'
-
--->
-<rss version="2.0" >
-<channel>
-<managingEditor foo:bar="baz" xmlns:foo="http://example.org">example@example.com</managingEditor>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_multiple_categories.xml b/toolkit/components/feeds/test/xml/rss2/feed_multiple_categories.xml
deleted file mode 100644
index 538362b6a..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_multiple_categories.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel category works
-Expect: feed.categories.queryElementAt(2, Components.interfaces.nsIPropertyBag).getProperty('term') == 'hmm2'
-
--->
-<rss version="2.0" >
-<channel>
-<category>hmm0</category>
-<category>hmm1</category>
-<category>hmm2</category>
-<category>hmm3</category>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_pubDate.xml b/toolkit/components/feeds/test/xml/rss2/feed_pubDate.xml
deleted file mode 100644
index 42cea6832..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_pubDate.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel pubDate works
-Expect: feed.fields.getProperty('pubDate') == 'Sat, 07 Sep 2002 00:00:01 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<pubDate>Sat, 07 Sep 2002 00:00:01 GMT</pubDate>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_invalid.xml b/toolkit/components/feeds/test/xml/rss2/feed_pubDate_invalid.xml
deleted file mode 100644
index 48cce256a..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_invalid.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: non-RFC822 date should produce null feed.updated
-Expect: feed.updated == null
-
--->
-<rss version="2.0" >
-<channel>
-<pubDate>Satmonkey, 07 Sepmonkey 2002 00:00:01 GMT</pubDate>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_1.xml b/toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_1.xml
deleted file mode 100644
index 846ef22a6..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: Test whether date parsing handles partly-abbreviated dates.
-Expect: feed.updated == 'Tue, 25 Apr 2006 08:00:00 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<pubDate>Tues, 25 Apri 2006 08:00:00 GMT</pubDate>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_2.xml b/toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_2.xml
deleted file mode 100644
index d1ee96f36..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: Test whether date parsing handles unabbreviated dates.
-Expect: feed.updated == 'Sat, 25 Nov 2006 00:12:45 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<pubDate>Saturday 25 November 2006 10:12:45 +1000</pubDate>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_timezoneZ.xml b/toolkit/components/feeds/test/xml/rss2/feed_pubDate_timezoneZ.xml
deleted file mode 100644
index b31ed5c56..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_timezoneZ.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: Test whether date parsing handles "Z" as a timezone in RFC822.
-Expect: feed.updated == 'Tue, 25 Apr 2006 08:00:00 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<pubDate>Tue, 25 Apr 2006 08:00:00 Z</pubDate>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_utc.xml b/toolkit/components/feeds/test/xml/rss2/feed_pubDate_utc.xml
deleted file mode 100644
index 8eff56046..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_pubDate_utc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: Test whether date parsing handles 'UTC' as a timezone.
-Expect: feed.updated == 'Mon, 16 Apr 2007 03:12:45 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<pubDate>Monday, 16 April 2007 03:12:45 UTC</pubDate>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_rating.xml b/toolkit/components/feeds/test/xml/rss2/feed_rating.xml
deleted file mode 100644
index dd5f8f9e5..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_rating.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel rating works
-Expect: feed.fields.getProperty('rating') == '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l by "webmaster@example.com" on "2006.01.29T10:09-0800" r (n 0 s 0 v 0 l 0))'
-
--->
-<rss version="2.0" >
-<channel>
-<rating>(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l by "webmaster@example.com" on "2006.01.29T10:09-0800" r (n 0 s 0 v 0 l 0))</rating>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_single_quote_stylesheet_pi.xml b/toolkit/components/feeds/test/xml/rss2/feed_single_quote_stylesheet_pi.xml
deleted file mode 100644
index 10141fe7e..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_single_quote_stylesheet_pi.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-Description: stylesheets with single quoted attributes work. Bug 352549.
-Base: http://www.penny-arcade.com/rss.xml
-Expect: result.stylesheet.spec == "http://www.penny-arcade.com/stylesheets/rss-display.xsl"
-
--->
-<?xml-stylesheet type='text/xsl' href='/stylesheets/rss-display.xsl' version='1.0'?>
-<rss version="2.0">
-<channel>
-<title>Penny-Arcade</title>
-<link>http://www.penny-arcade.com/</link>
-<language>en-us</language>
-
-<copyright>Copyright 1999 - 2006 Penny Arcade, Inc.</copyright>
-<image>
-<url>http://www.penny-arcade.com/images/rss-logo.png</url>
-<title>Penny-Arcade Logo</title>
-<link>http://www.penny-arcade.com/</link>
-<width>144</width>
-
-<height>82</height>
-</image>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_skipDays.xml b/toolkit/components/feeds/test/xml/rss2/feed_skipDays.xml
deleted file mode 100644
index 8c6ffa9e4..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_skipDays.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel skipDays works
-Expect: ((feed.skipDays.queryElementAt(0, Components.interfaces.nsISupportsString) == 'Sunday') && (feed.skipDays.queryElementAt(1, Components.interfaces.nsISupportsString) == 'Monday'))
-
--->
-<rss version="2.0" >
-<channel>
-<skipDays>
- <day>Sunday</day>
- <day>Monday</day>
-</skipDays>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_skipHours.xml b/toolkit/components/feeds/test/xml/rss2/feed_skipHours.xml
deleted file mode 100644
index a20372eda..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_skipHours.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel skipHours works
-Expect: ((feed.skipHours.queryElementAt(0, Components.interfaces.nsISupportsString) == '0') && (feed.skipHours.queryElementAt(4, Components.interfaces.nsISupportsString) == '23'))
-
--->
-<rss version="2.0" >
-<channel>
-<skipHours>
- <hour>0</hour>
- <hour>1</hour>
- <hour>2</hour>
- <hour>22</hour>
- <hour>23</hour>
-</skipHours>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_subtitle.xml b/toolkit/components/feeds/test/xml/rss2/feed_subtitle.xml
deleted file mode 100644
index a98a3c19e..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_subtitle.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel description works
-Expect: feed.subtitle.text == 'test'
-
--->
-<rss version="2.0" >
-<channel>
-<description>test</description>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_subtitle_html.xml b/toolkit/components/feeds/test/xml/rss2/feed_subtitle_html.xml
deleted file mode 100644
index fca819d36..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_subtitle_html.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel description works
-Expect: feed.subtitle.plainText() == '<i><b>test</b></i>'
-
--->
-<rss version="2.0" >
-<channel>
-<description><![CDATA[<i><b>test</b></i>]]></description>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_subtitle_markup_stripped.xml b/toolkit/components/feeds/test/xml/rss2/feed_subtitle_markup_stripped.xml
deleted file mode 100644
index 54f6a623c..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_subtitle_markup_stripped.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel description markup is not HTML
-Expect: feed.subtitle.plainText() == '<i><b>test</b></i>'
-
--->
-<rss version="2.0" >
-<channel>
-<description><![CDATA[<i><b>test</b></i>]]></description>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_textinput.xml b/toolkit/components/feeds/test/xml/rss2/feed_textinput.xml
deleted file mode 100644
index 4617d62bc..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_textinput.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel textInput works
-Expect: ((feed.textInput.getProperty('description') == 'Your aggregator supports the textInput element. What software are you using?') && (feed.textInput.getProperty('link') == 'http://www.cadenhead.org/textinput.php') && (feed.textInput.getProperty('name') == 'query') && (feed.textInput.getProperty('title') == 'TextInput Inquiry'))
-
--->
-<rss version="2.0" >
-<channel>
-<textInput>
- <description>Your aggregator supports the textInput element. What software are you using?</description>
- <link>http://www.cadenhead.org/textinput.php</link>
- <name>query</name>
- <title>TextInput Inquiry</title>
-</textInput>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_title.xml b/toolkit/components/feeds/test/xml/rss2/feed_title.xml
deleted file mode 100644
index 1f7d63ad2..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_title.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel title works
-Expect: feed.title.plainText() == 'test title'
-
--->
-<rss version="2.0" >
-<channel>
-<title>test title</title>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_title_cdata_mixed.xml b/toolkit/components/feeds/test/xml/rss2/feed_title_cdata_mixed.xml
deleted file mode 100644
index 19ef62915..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_title_cdata_mixed.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel title works w/ funky CDATA title
-Expect: feed.title.plainText() == 'test title'
-
--->
-<rss version="2.0" >
-<channel>
-<title>test t<![CDATA[it]]>le</title>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_title_nesting.xml b/toolkit/components/feeds/test/xml/rss2/feed_title_nesting.xml
deleted file mode 100644
index 82492cef7..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_title_nesting.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel title works w/ nested title
-Expect: feed.title.text == 'test title'
-
--->
-<rss version="2.0" >
-<channel>
-<title>test title</title>
-<bogus><title>bogus title</title></bogus>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_ttl.xml b/toolkit/components/feeds/test/xml/rss2/feed_ttl.xml
deleted file mode 100644
index 57158aff4..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_ttl.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel ttl works
-Expect: feed.fields.getProperty('ttl') == '60'
-
--->
-<rss version="2.0" >
-<channel>
-<ttl>60</ttl>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_updated.xml b/toolkit/components/feeds/test/xml/rss2/feed_updated.xml
deleted file mode 100644
index c9e75e360..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_updated.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel pubDate works
-Expect: feed.updated == 'Sat, 07 Sep 2002 00:00:01 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<pubDate>Sat, 07 Sep 2002 00:00:01 GMT</pubDate>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_updated_dcdate.xml b/toolkit/components/feeds/test/xml/rss2/feed_updated_dcdate.xml
deleted file mode 100644
index aa69e7800..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_updated_dcdate.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel pubDate works
-Expect: feed.updated == 'Sat, 07 Sep 2002 00:00:01 GMT'
-
--->
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<channel>
-<dc:date>Sat, 07 Sep 2002 00:00:01 GMT</dc:date>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_updated_lastBuildDate.xml b/toolkit/components/feeds/test/xml/rss2/feed_updated_lastBuildDate.xml
deleted file mode 100644
index 2fb24a7ec..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_updated_lastBuildDate.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel lastBuildDate works
-Expect: feed.updated == 'Sat, 07 Sep 2002 00:00:01 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<lastBuildDate>Sat, 07 Sep 2002 00:00:01 GMT</lastBuildDate>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_updated_lastBuildDate_priority.xml b/toolkit/components/feeds/test/xml/rss2/feed_updated_lastBuildDate_priority.xml
deleted file mode 100644
index 24f024005..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_updated_lastBuildDate_priority.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel lastBuildDate trumps pubDate
-Expect: feed.updated == 'Sat, 07 Sep 2002 00:00:01 GMT'
-
--->
-<rss version="2.0" >
-<channel>
-<pubDate>Sun, 08 Sep 2002 00:00:01 GMT</pubDate>
-<lastBuildDate>Sat, 07 Sep 2002 00:00:01 GMT</lastBuildDate>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_webMaster.xml b/toolkit/components/feeds/test/xml/rss2/feed_webMaster.xml
deleted file mode 100644
index 887894983..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_webMaster.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel webMaster works
-Expect: feed.fields.getProperty('webMaster') == 'example@example.com'
-
--->
-<rss version="2.0" >
-<channel>
-<webMaster>example@example.com</webMaster>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_wfw_commentapi.xml b/toolkit/components/feeds/test/xml/rss2/feed_wfw_commentapi.xml
deleted file mode 100644
index af725064e..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_wfw_commentapi.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel copyright works
-Expect: feed.fields.getProperty('wfw:comment') == 'http://example.org'
-
--->
-<rss xmlns:wfw="http://wellformedweb.org/CommentAPI/" version="2.0" >
-<channel xmlns:dc="http://purl.org/dc/elements/1.1/">
-<wfw:comment>http://example.org</wfw:comment>
-<copyright>copyright 2006</copyright>
-<dc:creator>me</dc:creator>
-<dc:contributor>them</dc:contributor>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_wfw_commentrss.xml b/toolkit/components/feeds/test/xml/rss2/feed_wfw_commentrss.xml
deleted file mode 100644
index fb1d89609..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_wfw_commentrss.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel copyright works
-Expect: feed.fields.getProperty('wfw:commentRss') == 'http://example.org'
-
--->
-<rss xmlns:wfw="http://wellformedweb.org/CommentAPI/" version="2.0" >
-<channel xmlns:dc="http://purl.org/dc/elements/1.1/">
-<copyright>copyright 2006</copyright>
-<dc:creator>me</dc:creator>
-<wfw:commentRss>http://example.org</wfw:commentRss>
-<dc:contributor>them</dc:contributor>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_wiki.xml b/toolkit/components/feeds/test/xml/rss2/feed_wiki.xml
deleted file mode 100644
index b8cb783b0..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_wiki.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel unusual prefixed ext works
-Expect: feed.fields.getProperty('wiki:version') == '1'
-
--->
-<rss
-xmlns:w='http://purl.org/rss/1.0/modules/wiki/'
-xmlns:wfw="http://wellformedweb.org/CommentAPI/" version="2.0" >
-<channel xmlns:dc="http://purl.org/dc/elements/1.1/">
-<copyright>copyright 2006</copyright>
-<dc:creator>me</dc:creator>
-<w:version>1</w:version>
-<wfw:commentRss>http://example.org</wfw:commentRss>
-<dc:contributor>them</dc:contributor>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/feed_wiki_unusual_prefix.xml b/toolkit/components/feeds/test/xml/rss2/feed_wiki_unusual_prefix.xml
deleted file mode 100644
index b8cb783b0..000000000
--- a/toolkit/components/feeds/test/xml/rss2/feed_wiki_unusual_prefix.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel unusual prefixed ext works
-Expect: feed.fields.getProperty('wiki:version') == '1'
-
--->
-<rss
-xmlns:w='http://purl.org/rss/1.0/modules/wiki/'
-xmlns:wfw="http://wellformedweb.org/CommentAPI/" version="2.0" >
-<channel xmlns:dc="http://purl.org/dc/elements/1.1/">
-<copyright>copyright 2006</copyright>
-<dc:creator>me</dc:creator>
-<w:version>1</w:version>
-<wfw:commentRss>http://example.org</wfw:commentRss>
-<dc:contributor>them</dc:contributor>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/item_author.xml b/toolkit/components/feeds/test/xml/rss2/item_author.xml
deleted file mode 100644
index ad0c97e2a..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_author.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item author works
-Expect: var authors = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).authors; var author = authors.queryElementAt(0, Components.interfaces.nsIFeedPerson); ((author.name == 'Joe Bob Briggs'));
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_category.xml b/toolkit/components/feeds/test/xml/rss2/item_category.xml
deleted file mode 100644
index 4795e00bb..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_category.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item category works
-Expect: var cats = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('categories'); cats.QueryInterface(Components.interfaces.nsIArray); var cat = cats.queryElementAt(0, Components.interfaces.nsIPropertyBag); ((cat.getProperty('domain') == 'foo') && (cat.getProperty('term') == 'bar'));
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<category domain="foo">bar</category>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_comments.xml b/toolkit/components/feeds/test/xml/rss2/item_comments.xml
deleted file mode 100644
index da1cccc82..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_comments.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item comments works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('comments') == 'http://example.org'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<title>test</title>
-<!--<author>jbb@dallas.example.com (Joe Bob Briggs)</author>-->
-<comments>http://example.org</comments>
-
-<category domain="foo">bar</category>
-
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_content_encoded.xml b/toolkit/components/feeds/test/xml/rss2/item_content_encoded.xml
deleted file mode 100644
index 6611375b6..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_content_encoded.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item title works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).content.plainText() == 'foobar'
-
--->
-<rss version="2.0" >
-<channel>
-<item xmlns:c="http://purl.org/rss/1.0/modules/content/">
- <title>test</title>
- <c:encoded>foobar</c:encoded>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_count.xml b/toolkit/components/feeds/test/xml/rss2/item_count.xml
deleted file mode 100644
index a69cbc979..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_count.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: items length is correct
-Expect: feed.items.length == 1
-
--->
-<rss version="2.0"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-<channel>
-<title>Items Test</title>
-<link>http://mozilla.org/</link>
-<description></description>
-
-<dc:language>en-us</dc:language>
-<dc:creator>sayrer@gmail.com</dc:creator>
-<dc:date>2005-12-07T14:48:03-05:00</dc:date>
-
-<item>
-<title>Is the date right?</title>
-<link>http://example.org/dc_date.html</link>
-</item>
-
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/item_count2.xml b/toolkit/components/feeds/test/xml/rss2/item_count2.xml
deleted file mode 100644
index 27df0a932..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_count2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: items length is correct
-Expect: feed.items.length == 2
-
--->
-<rss version="2.0"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-<channel>
-<title>Items Test</title>
-<link>http://mozilla.org/</link>
-<description></description>
-
-<dc:language>en-us</dc:language>
-<dc:creator>sayrer@gmail.com</dc:creator>
-<dc:date>2005-12-07T14:48:03-05:00</dc:date>
-
-<item>
-<title>Is the date right?</title>
-<link>http://example.org/dc_date.html</link>
-</item>
-<item>
-<title>Is the date right?</title>
-<link>http://example.org/dc_date.html</link>
-</item>
-
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/item_description.xml b/toolkit/components/feeds/test/xml/rss2/item_description.xml
deleted file mode 100644
index 7416d48e6..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_description.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item desc encoded works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).summary.text == 'I\'m headed for France. I wasn\'t gonna go this year, but then last week <a href="http://www.imdb.com/title/tt0086525/">Valley Girl</a> came out and I said to myself, Joe Bob, you gotta get out of the country for a while.'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<comments>http://example.org</comments>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_description_2.xml b/toolkit/components/feeds/test/xml/rss2/item_description_2.xml
deleted file mode 100644
index 427726868..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_description_2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item desc encoded works
-Expect: feed.items.queryElementAt(1, Components.interfaces.nsIFeedEntry).summary.text == 'I\'m headed for France. I wasn\'t gonna go this year, but then last week <a href="http://www.imdb.com/title/tt0086525/">Valley Girl</a> came out and I said to myself, Joe Bob, you gotta get out of the country for a while.'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
- <description>hmmm</description>
-</item>
-<item>
-<comments>http://example.org</comments>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_description_cdata.xml b/toolkit/components/feeds/test/xml/rss2/item_description_cdata.xml
deleted file mode 100644
index ef3926f87..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_description_cdata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item desc CDATA works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).summary.text == 'I\'m headed for France. I wasn\'t gonna go this year, but then last week <a href="http://www.imdb.com/title/tt0086525/">Valley Girl</a> came out and I said to myself, Joe Bob, you gotta get out of the country for a while.'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-<description><![CDATA[I'm headed for France. I wasn't gonna go this year, but then last week <a href="http://www.imdb.com/title/tt0086525/">Valley Girl</a> came out and I said to myself, Joe Bob, you gotta get out of the country for a while.]]></description>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_description_decode_entities.xml b/toolkit/components/feeds/test/xml/rss2/item_description_decode_entities.xml
deleted file mode 100644
index e259354dc..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_description_decode_entities.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-Description: item desc encoded, double-escaped entity
-Expect: var summary = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).summary; summary.plainText() == "test D\u00e9sol\u00e9e";
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<comments>http://example.org</comments>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<category domain="foo">bar</category>
-
-<description>
- &lt;b>test D&amp;eacute;sol&amp;eacute;e&lt;/b>
-</description>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_description_normalized.xml b/toolkit/components/feeds/test/xml/rss2/item_description_normalized.xml
deleted file mode 100644
index 9819deb36..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_description_normalized.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item desc encoded, normalied works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).summary.text == 'I\'m headed for France. I wasn\'t gonna go this year, but then last week <a href="http://www.imdb.com/title/tt0086525/">Valley Girl</a> came out and I said to myself, Joe Bob, you gotta get out of the country for a while.'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<comments>http://example.org</comments>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_description_normalized_nohtml.xml b/toolkit/components/feeds/test/xml/rss2/item_description_normalized_nohtml.xml
deleted file mode 100644
index 0a34a008d..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_description_normalized_nohtml.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item desc encoded, normalized works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).summary.plainText() == 'I\'m headed for France. I wasn\'t gonna go this year, but then last week Valley Girl came out and I said to myself, Joe Bob, you gotta get out of the country for a while.'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<comments>http://example.org</comments>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_enclosure.xml b/toolkit/components/feeds/test/xml/rss2/item_enclosure.xml
deleted file mode 100644
index 2e38a370a..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_enclosure.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item enclosure works
-Expect: var enc = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('enclosure'); enc.QueryInterface(Components.interfaces.nsIPropertyBag); ((enc.getProperty('length') == '24986239') && (enc.getProperty('type') == 'audio/mpeg') && (enc.getProperty('url') == 'http://dallas.example.com/joebob_050689.mp3') && (feed.type == 1) && (feed.enclosureCount == 1));
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_enclosure_duplicates.xml b/toolkit/components/feeds/test/xml/rss2/item_enclosure_duplicates.xml
deleted file mode 100644
index a9bcd2cc9..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_enclosure_duplicates.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: feed with duplicate enclosures on a single item
-Expect: ((feed.type == 4) && (feed.enclosureCount == 1));
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-
-<item>
-<enclosure length="24986239" type="video/mpeg" url="http://dallas.example.com/joebob_050689.mpeg" />
-<media:content fileSize="24986239" type="video/mpeg" url="http://dallas.example.com/joebob_050689.mpeg" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test audio</title>
-
-<category domain="foo">bar</category>
-
-<description>Listen to the words that are coming out of my mouth.</description>
-</item>
-
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_enclosure_duplicates2.xml b/toolkit/components/feeds/test/xml/rss2/item_enclosure_duplicates2.xml
deleted file mode 100644
index 51f7caba9..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_enclosure_duplicates2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: feed with duplicate enclosures on a single item with different data available
-Expect: var enc = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('enclosure'); enc.QueryInterface(Components.interfaces.nsIPropertyBag); ((enc.getProperty('length') == '24986239') && (enc.getProperty('type') == 'video/mpeg') && (feed.type == 4) && (feed.enclosureCount == 1) );
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-
-<item>
-<enclosure url="http://dallas.example.com/joebob_050689.mpeg" />
-<media:content fileSize="24986239" type="video/mpeg" url="http://dallas.example.com/joebob_050689.mpeg" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test audio</title>
-
-<category domain="foo">bar</category>
-
-<description>Listen to the words that are coming out of my mouth.</description>
-</item>
-
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_enclosure_mixed.xml b/toolkit/components/feeds/test/xml/rss2/item_enclosure_mixed.xml
deleted file mode 100644
index 7b49e4d74..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_enclosure_mixed.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: feed with different kinds of enclosures that should be TYPE_FEED (0)
-Expect: ((feed.type == 0) && (feed.enclosureCount == 2));
-
--->
-<rss version="2.0" >
-<channel>
-
-<item>
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test audio</title>
-
-<category domain="foo">bar</category>
-
-<description>Listen to the words that are coming out of my mouth.</description>
-</item>
-
-<item>
-<enclosure length="3000000" type="video/mpeg" url="http://dallas.example.com/joebob_pants.mpeg" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test video</title>
-
-<category domain="foo">bar</category>
-
-<description>Look into my eyes....</description>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_enclosure_mixed2.xml b/toolkit/components/feeds/test/xml/rss2/item_enclosure_mixed2.xml
deleted file mode 100644
index a54a40559..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_enclosure_mixed2.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: feed that doesn't have at least one enclosure per entry should be TYPE_FEED (0)
-Expect: ((feed.type == 0) && (feed.enclosureCount == 1));
-
--->
-<rss version="2.0" >
-<channel>
-
-<item>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>no video this week!</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm on a trip to the moon this week for this year's Spaceshot Vlogger
-conference. No video this week!</description>
-</item>
-
-<item>
-<enclosure length="3000000" type="video/mpeg" url="http://dallas.example.com/joebob_pants.mpeg" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>orange keyboard</title>
-
-<category domain="foo">bar</category>
-
-<description>Crazy things happen when you paint your keyboard orange.</description>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid.xml b/toolkit/components/feeds/test/xml/rss2/item_guid.xml
deleted file mode 100644
index 2e7f551ef..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item guid works
-Expect: var guid = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('guid'); guid.QueryInterface(Components.interfaces.nsIPropertyBag2); guid.getProperty('guid') == 'asdf';
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-<guid>asdf</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_bogus_url.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_bogus_url.xml
deleted file mode 100644
index 2f1b67ced..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_bogus_url.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item copes with bogus guid
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link == null;
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-<guid isPermaLink="true">xorg</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink.xml
deleted file mode 100644
index c64341427..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item guid works
-Expect: var link = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link; link.spec == 'http://www.example.org/';
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<guid isPermaLink="true">http://www.example.org/</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_default.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_default.xml
deleted file mode 100644
index 7d6ae7958..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_default.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item guid works
-Expect: var link = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link; link.spec == 'http://www.example.org/';
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<guid>http://www.example.org/</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_false.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_false.xml
deleted file mode 100644
index c2a1ad867..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_false.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item guid should not map to link when isPermaLink=false
-Expect: var link = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link; link == null;
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<guid isPermaLink="false">http://www.example.org/</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_false_uppercase.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_false_uppercase.xml
deleted file mode 100644
index 9ff2505c4..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_false_uppercase.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item guid should not map to link when isPermaLink=FaLsE
-Expect: var link = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link; link == null;
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<guid isPermaLink="FaLsE">http://www.example.org/</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_true_uppercase.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_true_uppercase.xml
deleted file mode 100644
index bc4fdc0e9..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_true_uppercase.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item guid should map to link when isPermaLink=TrUe
-Expect: var link = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link; link.spec == "http://www.example.org/";
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<guid isPermaLink="TrUe">http://www.example.org/</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_unknown_value.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_unknown_value.xml
deleted file mode 100644
index 4dce8c390..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_isPermaLink_unknown_value.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item guid should map to link when isPermaLink=meatcake or other unknown values
-Expect: var link = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link; link.spec == "http://www.example.org/";
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<title>test</title>
-<guid isPermaLink="meatcake">http://www.example.org/</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_normalized.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_normalized.xml
deleted file mode 100644
index e4ac97862..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_normalized.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item guid works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).id == 'asdf';
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-<guid>asdf</guid>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_guid_with_link.xml b/toolkit/components/feeds/test/xml/rss2/item_guid_with_link.xml
deleted file mode 100644
index d2d3daca5..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_guid_with_link.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item prefers link to guid
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link.spec == 'http://link.example.org/';
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-<guid isPermaLink="true">http://www.example.org</guid>
-<link>http://link.example.org/</link>
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_link.xml b/toolkit/components/feeds/test/xml/rss2/item_link.xml
deleted file mode 100644
index c89f71e77..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_link.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item comments works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('link') == 'http://dallas.example.com/1983/05/06/joebob.htm'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<title>test</title>
-<!--<author>jbb@dallas.example.com (Joe Bob Briggs)</author>-->
-<comments>http://example.org</comments>
-<link>http://dallas.example.com/1983/05/06/joebob.htm</link>
-<category domain="foo">bar</category>
-
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_link_normalized.xml b/toolkit/components/feeds/test/xml/rss2/item_link_normalized.xml
deleted file mode 100644
index 876d7613c..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_link_normalized.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item link normalized works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).link.spec == 'http://dallas.example.com/1983/05/06/joebob.htm'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-<title>test</title>
-<!--<author>jbb@dallas.example.com (Joe Bob Briggs)</author>-->
-<comments>http://example.org</comments>
-<link>http://dallas.example.com/1983/05/06/joebob.htm</link>
-<category domain="foo">bar</category>
-
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_plain_desc.xml b/toolkit/components/feeds/test/xml/rss2/item_plain_desc.xml
deleted file mode 100644
index ffb4226f1..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_plain_desc.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item desc plain text works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).summary.text == "I'm headed for France. I wasn't gonna go this year, but then last week \"Valley Girl\" came out and I said to myself, Joe Bob, you gotta get out of the country for a while."
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-<description>I'm headed for France. I wasn't gonna go this year, but then last week "Valley Girl" came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_populated_enclosures.xml b/toolkit/components/feeds/test/xml/rss2/item_populated_enclosures.xml
deleted file mode 100644
index 0a7d60df6..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_populated_enclosures.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item enclosure is added to enclosures array
-Expect: var encs = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).enclosures; encs.QueryInterface(Components.interfaces.nsIArray); var enc = encs.queryElementAt(0, Components.interfaces.nsIPropertyBag2); ((enc.getProperty('length') == '24986239') && (enc.getProperty('type') == 'audio/mpeg') && (enc.getProperty('url') == 'http://dallas.example.com/joebob_050689.mp3'));
-
--->
-<rss version="2.0" >
-<channel>
-<item>
-
-<enclosure length="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_pubDate.xml b/toolkit/components/feeds/test/xml/rss2/item_pubDate.xml
deleted file mode 100644
index acb4abdcc..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_pubDate.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: entry pubDate works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).published == 'Tue, 02 Sep 2003 00:00:01 GMT'
-
--->
-<rss version="2.0" xmlns:dcterms="http://purl.org/dc/terms/">
-<channel>
-<item>
-<pubDate>Tue, 02 Sep 2003 00:00:01 GMT</pubDate>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_published.xml b/toolkit/components/feeds/test/xml/rss2/item_published.xml
deleted file mode 100644
index 86bf55602..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_published.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: entry published works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).published == 'Sat, 07 Sep 2002 00:00:01 GMT'
-
--->
-<rss version="2.0" xmlns:dcterms="http://purl.org/dc/terms/">
-<channel>
-<item>
-<dcterms:issued>Sat, 07 Sep 2002 00:00:01 GMT</dcterms:issued>
-</item>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/item_title.xml b/toolkit/components/feeds/test/xml/rss2/item_title.xml
deleted file mode 100644
index 0126d7da0..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_title.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item title works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('title') == 'test'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
- <title>test</title>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_title_normalized.xml b/toolkit/components/feeds/test/xml/rss2/item_title_normalized.xml
deleted file mode 100644
index 51de0f7e2..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_title_normalized.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: item title works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).title.text == 'test'
-
--->
-<rss version="2.0" >
-<channel>
-<item>
- <title>test</title>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/item_updated_dcdate.xml b/toolkit/components/feeds/test/xml/rss2/item_updated_dcdate.xml
deleted file mode 100644
index dc20cdbc0..000000000
--- a/toolkit/components/feeds/test/xml/rss2/item_updated_dcdate.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: channel pubDate works
-Expect: feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).updated == 'Sat, 07 Sep 2002 00:00:01 GMT'
-
--->
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<channel>
-<item>
-<dc:date>Sat, 07 Sep 2002 00:00:01 GMT</dc:date>
-</item>
-</channel>
-</rss> \ No newline at end of file
diff --git a/toolkit/components/feeds/test/xml/rss2/items_2_titles.xml b/toolkit/components/feeds/test/xml/rss2/items_2_titles.xml
deleted file mode 100644
index 3a0d1eb67..000000000
--- a/toolkit/components/feeds/test/xml/rss2/items_2_titles.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: 2 items title works
-Expect: ((feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).title.text == 'test') && (feed.items.queryElementAt(1, Components.interfaces.nsIFeedEntry).title.text == 'test #2'))
-
--->
-<rss version="2.0" >
-<channel>
-<item>
- <title>test</title>
-</item>
-<item>
- <title>test #2</title>
-</item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/mrss_content.xml b/toolkit/components/feeds/test/xml/rss2/mrss_content.xml
deleted file mode 100644
index 62a47cdef..000000000
--- a/toolkit/components/feeds/test/xml/rss2/mrss_content.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: mrss content works
-Expect: var enc = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getPropertyAsInterface('mediacontent', Components.interfaces.nsIArray).queryElementAt(0, Components.interfaces.nsIPropertyBag); Assert.equal(enc.getProperty('fileSize'), '24986239', 'file size is correct'); Assert.equal(enc.getProperty('type'), 'video/mpeg', 'type is correct'); Assert.equal(enc.getProperty('url'), 'http://dallas.example.com/joebob_050689.mpeg', 'url is correct'); Assert.equal(feed.type, 4, 'Feed type is correct'); Assert.equal(feed.enclosureCount,1, 'Enclosure count is correct'); true;
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-<item>
-
-<media:content fileSize="24986239" type="video/mpeg" url="http://dallas.example.com/joebob_050689.mpeg" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/mrss_content2.xml b/toolkit/components/feeds/test/xml/rss2/mrss_content2.xml
deleted file mode 100644
index a0d740e69..000000000
--- a/toolkit/components/feeds/test/xml/rss2/mrss_content2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: mrss content with a thumbnail
-Expect: var enc = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getPropertyAsInterface('mediacontent', Components.interfaces.nsIArray).queryElementAt(0, Components.interfaces.nsIPropertyBag); Assert.equal(enc.getProperty('fileSize'), '24986239', 'file size is correct'); Assert.equal(enc.getProperty('type'), 'video/mpeg', 'type is correct'); Assert.equal(enc.getProperty('url'), 'http://dallas.example.com/joebob_050689.mpeg', 'url is correct'); Assert.equal(feed.type, 0, 'Feed type is correct'); Assert.equal(feed.enclosureCount,2, 'Enclosure count is correct'); true;
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-<item>
-
-<media:content fileSize="24986239" type="video/mpeg" url="http://dallas.example.com/joebob_050689.mpeg" />
-<media:thumbnail url="http://dallas.example.com/joebob_050689.jpg" width="75" height="50"/>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/mrss_content_429049.xml b/toolkit/components/feeds/test/xml/rss2/mrss_content_429049.xml
deleted file mode 100644
index d13efc94c..000000000
--- a/toolkit/components/feeds/test/xml/rss2/mrss_content_429049.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: this tests bug 429049. the item with a valid url is added to the enclosures array and the item with an empty url does not.
-Expect: var encs = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).enclosures; encs.QueryInterface(Components.interfaces.nsIArray); (encs.length == 1);
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-
-<item>
-<media:content fileSize="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-<description>no description</description>
-</item>
-
-<item>
-<media:content url="" height="" width=""></media:content>
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test empty</title>
-
-<category domain="foo">bar</category>
-<description>no description</description>
-</item>
-
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/mrss_content_multiple.xml b/toolkit/components/feeds/test/xml/rss2/mrss_content_multiple.xml
deleted file mode 100644
index c391efdd2..000000000
--- a/toolkit/components/feeds/test/xml/rss2/mrss_content_multiple.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: mrss content with multiple media:content items works
-Expect: var mcs = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('mediacontent'); mcs.QueryInterface(Components.interfaces.nsIArray); var enc1 = mcs.queryElementAt(0, Components.interfaces.nsIPropertyBag); var enc2 = mcs.queryElementAt(1, Components.interfaces.nsIPropertyBag); ((enc1.getProperty('fileSize') == '24986239') && (enc1.getProperty('type') == 'video/mpeg') && (enc1.getProperty('url') == 'http://dallas.example.com/joebob_1.mpeg') && (enc2.getProperty('fileSize') == '30000000') && (enc2.getProperty('type') == 'video/mpeg') && (enc2.getProperty('url') == 'http://dallas.example.com/joebob_2.mpeg') && (feed.type == 4) && (feed.enclosureCount == 2));
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-<item>
-
-<media:content fileSize="24986239" type="video/mpeg" url="http://dallas.example.com/joebob_1.mpeg" />
-<media:content fileSize="30000000" type="video/mpeg" url="http://dallas.example.com/joebob_2.mpeg" />
-
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while. Two videos of that.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/mrss_content_populate_enclosure.xml b/toolkit/components/feeds/test/xml/rss2/mrss_content_populate_enclosure.xml
deleted file mode 100644
index f0718655f..000000000
--- a/toolkit/components/feeds/test/xml/rss2/mrss_content_populate_enclosure.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: mrss content added to enclosures array
-Expect: var encs = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).enclosures; encs.QueryInterface(Components.interfaces.nsIArray); var enc = encs.queryElementAt(0, Components.interfaces.nsIPropertyBag); ((enc.getProperty('length') == '24986239') && (enc.getProperty('type') == 'audio/mpeg') && (enc.getProperty('url') == 'http://dallas.example.com/joebob_050689.mp3') && (feed.type == 1) && (feed.enclosureCount == 1));
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-<item>
-
-<media:content fileSize="24986239" type="audio/mpeg" url="http://dallas.example.com/joebob_050689.mp3" />
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/mrss_group_content.xml b/toolkit/components/feeds/test/xml/rss2/mrss_group_content.xml
deleted file mode 100644
index da2ddb29c..000000000
--- a/toolkit/components/feeds/test/xml/rss2/mrss_group_content.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: mrss group content works
-Expect: var mg = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).fields.getProperty('mediagroup'); mg.QueryInterface(Components.interfaces.nsIPropertyBag); var mcs = mg.getProperty("mediacontent"); mcs.QueryInterface(Components.interfaces.nsIArray); var mc1 = mcs.queryElementAt(0, Components.interfaces.nsIPropertyBag); var mc2 = mcs.queryElementAt(1, Components.interfaces.nsIPropertyBag); ((mc1.getProperty('fileSize') == '400') && (mc1.getProperty('type') == 'audio/mpeg') && (mc1.getProperty('url') == 'http://dallas.example.com/joebob_050689_2.mp3') && (mc2.getProperty('fileSize') == '200') && (mc2.getProperty('type') == 'audio/mpeg') && (mc2.getProperty('url') == 'http://dallas.example.com/joebob_050689_1.mp3'));
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-<item>
-
-<media:group>
- <media:content fileSize="400" type="audio/mpeg" url="http://dallas.example.com/joebob_050689_2.mp3" />
- <media:content fileSize="200" type="audio/mpeg" url="http://dallas.example.com/joebob_050689_1.mp3" />
-</media:group>
-
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-
-</channel>
-</rss>
diff --git a/toolkit/components/feeds/test/xml/rss2/mrss_group_content_populate_enclosure.xml b/toolkit/components/feeds/test/xml/rss2/mrss_group_content_populate_enclosure.xml
deleted file mode 100644
index f7b9ebabf..000000000
--- a/toolkit/components/feeds/test/xml/rss2/mrss_group_content_populate_enclosure.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-
-Description: mrss group content works
-Expect: var encs = feed.items.queryElementAt(0, Components.interfaces.nsIFeedEntry).enclosures; encs.QueryInterface(Components.interfaces.nsIArray); var enc1 = encs.queryElementAt(0, Components.interfaces.nsIPropertyBag); var enc2 = encs.queryElementAt(1, Components.interfaces.nsIPropertyBag); ((enc1.getProperty('length') == '400') && (enc1.getProperty('type') == 'audio/mpeg') && (enc1.getProperty('url') == 'http://dallas.example.com/joebob_050689_2.mp3') && (enc2.getProperty('length') == '200') && (enc2.getProperty('type') == 'audio/mpeg') && (enc2.getProperty('url') == 'http://dallas.example.com/joebob_050689_1.mp3'));
-
-
--->
-<rss xmlns:media="http://search.yahoo.com/mrss" version="2.0" >
-<channel>
-<item>
-
-<media:group>
- <media:content fileSize="400" type="audio/mpeg" url="http://dallas.example.com/joebob_050689_2.mp3" />
- <media:content fileSize="200" type="audio/mpeg" url="http://dallas.example.com/joebob_050689_1.mp3" />
-</media:group>
-
-<author>jbb@dallas.example.com (Joe Bob Briggs)</author>
-<comments>http://example.org</comments>
-<title>test</title>
-
-<category domain="foo">bar</category>
-
-<description>I'm headed for France. I wasn't gonna go this year, but then last week &lt;a href="http://www.imdb.com/title/tt0086525/"&gt;Valley Girl&lt;/a&gt; came out and I said to myself, Joe Bob, you gotta get out of the country for a while.</description></item>
-</channel>
-</rss>