Bug 1236991 - bonus: move all the tests into the component dir instead of cluttering up browser/.../tests/general, r=enndeakin
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 12 Apr 2016 22:32:07 +0100
changeset 331267 1418ce4fcd0b1b589840c2282abf8c723a226446
parent 331266 a91d2ac5476f3fe723fbcb96f7bfaf65c91ca237
child 331268 d73c2e06cc47b7512adf65a0c1adf7d447ad99f8
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenndeakin
bugs1236991
milestone48.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 1236991 - bonus: move all the tests into the component dir instead of cluttering up browser/.../tests/general, r=enndeakin MozReview-Commit-ID: O3HBNthHL2
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_bug329212.js
browser/base/content/test/general/browser_bug331772_xul_tooltiptext_in_html.js
browser/base/content/test/general/browser_bug561623.js
browser/base/content/test/general/browser_bug581947.js
browser/base/content/test/general/xul_tooltiptext.xhtml
toolkit/components/tooltiptext/moz.build
toolkit/components/tooltiptext/tests/browser.ini
toolkit/components/tooltiptext/tests/browser_bug329212.js
toolkit/components/tooltiptext/tests/browser_bug331772_xul_tooltiptext_in_html.js
toolkit/components/tooltiptext/tests/browser_bug561623.js
toolkit/components/tooltiptext/tests/browser_bug581947.js
toolkit/components/tooltiptext/tests/browser_input_file_tooltips.js
toolkit/components/tooltiptext/tests/title_test.svg
toolkit/components/tooltiptext/tests/xul_tooltiptext.xhtml
toolkit/content/tests/browser/browser.ini
toolkit/content/tests/browser/browser_input_file_tooltips.js
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -113,17 +113,16 @@ support-files =
   test_no_mcb_on_http_site_font.css
   test_no_mcb_on_http_site_font2.html
   test_no_mcb_on_http_site_font2.css
   test_mcb_redirect.html
   test_mcb_redirect_image.html
   test_mcb_double_redirect_image.html
   test_mcb_redirect.js
   test_mcb_redirect.sjs
-  xul_tooltiptext.xhtml
   file_bug1045809_1.html
   file_bug1045809_2.html
   file_csp_block_all_mixedcontent.html
   file_csp_block_all_mixedcontent.js
   !/toolkit/components/passwordmgr/test/browser/form_basic.html
   !/toolkit/components/passwordmgr/test/browser/insecure_test.html
   !/toolkit/components/passwordmgr/test/browser/insecure_test_subframe.html
   !/toolkit/content/tests/browser/common/mockTransfer.js
@@ -171,18 +170,16 @@ skip-if = os == "mac" # The Fitt's Law b
 [browser_blob-channelname.js]
 [browser_bookmark_popup.js]
 skip-if = (os == "linux" && debug) # mouseover not reliable on linux debug builds
 [browser_bookmark_titles.js]
 skip-if = buildapp == 'mulet' || toolkit == "windows" # Disabled on Windows due to frequent failures (bugs 825739, 841341)
 [browser_bug304198.js]
 [browser_bug321000.js]
 skip-if = true # browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
-[browser_bug329212.js]
-[browser_bug331772_xul_tooltiptext_in_html.js]
 [browser_bug356571.js]
 [browser_bug380960.js]
 [browser_bug386835.js]
 [browser_bug406216.js]
 [browser_bug408415.js]
 [browser_bug409481.js]
 [browser_bug409624.js]
 [browser_bug413915.js]
@@ -225,34 +222,32 @@ skip-if = buildapp == 'mulet' || e10s # 
 [browser_bug537474.js]
 [browser_bug550565.js]
 [browser_bug553455.js]
 skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works on mulet?
 [browser_bug555224.js]
 [browser_bug555767.js]
 [browser_bug556061.js]
 [browser_bug559991.js]
-[browser_bug561623.js]
 [browser_bug561636.js]
 [browser_bug562649.js]
 [browser_bug563588.js]
 [browser_bug565575.js]
 [browser_bug565667.js]
 skip-if = toolkit != "cocoa"
 [browser_bug567306.js]
 [browser_bug575561.js]
 [browser_bug575830.js]
 [browser_bug577121.js]
 [browser_bug578534.js]
 [browser_bug579872.js]
 [browser_bug580638.js]
 [browser_bug580956.js]
 [browser_bug581242.js]
 [browser_bug581253.js]
-[browser_bug581947.js]
 [browser_bug585558.js]
 [browser_bug585785.js]
 [browser_bug585830.js]
 [browser_bug590206.js]
 [browser_bug592338.js]
 [browser_bug594131.js]
 [browser_bug595507.js]
 [browser_bug596687.js]
