diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-08 20:36:18 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-13 11:37:45 -0400 |
| commit | 888331c540fd273d4ea0c81fdfe4f85c9456e0e4 (patch) | |
| tree | 9e1fbdd8600e3ed4d7747dbdd8cb11bdb431d287 /netwerk/test | |
| parent | 4d98f30b5316a6ff24e32cc6ba4a84c3fb1acf9c (diff) | |
| download | aura-central-888331c540fd273d4ea0c81fdfe4f85c9456e0e4.tar.gz | |
Issue mcp-graveyard/UXP%991 Part 4: Network and URILoader
Diffstat (limited to 'netwerk/test')
| -rw-r--r-- | netwerk/test/unit/test_bug650995.js | 14 | ||||
| -rw-r--r-- | netwerk/test/unit/test_idn_blacklist.js | 7 | ||||
| -rw-r--r-- | netwerk/test/unit/test_idn_urls.js | 7 |
3 files changed, 4 insertions, 24 deletions
diff --git a/netwerk/test/unit/test_bug650995.js b/netwerk/test/unit/test_bug650995.js index 3c1ea8d67..bf2e9fa7d 100644 --- a/netwerk/test/unit/test_bug650995.js +++ b/netwerk/test/unit/test_bug650995.js @@ -78,24 +78,14 @@ function InitializeCacheDevices(memDevice, diskDevice) { this.start = function() { prefService.setBoolPref("browser.cache.memory.enable", memDevice); if (memDevice) { - try { - cap = prefService.getIntPref("browser.cache.memory.capacity"); - } - catch(ex) { - cap = 0; - } + cap = prefService.getIntPref("browser.cache.memory.capacity", 0); if (cap == 0) { prefService.setIntPref("browser.cache.memory.capacity", 1024); } } prefService.setBoolPref("browser.cache.disk.enable", diskDevice); if (diskDevice) { - try { - cap = prefService.getIntPref("browser.cache.disk.capacity"); - } - catch(ex) { - cap = 0; - } + cap = prefService.getIntPref("browser.cache.disk.capacity", 0); if (cap == 0) { prefService.setIntPref("browser.cache.disk.capacity", 1024); } diff --git a/netwerk/test/unit/test_idn_blacklist.js b/netwerk/test/unit/test_idn_blacklist.js index 5ca0173bb..aea45d706 100644 --- a/netwerk/test/unit/test_idn_blacklist.js +++ b/netwerk/test/unit/test_idn_blacklist.js @@ -121,12 +121,7 @@ const testcases = [ function run_test() { var pbi = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); var oldProfile = pbi.getCharPref("network.IDN.restriction_profile", "moderate"); - var oldWhiteListCom; - try { - oldWhitelistCom = pbi.getBoolPref("network.IDN.whitelist.com"); - } catch(e) { - oldWhitelistCom = false; - } + var oldWhitelistCom = pbi.getBoolPref("network.IDN.whitelist.com", false); var idnService = Cc["@mozilla.org/network/idn-service;1"].getService(Ci.nsIIDNService); pbi.setCharPref("network.IDN.restriction_profile", "moderate"); diff --git a/netwerk/test/unit/test_idn_urls.js b/netwerk/test/unit/test_idn_urls.js index 06a53032b..358854093 100644 --- a/netwerk/test/unit/test_idn_urls.js +++ b/netwerk/test/unit/test_idn_urls.js @@ -295,12 +295,7 @@ const profiles = ["ASCII", "high", "moderate"]; function run_test() { var pbi = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); var oldProfile = pbi.getCharPref("network.IDN.restriction_profile", "moderate"); - var oldWhiteListCom; - try { - oldWhitelistCom = pbi.getBoolPref("network.IDN.whitelist.com"); - } catch(e) { - oldWhitelistCom = false; - } + var oldWhitelistCom = pbi.getBoolPref("network.IDN.whitelist.com", false); var idnService = Cc["@mozilla.org/network/idn-service;1"].getService(Ci.nsIIDNService); for (var i = 0; i < profiles.length; ++i) { |