Bug 1343521 - Move the mochitests in browser/modules/test/ to their own subdirectory. r?jaws
MozReview-Commit-ID: AV3QzLofo2w
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -1,18 +1,18 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
XPCSHELL_TESTS_MANIFESTS += [
'test/unit/social/xpcshell.ini',
- 'test/xpcshell/xpcshell.ini',
+ 'test/unit/xpcshell.ini',
]
EXTRA_JS_MODULES += [
'AboutHome.jsm',
'AboutNewTab.jsm',
'AttributionCode.jsm',
'BrowserUITelemetry.jsm',
'BrowserUsageTelemetry.jsm',
rename from browser/modules/test/.eslintrc.js
rename to browser/modules/test/browser/.eslintrc.js
--- a/browser/modules/test/.eslintrc.js
+++ b/browser/modules/test/browser/.eslintrc.js
@@ -1,7 +1,7 @@
"use strict";
module.exports = {
"extends": [
- "../../../testing/mochitest/browser.eslintrc.js"
+ "../../../../testing/mochitest/browser.eslintrc.js"
]
};
rename from browser/modules/test/browser.ini
rename to browser/modules/test/browser/browser.ini
--- a/browser/modules/test/browser.ini
+++ b/browser/modules/test/browser/browser.ini
@@ -16,18 +16,18 @@ support-files =
!/browser/components/search/test/testEngine.xml
[browser_NetworkPrioritizer.js]
[browser_PermissionUI.js]
[browser_PermissionUI_prompts.js]
[browser_ProcessHangNotifications.js]
skip-if = !e10s
[browser_SelfSupportBackend.js]
support-files =
- ../../components/uitour/test/uitour.html
- ../../components/uitour/UITour-lib.js
+ ../../../components/uitour/test/uitour.html
+ ../../../components/uitour/UITour-lib.js
[browser_SitePermissions.js]
[browser_SitePermissions_combinations.js]
[browser_SitePermissions_expiry.js]
[browser_SitePermissions_tab_urls.js]
[browser_taskbar_preview.js]
skip-if = os != "win"
[browser_UnsubmittedCrashHandler.js]
run-if = crashreporter
rename from browser/modules/test/browser_BrowserUITelemetry_buckets.js
rename to browser/modules/test/browser/browser_BrowserUITelemetry_buckets.js
rename from browser/modules/test/browser_BrowserUITelemetry_defaults.js
rename to browser/modules/test/browser/browser_BrowserUITelemetry_defaults.js
rename from browser/modules/test/browser_BrowserUITelemetry_sidebar.js
rename to browser/modules/test/browser/browser_BrowserUITelemetry_sidebar.js
rename from browser/modules/test/browser_BrowserUITelemetry_syncedtabs.js
rename to browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
rename from browser/modules/test/browser_ContentSearch.js
rename to browser/modules/test/browser/browser_ContentSearch.js
--- a/browser/modules/test/browser_ContentSearch.js
+++ b/browser/modules/test/browser/browser_ContentSearch.js
@@ -3,17 +3,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const TEST_MSG = "ContentSearchTest";
const CONTENT_SEARCH_MSG = "ContentSearch";
const TEST_CONTENT_SCRIPT_BASENAME = "contentSearch.js";
var gMsgMan;
/* eslint no-undef:"error" */
-/* import-globals-from ../../components/search/test/head.js */
+/* import-globals-from ../../../components/search/test/head.js */
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/browser/components/search/test/head.js",
this);
let originalEngine = Services.search.currentEngine;
add_task(function* setup() {
yield promiseNewEngine("testEngine.xml", {
rename from browser/modules/test/browser_NetworkPrioritizer.js
rename to browser/modules/test/browser/browser_NetworkPrioritizer.js
rename from browser/modules/test/browser_PermissionUI.js
rename to browser/modules/test/browser/browser_PermissionUI.js
rename from browser/modules/test/browser_PermissionUI_prompts.js
rename to browser/modules/test/browser/browser_PermissionUI_prompts.js
rename from browser/modules/test/browser_ProcessHangNotifications.js
rename to browser/modules/test/browser/browser_ProcessHangNotifications.js
rename from browser/modules/test/browser_SelfSupportBackend.js
rename to browser/modules/test/browser/browser_SelfSupportBackend.js
rename from browser/modules/test/browser_SitePermissions.js
rename to browser/modules/test/browser/browser_SitePermissions.js
rename from browser/modules/test/browser_SitePermissions_combinations.js
rename to browser/modules/test/browser/browser_SitePermissions_combinations.js
rename from browser/modules/test/browser_SitePermissions_expiry.js
rename to browser/modules/test/browser/browser_SitePermissions_expiry.js
rename from browser/modules/test/browser_SitePermissions_tab_urls.js
rename to browser/modules/test/browser/browser_SitePermissions_tab_urls.js
rename from browser/modules/test/browser_UnsubmittedCrashHandler.js
rename to browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
rename from browser/modules/test/browser_UsageTelemetry.js
rename to browser/modules/test/browser/browser_UsageTelemetry.js
rename from browser/modules/test/browser_UsageTelemetry_content.js
rename to browser/modules/test/browser/browser_UsageTelemetry_content.js
rename from browser/modules/test/browser_UsageTelemetry_content_aboutHome.js
rename to browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js
rename from browser/modules/test/browser_UsageTelemetry_private_and_restore.js
rename to browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js
rename from browser/modules/test/browser_UsageTelemetry_searchbar.js
rename to browser/modules/test/browser/browser_UsageTelemetry_searchbar.js
rename from browser/modules/test/browser_UsageTelemetry_urlbar.js
rename to browser/modules/test/browser/browser_UsageTelemetry_urlbar.js
rename from browser/modules/test/browser_bug1319078.js
rename to browser/modules/test/browser/browser_bug1319078.js
rename from browser/modules/test/browser_taskbar_preview.js
rename to browser/modules/test/browser/browser_taskbar_preview.js
rename from browser/modules/test/browser_urlBar_zoom.js
rename to browser/modules/test/browser/browser_urlBar_zoom.js
rename from browser/modules/test/contentSearch.js
rename to browser/modules/test/browser/contentSearch.js
rename from browser/modules/test/contentSearchBadImage.xml
rename to browser/modules/test/browser/contentSearchBadImage.xml
rename from browser/modules/test/contentSearchSuggestions.sjs
rename to browser/modules/test/browser/contentSearchSuggestions.sjs
rename from browser/modules/test/contentSearchSuggestions.xml
rename to browser/modules/test/browser/contentSearchSuggestions.xml
--- a/browser/modules/test/contentSearchSuggestions.xml
+++ b/browser/modules/test/browser/contentSearchSuggestions.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>browser_ContentSearch contentSearchSuggestions.xml</ShortName>
-<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/contentSearchSuggestions.sjs?{searchTerms}"/>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/browser/contentSearchSuggestions.sjs?{searchTerms}"/>
<Url type="text/html" method="GET" template="http://browser-ContentSearch.com/contentSearchSuggestions" rel="searchform"/>
</SearchPlugin>
rename from browser/modules/test/head.js
rename to browser/modules/test/browser/head.js
rename from browser/modules/test/usageTelemetrySearchSuggestions.sjs
rename to browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs
rename from browser/modules/test/usageTelemetrySearchSuggestions.xml
rename to browser/modules/test/browser/usageTelemetrySearchSuggestions.xml
--- a/browser/modules/test/usageTelemetrySearchSuggestions.xml
+++ b/browser/modules/test/browser/usageTelemetrySearchSuggestions.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>browser_UsageTelemetry usageTelemetrySearchSuggestions.xml</ShortName>
-<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/usageTelemetrySearchSuggestions.sjs?{searchTerms}"/>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs?{searchTerms}"/>
<Url type="text/html" method="GET" template="http://example.com" rel="searchform"/>
</SearchPlugin>
rename from browser/modules/test/xpcshell/.eslintrc.js
rename to browser/modules/test/unit/.eslintrc.js
deleted file mode 100644
--- a/browser/modules/test/unit/social/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
- "extends": [
- "../../../../../testing/xpcshell/xpcshell.eslintrc.js"
- ]
-};
--- a/browser/modules/test/unit/social/head.js
+++ b/browser/modules/test/unit/social/head.js
@@ -30,17 +30,16 @@ const gProfD = do_get_profile();
function createAppInfo(ID, name, version, platformVersion = "1.0") {
let tmp = {};
Cu.import("resource://testing-common/AppInfo.jsm", tmp);
tmp.updateAppInfo({
ID, name, version, platformVersion,
crashReporter: true,
});
- gAppInfo = tmp.getAppInfo();
}
function initApp() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
// prepare a blocklist file for the blocklist service
var blocklistFile = gProfD.clone();
blocklistFile.append("blocklist.xml");
if (blocklistFile.exists())
rename from browser/modules/test/xpcshell/test_AttributionCode.js
rename to browser/modules/test/unit/test_AttributionCode.js
rename from browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
rename to browser/modules/test/unit/test_DirectoryLinksProvider.js
rename from browser/modules/test/xpcshell/test_E10SUtils_nested_URIs.js
rename to browser/modules/test/unit/test_E10SUtils_nested_URIs.js
rename from browser/modules/test/xpcshell/test_LaterRun.js
rename to browser/modules/test/unit/test_LaterRun.js
rename from browser/modules/test/xpcshell/test_SitePermissions.js
rename to browser/modules/test/unit/test_SitePermissions.js
rename from browser/modules/test/xpcshell/xpcshell.ini
rename to browser/modules/test/unit/xpcshell.ini