Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 889182 - mozapps/extensions xpcshell tests cannot be run concurrently. r=Unfocused

Browse Source
This commit is contained in:
Mihnea Dobrescu-Balaur 2013-07-24 22:35:43 -07:00
parent f886fc6f10
commit f76a4b028f
125 changed files with 872 additions and 934 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>hardblock@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:name>Hardblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update1.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>hardblock@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<em:name>Hardblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update2.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>hardblock@tests.mozilla.org</em:id>
<em:version>3.0</em:version>
<em:name>Hardblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update3.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>regexpblock@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:name>RegExp-blocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update1.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>regexpblock@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<em:name>RegExp-blocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update2.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>regexpblock@tests.mozilla.org</em:id>
<em:version>3.0</em:version>
<em:name>RegExp-blocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update3.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock1@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update1.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock1@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update2.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock1@tests.mozilla.org</em:id>
<em:version>3.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update3.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock2@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update1.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock2@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update2.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock2@tests.mozilla.org</em:id>
<em:version>3.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update3.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock3@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update1.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock3@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update2.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock3@tests.mozilla.org</em:id>
<em:version>3.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update3.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock4@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update1.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock4@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update2.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock4@tests.mozilla.org</em:id>
<em:version>3.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update3.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock5@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update1.rdf</em:updateURL>
<em:internalName>test/1.0</em:internalName>
<em:targetApplication>
<Description>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock5@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update2.rdf</em:updateURL>
<em:internalName>test/1.0</em:internalName>
<em:targetApplication>
<Description>

1
toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>softblock5@tests.mozilla.org</em:id>
<em:version>3.0</em:version>
<em:name>Softblocked add-on</em:name>
<em:updateURL>http://localhost:4444/data/addon_update3.rdf</em:updateURL>
<em:internalName>test/1.0</em:internalName>
<em:targetApplication>
<Description>

8
toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf
View File

@ -25,9 +25,9 @@
<em:translator>XPI Add-on 1 - Second Translator</em:translator>
<em:contributor>XPI Add-on 1 - First Contributor</em:contributor>
<em:contributor>XPI Add-on 1 - Second Contributor</em:contributor>
<em:homepageURL>http://localhost:4444/xpi/1/homepage.html</em:homepageURL>
<em:optionsURL>http://localhost:4444/xpi/1/options.html</em:optionsURL>
<em:aboutURL>http://localhost:4444/xpi/1/about.html</em:aboutURL>
<em:iconURL>http://localhost:4444/xpi/1/icon.png</em:iconURL>
<em:homepageURL>http://localhost/xpi/1/homepage.html</em:homepageURL>
<em:optionsURL>http://localhost/xpi/1/options.html</em:optionsURL>
<em:aboutURL>http://localhost/xpi/1/about.html</em:aboutURL>
<em:iconURL>http://localhost/xpi/1/icon.png</em:iconURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_1/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_1@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_2/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_2@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_3/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_3@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_4/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_4@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_5/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_5@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_6/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_6@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_7/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_7@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_8/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_8@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

18
toolkit/mozapps/extensions/test/addons/test_bug463819_9/install.rdf
View File

@ -1,18 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>test_bug463819_9@tests.mozilla.org</em:id>
<em:version>1</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
<em:name>Test for Bug 463819</em:name>
<em:updateURL>http://localhost:4444/test_bug463819.rdf</em:updateURL>
</Description>
</RDF>

1
toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf
View File

@ -13,6 +13,5 @@
</Description>
</em:targetApplication>
<em:name>Test for Bug 470377</em:name>
<em:updateURL>http://localhost:4444/test_bug470377_1.rdf</em:updateURL>
</Description>
</RDF>

1
toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf
View File

@ -13,6 +13,5 @@
</Description>
</em:targetApplication>
<em:name>Test for Bug 470377</em:name>
<em:updateURL>http://localhost:4444/test_bug470377_2.rdf</em:updateURL>
</Description>
</RDF>

1
toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf
View File

@ -13,6 +13,5 @@
</Description>
</em:targetApplication>
<em:name>Test for Bug 470377</em:name>
<em:updateURL>http://localhost:4444/test_bug470377_3.rdf</em:updateURL>
</Description>
</RDF>

1
toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf
View File

@ -13,6 +13,5 @@
</Description>
</em:targetApplication>
<em:name>Test for Bug 470377</em:name>
<em:updateURL>http://localhost:4444/test_bug470377_4.rdf</em:updateURL>
</Description>
</RDF>

1
toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf
View File

@ -13,6 +13,5 @@
</Description>
</em:targetApplication>
<em:name>Test for Bug 470377</em:name>
<em:updateURL>http://localhost:4444/test_bug470377_5.rdf</em:updateURL>
</Description>
</RDF>

3
toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf
View File

@ -12,9 +12,6 @@
<em:name>Bug 567184 Test</em:name>
<em:description>Test Description</em:description>
<!-- Prevent checking for updates on the default update server -->
<em:updateURL>http://localhost:4444/data/</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

1
toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf
View File

@ -7,7 +7,6 @@
<em:id>addon1@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:name>Test 1</em:name>
<em:updateURL>http://localhost:4444/data/test_bug655254.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>

14
toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf
View File

@ -13,7 +13,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft1_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft1_2.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -33,7 +33,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft2_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft2_2.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -53,7 +53,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft3_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft3_2.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -73,7 +73,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft4_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft4_2.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -93,7 +93,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft5_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft5_2.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -113,7 +113,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_hard1_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_hard1_2.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -133,7 +133,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_regexp1_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_regexp1_2.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

14
toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf
View File

@ -13,7 +13,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft1_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft1_3.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -33,7 +33,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft2_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft2_3.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -53,7 +53,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft3_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft3_3.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -73,7 +73,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft4_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft4_3.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -93,7 +93,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft5_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft5_3.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -113,7 +113,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_hard1_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_hard1_3.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -133,7 +133,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_regexp1_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_regexp1_3.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

14
toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf
View File

@ -13,7 +13,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft1_1.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft1_1.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -33,7 +33,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft2_1.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft2_1.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -53,7 +53,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft3_1.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft3_1.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -73,7 +73,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft4_1.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft4_1.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -93,7 +93,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_soft5_1.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_soft5_1.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -113,7 +113,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_hard1_1.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_hard1_1.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -133,7 +133,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>*</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/blocklist_regexp1_1.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/blocklist_regexp1_1.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

138
toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml
View File

