Bug 1552714 - Move DOM L10n tests from intl/l10n to dom/l10n. r=fluent-reviewers,smaug,Pike
authorZibi Braniecki <zbraniecki@mozilla.com>
Thu, 06 Jun 2019 16:32:39 +0000
changeset 477627 9504f0040d43facc4e243f79fd19af624720cdba
parent 477626 cf6ce31cd14b48843a355dc12be2d5656cc685a1
child 477628 886ea903b3a6632a76e46db115a591abc1b9d430
push id36119
push userncsoregi@mozilla.com
push dateThu, 06 Jun 2019 21:52:09 +0000
treeherdermozilla-central@6a81efd823db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfluent-reviewers, smaug, Pike
bugs1552714
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1552714 - Move DOM L10n tests from intl/l10n to dom/l10n. r=fluent-reviewers,smaug,Pike Differential Revision: https://phabricator.services.mozilla.com/D33197
dom/l10n/moz.build
dom/l10n/tests/mochitest/browser.ini
dom/l10n/tests/mochitest/chrome.ini
dom/l10n/tests/mochitest/document_l10n/README.txt
dom/l10n/tests/mochitest/document_l10n/non-system-principal/README.txt
dom/l10n/tests/mochitest/document_l10n/non-system-principal/browser_resource_uri.js
dom/l10n/tests/mochitest/document_l10n/non-system-principal/localization/test.ftl
dom/l10n/tests/mochitest/document_l10n/non-system-principal/test.html
dom/l10n/tests/mochitest/document_l10n/test_docl10n.html
dom/l10n/tests/mochitest/document_l10n/test_docl10n.xhtml
dom/l10n/tests/mochitest/document_l10n/test_docl10n.xul
dom/l10n/tests/mochitest/document_l10n/test_docl10n_initialize_after_parse.xhtml
dom/l10n/tests/mochitest/document_l10n/test_docl10n_initialize_after_parse.xul
dom/l10n/tests/mochitest/document_l10n/test_docl10n_ready_rejected.html
dom/l10n/tests/mochitest/document_l10n/test_docl10n_removeResourceIds.html
dom/l10n/tests/mochitest/document_l10n/test_unpriv_iframe.html
dom/l10n/tests/mochitest/dom_localization/test_attr_sanitized.html
dom/l10n/tests/mochitest/dom_localization/test_connectRoot.html
dom/l10n/tests/mochitest/dom_localization/test_disconnectRoot.html
dom/l10n/tests/mochitest/dom_localization/test_domloc.xul
dom/l10n/tests/mochitest/dom_localization/test_getAttributes.html
dom/l10n/tests/mochitest/dom_localization/test_mutations.html
dom/l10n/tests/mochitest/dom_localization/test_overlay.html
dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_all.html
dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_children.html
dom/l10n/tests/mochitest/dom_localization/test_overlay_repeated.html
dom/l10n/tests/mochitest/dom_localization/test_overlay_sanitized.html
dom/l10n/tests/mochitest/dom_localization/test_repeated_l10nid.html
dom/l10n/tests/mochitest/dom_localization/test_setAttributes.html
dom/l10n/tests/mochitest/dom_localization/test_translateElements.html
dom/l10n/tests/mochitest/dom_localization/test_translateFragment.html
dom/l10n/tests/mochitest/dom_localization/test_translateRoots.html
dom/l10n/tests/mochitest/domoverlays/test_attributes.html
dom/l10n/tests/mochitest/domoverlays/test_domoverlays.xul
dom/l10n/tests/mochitest/domoverlays/test_extra_text_markup.html
dom/l10n/tests/mochitest/domoverlays/test_functional_children.html
dom/l10n/tests/mochitest/domoverlays/test_text_children.html
dom/l10n/tests/mochitest/mochitest.ini
dom/l10n/tests/mochitest/test_domoverlays.xul
dom/l10n/tests/mochitest/test_domoverlays_attributes.html
dom/l10n/tests/mochitest/test_domoverlays_extra_text_markup.html
dom/l10n/tests/mochitest/test_domoverlays_functional_children.html
dom/l10n/tests/mochitest/test_domoverlays_text_children.html
intl/l10n/moz.build
intl/l10n/test/browser.ini
intl/l10n/test/chrome.ini
intl/l10n/test/document_l10n/README.txt
intl/l10n/test/document_l10n/non-system-principal/README.txt
intl/l10n/test/document_l10n/non-system-principal/browser_resource_uri.js
intl/l10n/test/document_l10n/non-system-principal/localization/test.ftl
intl/l10n/test/document_l10n/non-system-principal/test.html
intl/l10n/test/dom/test_docl10n.html
intl/l10n/test/dom/test_docl10n.xhtml
intl/l10n/test/dom/test_docl10n.xul
intl/l10n/test/dom/test_docl10n_initialize_after_parse.xhtml
intl/l10n/test/dom/test_docl10n_initialize_after_parse.xul
intl/l10n/test/dom/test_docl10n_ready_rejected.html
intl/l10n/test/dom/test_docl10n_removeResourceIds.html
intl/l10n/test/dom/test_docl10n_unpriv_iframe.html
intl/l10n/test/dom/test_domloc.xul
intl/l10n/test/dom/test_domloc_attr_sanitized.html
intl/l10n/test/dom/test_domloc_connectRoot.html
intl/l10n/test/dom/test_domloc_disconnectRoot.html
intl/l10n/test/dom/test_domloc_getAttributes.html
intl/l10n/test/dom/test_domloc_mutations.html
intl/l10n/test/dom/test_domloc_overlay.html
intl/l10n/test/dom/test_domloc_overlay_missing_all.html
intl/l10n/test/dom/test_domloc_overlay_missing_children.html
intl/l10n/test/dom/test_domloc_overlay_repeated.html
intl/l10n/test/dom/test_domloc_overlay_sanitized.html
intl/l10n/test/dom/test_domloc_repeated_l10nid.html
intl/l10n/test/dom/test_domloc_setAttributes.html
intl/l10n/test/dom/test_domloc_translateElements.html
intl/l10n/test/dom/test_domloc_translateFragment.html
intl/l10n/test/dom/test_domloc_translateRoots.html
intl/l10n/test/mochitest.ini
--- a/dom/l10n/moz.build
+++ b/dom/l10n/moz.build
@@ -22,12 +22,14 @@ UNIFIED_SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 FINAL_LIBRARY = 'xul'
 
+MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
+BROWSER_CHROME_MANIFESTS += ['tests/mochitest/browser.ini']
 
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['tests/gtest']
rename from intl/l10n/test/browser.ini
rename to dom/l10n/tests/mochitest/browser.ini
--- a/dom/l10n/tests/mochitest/chrome.ini
+++ b/dom/l10n/tests/mochitest/chrome.ini
@@ -1,11 +1,37 @@
-[test_domoverlays_attributes.html]
-[test_domoverlays_functional_children.html]
-[test_domoverlays_text_children.html]
-[test_domoverlays_extra_text_markup.html]
-[test_domoverlays.xul]
+[domoverlays/test_attributes.html]
+[domoverlays/test_functional_children.html]
+[domoverlays/test_text_children.html]
+[domoverlays/test_extra_text_markup.html]
+[domoverlays/test_domoverlays.xul]
 
 [mutations/test_append_content_post_dcl.html]
 [mutations/test_append_content_pre_dcl.html]
 [mutations/test_append_fragment_post_dcl.html]
 [mutations/test_set_attributes.html]
 [mutations/test_pause_observing.html]
+
+[dom_localization/test_attr_sanitized.html]
+[dom_localization/test_getAttributes.html]
+[dom_localization/test_setAttributes.html]
+[dom_localization/test_translateElements.html]
+[dom_localization/test_translateFragment.html]
+[dom_localization/test_connectRoot.html]
+[dom_localization/test_disconnectRoot.html]
+[dom_localization/test_repeated_l10nid.html]
+[dom_localization/test_translateRoots.html]
+[dom_localization/test_mutations.html]
+[dom_localization/test_overlay.html]
+[dom_localization/test_overlay_repeated.html]
+[dom_localization/test_overlay_missing_all.html]
+[dom_localization/test_overlay_missing_children.html]
+[dom_localization/test_overlay_sanitized.html]
+[dom_localization/test_domloc.xul]
+
+
+[document_l10n/test_docl10n.xul]
+[document_l10n/test_docl10n_initialize_after_parse.xhtml]
+[document_l10n/test_docl10n_initialize_after_parse.xul]
+[document_l10n/test_docl10n.xhtml]
+[document_l10n/test_docl10n.html]
+[document_l10n/test_docl10n_ready_rejected.html]
+[document_l10n/test_docl10n_removeResourceIds.html]
rename from intl/l10n/test/document_l10n/README.txt
rename to dom/l10n/tests/mochitest/document_l10n/README.txt
rename from intl/l10n/test/document_l10n/non-system-principal/README.txt
rename to dom/l10n/tests/mochitest/document_l10n/non-system-principal/README.txt
rename from intl/l10n/test/document_l10n/non-system-principal/browser_resource_uri.js
rename to dom/l10n/tests/mochitest/document_l10n/non-system-principal/browser_resource_uri.js
--- a/intl/l10n/test/document_l10n/non-system-principal/browser_resource_uri.js
+++ b/dom/l10n/tests/mochitest/document_l10n/non-system-principal/browser_resource_uri.js
@@ -1,11 +1,11 @@
 const { L10nRegistry, FileSource } = ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm");
 
