From 7544bd8298555da4dba96efaa2b9eedfb338ab9b Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Tue, 8 Oct 2019 17:29:16 +0000
Subject: [PATCH] Bug 1586836 - remove <xul:textbox> from a11y tests r=MarcoZ

Differential Revision: https://phabricator.services.mozilla.com/D48576

--HG--
extra : moz-landing-system : lando
---
 .../tests/mochitest/actions/test_general.xul  |  3 +-
 accessible/tests/mochitest/events/a11y.ini    |  1 -
 .../mochitest/events/test_caretmove.html      | 13 +++-
 .../tests/mochitest/events/test_caretmove.xul | 70 -------------------
 .../mochitest/events/test_focus_tabbox.xul    |  7 +-
 .../tests/mochitest/name/test_general.xul     |  5 +-
 6 files changed, 19 insertions(+), 80 deletions(-)
 delete mode 100644 accessible/tests/mochitest/events/test_caretmove.xul

diff --git a/accessible/tests/mochitest/actions/test_general.xul b/accessible/tests/mochitest/actions/test_general.xul
index d8dfeb5fe627..956688afa94a 100644
--- a/accessible/tests/mochitest/actions/test_general.xul
+++ b/accessible/tests/mochitest/actions/test_general.xul
@@ -7,6 +7,7 @@
 
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="nsIAccessible actions testing">
 
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
@@ -156,7 +157,7 @@
              tabindex="0"/>
       <hbox>
         <label id="name_entry_label" value="Name" control="name_entry"/>
-        <textbox id="name_entry"/>
+        <html:input id="name_entry"/>
       </hbox>
       <toolbarbutton id="toolbarbutton">
         <label id="toolbarbutton_label">toolbarbutton</label>
diff --git a/accessible/tests/mochitest/events/a11y.ini b/accessible/tests/mochitest/events/a11y.ini
index 9a10a7fa016b..a65141d27762 100644
--- a/accessible/tests/mochitest/events/a11y.ini
+++ b/accessible/tests/mochitest/events/a11y.ini
@@ -15,7 +15,6 @@ support-files =
 [test_bug1322593.html]
 [test_bug1322593-2.html]
 [test_caretmove.html]
-[test_caretmove.xul]
 [test_coalescence.html]
 [test_contextmenu.html]
 [test_descrchange.html]
diff --git a/accessible/tests/mochitest/events/test_caretmove.html b/accessible/tests/mochitest/events/test_caretmove.html
index 18250e1dc6cb..ce4a0cf3b4ee 100644
--- a/accessible/tests/mochitest/events/test_caretmove.html
+++ b/accessible/tests/mochitest/events/test_caretmove.html
@@ -39,7 +39,6 @@
      */
     var gQueue = null;
 