@ -9,7 +9,7 @@
<authors>
<author>
<name>Test Creator 1</name>
<link>http://localhost:4444/creator1.html</link>
<link>http://localhost:%PORT%/creator1.html</link>
</author>
</authors>
<status id="8">Preliminarily Reviewed</status>
@ -26,7 +26,7 @@
<reviews num=" 1111 "> </reviews>
<!-- Test that a negative total_downloads is ignored -->
<total_downloads>-2</total_downloads>
<install>http://localhost:4444/test1.xpi</install>
<install>http://localhost:%PORT%/test1.xpi</install>
</addon>
<!-- Passes requirements. Tests optional attributes. Also tests that
@ -42,11 +42,11 @@
and the second one is a developer -->
<author>
<name>Test Creator 2</name>
<link>http://localhost:4444/creator2.html</link>
<link>http://localhost:%PORT%/creator2.html</link>
</author>
<author>
<name>Test Developer 2</name>
<link>http://localhost:4444/developer2.html</link>
<link>http://localhost:%PORT%/developer2.html</link>
</author>
</authors>
<summary>&lt;h1&gt;Test Summary 2&lt;/h1&gt;&lt;p&gt;paragraph&lt;/p&gt;</summary>
@ -54,9 +54,9 @@
<developer_comments>Test Developer
Comments 2</developer_comments>
<eula>Test EULA 2</eula>
<icon size="64">http://localhost:4444/icon2-64.png</icon>
<icon size="48">http://localhost:4444/icon2-48.png</icon>
<icon size="32">http://localhost:4444/icon2-32.png</icon>
<icon size="64">http://localhost:%PORT%/icon2-64.png</icon>
<icon size="48">http://localhost:%PORT%/icon2-48.png</icon>
<icon size="32">http://localhost:%PORT%/icon2-32.png</icon>
<status id="4">Public</status>
<compatible_applications>
<application>
@ -68,31 +68,31 @@
<!-- Test that multiple preview images are correctly parsed -->
<previews>
<preview primary="0">
<full type="image/png">http://localhost:4444/full1-2.png</full>
<thumbnail type="image/png">http://localhost:4444/thumbnail1-2.png</thumbnail>
<full type="image/png">http://localhost:%PORT%/full1-2.png</full>
<thumbnail type="image/png">http://localhost:%PORT%/thumbnail1-2.png</thumbnail>
</preview>
<preview primary="0">
<full type="image/png">http://localhost:4444/full2-2.png</full>
<thumbnail type="image/png">http://localhost:4444/thumbnail2-2.png</thumbnail>
<full type="image/png">http://localhost:%PORT%/full2-2.png</full>
<thumbnail type="image/png">http://localhost:%PORT%/thumbnail2-2.png</thumbnail>
<caption>Caption 2</caption>
</preview>
</previews>
<rating>NaN</rating>
<!-- Test that learnmore is used as the add-on's homepageURL
if there is no homepage defined -->
<learnmore>http://localhost:4444/learnmore2.html</learnmore>
<learnmore>http://localhost:%PORT%/learnmore2.html</learnmore>
<homepage/>
<support>http://localhost:4444/support2.html</support>
<support>http://localhost:%PORT%/support2.html</support>
<contribution_data>
<link>http://localhost:4444/contribution2.html</link>
<meet_developers>http://localhost:4444/meetDevelopers2.html</meet_developers>
<link>http://localhost:%PORT%/contribution2.html</link>
<meet_developers>http://localhost:%PORT%/meetDevelopers2.html</meet_developers>
</contribution_data>
<reviews num="NaN">http://localhost:4444/review2.html</reviews>
<reviews num="NaN">http://localhost:%PORT%/review2.html</reviews>
<total_downloads>NaN</total_downloads>
<weekly_downloads>NaN</weekly_downloads>
<daily_users>NaN</daily_users>
<last_updated epoch="NaN">Not an acual date</last_updated>
<install size="NaN" os="ALL">http://localhost:4444/test2.xpi</install>
<install size="NaN" os="ALL">http://localhost:%PORT%/test2.xpi</install>
</addon>
<!-- Passes requirements. Tests optional attributes with extra whitespace. -->
@ -106,7 +106,7 @@
<!-- Test that authors with blank names are ignored -->
<author>
<name> </name>
<link> http://localhost:4444/ignore3.html </link>
<link> http://localhost:%PORT%/ignore3.html </link>
</author>
<!-- Test that authors with blank links are ignored -->
<author>
@ -115,11 +115,11 @@
</author>
<author>
<name> Test Creator 3 </name>
<link> http://localhost:4444/creator3.html </link>
<link> http://localhost:%PORT%/creator3.html </link>
</author>
<author>
<name> First Test Developer 3 </name>
<link> http://localhost:4444/developer1-3.html </link>
<link> http://localhost:%PORT%/developer1-3.html </link>
</author>
<author>
<name> </name>
@ -127,14 +127,14 @@
</author>
<author>
<name> Second Test Developer 3 </name>
<link> http://localhost:4444/developer2-3.html </link>
<link> http://localhost:%PORT%/developer2-3.html </link>
</author>
</authors>
<summary> Test Summary 3 </summary>
<description> Test Description 3&lt;br&gt;&lt;ul&gt;&lt;li&gt;List item 1&lt;li&gt;List item 2&lt;/ul&gt; </description>
<developer_comments> Test Developer Comments 3 </developer_comments>
<eula> Test EULA 3 </eula>
<icon size="32"> http://localhost:4444/icon3.png </icon>
<icon size="32"> http://localhost:%PORT%/icon3.png </icon>
<status id=" 8 ">Preliminarily Reviewed</status>
<!-- Test that an incompatible + compatible application list passes -->
<compatible_applications>
@ -152,7 +152,7 @@
<!-- Test that primary images appear first in the add-on's screenshots array -->
<previews>
<preview primary=" 0 ">
<full type=" image/png "> http://localhost:4444/full2-3.png </full>
<full type=" image/png "> http://localhost:%PORT%/full2-3.png </full>
<caption> Caption 2 - 3 </caption>
</preview>
<!-- Test that a preview without a <full> element is ignored -->
@ -164,13 +164,13 @@
<full type=" image/png "> </full>
<caption> Caption ignore - 3 </caption>
<preview primary=" 1 ">
<full type=" image/png "> http://localhost:4444/full1-3.png </full>
<thumbnail type=" image/png "> http://localhost:4444/thumbnail1-3.png </thumbnail>
<full type=" image/png "> http://localhost:%PORT%/full1-3.png </full>
<thumbnail type=" image/png "> http://localhost:%PORT%/thumbnail1-3.png </thumbnail>
<caption> Caption 1 - 3 </caption>
</preview>
<preview primary=" 0 ">
<full type=" image/png "> http://localhost:4444/full3-3.png </full>
<thumbnail type=" image/png "> http://localhost:4444/thumbnail3-3.png </thumbnail>
<full type=" image/png "> http://localhost:%PORT%/full3-3.png </full>
<thumbnail type=" image/png "> http://localhost:%PORT%/thumbnail3-3.png </thumbnail>
<caption> Caption 3 - 3 </caption>
</preview>
</preview>
@ -179,23 +179,23 @@
<rating> 2 </rating>
<!-- Test that hompage is used as the add-on's homepageURL
even if learnmore is defined -->
<learnmore> http://localhost:4444/learnmore3.html </learnmore>
<homepage> http://localhost:4444/homepage3.html </homepage>
<support> http://localhost:4444/support3.html </support>
<learnmore> http://localhost:%PORT%/learnmore3.html </learnmore>
<homepage> http://localhost:%PORT%/homepage3.html </homepage>
<support> http://localhost:%PORT%/support3.html </support>
<contribution_data>
<link> http://localhost:4444/contribution3.html </link>
<link> http://localhost:%PORT%/contribution3.html </link>
<suggested_amount currency="USD"> $11.11 </suggested_amount>
<meet_developers> http://localhost:4444/meetDevelopers3.html </meet_developers>
<meet_developers> http://localhost:%PORT%/meetDevelopers3.html </meet_developers>
</contribution_data>
<reviews num=" 1111 "> http://localhost:4444/review3.html </reviews>
<reviews num=" 1111 "> http://localhost:%PORT%/review3.html </reviews>
<total_downloads> 2222 </total_downloads>
<weekly_downloads> 3333 </weekly_downloads>
<daily_users> 4444 </daily_users>
<last_updated epoch=" 1265033045 "> 2010-02-01T14:04:05Z </last_updated>
<!-- Test that an incompatible install is ignored -->
<install size=" 9999 " os=" UNKNOWN "> http://localhost:4444/fail3.xpi </install>
<install size=" 9999 " os=" UNKNOWN "> http://localhost:%PORT%/fail3.xpi </install>
<!-- Test that OS matching is case-insensitive -->
<install size=" 5555 " os=" xpCShell " hash=" sha1:c26f0b0d62e5dcddcda95074d3f3fedb9bbc26e3 "> http://localhost:4444/test3.xpi </install>
<install size=" 5555 " os=" xpCShell " hash=" sha1:c26f0b0d62e5dcddcda95074d3f3fedb9bbc26e3 "> http://localhost:%PORT%/test3.xpi </install>
</addon>
<!-- Fails because name is undefined -->
@ -213,7 +213,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test4.xpi</install>
<install>http://localhost:%PORT%/test4.xpi</install>
</addon>
<!-- Fails because name is empty-->
@ -232,7 +232,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test5.xpi</install>
<install>http://localhost:%PORT%/test5.xpi</install>
</addon>
<!-- Fails because type is undefined -->
@ -250,7 +250,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test6.xpi</install>
<install>http://localhost:%PORT%/test6.xpi</install>
</addon>
<!-- Fails because type is empty -->
@ -269,7 +269,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test7.xpi</install>
<install>http://localhost:%PORT%/test7.xpi</install>
</addon>
<!-- Fails because type is unknown -->
@ -288,7 +288,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test8.xpi</install>
<install>http://localhost:%PORT%/test8.xpi</install>
</addon>
<!-- Fails because guid is undefined -->
@ -306,7 +306,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test9.xpi</install>
<install>http://localhost:%PORT%/test9.xpi</install>
</addon>
<!-- Fails because guid is empty -->
@ -325,7 +325,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test10.xpi</install>
<install>http://localhost:%PORT%/test10.xpi</install>
</addon>
<!-- Fails because guid matches previously successful result -->
@ -344,7 +344,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test11.xpi</install>
<install>http://localhost:%PORT%/test11.xpi</install>
</addon>
<!-- Fails because guid matches already installed add-on -->
@ -363,7 +363,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test12.xpi</install>
<install>http://localhost:%PORT%/test12.xpi</install>
</addon>
<!-- Fails because version is undefined -->
@ -381,7 +381,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test13.xpi</install>
<install>http://localhost:%PORT%/test13.xpi</install>
</addon>
<!-- Fails because version is empty -->
@ -400,7 +400,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test14.xpi</install>
<install>http://localhost:%PORT%/test14.xpi</install>
</addon>
<!-- Fails because authors undefined -->
@ -418,7 +418,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test15.xpi</install>
<install>http://localhost:%PORT%/test15.xpi</install>
</addon>
<!-- Fails because it has no defined author elements -->
@ -437,7 +437,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test16.xpi</install>
<install>http://localhost:%PORT%/test16.xpi</install>
</addon>
<!-- Fails because no non-empty author elements -->
@ -459,7 +459,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test17.xpi</install>
<install>http://localhost:%PORT%/test17.xpi</install>
</addon>
<!-- Fails because status is undefined -->
@ -477,7 +477,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test18.xpi</install>
<install>http://localhost:%PORT%/test18.xpi</install>
</addon>
<!-- Fails because status is not Public -->
@ -496,7 +496,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test19.xpi</install>
<install>http://localhost:%PORT%/test19.xpi</install>
</addon>
<!-- Fails because compatible_applications is undefined -->
@ -508,7 +508,7 @@
<authors><author><name>Test Creator 20</name></author></authors>
<status id="4">Public</status>
<summary>Add-on with undefined compatible_applications should be ignored.</summary>
<install>http://localhost:4444/test20.xpi</install>
<install>http://localhost:%PORT%/test20.xpi</install>
</addon>
<!-- Fails because no compatible applications matched -->
@ -527,7 +527,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test21.xpi</install>
<install>http://localhost:%PORT%/test21.xpi</install>
</addon>
<!-- Fails because compatible application's min version is undefined -->
@ -545,7 +545,7 @@
<max_version>2.0</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test22.xpi</install>
<install>http://localhost:%PORT%/test22.xpi</install>
</addon>
<!-- Fails because compatible application's min version too high -->
@ -564,7 +564,7 @@
<max_version>2.0</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test23.xpi</install>
<install>http://localhost:%PORT%/test23.xpi</install>
</addon>
<!-- Fails because compatible application's max version is undefined -->
@ -582,7 +582,7 @@
<min_version>0.9</min_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test24.xpi</install>
<install>http://localhost:%PORT%/test24.xpi</install>
</addon>
<!-- Fails because compatible application's max version is too low -->
@ -601,7 +601,7 @@
<max_version>0.9.9</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test25.xpi</install>
<install>http://localhost:%PORT%/test25.xpi</install>
</addon>
<!-- Fails because XPI URL is undefined -->
@ -657,8 +657,8 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install os="UNKNOWN1">http://localhost:4444/test28.xpi</install>
<install os="UNKNOWN2">http://localhost:4444/test28.xpi</install>
<install os="UNKNOWN1">http://localhost:%PORT%/test28.xpi</install>
<install os="UNKNOWN2">http://localhost:%PORT%/test28.xpi</install>
</addon>
<!-- Fails because XPI URL matches an installing AddonInstall -->
@ -677,7 +677,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/addons/test_AddonRepository_2.xpi</install>
<install>http://localhost:%PORT%/addons/test_AddonRepository_2.xpi</install>
</addon>
<!-- Passes because the add-on has the right payment info -->
@ -689,7 +689,7 @@
<authors>
<author>
<name>Test Creator - Last Passing</name>
<link>http://localhost:4444/creatorLastPassing.html</link>
<link>http://localhost:%PORT%/creatorLastPassing.html</link>
</author>
</authors>
<status id="4">Public</status>
@ -705,7 +705,7 @@
</compatible_applications>
<rating>5</rating>
<payment_data>
<link>http://localhost:4444/purchaseURL1</link>
<link>http://localhost:%PORT%/purchaseURL1</link>
<amount amount="5">$5</amount>
</payment_data>
</addon>
@ -719,7 +719,7 @@
<authors>
<author>
<name>Test Creator - Last Passing</name>
<link>http://localhost:4444/creatorLastPassing.html</link>
<link>http://localhost:%PORT%/creatorLastPassing.html</link>
</author>
</authors>
<status id="4">Public</status>
@ -735,7 +735,7 @@
</compatible_applications>
<rating>5</rating>
<payment_data>
<link>http://localhost:4444/purchaseURL2</link>
<link>http://localhost:%PORT%/purchaseURL2</link>
<amount amount="10.0">$10</amount>
</payment_data>
</addon>
@ -749,7 +749,7 @@
<authors>
<author>
<name>Test Creator - Last Passing</name>
<link>http://localhost:4444/creatorLastPassing.html</link>
<link>http://localhost:%PORT%/creatorLastPassing.html</link>
</author>
</authors>
<status id="4">Public</status>
@ -765,7 +765,7 @@
</compatible_applications>
<rating>5</rating>
<payment_data>
<link>http://localhost:4444/purchaseURL3</link>
<link>http://localhost:%PORT%/purchaseURL3</link>
<amount amount="10">$10</amount>
</payment_data>
</addon>
@ -781,7 +781,7 @@
<authors>
<author>
<name>Test Creator - Last Passing</name>
<link>http://localhost:4444/creatorLastPassing.html</link>
<link>http://localhost:%PORT%/creatorLastPassing.html</link>
</author>
</authors>
<status id="4">Public</status>
@ -794,7 +794,7 @@
</compatible_applications>
<!-- Test that a rating > 5 becomes a rating = 5 -->
<rating>10</rating>
<install>http://localhost:4444/addons/test_AddonRepository_3.xpi</install>
<install>http://localhost:%PORT%/addons/test_AddonRepository_3.xpi</install>
</addon>
<!-- Fails because of MAX_RESULTS limit. The previous <addon> should
@ -814,7 +814,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test-surpassesLimit.xpi</install>
<install>http://localhost:%PORT%/test-surpassesLimit.xpi</install>
</addon>
</searchresults>