-let uri = "chrome://mochitests/content/browser/intl/l10n/test/document_l10n/non-system-principal/";
+let uri = "chrome://mochitests/content/browser/dom/l10n/tests/mochitest//document_l10n/non-system-principal/";
 let protocol = Services.io.getProtocolHandler("resource")
                           .QueryInterface(Ci.nsIResProtocolHandler);
 
 protocol.setSubstitution("l10n-test", Services.io.newURI(uri));
 
 // Since we want the mock source to work with all locales, we're going
 // to register it for currently used locales, and we'll put the path that
 // doesn't use the `{locale}` component to make it work irrelevant of
rename from intl/l10n/test/document_l10n/non-system-principal/localization/test.ftl
rename to dom/l10n/tests/mochitest/document_l10n/non-system-principal/localization/test.ftl
rename from intl/l10n/test/document_l10n/non-system-principal/test.html
rename to dom/l10n/tests/mochitest/document_l10n/non-system-principal/test.html
rename from intl/l10n/test/dom/test_docl10n.html
rename to dom/l10n/tests/mochitest/document_l10n/test_docl10n.html
rename from intl/l10n/test/dom/test_docl10n.xhtml
rename to dom/l10n/tests/mochitest/document_l10n/test_docl10n.xhtml
rename from intl/l10n/test/dom/test_docl10n.xul
rename to dom/l10n/tests/mochitest/document_l10n/test_docl10n.xul
rename from intl/l10n/test/dom/test_docl10n_initialize_after_parse.xhtml
rename to dom/l10n/tests/mochitest/document_l10n/test_docl10n_initialize_after_parse.xhtml
rename from intl/l10n/test/dom/test_docl10n_initialize_after_parse.xul
rename to dom/l10n/tests/mochitest/document_l10n/test_docl10n_initialize_after_parse.xul
rename from intl/l10n/test/dom/test_docl10n_ready_rejected.html
rename to dom/l10n/tests/mochitest/document_l10n/test_docl10n_ready_rejected.html
rename from intl/l10n/test/dom/test_docl10n_removeResourceIds.html
rename to dom/l10n/tests/mochitest/document_l10n/test_docl10n_removeResourceIds.html
rename from intl/l10n/test/dom/test_docl10n_unpriv_iframe.html
rename to dom/l10n/tests/mochitest/document_l10n/test_unpriv_iframe.html
rename from intl/l10n/test/dom/test_domloc_attr_sanitized.html
rename to dom/l10n/tests/mochitest/dom_localization/test_attr_sanitized.html
rename from intl/l10n/test/dom/test_domloc_connectRoot.html
rename to dom/l10n/tests/mochitest/dom_localization/test_connectRoot.html
rename from intl/l10n/test/dom/test_domloc_disconnectRoot.html
rename to dom/l10n/tests/mochitest/dom_localization/test_disconnectRoot.html
rename from intl/l10n/test/dom/test_domloc.xul
rename to dom/l10n/tests/mochitest/dom_localization/test_domloc.xul
rename from intl/l10n/test/dom/test_domloc_getAttributes.html
rename to dom/l10n/tests/mochitest/dom_localization/test_getAttributes.html
rename from intl/l10n/test/dom/test_domloc_mutations.html
rename to dom/l10n/tests/mochitest/dom_localization/test_mutations.html
rename from intl/l10n/test/dom/test_domloc_overlay.html
rename to dom/l10n/tests/mochitest/dom_localization/test_overlay.html
rename from intl/l10n/test/dom/test_domloc_overlay_missing_all.html
rename to dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_all.html
rename from intl/l10n/test/dom/test_domloc_overlay_missing_children.html
rename to dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_children.html
rename from intl/l10n/test/dom/test_domloc_overlay_repeated.html
rename to dom/l10n/tests/mochitest/dom_localization/test_overlay_repeated.html
rename from intl/l10n/test/dom/test_domloc_overlay_sanitized.html
rename to dom/l10n/tests/mochitest/dom_localization/test_overlay_sanitized.html
rename from intl/l10n/test/dom/test_domloc_repeated_l10nid.html
rename to dom/l10n/tests/mochitest/dom_localization/test_repeated_l10nid.html
rename from intl/l10n/test/dom/test_domloc_setAttributes.html
rename to dom/l10n/tests/mochitest/dom_localization/test_setAttributes.html
rename from intl/l10n/test/dom/test_domloc_translateElements.html
rename to dom/l10n/tests/mochitest/dom_localization/test_translateElements.html
rename from intl/l10n/test/dom/test_domloc_translateFragment.html
rename to dom/l10n/tests/mochitest/dom_localization/test_translateFragment.html
rename from intl/l10n/test/dom/test_domloc_translateRoots.html
rename to dom/l10n/tests/mochitest/dom_localization/test_translateRoots.html
rename from dom/l10n/tests/mochitest/test_domoverlays_attributes.html
rename to dom/l10n/tests/mochitest/domoverlays/test_attributes.html
rename from dom/l10n/tests/mochitest/test_domoverlays.xul
rename to dom/l10n/tests/mochitest/domoverlays/test_domoverlays.xul
rename from dom/l10n/tests/mochitest/test_domoverlays_extra_text_markup.html
rename to dom/l10n/tests/mochitest/domoverlays/test_extra_text_markup.html
rename from dom/l10n/tests/mochitest/test_domoverlays_functional_children.html
rename to dom/l10n/tests/mochitest/domoverlays/test_functional_children.html
rename from dom/l10n/tests/mochitest/test_domoverlays_text_children.html
rename to dom/l10n/tests/mochitest/domoverlays/test_text_children.html
rename from intl/l10n/test/mochitest.ini
rename to dom/l10n/tests/mochitest/mochitest.ini
--- a/intl/l10n/test/mochitest.ini
+++ b/dom/l10n/tests/mochitest/mochitest.ini
@@ -1,1 +1,1 @@
-[dom/test_docl10n_unpriv_iframe.html]
+[document_l10n/test_unpriv_iframe.html]
--- a/intl/l10n/moz.build
+++ b/intl/l10n/moz.build
@@ -23,15 +23,13 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'locale'
 
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
 
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 
 SPHINX_TREES['l10n'] = 'docs'
 
 FINAL_LIBRARY = 'xul'
