bug 1254091 convert test_mousecapture.xul to mochitest-plain so we can run it in e10s, r=enndeakin
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 18 Mar 2016 12:48:22 +0000
changeset 313363 18fca568ae42914a5e3fe3bea594172e09a54070
parent 313362 64a06fbc559d953d09d2681114b5e5ec6495416a
child 313364 3169edcea9d93557be4168312fb784e86706d944
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenndeakin
bugs1254091
milestone48.0a1
bug 1254091 convert test_mousecapture.xul to mochitest-plain so we can run it in e10s, r=enndeakin MozReview-Commit-ID: 8xqtaIjafSw
toolkit/content/tests/chrome/chrome.ini
toolkit/content/tests/chrome/test_mousecapture.xul
toolkit/content/tests/mochitest/mochitest.ini
toolkit/content/tests/mochitest/test_mousecapture.xhtml
toolkit/content/tests/moz.build
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -113,18 +113,16 @@ skip-if = os == 'linux' && !debug #Bug 1
 [test_menuchecks.xul]
 [test_menuitem_blink.xul]
 [test_menuitem_commands.xul]
 [test_menulist.xul]
 skip-if = buildapp == 'mulet'
 [test_menulist_keynav.xul]
 [test_menulist_null_value.xul]
 [test_menulist_paging.xul]
-[test_mousecapture.xul]
-skip-if = buildapp == 'mulet'
 [test_mousescroll.xul]
 skip-if = buildapp == 'mulet'
 [test_notificationbox.xul]
 skip-if = buildapp == 'mulet'
 [test_panel.xul]
 [test_panelfrommenu.xul]
 skip-if = buildapp == 'mulet'
 [test_popup_anchor.xul]
new file mode 100644
--- /dev/null
+++ b/toolkit/content/tests/mochitest/mochitest.ini
@@ -0,0 +1,3 @@
+[test_mousecapture.xhtml]
+skip-if = toolkit == "android"
+
rename from toolkit/content/tests/chrome/test_mousecapture.xul
rename to toolkit/content/tests/mochitest/test_mousecapture.xhtml
--- a/toolkit/content/tests/chrome/test_mousecapture.xul
+++ b/toolkit/content/tests/mochitest/test_mousecapture.xhtml
@@ -1,20 +1,23 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+<!DOCTYPE HTML>
+<html xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>Mouse Capture Tests</title>
+  <link rel="stylesheet" href="chrome://global/skin/" type="text/css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> 
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script> 
+</head>
+<body id="body" xmlns="http://www.w3.org/1999/xhtml">
+  <p id="display"/><div id="content" style="display: none"/><pre id="test"/>
 