30
toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_cache.xml
View File

@ -24,18 +24,18 @@
<eula>Repo Add-on 1 - EULA</eula>
<developer_comments>Repo Add-on 1
Developer Comments</developer_comments>
<icon size="32">http://localhost:4444/repo/1/icon.png</icon>
<icon size="32">http://localhost/repo/1/icon.png</icon>
<status id="4">Public</status>
<rating>1</rating>
<learnmore>http://localhost:4444/repo/1/learnmore.html</learnmore>
<homepage>http://localhost:4444/repo/1/homepage.html</homepage>
<support>http://localhost:4444/repo/1/support.html</support>
<learnmore>http://localhost/repo/1/learnmore.html</learnmore>
<homepage>http://localhost/repo/1/homepage.html</homepage>
<support>http://localhost/repo/1/support.html</support>
<contribution_data>
<link>http://localhost:4444/repo/1/contribution.html</link>
<link>http://localhost/repo/1/contribution.html</link>
<suggested_amount currency="USD">$11.11</suggested_amount>
<meet_developers>http://localhost:4444/repo/1/meetDevelopers.html</meet_developers>
<meet_developers>http://localhost/repo/1/meetDevelopers.html</meet_developers>
</contribution_data>
<reviews num="1111">http://localhost:4444/repo/1/review.html</reviews>
<reviews num="1111">http://localhost/repo/1/review.html</reviews>
<total_downloads>2221</total_downloads>
<weekly_downloads>3331</weekly_downloads>
<daily_users>4441</daily_users>
@ -66,7 +66,7 @@
<description>Repo Add-on 2 - Full Description</description>
<eula>Repo Add-on 2 - EULA</eula>
<developer_comments>Repo Add-on 2 - Developer Comments</developer_comments>
<icon size="32">http://localhost:4444/repo/2/icon.png</icon>
<icon size="32">http://localhost/repo/2/icon.png</icon>
<status id="9">Unknown</status>
<previews>
<preview primary="1">
@ -81,14 +81,14 @@
</preview>
</previews>
<rating>2</rating>
<learnmore>http://localhost:4444/repo/2/learnmore.html</learnmore>
<homepage>http://localhost:4444/repo/2/homepage.html</homepage>
<support>http://localhost:4444/repo/2/support.html</support>
<learnmore>http://localhost/repo/2/learnmore.html</learnmore>
<homepage>http://localhost/repo/2/homepage.html</homepage>
<support>http://localhost/repo/2/support.html</support>
<contribution_data>
<link>http://localhost:4444/repo/2/contribution.html</link>
<meet_developers>http://localhost:4444/repo/2/meetDevelopers.html</meet_developers>
<link>http://localhost/repo/2/contribution.html</link>
<meet_developers>http://localhost/repo/2/meetDevelopers.html</meet_developers>
</contribution_data>
<reviews num="1112">http://localhost:4444/repo/2/review.html</reviews>
<reviews num="1112">http://localhost/repo/2/review.html</reviews>
<total_downloads>2222</total_downloads>
<weekly_downloads>3332</weekly_downloads>
<daily_users>4442</daily_users>
@ -101,7 +101,7 @@
<type id="9999">Unknown</type>
<guid>test_AddonRepository_3@tests.mozilla.org</guid>
<version>2.3</version>
<icon size="32">http://localhost:4444/repo/3/icon.png</icon>
<icon size="32">http://localhost/repo/3/icon.png</icon>
<previews>
<preview primary="1">
<full type="image/png">http://localhost:4444/repo/3/firstFull.png</full>

4
toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml
View File

@ -8,7 +8,7 @@
<authors>
<author>
<name>Test Creator 1</name>
<link>http://localhost:4444/creator1.html</link>
<link>http://localhost:%PORT%/creator1.html</link>
</author>
</authors>
<compatible_applications>
@ -18,6 +18,6 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test1.xpi</install>
<install>http://localhost:%PORT%/test1.xpi</install>
</addon>
</searchresults>

4
toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml
View File

@ -8,7 +8,7 @@
<authors>
<author>
<name>Test Creator 1</name>
<link>http://localhost:4444/creator1.html</link>
<link>http://localhost:%PORT%/creator1.html</link>
</author>
</authors>
<compatible_applications>
@ -18,6 +18,6 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test1.xpi</install>
<install>http://localhost:%PORT%/test1.xpi</install>
</addon>
</searchresults>

4
toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml
View File

@ -8,7 +8,7 @@
<authors>
<author>
<name>Test Creator 1</name>
<link>http://localhost:4444/creator1.html</link>
<link>http://localhost:%PORT%/creator1.html</link>
</author>
</authors>
<compatible_applications>
@ -18,6 +18,6 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test1.xpi</install>
<install>http://localhost:%PORT%/test1.xpi</install>
</addon>
</searchresults>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_failed.xml
View File

@ -15,7 +15,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test1.xpi</install>
<install>http://localhost:%PORT%/test1.xpi</install>
</addon>
</searchresults>

34
toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml
View File

@ -10,18 +10,18 @@
<authors>
<author>
<name>Test Creator 1</name>
<link>http://localhost:4444/creator1.html</link>
<link>http://localhost:%PORT%/creator1.html</link>
</author>
<author>
<name>Test Developer 1</name>
<link>http://localhost:4444/developer1.html</link>
<link>http://localhost:%PORT%/developer1.html</link>
</author>
</authors>
<summary>Test Summary 1</summary>
<description>Test Description 1</description>
<eula>Test EULA 1</eula>
<developer_comments>Test Developer Comments 1</developer_comments>
<icon size="32">http://localhost:4444/icon1.png</icon>
<icon size="32">http://localhost:%PORT%/icon1.png</icon>
<status id="8">Preliminarily Reviewed</status>
<compatible_applications>
<application>
@ -33,33 +33,33 @@
<previews>
<preview primary="1">
<full type="image/png" width="400" height="300">
http://localhost:4444/full1-1.png
http://localhost:%PORT%/full1-1.png
</full>
<thumbnail type="image/png" width="200" height="150">
http://localhost:4444/thumbnail1-1.png
http://localhost:%PORT%/thumbnail1-1.png
</thumbnail>
<caption>Caption 1 - 1</caption>
</preview>
<preview primary="0">
<full type="image/png">http://localhost:4444/full2-1.png</full>
<thumbnail type="image/png">http://localhost:4444/thumbnail2-1.png</thumbnail>
<full type="image/png">http://localhost:%PORT%/full2-1.png</full>
<thumbnail type="image/png">http://localhost:%PORT%/thumbnail2-1.png</thumbnail>
<caption>Caption 2 - 1</caption>
</preview>
</previews>
<rating>4</rating>
<learnmore>http://localhost:4444/learnmore1.html</learnmore>
<support>http://localhost:4444/support1.html</support>
<learnmore>http://localhost:%PORT%/learnmore1.html</learnmore>
<support>http://localhost:%PORT%/support1.html</support>
<contribution_data>
<link>http://localhost:4444/contribution1.html</link>
<link>http://localhost:%PORT%/contribution1.html</link>
<suggested_amount currency="USD">$11.11</suggested_amount>
<meet_developers>http://localhost:4444/meetDevelopers1.html</meet_developers>
<meet_developers>http://localhost:%PORT%/meetDevelopers1.html</meet_developers>
</contribution_data>
<reviews num="1111">http://localhost:4444/review1.html</reviews>
<reviews num="1111">http://localhost:%PORT%/review1.html</reviews>
<total_downloads>2222</total_downloads>
<weekly_downloads>3333</weekly_downloads>
<daily_users>4444</daily_users>
<last_updated epoch="1265033045">2010-02-01T14:04:05Z</last_updated>
<install size="5555">http://localhost:4444/addons/test_AddonRepository_2.xpi</install>
<install size="5555">http://localhost:%PORT%/addons/test_AddonRepository_2.xpi</install>
</addon>
<addon_compatibility hosted="true" id="123">
@ -141,7 +141,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test2.xpi</install>
<install>http://localhost:%PORT%/test2.xpi</install>
</addon>
<!-- Fails because guid was not requested -->
@ -160,7 +160,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test3.xpi</install>
<install>http://localhost:%PORT%/test3.xpi</install>
</addon>
<!-- Passes even though guid matches already installed add-on,
@ -180,8 +180,8 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install os="UNKNOWN1">http://localhost:4444/test4.xpi</install>
<install os="UNKNOWN2">http://localhost:4444/test4.xpi</install>
<install os="UNKNOWN1">http://localhost:%PORT%/test4.xpi</install>
<install os="UNKNOWN2">http://localhost:%PORT%/test4.xpi</install>
</addon>
</searchresults>

