Bug 282097 - Part 8: Clean up test expectations. r=masayuki
authorJ. Ryan Stinnett <jryans@gmail.com>
Wed, 10 Jul 2013 09:13:14 -0500
changeset 138144 993613b4491443a6764b80f2bbeefd2457a28168
parent 138143 a00e830672350da59cfeab683c9aa61c09997bce
child 138145 116295f5b522a5be506d942319dc47c8d5bbf391
push id30839
push userryanvm@gmail.com
push dateThu, 11 Jul 2013 14:25:52 +0000
treeherdermozilla-inbound@0daef1c8ef64 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs282097
milestone25.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 282097 - Part 8: Clean up test expectations. r=masayuki
editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
toolkit/content/tests/chrome/Makefile.in
--- a/editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
+++ b/editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
@@ -180,25 +180,27 @@ function runTests()
     // Delete key:
     //   If editor is readonly, it doesn't consume.
     //   If editor is editable, delete is consumed.
     //   Otherwise, editor doesn't consume the event but the native key
     //   bindings on nsTextControlFrame may consume it.
     reset("");
     synthesizeKey("VK_DELETE", { });
     // Linux: native handler
+    // Mac: cmd_deleteCharForward
     check(aDescription + "Delete",
-          true, true, !aIsReadonly || kIsLinux);
+          true, true, !aIsReadonly || kIsLinux || kIsMac);
 
     reset("");
     // Win: cmd_cutOrDelete
     // Linux: cmd_cut
+    // Mac: cmd_deleteCharForward
     synthesizeKey("VK_DELETE", { shiftKey: true });
     check(aDescription + "Shift+Delete",
-          true, true, kIsWin || kIsLinux);
+          true, true, true);
 
     reset("");
     synthesizeKey("VK_DELETE", { ctrlKey: true });
     // Win: cmd_deleteWordForward
     // Linux: cmd_copy
     check(aDescription + "Ctrl+Delete",
           true, true, kIsWin || kIsLinux);
 
--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -31,18 +31,16 @@ MOCHITEST_CHROME_FILES = \
 		test_bug409624.xul \
 		bug409624_window.xul \
 		test_bug418874.xul \
 		bug429723_window.xul \
 		test_bug429723.xul \
 		test_bug437844.xul \
 		bug451286_window.xul \
 		test_bug451286.xul \
-		bug451540_window.xul \
-		test_bug451540.xul \
 		test_bug471776.xul \
 		test_bug570192.xul \
 		test_bug624329.xul \
 		bug624329_window.xul \
 		test_popup_preventdefault_chrome.xul \
 		window_popup_preventdefault_chrome.xul \
 		test_largemenu.xul \
 		window_largemenu.xul \
@@ -162,17 +160,19 @@ MOCHITEST_CHROME_FILES = \
 		$(NULL)
 
 # test_panel_focus.xul won't work if the Full Keyboard Access preference is set to
 # textboxes and lists only, so skip this test on Mac
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOCHITEST_CHROME_FILES += test_panel_focus.xul \
                window_panel_focus.xul \
                test_chromemargin.xul \
-               window_chromemargin.xul
+               window_chromemargin.xul \
+               bug451540_window.xul \
+               test_bug451540.xul
 else
 MOCHITEST_CHROME_FILES += test_autocomplete_mac_caret.xul
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 MOCHITEST_CHROME_FILES += $(filter disabled-temporarily, test_cursorsnap.xul) \
 		window_cursorsnap_dialog.xul \
 		window_cursorsnap_wizard.xul