-<window title="Mouse Capture Tests" align="start"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-
-<script>
-<![CDATA[
+<script><![CDATA[
 
 SimpleTest.expectAssertions(6, 12);
 
 SimpleTest.waitForExplicitFinish();
 
 var captureRetargetMode = false;
 var cachedMouseDown = null;
 var previousWidth = 0, originalWidth = 0;
@@ -261,40 +264,41 @@ function runCaptureTest(element, callbac
   win.removeEventListener("mousemove", mouseMoved, false);
 }
 
 SimpleTest.waitForFocus(runTests);
 
 ]]>
 </script>
 
-<tooltip id="tooltip">
-  <label value="Test"/>
-</tooltip>
+<xul:vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" align="start">
+  <tooltip id="tooltip">
+    <label value="Test"/>
+  </tooltip>
 
-<hbox id="splitterbox" style="margin-top: 5px;" onmousedown="this.setCapture()">
-  <hbox id="leftbox" width="100" flex="1"/>
-  <splitter id="splitter" height="5"/>
-  <hbox id="rightbox" width="100" flex="1"/>
-</hbox>
+  <hbox id="splitterbox" style="margin-top: 5px;" onmousedown="this.setCapture()">
+    <hbox id="leftbox" width="100" flex="1"/>
+    <splitter id="splitter" height="5"/>
+    <hbox id="rightbox" width="100" flex="1"/>
+  </hbox>
 
-<vbox id="custom" width="10" height="10" onmousedown="this.setCapture(); cachedMouseDown = event;"/>
-<vbox id="custom2" width="10" height="10" onmousedown="this.setCapture(); document.releaseCapture();"/>
-<vbox id="custom3" width="10" height="10" onmousedown="this.setCapture(); this.releaseCapture();"/>
-<vbox id="custom4" width="10" height="10" onmousedown="this.setCapture();"
-                                          onmousemove="this.releaseCapture();"/>
-<hbox id="custom5" width="40" height="40"
-      onmousedown="this.setCapture(captureRetargetMode);">
-  <spacer id="custom5spacer" width="5"/>
-  <hbox id="custom5inner" width="35" height="35"/>
-</hbox>
-<vbox id="custom6" width="10" height="10"
-      onmousedown="document.createElement('hbox').setCapture();"/>
+  <vbox id="custom" width="10" height="10" onmousedown="this.setCapture(); cachedMouseDown = event;"/>
+  <vbox id="custom2" width="10" height="10" onmousedown="this.setCapture(); document.releaseCapture();"/>
+  <vbox id="custom3" width="10" height="10" onmousedown="this.setCapture(); this.releaseCapture();"/>
+  <vbox id="custom4" width="10" height="10" onmousedown="this.setCapture();"
+                                            onmousemove="this.releaseCapture();"/>
+  <hbox id="custom5" width="40" height="40"
+        onmousedown="this.setCapture(captureRetargetMode);">
+    <spacer id="custom5spacer" width="5"/>
+    <hbox id="custom5inner" width="35" height="35"/>
+  </hbox>
+  <vbox id="custom6" width="10" height="10"
+        onmousedown="document.createElement('hbox').setCapture();"/>
+</xul:vbox>
 
-<hbox>
   <iframe width="100" height="100"
           src="data:text/html,%3Cbody style%3D'font-size%3A 40pt%3B'%3E.%3Cb id%3D'b'%3EThis%3C/b%3E is some text%3Cdiv id='fixed' style='position: fixed; left: 55px; top: 5px; width: 10px; height: 10px'%3E.%3C/div%3E%3C/body%3E"/>
 
   <iframe width="100" height="100"
           src="data:text/html,%3Cframeset cols='50%, 50%'%3E%3Cframe src='about:blank'%3E%3Cframe src='about:blank'%3E%3C/frameset%3E"/>
 
   <iframe width="100" height="100"
           src="data:text/html,%3Cinput id='input' onfocus='this.style.display = &quot;none&quot;' style='float: left;'>"/>
@@ -306,22 +310,18 @@ SimpleTest.waitForFocus(runTests);
     <option id="option4">Four</option>
     <option id="option5">Five</option>
     <option id="option6">Six</option>
     <option id="option7">Seven</option>
     <option id="option8">Eight</option>
     <option id="option9">Nine</option>
     <option id="option10">Ten</option>
   </select>
-</hbox>
 
-<hbox>
   <img id="image" xmlns="http://www.w3.org/1999/xhtml"
        onmousedown="this.setCapture();" onmouseup="this.releaseCapture();"
        ondragstart="ok(false, 'should not get a drag when a setCapture is active');"
        src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAG0lEQVR42mP8z0A%2BYKJA76jmUc2jmkc1U0EzACKcASfOgGoMAAAAAElFTkSuQmCC"/>
-</hbox>
 
-<body id="body" xmlns="http://www.w3.org/1999/xhtml">
-  <p id="display"/><div id="content" style="display: none"/><pre id="test"/>
 </body>
 
-</window>
+</html>
+
--- a/toolkit/content/tests/moz.build
+++ b/toolkit/content/tests/moz.build
@@ -8,9 +8,12 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh
 
 BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
 
 MOCHITEST_CHROME_MANIFESTS += [
     'chrome/chrome.ini',
     'widgets/chrome.ini',
 ]
 
-MOCHITEST_MANIFESTS += ['widgets/mochitest.ini']
+MOCHITEST_MANIFESTS += [
+    'mochitest/mochitest.ini',
+    'widgets/mochitest.ini',
+]