--- a/toolkit/components/tooltiptext/moz.build
+++ b/toolkit/components/tooltiptext/moz.build
@@ -1,15 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; 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 += ['tests/browser.ini']
 
 EXTRA_COMPONENTS += [
     'TooltipTextProvider.js',
     'TooltipTextProvider.manifest',
 ]
 
 with Files('**'):
     BUG_COMPONENT = ('Toolkit', 'General')
new file mode 100644
--- /dev/null
+++ b/toolkit/components/tooltiptext/tests/browser.ini
@@ -0,0 +1,7 @@
+[browser_bug329212.js]
+support-files = title_test.svg
+[browser_bug331772_xul_tooltiptext_in_html.js]
+support-files = xul_tooltiptext.xhtml
+[browser_bug561623.js]
+[browser_bug581947.js]
+[browser_input_file_tooltips.js]
rename from browser/base/content/test/general/browser_bug329212.js
rename to toolkit/components/tooltiptext/tests/browser_bug329212.js
--- a/browser/base/content/test/general/browser_bug329212.js
+++ b/toolkit/components/tooltiptext/tests/browser_bug329212.js
@@ -1,14 +1,14 @@
 "use strict";
 
 add_task(function*() {
   yield BrowserTestUtils.withNewTab({
     gBrowser,
-    url: "http://mochi.test:8888/browser/browser/base/content/test/general/title_test.svg",
+    url: "http://mochi.test:8888/browser/toolkit/components/tooltiptext/tests/title_test.svg",
   }, function*(browser) {
     yield ContentTask.spawn(browser, "", function() {
       let tttp = Cc["@mozilla.org/embedcomp/default-tooltiptextprovider;1"]
                  .getService(Ci.nsITooltipTextProvider);
       function checkElement(id, expectedTooltipText) {
         let el = content.document.getElementById(id);
         let textObj = {};
         let shouldHaveTooltip = expectedTooltipText !== null;
rename from browser/base/content/test/general/browser_bug331772_xul_tooltiptext_in_html.js
rename to toolkit/components/tooltiptext/tests/browser_bug331772_xul_tooltiptext_in_html.js
--- a/browser/base/content/test/general/browser_bug331772_xul_tooltiptext_in_html.js
+++ b/toolkit/components/tooltiptext/tests/browser_bug331772_xul_tooltiptext_in_html.js
@@ -1,15 +1,15 @@
 /**
  * Tests that the tooltiptext attribute is used for XUL elements in an HTML doc.
  */
 add_task(function*() {
   yield BrowserTestUtils.withNewTab({
     gBrowser,
-    url: "http://mochi.test:8888/browser/browser/base/content/test/general/xul_tooltiptext.xhtml",
+    url: "http://mochi.test:8888/browser/toolkit/components/tooltiptext/tests/xul_tooltiptext.xhtml",
   }, function*(browser) {
     yield ContentTask.spawn(browser, "", function() {
       let textObj = {};
       let tttp = Cc["@mozilla.org/embedcomp/default-tooltiptextprovider;1"]
                  .getService(Ci.nsITooltipTextProvider);
       let xulToolbarButton = content.document.getElementById("xulToolbarButton");
       ok(tttp.getNodeText(xulToolbarButton, textObj, {}), "should get tooltiptext");
       is(textObj.value, "XUL tooltiptext");
rename from browser/base/content/test/general/browser_bug561623.js
rename to toolkit/components/tooltiptext/tests/browser_bug561623.js
rename from browser/base/content/test/general/browser_bug581947.js
rename to toolkit/components/tooltiptext/tests/browser_bug581947.js
rename from toolkit/content/tests/browser/browser_input_file_tooltips.js
rename to toolkit/components/tooltiptext/tests/browser_input_file_tooltips.js
copy from browser/base/content/test/general/title_test.svg
copy to toolkit/components/tooltiptext/tests/title_test.svg
rename from browser/base/content/test/general/xul_tooltiptext.xhtml
rename to toolkit/components/tooltiptext/tests/xul_tooltiptext.xhtml
--- a/toolkit/content/tests/browser/browser.ini
+++ b/toolkit/content/tests/browser/browser.ini
@@ -9,17 +9,16 @@ support-files =
 [browser_bug594509.js]
 [browser_bug982298.js]
 [browser_bug1198465.js]
 [browser_contentTitle.js]
 [browser_default_image_filename.js]
 [browser_f7_caret_browsing.js]
 skip-if = e10s
 [browser_findbar.js]
-[browser_input_file_tooltips.js]
 [browser_isSynthetic.js]
 support-files =
   empty.png
 [browser_keyevents_during_autoscrolling.js]
 [browser_save_resend_postdata.js]
 support-files =
   common/mockTransfer.js
   data/post_form_inner.sjs