6
toolkit/mozapps/extensions/test/xpcshell/data/test_backgroundupdate.rdf
View File

@ -15,7 +15,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -36,7 +36,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
@ -57,7 +57,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

32
toolkit/mozapps/extensions/test/xpcshell/data/test_bug424262.xml
View File

@ -8,7 +8,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -19,7 +19,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -31,7 +31,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -42,7 +42,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -54,7 +54,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -65,7 +65,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -77,7 +77,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -88,7 +88,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -100,7 +100,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -111,7 +111,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -123,7 +123,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -134,7 +134,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -146,7 +146,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -157,7 +157,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -169,7 +169,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -180,6 +180,6 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
</searchresults>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_1.rdf
View File

@ -14,7 +14,7 @@
<em:id>unknown@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
<em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_2.rdf
View File

@ -14,7 +14,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_3.rdf
View File

@ -14,7 +14,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_4.rdf
View File

@ -14,7 +14,7 @@
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
<em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_5.rdf
View File

@ -14,7 +14,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>3</em:maxVersion>
<em:updateLink>http://localhost:4444/broken.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/broken.xpi</em:updateLink>
</RDF:Description>
</em:targetApplication>
</RDF:Description>

52
toolkit/mozapps/extensions/test/xpcshell/data/test_bug554133.xml
View File

@ -8,7 +8,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -19,7 +19,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -30,7 +30,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -42,7 +42,7 @@
<max_version>2</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -53,7 +53,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -64,7 +64,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -75,7 +75,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -87,7 +87,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install os="UNKNOWN">http://localhost:4444/test.xpi</install>
<install os="UNKNOWN">http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -98,7 +98,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -109,7 +109,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -120,7 +120,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -132,7 +132,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -143,7 +143,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -154,7 +154,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -165,7 +165,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -176,7 +176,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -187,7 +187,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -198,7 +198,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -209,7 +209,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -220,7 +220,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -231,7 +231,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -242,7 +242,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -253,7 +253,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -264,7 +264,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
<addon>
@ -275,7 +275,7 @@
<authors>
<author>
<name>Test Creator</name>
<link>http://localhost:4444/creator.html</link>
<link>http://localhost:%PORT%/creator.html</link>
</author>
</authors>
<status id='4'>Public</status>
@ -286,7 +286,7 @@
<max_version>1</max_version>
</application>
</compatible_applications>
<install>http://localhost:4444/test.xpi</install>
<install>http://localhost:%PORT%/test.xpi</install>
</addon>
</searchresults>

6
toolkit/mozapps/extensions/test/xpcshell/data/test_dictionary.rdf
View File

@ -14,7 +14,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_dictionary_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_dictionary_3.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -34,7 +34,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_dictionary_4.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_dictionary_4.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -54,7 +54,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_dictionary_5.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_dictionary_5.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_1.rdf
View File

@ -14,7 +14,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_hotfix_1.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_hotfix_1.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_2.rdf
View File

@ -14,7 +14,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_hotfix_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_hotfix_2.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_3.rdf
View File

@ -14,7 +14,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>2</em:minVersion>
<em:maxVersion>2</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_hotfix_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_hotfix_3.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_migrate4.rdf
View File

@ -33,7 +33,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0</em:minVersion>
<em:maxVersion>2</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_migrate4_6.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_migrate4_6.xpi</em:updateLink>
<em:updateInfoURL>http://example.com/updateInfo.xhtml</em:updateInfoURL>
</Description>
</em:targetApplication>

18
toolkit/mozapps/extensions/test/xpcshell/data/test_update.rdf
View File

@ -39,7 +39,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_update.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update.xpi</em:updateLink>
<em:updateInfoURL>http://example.com/updateInfo.xhtml</em:updateInfoURL>
</Description>
</em:targetApplication>
@ -136,7 +136,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_update8.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update8.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -156,7 +156,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_update9_2.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update9_2.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -170,7 +170,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0.9</em:minVersion>
<em:maxVersion>0.9</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_update9_3.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update9_3.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -184,7 +184,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0.9</em:minVersion>
<em:maxVersion>0.9</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_update9_4.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update9_4.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -198,7 +198,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>5</em:minVersion>
<em:maxVersion>6</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_update9_5.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update9_5.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -218,7 +218,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>0.1</em:minVersion>
<em:maxVersion>0.4</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_update10.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update10.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -239,7 +239,7 @@
<em:minVersion>0.1</em:minVersion>
<em:maxVersion>0.2</em:maxVersion>
<em:strictCompatibility>true</em:strictCompatibility>
<em:updateLink>http://localhost:4444/addons/test_update11.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update11.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>
@ -259,7 +259,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
<em:updateLink>http://localhost:4444/addons/test_update12.xpi</em:updateLink>
<em:updateLink>http://localhost:%PORT%/addons/test_update12.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf
View File

@ -15,7 +15,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
<em:updateLink>https://localhost:4444/addons/test1.xpi</em:updateLink>
<em:updateLink>https://localhost:%PORT%/addons/test1.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_normal.rdf
View File

@ -15,7 +15,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
<em:updateLink>https://localhost:4444/addons/test1.xpi</em:updateLink>
<em:updateLink>https://localhost:%PORT%/addons/test1.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>

2
toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_strict.rdf
View File

@ -15,7 +15,7 @@
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
<em:updateLink>https://localhost:4444/addons/test1.xpi</em:updateLink>
<em:updateLink>https://localhost:%PORT%/addons/test1.xpi</em:updateLink>
</Description>
</em:targetApplication>
</Description>

71
toolkit/mozapps/extensions/test/xpcshell/head_addons.js
View File

