From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 02:47:55 +0200 Subject: Adding upstream version 124.0.1. Signed-off-by: Daniel Baumann --- .../urlformatter/tests/unit/head_urlformatter.js | 13 +++ .../urlformatter/tests/unit/test_urlformatter.js | 100 +++++++++++++++++++++ .../urlformatter/tests/unit/xpcshell.toml | 5 ++ 3 files changed, 118 insertions(+) create mode 100644 toolkit/components/urlformatter/tests/unit/head_urlformatter.js create mode 100644 toolkit/components/urlformatter/tests/unit/test_urlformatter.js create mode 100644 toolkit/components/urlformatter/tests/unit/xpcshell.toml (limited to 'toolkit/components/urlformatter/tests') diff --git a/toolkit/components/urlformatter/tests/unit/head_urlformatter.js b/toolkit/components/urlformatter/tests/unit/head_urlformatter.js new file mode 100644 index 0000000000..35d5b11b8c --- /dev/null +++ b/toolkit/components/urlformatter/tests/unit/head_urlformatter.js @@ -0,0 +1,13 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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 { getAppInfo, updateAppInfo } = ChromeUtils.importESModule( + "resource://testing-common/AppInfo.sys.mjs" +); +updateAppInfo({ + name: "Url Formatter Test", + ID: "urlformattertest@test.mozilla.org", + version: "1", + platformVersion: "2.0", +}); +var gAppInfo = getAppInfo(); diff --git a/toolkit/components/urlformatter/tests/unit/test_urlformatter.js b/toolkit/components/urlformatter/tests/unit/test_urlformatter.js new file mode 100644 index 0000000000..c6a0c669c3 --- /dev/null +++ b/toolkit/components/urlformatter/tests/unit/test_urlformatter.js @@ -0,0 +1,100 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +function run_test() { + var formatter = Services.urlFormatter; + var locale = Services.locale.appLocaleAsBCP47; + var OSVersion = + Services.sysinfo.getProperty("name") + + " " + + Services.sysinfo.getProperty("version"); + try { + OSVersion += " (" + Services.sysinfo.getProperty("secondaryLibrary") + ")"; + } catch (e) {} + OSVersion = encodeURIComponent(OSVersion); + var abi = Services.appinfo.XPCOMABI; + + let defaults = Services.prefs.getDefaultBranch(null); + let channel = defaults.getCharPref("app.update.channel", "default"); + + // Set distribution values. + defaults.setCharPref("distribution.id", "bacon"); + defaults.setCharPref("distribution.version", "1.0"); + + var upperUrlRaw = + "http://%LOCALE%.%VENDOR%.foo/?name=%NAME%&id=%ID%&version=%VERSION%&platversion=%PLATFORMVERSION%&abid=%APPBUILDID%&pbid=%PLATFORMBUILDID%&app=%APP%&os=%OS%&abi=%XPCOMABI%"; + var lowerUrlRaw = + "http://%locale%.%vendor%.foo/?name=%name%&id=%id%&version=%version%&platversion=%platformversion%&abid=%appbuildid%&pbid=%platformbuildid%&app=%app%&os=%os%&abi=%xpcomabi%"; + // XXX %APP%'s RegExp is not global, so it only replaces the first space + var ulUrlRef = + "http://" + + locale + + ".Mozilla.foo/?name=Url Formatter Test&id=urlformattertest@test.mozilla.org&version=1&platversion=2.0&abid=" + + gAppInfo.appBuildID + + "&pbid=" + + gAppInfo.platformBuildID + + "&app=urlformatter test&os=XPCShell&abi=" + + abi; + var multiUrl = "http://%VENDOR%.%VENDOR%.%NAME%.%VENDOR%.%NAME%"; + var multiUrlRef = + "http://Mozilla.Mozilla.Url Formatter Test.Mozilla.Url Formatter Test"; + var encodedUrl = + "https://%LOCALE%.%VENDOR%.foo/?q=%E3%82%BF%E3%83%96&app=%NAME%&ver=%PLATFORMVERSION%"; + var encodedUrlRef = + "https://" + + locale + + ".Mozilla.foo/?q=%E3%82%BF%E3%83%96&app=Url Formatter Test&ver=2.0"; + var advancedUrl = + "http://test.mozilla.com/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"; + var advancedUrlRef = + "http://test.mozilla.com/Url Formatter Test/1/" + + gAppInfo.appBuildID + + "/XPCShell_" + + abi + + "/" + + locale + + "/" + + channel + + "/" + + OSVersion + + "/bacon/1.0/"; + + var pref = "xpcshell.urlformatter.test"; + Services.prefs.setStringPref(pref, upperUrlRaw); + + Assert.equal(formatter.formatURL(upperUrlRaw), ulUrlRef); + Assert.equal(formatter.formatURLPref(pref), ulUrlRef); + // Keys must be uppercase + Assert.notEqual(formatter.formatURL(lowerUrlRaw), ulUrlRef); + Assert.equal(formatter.formatURL(multiUrl), multiUrlRef); + // Encoded strings must be kept as is (Bug 427304) + Assert.equal(formatter.formatURL(encodedUrl), encodedUrlRef); + + Assert.equal(formatter.formatURL(advancedUrl), advancedUrlRef); + + for (let val of [ + "MOZILLA_API_KEY", + "GOOGLE_LOCATION_SERVICE_API_KEY", + "GOOGLE_SAFEBROWSING_API_KEY", + "BING_API_CLIENTID", + "BING_API_KEY", + ]) { + let url = "http://test.mozilla.com/?val=%" + val + "%"; + Assert.notEqual(formatter.formatURL(url), url); + } + + let url_sb = + "http://test.mozilla.com/%GOOGLE_SAFEBROWSING_API_KEY%/?val=%GOOGLE_SAFEBROWSING_API_KEY%"; + Assert.equal( + formatter.trimSensitiveURLs(formatter.formatURL(url_sb)), + "http://test.mozilla.com/[trimmed-google-api-key]/?val=[trimmed-google-api-key]" + ); + + let url_gls = + "http://test.mozilla.com/%GOOGLE_LOCATION_SERVICE_API_KEY%/?val=%GOOGLE_LOCATION_SERVICE_API_KEY%"; + Assert.equal( + formatter.trimSensitiveURLs(formatter.formatURL(url_gls)), + "http://test.mozilla.com/[trimmed-google-api-key]/?val=[trimmed-google-api-key]" + ); +} diff --git a/toolkit/components/urlformatter/tests/unit/xpcshell.toml b/toolkit/components/urlformatter/tests/unit/xpcshell.toml new file mode 100644 index 0000000000..5c91088e7c --- /dev/null +++ b/toolkit/components/urlformatter/tests/unit/xpcshell.toml @@ -0,0 +1,5 @@ +[DEFAULT] +head = "head_urlformatter.js" +skip-if = ["os == 'android'"] + +["test_urlformatter.js"] -- cgit v1.2.3