--- a/intl/l10n/test/chrome.ini
+++ b/intl/l10n/test/chrome.ini
@@ -1,31 +1,6 @@
-[dom/test_domloc_attr_sanitized.html]
-[dom/test_domloc_getAttributes.html]
-[dom/test_domloc_setAttributes.html]
-[dom/test_domloc_translateElements.html]
-[dom/test_domloc_translateFragment.html]
-[dom/test_domloc_connectRoot.html]
-[dom/test_domloc_disconnectRoot.html]
-[dom/test_domloc_repeated_l10nid.html]
-[dom/test_domloc_translateRoots.html]
-[dom/test_domloc_mutations.html]
-[dom/test_domloc_overlay.html]
-[dom/test_domloc_overlay_repeated.html]
-[dom/test_domloc_overlay_missing_all.html]
-[dom/test_domloc_overlay_missing_children.html]
-[dom/test_domloc_overlay_sanitized.html]
-[dom/test_domloc.xul]
-
 [dom/test_mozdom_translateElements.html]
 [dom/test_mozdom_translateFragment.html]
 [dom/test_mozdom_translateRoots.html]
 
-[dom/test_docl10n.xul]
-[dom/test_docl10n_initialize_after_parse.xhtml]
-[dom/test_docl10n_initialize_after_parse.xul]
-[dom/test_docl10n.xhtml]
-[dom/test_docl10n.html]
-[dom/test_docl10n_ready_rejected.html]
-[dom/test_docl10n_removeResourceIds.html]
-
 [dom_overlays/test_same_id.html]
 [dom_overlays/test_same_id_args.html]