@ -27,6 +27,9 @@ var gInternalManager = null;
var gAppInfo = null;
var gAddonsList;
var gPort = null;
var gUrlToFileMap = {};
var TEST_UNPACKED = false;
function isNightlyChannel() {
@ -277,7 +280,7 @@ function do_check_addon(aActualAddon, aExpectedAddon, aProperties) {
break;
default:
if (actualValue !== expectedValue)
if (remove_port(actualValue) !== remove_port(expectedValue))
do_throw("Failed for " + aProperty + " for add-on " + aExpectedAddon.id +
" (" + actualValue + " === " + expectedValue + ")");
}
@ -337,7 +340,7 @@ function do_check_compatibilityoverride(aActual, aExpected) {
function do_check_icons(aActual, aExpected) {
for (var size in aExpected) {
do_check_eq(aActual[size], aExpected[size]);
do_check_eq(remove_port(aActual[size]), remove_port(aExpected[size]));
}
}
@ -1315,6 +1318,70 @@ do_register_cleanup(function addon_cleanup() {
} catch (e) {}
});
/**
* Handler function that responds with the interpolated
* static file associated to the URL specified by request.path.
* This replaces the %PORT% entries in the file with the actual
* value of the running server's port (stored in gPort).
*/
function interpolateAndServeFile(request, response) {
try {
let file = gUrlToFileMap[request.path];
var data = "";
var fstream = Components.classes["@mozilla.org/network/file-input-stream;1"].
createInstance(Components.interfaces.nsIFileInputStream);
var cstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"].
createInstance(Components.interfaces.nsIConverterInputStream);
fstream.init(file, -1, 0, 0);
cstream.init(fstream, "UTF-8", 0, 0);
let (str = {}) {
let read = 0;
do {
// read as much as we can and put it in str.value
read = cstream.readString(0xffffffff, str);
data += str.value;
} while (read != 0);
}
data = data.replace(/%PORT%/g, gPort);
response.write(data);
} catch (e) {
do_throw("Exception while serving interpolated file.");
} finally {
cstream.close(); // this closes fstream as well
}
}
/**
* Sets up a path handler for the given URL and saves the
* corresponding file in the global url -> file map.
*
* @param url
* the actual URL
* @param file
* nsILocalFile representing a static file
*/
function mapUrlToFile(url, file, server) {
server.registerPathHandler(url, interpolateAndServeFile);
gUrlToFileMap[url] = file;
}
function mapFile(path, server) {
mapUrlToFile(path, do_get_file(path), server);
}
/**
* Take out the port number in an URL
*
* @param url
* String that represents an URL with a port number in it
*/
function remove_port(url) {
if (typeof url === "string")
return url.replace(/:\d+/, "");
return url;
}
// Wrap a function (typically a callback) to catch and report exceptions
function do_exception_wrap(func) {
return function() {

45
toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository.js
View File

@ -7,7 +7,8 @@
Components.utils.import("resource://gre/modules/AddonRepository.jsm");
Components.utils.import("resource://testing-common/httpd.js");
var gServer;
var gServer = new HttpServer();
gServer.start(-1);
const PREF_GETADDONS_BROWSEADDONS = "extensions.getAddons.browseAddons";
const PREF_GETADDONS_BYIDS = "extensions.getAddons.get.url";
@ -16,10 +17,12 @@ const PREF_GETADDONS_GETRECOMMENDED = "extensions.getAddons.recommended.url
const PREF_GETADDONS_BROWSESEARCHRESULTS = "extensions.getAddons.search.browseURL";
const PREF_GETADDONS_GETSEARCHRESULTS = "extensions.getAddons.search.url";
const PORT = 4444;
const PORT = gServer.identity.primaryPort;
const BASE_URL = "http://localhost:" + PORT;
const DEFAULT_URL = "about:blank";
gPort = PORT;
// Path to source URI of installed add-on
const INSTALL_URL1 = "/addons/test_AddonRepository_1.xpi";
// Path to source URI of installing add-on
@ -216,7 +219,7 @@ var SEARCH_RESULTS = [{
},
averageRating: 5,
repositoryStatus: 4,
purchaseURL: "http://localhost:4444/purchaseURL1",
purchaseURL: "http://localhost:" + PORT + "/purchaseURL1",
purchaseAmount: 5,
purchaseDisplayAmount: "$5",
icons: {}
@ -230,7 +233,7 @@ var SEARCH_RESULTS = [{
},
averageRating: 5,
repositoryStatus: 4,
purchaseURL: "http://localhost:4444/purchaseURL2",
purchaseURL: "http://localhost:" + PORT + "/purchaseURL2",
purchaseAmount: 10,
purchaseDisplayAmount: "$10",
icons: {}
@ -367,8 +370,6 @@ function run_test() {
installAllFiles([do_get_addon("test_AddonRepository_1")], function addon_1_install_callback() {
restartManager();
gServer = new HttpServer();
// Register other add-on XPI files
gServer.registerFile(INSTALL_URL2,
do_get_addon("test_AddonRepository_2"));
@ -376,22 +377,26 @@ function run_test() {
do_get_addon("test_AddonRepository_3"));
// Register files used to test search failure
gServer.registerFile(GET_TEST.failedURL,
do_get_file("data/test_AddonRepository_failed.xml"));
gServer.registerFile(RECOMMENDED_TEST.failedURL,
do_get_file("data/test_AddonRepository_failed.xml"));
gServer.registerFile(SEARCH_TEST.failedURL,
do_get_file("data/test_AddonRepository_failed.xml"));
mapUrlToFile(GET_TEST.failedURL,
do_get_file("data/test_AddonRepository_failed.xml"),
gServer);
mapUrlToFile(RECOMMENDED_TEST.failedURL,
do_get_file("data/test_AddonRepository_failed.xml"),
gServer);
mapUrlToFile(SEARCH_TEST.failedURL,
do_get_file("data/test_AddonRepository_failed.xml"),
gServer);
// Register files used to test search success
gServer.registerFile(GET_TEST.successfulURL,
do_get_file("data/test_AddonRepository_getAddonsByIDs.xml"));
gServer.registerFile(RECOMMENDED_TEST.successfulURL,
do_get_file("data/test_AddonRepository.xml"));
gServer.registerFile(SEARCH_TEST.successfulURL,
do_get_file("data/test_AddonRepository.xml"));
gServer.start(PORT);
mapUrlToFile(GET_TEST.successfulURL,
do_get_file("data/test_AddonRepository_getAddonsByIDs.xml"),
gServer);
mapUrlToFile(RECOMMENDED_TEST.successfulURL,
do_get_file("data/test_AddonRepository.xml"),
gServer);
mapUrlToFile(SEARCH_TEST.successfulURL,
do_get_file("data/test_AddonRepository.xml"),
gServer);
// Create an active AddonInstall so can check that it isn't returned in the results
AddonManager.getInstallForURL(BASE_URL + INSTALL_URL2, function addon_2_get(aInstall) {

16
toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_compatmode.js
View File

@ -8,20 +8,22 @@
const PREF_GETADDONS_GETSEARCHRESULTS = "extensions.getAddons.search.url";
Components.utils.import("resource://testing-common/httpd.js");
var gServer;
var gServer = new HttpServer();
gServer.start(-1);
gPort = gServer.identity.primaryPort;
var COMPATIBILITY_PREF;
// register static files with server and interpolate port numbers in them
mapFile("/data/test_AddonRepository_compatmode_ignore.xml", gServer);
mapFile("/data/test_AddonRepository_compatmode_normal.xml", gServer);
mapFile("/data/test_AddonRepository_compatmode_strict.xml", gServer);
function run_test() {
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
// Create and configure the HTTP server.
gServer = new HttpServer();
gServer.registerDirectory("/data/", do_get_file("data"));
gServer.start(4444);
Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS,
"http://localhost:4444/data/test_AddonRepository_compatmode_%COMPATIBILITY_MODE%.xml");
"http://localhost:" + gPort + "/data/test_AddonRepository_compatmode_%COMPATIBILITY_MODE%.xml");
startupManager();
run_test_1();
}

19
toolkit/mozapps/extensions/test/xpcshell/test_backgroundupdate.js
View File

@ -8,18 +8,19 @@
Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
Components.utils.import("resource://testing-common/httpd.js");
var testserver;
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
const profileDir = gProfD.clone();
profileDir.append("extensions");
// register static files with server and interpolate port numbers in them
mapFile("/data/test_backgroundupdate.rdf", testserver);
function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
// Create and configure the HTTP server.
testserver = new HttpServer();
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.start(4444);
startupManager();
@ -53,7 +54,7 @@ function run_test_2() {
writeInstallRDFForExtension({
id: "addon1@tests.mozilla.org",
version: "1.0",
updateURL: "http://localhost:4444/data/test_backgroundupdate.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_backgroundupdate.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -65,7 +66,7 @@ function run_test_2() {
writeInstallRDFForExtension({
id: "addon2@tests.mozilla.org",
version: "1.0",
updateURL: "http://localhost:4444/data/test_backgroundupdate.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_backgroundupdate.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -87,12 +88,12 @@ function run_test_2() {
// Background update uses a different pref, if set
Services.prefs.setCharPref("extensions.update.background.url",
"http://localhost:4444/data/test_backgroundupdate.rdf");
"http://localhost:" + gPort +"/data/test_backgroundupdate.rdf");
restartManager();
// Do hotfix checks
Services.prefs.setCharPref("extensions.hotfix.id", "hotfix@tests.mozilla.org");
Services.prefs.setCharPref("extensions.hotfix.url", "http://localhost:4444/missing.rdf");
Services.prefs.setCharPref("extensions.hotfix.url", "http://localhost:" + gPort + "/missing.rdf");
let installCount = 0;
let completeCount = 0;

14
toolkit/mozapps/extensions/test/xpcshell/test_badschema.js
View File

@ -6,7 +6,12 @@
Components.utils.import("resource://testing-common/httpd.js");
var testserver;
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
// register static files with server and interpolate port numbers in them
mapFile("/data/test_corrupt.rdf", testserver);
// The test extension uses an insecure update url.
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
@ -40,7 +45,7 @@ var addon3 = {
id: "addon3@tests.mozilla.org",
version: "1.0",
name: "Test 3",
updateURL: "http://localhost:4444/data/test_corrupt.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_corrupt.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -53,7 +58,7 @@ var addon4 = {
id: "addon4@tests.mozilla.org",
version: "1.0",
name: "Test 4",
updateURL: "http://localhost:4444/data/test_corrupt.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_corrupt.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -143,10 +148,7 @@ function run_test() {
writeInstallRDFForExtension(theme2, profileDir);
// Create and configure the HTTP server.
testserver = new HttpServer();
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.start(4444);
// Startup the profile and setup the initial state
startupManager();

14
toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
View File

@ -11,7 +11,12 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul";
Cu.import("resource://testing-common/httpd.js");
var testserver;
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
// register static files with server and interpolate port numbers in them
mapFile("/data/test_blocklist_regexp_1.xml", testserver);
const profileDir = gProfD.clone();
profileDir.append("extensions");
@ -66,7 +71,8 @@ function load_blocklist(aFile, aCallback) {
do_execute_soon(aCallback);
}, "blocklist-updated", false);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + aFile);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
gPort + "/data/" + aFile);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -79,10 +85,6 @@ function end_test() {
function run_test() {
testserver = new HttpServer();
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.start(4444);
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");

83
toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
View File

@ -40,7 +40,22 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false)
Cu.import("resource://testing-common/httpd.js");
var testserver;
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
// register static files with server and interpolate port numbers in them
mapFile("/data/blocklistchange/addon_update1.rdf", testserver);
mapFile("/data/blocklistchange/addon_update2.rdf", testserver);
mapFile("/data/blocklistchange/addon_update3.rdf", testserver);
mapFile("/data/blocklistchange/addon_change.xml", testserver);
mapFile("/data/blocklistchange/app_update.xml", testserver);
mapFile("/data/blocklistchange/blocklist_update1.xml", testserver);
mapFile("/data/blocklistchange/blocklist_update2.xml", testserver);
mapFile("/data/blocklistchange/manual_update.xml", testserver);
testserver.registerDirectory("/addons/", do_get_file("addons"));
var default_theme = {
id: "default@tests.mozilla.org",
@ -58,7 +73,7 @@ var softblock1_1 = {
id: "softblock1@tests.mozilla.org",
version: "1.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update1.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -70,7 +85,7 @@ var softblock1_2 = {
id: "softblock1@tests.mozilla.org",
version: "2.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update2.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -82,7 +97,7 @@ var softblock1_3 = {
id: "softblock1@tests.mozilla.org",
version: "3.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update3.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -94,7 +109,7 @@ var softblock2_1 = {
id: "softblock2@tests.mozilla.org",
version: "1.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update1.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -106,7 +121,7 @@ var softblock2_2 = {
id: "softblock2@tests.mozilla.org",
version: "2.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update2.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -118,7 +133,7 @@ var softblock2_3 = {
id: "softblock2@tests.mozilla.org",
version: "3.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update3.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -130,7 +145,7 @@ var softblock3_1 = {
id: "softblock3@tests.mozilla.org",
version: "1.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update1.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -142,7 +157,7 @@ var softblock3_2 = {
id: "softblock3@tests.mozilla.org",
version: "2.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update2.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -154,7 +169,7 @@ var softblock3_3 = {
id: "softblock3@tests.mozilla.org",
version: "3.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update3.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -166,7 +181,7 @@ var softblock4_1 = {
id: "softblock4@tests.mozilla.org",
version: "1.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update1.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -178,7 +193,7 @@ var softblock4_2 = {
id: "softblock4@tests.mozilla.org",
version: "2.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update2.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -190,7 +205,7 @@ var softblock4_3 = {
id: "softblock4@tests.mozilla.org",
version: "3.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update3.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -202,7 +217,7 @@ var softblock5_1 = {
id: "softblock5@tests.mozilla.org",
version: "1.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update1.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.rdf",
internalName: "test/1.0",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
@ -215,7 +230,7 @@ var softblock5_2 = {
id: "softblock5@tests.mozilla.org",
version: "2.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update2.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.rdf",
internalName: "test/1.0",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
@ -228,7 +243,7 @@ var softblock5_3 = {
id: "softblock5@tests.mozilla.org",
version: "3.0",
name: "Softblocked add-on",
updateURL: "http://localhost:4444/data/addon_update3.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.rdf",
internalName: "test/1.0",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
@ -241,7 +256,7 @@ var hardblock_1 = {
id: "hardblock@tests.mozilla.org",
version: "1.0",
name: "Hardblocked add-on",
updateURL: "http://localhost:4444/data/addon_update1.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -253,7 +268,7 @@ var hardblock_2 = {
id: "hardblock@tests.mozilla.org",
version: "2.0",
name: "Hardblocked add-on",
updateURL: "http://localhost:4444/data/addon_update2.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -265,7 +280,7 @@ var hardblock_3 = {
id: "hardblock@tests.mozilla.org",
version: "3.0",
name: "Hardblocked add-on",
updateURL: "http://localhost:4444/data/addon_update3.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -277,7 +292,7 @@ var regexpblock_1 = {
id: "regexpblock@tests.mozilla.org",
version: "1.0",
name: "RegExp-blocked add-on",
updateURL: "http://localhost:4444/data/addon_update1.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update1.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -289,7 +304,7 @@ var regexpblock_2 = {
id: "regexpblock@tests.mozilla.org",
version: "2.0",
name: "RegExp-blocked add-on",
updateURL: "http://localhost:4444/data/addon_update2.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update2.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -301,7 +316,7 @@ var regexpblock_3 = {
id: "regexpblock@tests.mozilla.org",
version: "3.0",
name: "RegExp-blocked add-on",
updateURL: "http://localhost:4444/data/addon_update3.rdf",
updateURL: "http://localhost:" + gPort + "/data/blocklistchange/addon_update3.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -395,7 +410,7 @@ function load_blocklist(aFile, aCallback) {
do_execute_soon(aCallback);
}, "blocklist-updated", false);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + aFile);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" + gPort + "/data/blocklistchange/" + aFile);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -447,25 +462,25 @@ function background_update(aCallback) {
// Manually updates the test add-ons to the given version
function manual_update(aVersion, aCallback) {
var installs = [];
AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_soft1_" + aVersion + ".xpi",
AddonManager.getInstallForURL("http://localhost:" + gPort + "/addons/blocklist_soft1_" + aVersion + ".xpi",
function(aInstall) {
installs.push(aInstall);
AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_soft2_" + aVersion + ".xpi",
AddonManager.getInstallForURL("http://localhost:" + gPort + "/addons/blocklist_soft2_" + aVersion + ".xpi",
function(aInstall) {
installs.push(aInstall);
AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_soft3_" + aVersion + ".xpi",
AddonManager.getInstallForURL("http://localhost:" + gPort + "/addons/blocklist_soft3_" + aVersion + ".xpi",
function(aInstall) {
installs.push(aInstall);
AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_soft4_" + aVersion + ".xpi",
AddonManager.getInstallForURL("http://localhost:" + gPort + "/addons/blocklist_soft4_" + aVersion + ".xpi",
function(aInstall) {
installs.push(aInstall);
AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_soft5_" + aVersion + ".xpi",
AddonManager.getInstallForURL("http://localhost:" + gPort + "/addons/blocklist_soft5_" + aVersion + ".xpi",
function(aInstall) {
installs.push(aInstall);
AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_hard1_" + aVersion + ".xpi",
AddonManager.getInstallForURL("http://localhost:" + gPort + "/addons/blocklist_hard1_" + aVersion + ".xpi",
function(aInstall) {
installs.push(aInstall);
AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_regexp1_" + aVersion + ".xpi",
AddonManager.getInstallForURL("http://localhost:" + gPort + "/addons/blocklist_regexp1_" + aVersion + ".xpi",
function(aInstall) {
installs.push(aInstall);
@ -502,7 +517,7 @@ function manual_update(aVersion, aCallback) {
}, "addon-install-blocked", false);
AddonManager.installAddonsFromWebpage("application/x-xpinstall", null,
NetUtil.newURI("http://localhost:4444/"),
NetUtil.newURI("http://localhost:" + gPort + "/"),
installs);
}, "application/x-xpinstall");
}, "application/x-xpinstall");
@ -557,12 +572,6 @@ function check_addon(aAddon, aExpectedVersion, aExpectedUserDisabled,
}
function run_test() {
// Create and configure the HTTP server.
testserver = new HttpServer();
testserver.registerDirectory("/data/", do_get_file("data/blocklistchange"));
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.start(4444);
do_test_pending("test_blocklistchange main");
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");

13
toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
View File

@ -30,7 +30,11 @@ userExtDir.append(gAppInfo.ID);
registerDirectory("XREUSysExt", userExtDir.parent);
Components.utils.import("resource://testing-common/httpd.js");
var testserver;
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
testserver.registerDirectory("/addons/", do_get_file("addons"));
function resetPrefs() {
Services.prefs.setIntPref("bootstraptest.active_version", -1);
@ -142,11 +146,6 @@ function run_test() {
resetPrefs();
// Create and configure the HTTP server.
testserver = new HttpServer();
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.start(4444);
startupManager();
let file = gProfD.clone();
@ -1137,7 +1136,7 @@ function run_test_23() {
"onNewInstall"
]);
let url = "http://localhost:4444/addons/test_bootstrap1_1.xpi";
let url = "http://localhost:" + gPort + "/addons/test_bootstrap1_1.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();

16
toolkit/mozapps/extensions/test/xpcshell/test_bug384052.js
View File

@ -1,17 +1,19 @@
const CLASS_ID = Components.ID("{12345678-1234-1234-1234-123456789abc}");
const CONTRACT_ID = "@mozilla.org/test-parameter-source;1";
var gTestURL = "http://127.0.0.1:4444/update.rdf?itemID=%ITEM_ID%&custom1=%CUSTOM1%&custom2=%CUSTOM2%";
// Get and create the HTTP server.
Components.utils.import("resource://testing-common/httpd.js");
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
var gTestURL = "http://127.0.0.1:" + gPort + "/update.rdf?itemID=%ITEM_ID%&custom1=%CUSTOM1%&custom2=%CUSTOM2%";
var gExpectedQuery = "itemID=test@mozilla.org&custom1=custom_parameter_1&custom2=custom_parameter_2";
var gSeenExpectedURL = false;
var gComponentRegistrar = Components.manager.QueryInterface(AM_Ci.nsIComponentRegistrar);
var gCategoryManager = AM_Cc["@mozilla.org/categorymanager;1"].getService(AM_Ci.nsICategoryManager);
// Get the HTTP server.
Components.utils.import("resource://testing-common/httpd.js");
var testserver;
// Factory for our parameter handler
var paramHandlerFactory = {
QueryInterface: function(iid) {
@ -36,13 +38,11 @@ function initTest()
// Setup extension manager
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
// Create and configure the HTTP server.
testserver = new HttpServer();
// Configure the HTTP server.
testserver.registerPathHandler("/update.rdf", function(aRequest, aResponse) {
gSeenExpectedURL = aRequest.queryString == gExpectedQuery;
aResponse.setStatusLine(null, 404, "Not Found");
});
testserver.start(4444);
// Register our parameter handlers
gComponentRegistrar.registerFactory(CLASS_ID, "Test component", CONTRACT_ID, paramHandlerFactory);

10
toolkit/mozapps/extensions/test/xpcshell/test_bug424262.js
View File

@ -4,7 +4,7 @@
*/
Components.utils.import("resource://gre/modules/AddonRepository.jsm");
const PREF_GETADDONS_GETRECOMMENDED = "extensions.getAddons.recommended.url";
const PREF_GETADDONS_GETRECOMMENDED = "extensions.getAddons.recommended.url";
Components.utils.import("resource://testing-common/httpd.js");
var server;
@ -45,11 +45,13 @@ function run_test()
startupManager();
server = new HttpServer();
server.registerDirectory("/", do_get_file("data"));
server.start(4444);
server.start(-1);
gPort = server.identity.primaryPort;
mapFile("/data/test_bug424262.xml", server);
// Point the addons repository to the test server
Services.prefs.setCharPref(PREF_GETADDONS_GETRECOMMENDED, "http://localhost:4444/test_bug424262.xml");
Services.prefs.setCharPref(PREF_GETADDONS_GETRECOMMENDED, "http://localhost:" +
gPort + "/data/test_bug424262.xml");
do_check_neq(AddonRepository, null);

7
toolkit/mozapps/extensions/test/xpcshell/test_bug430120.js
View File

@ -106,7 +106,8 @@ function run_test() {
testserver = new HttpServer();
testserver.registerPathHandler("/1", failHandler);
testserver.registerPathHandler("/2", pathHandler);
testserver.start(4444);
testserver.start(-1);
gPort = testserver.identity.primaryPort;
// Initialise the blocklist service
gBlocklist = Components.classes["@mozilla.org/extensions/blocklist;1"]
@ -119,7 +120,7 @@ function run_test() {
do_test_pending();
// This should have no effect as the blocklist is disabled
Services.prefs.setCharPref(PREF_BLOCKLIST_URL, "http://localhost:4444/1");
Services.prefs.setCharPref(PREF_BLOCKLIST_URL, "http://localhost:" + gPort + "/1");
Services.prefs.setBoolPref(PREF_BLOCKLIST_ENABLED, false);
timerService.fireTimer(BLOCKLIST_TIMER);
@ -132,7 +133,7 @@ function run_test() {
defaults.setCharPref(PREF_GENERAL_USERAGENT_LOCALE, "locale");
// This should correctly escape everything
Services.prefs.setCharPref(PREF_BLOCKLIST_URL, "http://localhost:4444/2?" +
Services.prefs.setCharPref(PREF_BLOCKLIST_URL, "http://localhost:" + gPort + "/2?" +
"%APP_ID%&%APP_VERSION%&%PRODUCT%&%VERSION%&%BUILD_ID%&" +
"%BUILD_TARGET%&%LOCALE%&%CHANNEL%&" +
"%OS_VERSION%&%PLATFORM_VERSION%&%DISTRIBUTION%&%DISTRIBUTION_VERSION%");

5
toolkit/mozapps/extensions/test/xpcshell/test_bug449027.js
View File

@ -373,7 +373,7 @@ function check_state(test, lastTest, callback) {
}
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" + gPort + "/data/" + file);
var blocklist = Components.classes["@mozilla.org/extensions/blocklist;1"]
.getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -392,7 +392,8 @@ function run_test() {
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
do_test_pending();
check_test_pt1();

27
toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js
View File

@ -2,18 +2,28 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul";
// Workaround for Bug 658720 - URL formatter can leak during xpcshell tests
const PREF_BLOCKLIST_ITEM_URL = "extensions.blocklist.itemURL";
Services.prefs.setCharPref(PREF_BLOCKLIST_ITEM_URL, "http://localhost:4444/blocklist/%blockID%");
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cu = Components.utils;
const Cr = Components.results;
const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul";
Cu.import("resource://testing-common/httpd.js");
var gTestserver = new HttpServer();
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
// register static files with server and interpolate port numbers in them
mapFile("/data/bug455906_warn.xml", gTestserver);
mapFile("/data/bug455906_start.xml", gTestserver);
mapFile("/data/bug455906_block.xml", gTestserver);
mapFile("/data/bug455906_empty.xml", gTestserver);
// Workaround for Bug 658720 - URL formatter can leak during xpcshell tests
const PREF_BLOCKLIST_ITEM_URL = "extensions.blocklist.itemURL";
Services.prefs.setCharPref(PREF_BLOCKLIST_ITEM_URL, "http://localhost:" + gPort + "/blocklist/%blockID%");
var ADDONS = [{
// Tests how the blocklist affects a disabled add-on
@ -105,7 +115,6 @@ var PLUGINS = [
var gNotificationCheck = null;
var gTestCheck = null;
var gTestserver = null;
// A fake plugin host for the blocklist service to use
var PluginHost = {
@ -205,7 +214,7 @@ function create_addon(addon) {
}
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" + gPort + "/data/" + file);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -246,10 +255,6 @@ function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupManager();
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
do_test_pending();
check_test_pt1();
}

2
toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1.js
View File

@ -24,7 +24,7 @@ function run_test() {
server = new HttpServer();
server.registerDirectory("/", do_get_file("data/test_bug470377"));
server.start(4444);
server.start(-1);
startupManager();

2
toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1_strictcompat.js
View File

@ -24,7 +24,7 @@ function run_test() {
server = new HttpServer();
server.registerDirectory("/", do_get_file("data/test_bug470377"));
server.start(4444);
server.start(-1);
startupManager();

2
toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js
View File

@ -23,7 +23,7 @@ function run_test() {
server = new HttpServer();
server.registerDirectory("/", do_get_file("data/test_bug470377"));
server.start(4444);
server.start(-1);
startupManager();
AddonManager.checkCompatibility = false;

5
toolkit/mozapps/extensions/test/xpcshell/test_bug514327_3.js
View File

@ -110,7 +110,7 @@ registrar.registerFactory(Components.ID("{1dfeb90a-2193-45d5-9cb8-864928b2af55}"
function do_update_blocklist(aDatafile, aNextPart) {
gNextTestPart = aNextPart;
gPrefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + aDatafile);
gPrefs.setCharPref("extensions.blocklist.url", "http://localhost:" + gPort + "/data/" + aDatafile);
gBlocklist.QueryInterface(Ci.nsITimerCallback).notify(null);
}
@ -119,7 +119,8 @@ function run_test() {
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
startupManager();

7
toolkit/mozapps/extensions/test/xpcshell/test_bug554133.js
View File

@ -71,10 +71,13 @@ function run_test()
server = new HttpServer();
server.registerDirectory("/", do_get_file("data"));
server.start(4444);
mapFile("/data/test_bug554133.xml", server);
server.start(-1);
gPort = server.identity.primaryPort;
// Point search to the test server
Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS, "http://localhost:4444/test_%TERMS%.xml");
Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS,
"http://localhost:" + gPort + "/data/test_%TERMS%.xml");
do_check_neq(AddonRepository, null);
gCurrentTest = 0;

10
toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js
View File

@ -10,13 +10,19 @@ const EXTENSIONS_DB = "extensions.sqlite";
const profileDir = gProfD.clone();
profileDir.append("extensions");
// getting an unused port
Components.utils.import("resource://testing-common/httpd.js");
let gServer = new HttpServer();
gServer.start(-1);
gPort = gServer.identity.primaryPort;
function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
writeInstallRDFForExtension({
id: "addon1@tests.mozilla.org",
version: "1.0",
updateURL: "http://localhost:4444/data/test_update.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_update.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -33,7 +39,7 @@ function run_test() {
}
function end_test() {
do_test_finished();
gServer.stop(do_test_finished);
}
function run_test_1() {

5
toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js
View File

@ -19,12 +19,13 @@ function run_test() {
testserver = new HttpServer();
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.start(4444);
testserver.start(-1);
gPort = testserver.identity.primaryPort;
writeInstallRDFForExtension({
id: "addon1@tests.mozilla.org",
version: "1.0",
updateURL: "http://localhost:4444/data/test_missing.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_missing.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",

12
toolkit/mozapps/extensions/test/xpcshell/test_bug619730.js
View File

@ -9,10 +9,14 @@ const Cu = Components.utils;
Cu.import("resource://testing-common/httpd.js");
var gTestserver = null;
var gTestserver = new HttpServer();
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
mapFile("/data/test_bug619730.xml", gTestserver);
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
gPort + "/data/" + file);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -26,10 +30,6 @@ function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupManager();
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
do_test_pending();
Services.obs.addObserver(function(aSubject, aTopic, aData) {

6
toolkit/mozapps/extensions/test/xpcshell/test_bug620837.js
View File

@ -30,10 +30,12 @@ function run_test() {
gTestserver = new HttpServer();
gTestserver.registerPathHandler("/", pathHandler);
gTestserver.start(4444);
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
Services.prefs.setCharPref("extensions.blocklist.url",
"http://localhost:4444/?%PING_COUNT%&%TOTAL_PING_COUNT%&%DAYS_SINCE_LAST_PING%");
"http://localhost:" + gPort +
"/?%PING_COUNT%&%TOTAL_PING_COUNT%&%DAYS_SINCE_LAST_PING%");
do_test_pending();
test1();

13
toolkit/mozapps/extensions/test/xpcshell/test_bug655254.js
View File

@ -14,7 +14,10 @@ Services.prefs.setIntPref("extensions.enabledScopes",
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2", "1.9.2");
Components.utils.import("resource://testing-common/httpd.js");
var testserver;
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
mapFile("/data/test_bug655254.rdf", testserver);
var userDir = gProfD.clone();
userDir.append("extensions2");
@ -37,7 +40,7 @@ var addon1 = {
id: "addon1@tests.mozilla.org",
version: "1.0",
name: "Test 1",
updateURL: "http://localhost:4444/data/test_bug655254.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_bug655254.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -48,12 +51,6 @@ var addon1 = {
// Set up the profile
function run_test() {
do_test_pending();
// Create and configure the HTTP server.
testserver = new HttpServer();
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.start(4444);
run_test_1();
}

17
toolkit/mozapps/extensions/test/xpcshell/test_compatoverrides.js
View File

@ -8,19 +8,24 @@
const PREF_GETADDONS_CACHE_ENABLED = "extensions.getAddons.cache.enabled";
const PREF_GETADDONS_BYIDS = "extensions.getAddons.getWithPerformance.url";
const PORT = 4444;
Components.utils.import("resource://testing-common/httpd.js");
var gServer = new HttpServer();
gServer.start(-1);
gPort = gServer.identity.primaryPort;
const PORT = gPort;
const BASE_URL = "http://localhost:" + PORT;
const DEFAULT_URL = "about:blank";
const REQ_URL = "/data.xml";
// register static file and mark it for interpolation
mapUrlToFile(REQ_URL, do_get_file("data/test_compatoverrides.xml"), gServer);
Services.prefs.setBoolPref(PREF_EM_STRICT_COMPATIBILITY, false);
Services.prefs.setBoolPref(PREF_GETADDONS_CACHE_ENABLED, true);
Services.prefs.setCharPref(PREF_GETADDONS_BYIDS,
BASE_URL + REQ_URL);
Components.utils.import("resource://testing-common/httpd.js");
var gServer;
// Not hosted, no overrides
var addon1 = {
@ -179,10 +184,6 @@ function run_test() {
writeInstallRDFForExtension(addon9, profileDir);
writeInstallRDFForExtension(addon10, profileDir);
gServer = new HttpServer();
gServer.registerFile(REQ_URL, do_get_file("data/test_compatoverrides.xml"));
gServer.start(PORT);
startupManager();
trigger_background_update(run_test_1);

19
toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js
View File

@ -6,7 +6,14 @@
Components.utils.import("resource://testing-common/httpd.js");
var testserver;
// Create and configure the HTTP server.
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
// register files with server
testserver.registerDirectory("/addons/", do_get_file("addons"));
mapFile("/data/test_corrupt.rdf", testserver);
// The test extension uses an insecure update url.
Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
@ -41,7 +48,7 @@ var addon3 = {
id: "addon3@tests.mozilla.org",
version: "1.0",
name: "Test 3",
updateURL: "http://localhost:4444/data/test_corrupt.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_corrupt.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -54,7 +61,7 @@ var addon4 = {
id: "addon4@tests.mozilla.org",
version: "1.0",
name: "Test 4",
updateURL: "http://localhost:4444/data/test_corrupt.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_corrupt.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -143,12 +150,6 @@ function run_test() {
writeInstallRDFForExtension(theme1, profileDir);
writeInstallRDFForExtension(theme2, profileDir);
// Create and configure the HTTP server.
testserver = new HttpServer();
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.start(4444);
// Startup the profile and setup the initial state
startupManager();

20
toolkit/mozapps/extensions/test/xpcshell/test_corrupt_strictcompat.js
View File

@ -6,7 +6,15 @@
Components.utils.import("resource://testing-common/httpd.js");
var testserver;
// Create and configure the HTTP server.
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
// register files with server
testserver.registerDirectory("/addons/", do_get_file("addons"));
mapFile("/data/test_corrupt.rdf", testserver);
// The test extension uses an insecure update url.
Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
@ -41,7 +49,7 @@ var addon3 = {
id: "addon3@tests.mozilla.org",
version: "1.0",
name: "Test 3",
updateURL: "http://localhost:4444/data/test_corrupt.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_corrupt.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -54,7 +62,7 @@ var addon4 = {
id: "addon4@tests.mozilla.org",
version: "1.0",
name: "Test 4",
updateURL: "http://localhost:4444/data/test_corrupt.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_corrupt.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -143,12 +151,6 @@ function run_test() {
writeInstallRDFForExtension(theme1, profileDir);
writeInstallRDFForExtension(theme2, profileDir);
// Create and configure the HTTP server.
testserver = new HttpServer();
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.start(4444);
// Startup the profile and setup the initial state
startupManager();

23
toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js
View File

@ -22,7 +22,14 @@ userExtDir.append(gAppInfo.ID);
registerDirectory("XREUSysExt", userExtDir.parent);
Components.utils.import("resource://testing-common/httpd.js");
var testserver;
// Create and configure the HTTP server.
var testserver = new HttpServer();
testserver.start(-1);
gPort = testserver.identity.primaryPort;
// register files with server
testserver.registerDirectory("/addons/", do_get_file("addons"));
mapFile("/data/test_dictionary.rdf", testserver);
/**
* This object is both a factory and an mozISpellCheckingEngine implementation (so, it
@ -101,12 +108,6 @@ var HunspellEngine = {
function run_test() {
do_test_pending();
// Create and configure the HTTP server.
testserver = new HttpServer();
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.start(4444);
startupManager();
run_test_1();
@ -506,7 +507,7 @@ function run_test_23() {
"onNewInstall"
]);
let url = "http://localhost:4444/addons/test_dictionary.xpi";
let url = "http://localhost:" + gPort + "/addons/test_dictionary.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();
@ -653,7 +654,7 @@ function run_test_27() {
writeInstallRDFForExtension({
id: "ab-CD@dictionaries.addons.mozilla.org",
version: "1.0",
updateURL: "http://localhost:4444/data/test_dictionary.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_dictionary.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -699,7 +700,7 @@ function run_test_28() {
id: "ef@dictionaries.addons.mozilla.org",
version: "1.0",
type: "64",
updateURL: "http://localhost:4444/data/test_dictionary.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_dictionary.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
@ -745,7 +746,7 @@ function run_test_29() {
id: "gh@dictionaries.addons.mozilla.org",
version: "1.0",
type: "64",
updateURL: "http://localhost:4444/data/test_dictionary.rdf",
updateURL: "http://localhost:" + gPort + "/data/test_dictionary.rdf",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",

42
toolkit/mozapps/extensions/test/xpcshell/test_dss.js
View File

@ -4,6 +4,12 @@
Components.utils.import("resource://gre/modules/NetUtil.jsm");
// using a dynamic port in the addon metadata
Components.utils.import("resource://testing-common/httpd.js");
let gServer = new HttpServer();
gServer.start(-1);
gPort = gServer.identity.primaryPort;
// This verifies that themes behave as expected
const PREF_GENERAL_SKINS_SELECTEDSKIN = "general.skins.selectedSkin";
@ -231,11 +237,11 @@ function run_test_3() {
name: "Test LW Theme",
description: "A test theme",
author: "Mozilla",
homepageURL: "http://localhost:4444/data/index.html",
headerURL: "http://localhost:4444/data/header.png",
footerURL: "http://localhost:4444/data/footer.png",
previewURL: "http://localhost:4444/data/preview.png",
iconURL: "http://localhost:4444/data/icon.png"
homepageURL: "http://localhost:" + gPort + "/data/index.html",
headerURL: "http://localhost:" + gPort + "/data/header.png",
footerURL: "http://localhost:" + gPort + "/data/footer.png",
previewURL: "http://localhost:" + gPort + "/data/preview.png",
iconURL: "http://localhost:" + gPort + "/data/icon.png"
};
ensure_test_completed();
@ -247,10 +253,10 @@ function run_test_3() {
do_check_eq(p1.type, "theme");
do_check_eq(p1.description, "A test theme");
do_check_eq(p1.creator, "Mozilla");
do_check_eq(p1.homepageURL, "http://localhost:4444/data/index.html");
do_check_eq(p1.iconURL, "http://localhost:4444/data/icon.png");
do_check_eq(p1.homepageURL, "http://localhost:" + gPort + "/data/index.html");
do_check_eq(p1.iconURL, "http://localhost:" + gPort + "/data/icon.png");
do_check_eq(p1.screenshots.length, 1);
do_check_eq(p1.screenshots[0], "http://localhost:4444/data/preview.png");
do_check_eq(p1.screenshots[0], "http://localhost:" + gPort + "/data/preview.png");
do_check_false(p1.appDisabled);
do_check_false(p1.userDisabled);
do_check_true(p1.isCompatible);
@ -308,11 +314,11 @@ function run_test_4() {
name: "Test LW Theme",
description: "A second test theme",
author: "Mozilla",
homepageURL: "http://localhost:4444/data/index.html",
headerURL: "http://localhost:4444/data/header.png",
footerURL: "http://localhost:4444/data/footer.png",
previewURL: "http://localhost:4444/data/preview.png",
iconURL: "http://localhost:4444/data/icon.png"
homepageURL: "http://localhost:" + gPort + "/data/index.html",
headerURL: "http://localhost:" + gPort + "/data/header.png",
footerURL: "http://localhost:" + gPort + "/data/footer.png",
previewURL: "http://localhost:" + gPort + "/data/preview.png",
iconURL: "http://localhost:" + gPort + "/data/icon.png"
};
ensure_test_completed();
@ -781,11 +787,11 @@ function run_test_14() {
name: "Test LW Theme",
description: "A test theme",
author: "Mozilla",
homepageURL: "http://localhost:4444/data/index.html",
headerURL: "http://localhost:4444/data/header.png",
footerURL: "http://localhost:4444/data/footer.png",
previewURL: "http://localhost:4444/data/preview.png",
iconURL: "http://localhost:4444/data/icon.png"
homepageURL: "http://localhost:" + gPort + "/data/index.html",
headerURL: "http://localhost:" + gPort + "/data/header.png",
footerURL: "http://localhost:" + gPort + "/data/footer.png",
previewURL: "http://localhost:" + gPort + "/data/preview.png",
iconURL: "http://localhost:" + gPort + "/data/icon.png"
};
AddonManager.getAddonByID("default@tests.mozilla.org", function(d) {

5
toolkit/mozapps/extensions/test/xpcshell/test_filepointer.js
View File

@ -94,7 +94,8 @@ function run_test() {
testserver = new HttpServer();
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.start(4444);
testserver.start(-1);
gPort = testserver.identity.primaryPort;
run_test_1();
}
@ -136,7 +137,7 @@ function run_test_2() {
"onNewInstall",
]);
let url = "http://localhost:4444/addons/test_filepointer.xpi";
let url = "http://localhost:" + gPort + "/addons/test_filepointer.xpi";
AddonManager.getInstallForURL(url, function(install) {
ensure_test_completed();

12
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Device.js
View File

@ -8,7 +8,10 @@
Components.utils.import("resource://testing-common/httpd.js");
var gTestserver = null;
var gTestserver = new HttpServer();
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
mapFile("/data/test_gfxBlacklist.xml", gTestserver);
function get_platform() {
var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
@ -17,7 +20,8 @@ function get_platform() {
}
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
gPort + "/data/" + file);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -68,10 +72,6 @@ function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupManager();
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
do_test_pending();
function checkBlacklist()

12
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_DriverNew.js
View File

@ -8,7 +8,10 @@
Components.utils.import("resource://testing-common/httpd.js");
var gTestserver = null;
var gTestserver = new HttpServer();
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
mapFile("/data/test_gfxBlacklist.xml", gTestserver);
function get_platform() {
var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
@ -17,7 +20,8 @@ function get_platform() {
}
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
gPort + "/data/" + file);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -67,10 +71,6 @@ function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupManager();
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
do_test_pending();
function checkBlacklist()

12
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js
View File

@ -8,7 +8,10 @@
Components.utils.import("resource://testing-common/httpd.js");
var gTestserver = null;
var gTestserver = new HttpServer();
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
mapFile("/data/test_gfxBlacklist.xml", gTestserver);
function get_platform() {
var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
@ -17,7 +20,8 @@ function get_platform() {
}
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
gPort + "/data/" + file);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -67,10 +71,6 @@ function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupManager();
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
do_test_pending();
function checkBlacklist()

12
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js
View File

@ -8,7 +8,10 @@
Components.utils.import("resource://testing-common/httpd.js");
var gTestserver = null;
var gTestserver = new HttpServer();
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
mapFile("/data/test_gfxBlacklist.xml", gTestserver);
function get_platform() {
var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
@ -17,7 +20,8 @@ function get_platform() {
}
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
gPort + "/data/" + file);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -67,10 +71,6 @@ function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupManager();
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
do_test_pending();
function checkBlacklist()

12
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js
View File

@ -8,7 +8,10 @@
Components.utils.import("resource://testing-common/httpd.js");
var gTestserver = null;
var gTestserver = new HttpServer();
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
mapFile("/data/test_gfxBlacklist.xml", gTestserver);
function get_platform() {
var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
@ -17,7 +20,8 @@ function get_platform() {
}
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
gPort + "/data/" + file);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -67,10 +71,6 @@ function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupManager();
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
do_test_pending();
function checkBlacklist()

12
toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js
View File

@ -8,7 +8,10 @@
Components.utils.import("resource://testing-common/httpd.js");
var gTestserver = null;
var gTestserver = new HttpServer();
gTestserver.start(-1);
gPort = gTestserver.identity.primaryPort;
mapFile("/data/test_gfxBlacklist.xml", gTestserver);
function get_platform() {
var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
@ -17,7 +20,8 @@ function get_platform() {
}
function load_blocklist(file) {
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + file);
Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:" +
gPort + "/data/" + file);
var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
getService(Ci.nsITimerCallback);
blocklist.notify(null);
@ -67,10 +71,6 @@ function run_test() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
startupManager();
gTestserver = new HttpServer();
gTestserver.registerDirectory("/data/", do_get_file("data"));
gTestserver.start(4444);
do_test_pending();
function checkBlacklist()

Some files were not shown because too many files have changed in this diff Show More