-    // gA11yEventDumpID = "eventdump"; // debug stuff
     // gA11yEventDumpToConsole = true;
 
     function doTests() {
@@ -52,6 +51,15 @@
       gQueue.push(new synthClick(id, new caretMoveChecker(0, id)));
       gQueue.push(new synthRightKey(id, new caretMoveChecker(1, id)));
 
+      if (!MAC) {
+        gQueue.push(new synthSelectAll(id, new caretMoveChecker(5, id)));
+        gQueue.push(new synthHomeKey(id, new caretMoveChecker(0, id)));
+        gQueue.push(new synthRightKey(id, new caretMoveChecker(1, id)));
+      }
+      else {
+        todo(false, "Make these tests pass on OSX (bug 650294)");
+      }
+
       id = "textarea";
       gQueue.push(new synthClick(id, new caretMoveChecker(0, id)));
       gQueue.push(new synthRightKey(id, new caretMoveChecker(1, id)));
@@ -119,6 +127,7 @@
   </pre>
 
   <input id="textbox" value="hello"/>
+
   <textarea id="textarea">text<br>text</textarea>
   <p id="p" contentEditable="true"><span>text</span><br/>text</p>
   <div id="div" contentEditable="true"><p id="p1_in_div">text</p><p id="p2_in_div">text</p></div>
@@ -129,7 +138,5 @@
   <p contentEditable="true" id="test4"><span id="test4_span"></span></p>
 
   <textarea id="textarea_wrapped" cols="5">hey friend</textarea>
-
-  <div id="eventdump"></div>
 </body>
 </html>
diff --git a/accessible/tests/mochitest/events/test_caretmove.xul b/accessible/tests/mochitest/events/test_caretmove.xul
deleted file mode 100644
index cc1d043d8158..000000000000
--- a/accessible/tests/mochitest/events/test_caretmove.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="Caret move event testing">
-
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
-
-  <script type="application/javascript"
-          src="../common.js" />
-  <script type="application/javascript"
-          src="../events.js" />
-
-  <script type="application/javascript">
-    /**
-     * Do tests.
-     */
-
-    //gA11yEventDumpID = "eventdump"; // debug stuff
-    //gA11yEventDumpToConsole = true;
-
-    var gQueue = null;
-
-    function doTests()
-    {
-      if (MAC) {
-        todo(false, "Make these tests pass on OSX (bug 650294)");
-        SimpleTest.finish();
-        return;
-      }
-
-      gQueue = new eventQueue(EVENT_TEXT_CARET_MOVED);
-
-      var id = "textbox";
-      var input = getNode(id).inputField;
-      gQueue.push(new synthFocus(id, new caretMoveChecker(5, input)));
-      gQueue.push(new synthSelectAll(id, new caretMoveChecker(5, input)));
-      gQueue.push(new synthHomeKey(id, new caretMoveChecker(0, input)));
-      gQueue.push(new synthRightKey(id, new caretMoveChecker(1, input)));
-
-      gQueue.invoke(); // Will call SimpleTest.finish();
-    }
-
-    SimpleTest.waitForExplicitFinish();
-    addA11yLoadEvent(doTests);
-  </script>
-
-  <hbox flex="1" style="overflow: auto;">
-    <body xmlns="http://www.w3.org/1999/xhtml">
-      <a target="_blank"
-         href="https://bugzilla.mozilla.org/show_bug.cgi?id=634240"
-         title="No caret move events are fired for XUL textbox accessible">
-        Mozilla Bug 634240
-      </a>
-      <p id="display"></p>
-      <div id="content" style="display: none"></div>
-      <pre id="test">
-      </pre>
-    </body>
-
-    <vbox flex="1">
-      <textbox id="textbox" value="hello"/>
-
-      <vbox id="eventdump"/>
-    </vbox>
-  </hbox>
-</window>
diff --git a/accessible/tests/mochitest/events/test_focus_tabbox.xul b/accessible/tests/mochitest/events/test_focus_tabbox.xul
index e3d913a24185..1b808831dc56 100644
--- a/accessible/tests/mochitest/events/test_focus_tabbox.xul
+++ b/accessible/tests/mochitest/events/test_focus_tabbox.xul
@@ -4,6 +4,7 @@
                  type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="Tabbox focus testing">
 
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
@@ -34,11 +35,11 @@
       // Test focus events.
       gQueue = new eventQueue();
 
-      var textbox = getNode("textbox").inputField;
+      var input = getNode("input");
       gQueue.push(new synthClick("tab1", new focusChecker("tab1")));
       gQueue.push(new synthTab("tab1", new focusChecker("checkbox1")));
       gQueue.push(new synthKey("tab1", "VK_TAB", { ctrlKey: true },
-                               new focusChecker(textbox)));
+                               new focusChecker(input)));
       gQueue.push(new synthKey("tab2", "VK_TAB", { ctrlKey: true },
                                new focusChecker("tab3")));
       gQueue.push(new synthKey("tab3", "VK_TAB", { ctrlKey: true },
@@ -87,7 +88,7 @@
             <label value="Label After checkboxes" />
           </tabpanel>
           <tabpanel orient="vertical">
-            <textbox id="textbox" />
+            <html:input id="input" />
           </tabpanel>
           <tabpanel orient="vertical">
             <description>Tab 3 content</description>
diff --git a/accessible/tests/mochitest/name/test_general.xul b/accessible/tests/mochitest/name/test_general.xul
index a6e91c8e7f26..8777b3c85663 100644
--- a/accessible/tests/mochitest/name/test_general.xul
+++ b/accessible/tests/mochitest/name/test_general.xul
@@ -7,6 +7,7 @@
 
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="Accessibility Name Calculating Test.">
 
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
@@ -231,8 +232,8 @@
   <checkbox id="rememberHistoryDays"
             label="Remember "
             aria-labelledby="rememberHistoryDays historyDays rememberAfter"/>
-  <textbox id="historyDays" value="3"
-           aria-labelledby="rememberHistoryDays historyDays rememberAfter"/>
+  <html:input id="historyDays" value="3"
+              aria-labelledby="rememberHistoryDays historyDays rememberAfter"/>
   <label id="rememberAfter">days</label>
 
   <!-- the name from subtree, mixed content -->