From a06e8de5c81c15e24235f8001483abe125f6b551 Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Fri, 3 Oct 2014 15:33:50 +0900 Subject: [PATCH] Bug 975383 part.9 Remove compositionupdate event dispatchers from all tests r=smaug --- editor/libeditor/tests/test_bug1026397.html | 1 - editor/libeditor/tests/test_bug697842.html | 2 - editor/libeditor/tests/test_bug795785.html | 2 - ...t_contenteditable_text_input_handling.html | 1 - layout/base/tests/bug613807-1.html | 3 - .../Harness_sanity/test_sanityEventUtils.html | 2 +- .../mochitest/tests/SimpleTest/EventUtils.js | 3 +- .../file_autocomplete_with_composition.js | 47 +++------ .../content/tests/chrome/findbar_window.xul | 1 - widget/tests/test_assign_event_data.html | 7 -- widget/tests/test_imestate.html | 3 - .../test_input_events_on_deactive_window.xul | 1 - .../window_composition_text_querycontent.xul | 99 ------------------- 13 files changed, 15 insertions(+), 157 deletions(-) diff --git a/editor/libeditor/tests/test_bug1026397.html b/editor/libeditor/tests/test_bug1026397.html index 5ac95d3d891..35261128844 100644 --- a/editor/libeditor/tests/test_bug1026397.html +++ b/editor/libeditor/tests/test_bug1026397.html @@ -47,7 +47,6 @@ function runTests() } synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: aInsertString }); synthesizeText( { "composition": { "string": aInsertString, diff --git a/editor/libeditor/tests/test_bug697842.html b/editor/libeditor/tests/test_bug697842.html index 9a6700b3969..ac1ee8f59e6 100644 --- a/editor/libeditor/tests/test_bug697842.html +++ b/editor/libeditor/tests/test_bug697842.html @@ -53,7 +53,6 @@ function runTests() // input first character composingString = "\u306B"; - synthesizeComposition({ type: "compositionupdate", data: composingString }); synthesizeText( { "composition": { "string": composingString, @@ -67,7 +66,6 @@ function runTests() // input second character composingString = "\u306B\u3085"; - synthesizeComposition({ type: "compositionupdate", data: composingString }); synthesizeText( { "composition": { "string": composingString, diff --git a/editor/libeditor/tests/test_bug795785.html b/editor/libeditor/tests/test_bug795785.html index aedffa76278..1b311a8b09e 100644 --- a/editor/libeditor/tests/test_bug795785.html +++ b/editor/libeditor/tests/test_bug795785.html @@ -122,7 +122,6 @@ function doCompositionTest(aElement, aElementDescription, aCallback) "\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u3088\u308a" + "\u77ed\u6642\u9593\u3067\u7c21\u5358\u306b\u4f5c\u6210\u3067" + "\u304d\u307e\u3059\u3002"; - synthesizeComposition({ type: "compositionupdate", data: str }); synthesizeText({ composition: { string: str, @@ -135,7 +134,6 @@ function doCompositionTest(aElement, aElementDescription, aCallback) hitEventLoop(function () { isnot(aElement.scrollTop, 0, aElementDescription + " was not scrolled by composition"); - synthesizeComposition({ type: "compositionupdate", data: "" }); synthesizeText({ composition: { string: "", clauses: [ { length: 0, attr: 0 } ] }, caret: { start: 0, length: 0 } diff --git a/editor/libeditor/tests/test_contenteditable_text_input_handling.html b/editor/libeditor/tests/test_contenteditable_text_input_handling.html index 79f9553cc9b..31c9054bbe9 100644 --- a/editor/libeditor/tests/test_contenteditable_text_input_handling.html +++ b/editor/libeditor/tests/test_contenteditable_text_input_handling.html @@ -222,7 +222,6 @@ function runTests() // start composition synthesizeComposition({ type: "compositionstart" }); // input first character - synthesizeComposition({ type: "compositionupdate", data: "\u3089" }); synthesizeText( { "composition": { "string": "\u3089", diff --git a/layout/base/tests/bug613807-1.html b/layout/base/tests/bug613807-1.html index d56634238d5..08f516f890b 100644 --- a/layout/base/tests/bug613807-1.html +++ b/layout/base/tests/bug613807-1.html @@ -50,7 +50,6 @@ synthesizeComposition({ type: "compositionstart" }); // input raw characters - synthesizeComposition({ type: "compositionupdate", data: "\u306D" }); synthesizeText( { composition: { string: "\u306D", @@ -60,7 +59,6 @@ }, caret: { start: 1, length: 0 } }); - synthesizeComposition({ type: "compositionupdate", data: "\u306D\u3053" }); synthesizeText( { composition: { string: "\u306D\u3053", @@ -72,7 +70,6 @@ }); // convert - synthesizeComposition({ type: "compositionupdate", data: "\u732B" }); synthesizeText( { composition: { string: "\u732B", diff --git a/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html b/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html index 69261a3f6bb..76e32d9d774 100644 --- a/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html +++ b/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html @@ -124,7 +124,7 @@ function starttest() { check = false; window.addEventListener("compositionupdate", function() { check = true; }, false); synthesizeComposition({ type: "compositionupdate", data: "a" }); - is(check, true, 'synthesizeComposition() should dispatch compositionupdate'); + is(check, false, 'synthesizeComposition() should not dispatch compositionupdate without error'); check = false; window.addEventListener("text", function() { check = true; }, false); diff --git a/testing/mochitest/tests/SimpleTest/EventUtils.js b/testing/mochitest/tests/SimpleTest/EventUtils.js index de8148a38d4..6412cd6d10a 100644 --- a/testing/mochitest/tests/SimpleTest/EventUtils.js +++ b/testing/mochitest/tests/SimpleTest/EventUtils.js @@ -870,8 +870,7 @@ const COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT = 0x05; * * @param aEvent The composition event information. This must * have |type| member. The value must be - * "compositionstart", "compositionend" or - * "compositionupdate". + * "compositionstart" or "compositionend". * And also this may have |data| and |locale| which * would be used for the value of each property of * the composition event. Note that the data would diff --git a/toolkit/content/tests/chrome/file_autocomplete_with_composition.js b/toolkit/content/tests/chrome/file_autocomplete_with_composition.js index ea3deab3279..d8e67ebe719 100644 --- a/toolkit/content/tests/chrome/file_autocomplete_with_composition.js +++ b/toolkit/content/tests/chrome/file_autocomplete_with_composition.js @@ -88,7 +88,6 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { execute: function (aWindow) { synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow); synthesizeComposition({ type: "compositionstart" }, aWindow); - synthesizeComposition({ type: "compositionupdate", data: "M" }, aWindow); synthesizeText( { "composition": { "string": "M", @@ -101,10 +100,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "M", searchString: "" }, - { description: "compositionupdate shouldn't open the popup", + { description: "modifying composition string shouldn't open the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "Mo" }, aWindow); synthesizeText( { "composition": { "string": "Mo", @@ -141,7 +139,6 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { execute: function (aWindow) { synthesizeKey("z", { type: "keydown" }, aWindow); synthesizeComposition({ type: "compositionstart" }, aWindow); - synthesizeComposition({ type: "compositionupdate", data: "z" }, aWindow); synthesizeText( { "composition": { "string": "z", @@ -154,10 +151,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Moz", searchString: "Mo" }, - { description: "compositionupdate shouldn't reopen the popup", + { description: "modifying composition string shouldn't reopen the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "zi" }, aWindow); synthesizeText( { "composition": { "string": "zi", @@ -193,7 +189,6 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { execute: function (aWindow) { synthesizeKey("l", { type: "keydown" }, aWindow); synthesizeComposition({ type: "compositionstart" }, aWindow); - synthesizeComposition({ type: "compositionupdate", data: "l" }, aWindow); synthesizeText( { "composition": { "string": "l", @@ -206,10 +201,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Mozil", searchString: "Mozi" }, - { description: "compositionupdate shouldn't reopen the popup", + { description: "modifying composition string shouldn't reopen the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "ll" }, aWindow); synthesizeText( { "composition": { "string": "ll", @@ -222,10 +216,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Mozill", searchString: "Mozi" }, - { description: "empty compositionupdate shouldn't reopen the popup", + { description: "modifying composition string to empty string shouldn't reopen the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "" }, aWindow); synthesizeText( { "composition": { "string": "", @@ -264,7 +257,6 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { synthesizeKey("VK_LEFT", { shiftKey: true }, aWindow); synthesizeKey("z", { type: "keydown" }, aWindow); synthesizeComposition({ type: "compositionstart" }, aWindow); - synthesizeComposition({ type: "compositionupdate", data: "z" }, aWindow); synthesizeText( { "composition": { "string": "z", @@ -277,10 +269,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Moz", searchString: "Mozi" }, - { description: "compositionupdate shouldn't reopen the popup", + { description: "modifying composition string shouldn't reopen the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "zi" }, aWindow); synthesizeText( { "composition": { "string": "zi", @@ -293,10 +284,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Mozi", searchString: "Mozi" }, - { description: "empty compositionupdate shouldn't reopen the popup", + { description: "modifying composition string to empty string shouldn't reopen the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "" }, aWindow); synthesizeText( { "composition": { "string": "", @@ -340,7 +330,6 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { execute: function (aWindow) { synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow); synthesizeComposition({ type: "compositionstart" }, aWindow); - synthesizeComposition({ type: "compositionupdate", data: "M" }, aWindow); synthesizeText( { "composition": { "string": "M", @@ -353,10 +342,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "M", searchString: "" }, - { description: "compositionupdate shouldn't open the popup", + { description: "modifying composition string shouldn't open the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "Mo" }, aWindow); synthesizeText( { "composition": { "string": "Mo", @@ -369,10 +357,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Mo", searchString: "" }, - { description: "empty compositionupdate shouldn't open the popup", + { description: "modifying composition string to empty string shouldn't open the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "" }, aWindow); synthesizeText( { "composition": { "string": "", @@ -416,7 +403,6 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { execute: function (aWindow) { synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow); synthesizeComposition({ type: "compositionstart" }, aWindow); - synthesizeComposition({ type: "compositionupdate", data: "M" }, aWindow); synthesizeText( { "composition": { "string": "M", @@ -429,10 +415,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "M", searchString: "" }, - { description: "compositionupdate shouldn't open the popup", + { description: "modifying composition string shouldn't open the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "Mo" }, aWindow); synthesizeText( { "composition": { "string": "Mo", @@ -445,10 +430,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Mo", searchString: "" }, - { description: "empty compositionupdate shouldn't open the popup", + { description: "modifying composition string to empty string shouldn't open the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "" }, aWindow); synthesizeText( { "composition": { "string": "", @@ -495,7 +479,6 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { execute: function (aWindow) { synthesizeKey("z", { type: "keydown", shiftKey: true }, aWindow); synthesizeComposition({ type: "compositionstart" }, aWindow); - synthesizeComposition({ type: "compositionupdate", data: "z" }, aWindow); synthesizeText( { "composition": { "string": "z", @@ -508,10 +491,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Moz", searchString: "Mo" }, - { description: "compositionupdate shouldn't open the popup", + { description: "modifying composition string shouldn't open the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "zi" }, aWindow); synthesizeText( { "composition": { "string": "zi", @@ -524,10 +506,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "Mozi", searchString: "Mo" }, - { description: "empty compositionupdate shouldn't open the popup", + { description: "modifying composition string to empty string shouldn't open the popup", completeDefaultIndex: false, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "" }, aWindow); synthesizeText( { "composition": { "string": "", @@ -571,7 +552,6 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { execute: function (aWindow) { synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow); synthesizeComposition({ type: "compositionstart" }, aWindow); - synthesizeComposition({ type: "compositionupdate", data: "M" }, aWindow); synthesizeText( { "composition": { "string": "M", @@ -584,10 +564,9 @@ nsDoTestsForAutoCompleteWithComposition.prototype = { }, aWindow); }, popup: false, value: "M", searchString: "" }, - { description: "compositionupdate shouldn't open the popup (completeDefaultIndex is true)", + { description: "modifying composition string shouldn't open the popup (completeDefaultIndex is true)", completeDefaultIndex: true, execute: function (aWindow) { - synthesizeComposition({ type: "compositionupdate", data: "Mo" }, aWindow); synthesizeText( { "composition": { "string": "Mo", diff --git a/toolkit/content/tests/chrome/findbar_window.xul b/toolkit/content/tests/chrome/findbar_window.xul index c28db00b226..6ef189cc00a 100644 --- a/toolkit/content/tests/chrome/findbar_window.xul +++ b/toolkit/content/tests/chrome/findbar_window.xul @@ -235,7 +235,6 @@ var searchStr = "text"; synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: searchStr }); synthesizeText( { "composition": { "string": searchStr, diff --git a/widget/tests/test_assign_event_data.html b/widget/tests/test_assign_event_data.html index 303797f75a4..d723be5ffa9 100644 --- a/widget/tests/test_assign_event_data.html +++ b/widget/tests/test_assign_event_data.html @@ -176,7 +176,6 @@ const kTests = [ document.getElementById(this.targetID).focus(); synthesizeKey("a", { type: "keydown" }); synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306D" }); synthesizeText({ "composition": { "string": "\u306D", "clauses": @@ -187,7 +186,6 @@ const kTests = [ "caret": { "start": 1, "length": 0 } }); synthesizeKey("a", { type: "keyup" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306D" }); synthesizeText({ "composition": { "string": "\u306D", "clauses": @@ -210,7 +208,6 @@ const kTests = [ document.getElementById(this.targetID).value = ""; document.getElementById(this.targetID).focus(); synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306D" }); synthesizeText({ "composition": { "string": "\u306D", "clauses": @@ -221,7 +218,6 @@ const kTests = [ "caret": { "start": 1, "length": 0 } }); synthesizeKey("VK_RETURN", { type: "keydown" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306D" }); synthesizeText({ "composition": { "string": "\u306D", "clauses": @@ -292,7 +288,6 @@ const kTests = [ document.getElementById(this.targetID).value = ""; document.getElementById(this.targetID).focus(); synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306D" }); synthesizeText({ "composition": { "string": "\u306D", "clauses": @@ -315,7 +310,6 @@ const kTests = [ document.getElementById(this.targetID).value = ""; document.getElementById(this.targetID).focus(); synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u30E9\u30FC\u30E1\u30F3" }); synthesizeText({ "composition": { "string": "\u30E9\u30FC\u30E1\u30F3", "clauses": @@ -351,7 +345,6 @@ const kTests = [ document.getElementById(this.targetID).value = ""; document.getElementById(this.targetID).focus(); synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u30E9\u30FC\u30E1\u30F3" }); synthesizeText({ "composition": { "string": "\u30E9\u30FC\u30E1\u30F3", "clauses": diff --git a/widget/tests/test_imestate.html b/widget/tests/test_imestate.html index e0a9ff74f45..cdb63e92bbf 100644 --- a/widget/tests/test_imestate.html +++ b/widget/tests/test_imestate.html @@ -1236,8 +1236,6 @@ function runEditorFlagChangeTests() synthesizeComposition({ type: "compositionstart" }); // input characters - synthesizeComposition({ type: "compositionupdate", - data: "\u3078\u3093\u3057\u3093" }); synthesizeText( { "composition": { "string": "\u3078\u3093\u3057\u3093", @@ -1268,7 +1266,6 @@ function runEditorFlagChangeTests() description + "#3 IME isn't enabled on HTML editor"); // cancel the composition - synthesizeComposition({ type: "compositionupdate", data: "" }); synthesizeText( { "composition": { "string": "", diff --git a/widget/tests/test_input_events_on_deactive_window.xul b/widget/tests/test_input_events_on_deactive_window.xul index c314240a2a2..d7e3f4c7812 100644 --- a/widget/tests/test_input_events_on_deactive_window.xul +++ b/widget/tests/test_input_events_on_deactive_window.xul @@ -159,7 +159,6 @@ function startTests() checkCompositionEvents(true, false, false, false, "compositionstart"); clear(); // input first character - synthesizeComposition({ type: "compositionupdate", data: "\u3089" }); synthesizeText( { "composition": { "string": "\u3089", diff --git a/widget/tests/window_composition_text_querycontent.xul b/widget/tests/window_composition_text_querycontent.xul index a30383c735b..3dbbaa7ba56 100644 --- a/widget/tests/window_composition_text_querycontent.xul +++ b/widget/tests/window_composition_text_querycontent.xul @@ -194,7 +194,6 @@ function runUndoRedoTest() synthesizeComposition({ type: "compositionstart" }); // input raw characters - synthesizeComposition({ type: "compositionupdate", data: "\u306D" }); synthesizeText( { "composition": { "string": "\u306D", @@ -206,7 +205,6 @@ function runUndoRedoTest() "caret": { "start": 1, "length": 0 } }); - synthesizeComposition({ type: "compositionupdate", data: "\u306D\u3053" }); synthesizeText( { "composition": { "string": "\u306D\u3053", @@ -219,7 +217,6 @@ function runUndoRedoTest() }); // convert - synthesizeComposition({ type: "compositionupdate", data: "\u732B" }); synthesizeText( { "composition": { "string": "\u732B", @@ -251,7 +248,6 @@ function runUndoRedoTest() synthesizeComposition({ type: "compositionstart" }); // input raw characters - synthesizeComposition({ type: "compositionupdate", data: "\u307E" }); synthesizeText( { "composition": { "string": "\u307E", @@ -264,7 +260,6 @@ function runUndoRedoTest() }); // cancel the composition - synthesizeComposition({ type: "compositionupdate", data: "" }); synthesizeText( { "composition": { "string": "", @@ -283,7 +278,6 @@ function runUndoRedoTest() synthesizeComposition({ type: "compositionstart" }); // input raw characters - synthesizeComposition({ type: "compositionupdate", data: "\u3080" }); synthesizeText( { "composition": { "string": "\u3080", @@ -295,7 +289,6 @@ function runUndoRedoTest() "caret": { "start": 1, "length": 0 } }); - synthesizeComposition({ type: "compositionupdate", data: "\u3080\u3059" }); synthesizeText( { "composition": { "string": "\u3080\u3059", @@ -307,8 +300,6 @@ function runUndoRedoTest() "caret": { "start": 2, "length": 0 } }); - synthesizeComposition({ type: "compositionupdate", - data: "\u3080\u3059\u3081" }); synthesizeText( { "composition": { "string": "\u3080\u3059\u3081", @@ -321,7 +312,6 @@ function runUndoRedoTest() }); // convert - synthesizeComposition({ type: "compositionupdate", data: "\u5A18" }); synthesizeText( { "composition": { "string": "\u5A18", @@ -386,7 +376,6 @@ function runUndoRedoTest() synthesizeComposition({ type: "compositionstart" }); // input raw characters - synthesizeComposition({ type: "compositionupdate", data: "\u3088" }); synthesizeText( { "composition": { "string": "\u3088", @@ -398,7 +387,6 @@ function runUndoRedoTest() "caret": { "start": 1, "length": 0 } }); - synthesizeComposition({ type: "compositionupdate", data: "\u3088\u3046" }); synthesizeText( { "composition": { "string": "\u3088\u3046", @@ -410,8 +398,6 @@ function runUndoRedoTest() "caret": { "start": 2, "length": 0 } }); - synthesizeComposition({ type: "compositionupdate", - data: "\u3088\u3046\u304b" }); synthesizeText( { "composition": { "string": "\u3088\u3046\u304b", @@ -423,8 +409,6 @@ function runUndoRedoTest() "caret": { "start": 3, "length": 0 } }); - synthesizeComposition({ type: "compositionupdate", - data: "\u3088\u3046\u304b\u3044" }); synthesizeText( { "composition": { "string": "\u3088\u3046\u304b\u3044", @@ -437,7 +421,6 @@ function runUndoRedoTest() }); // convert - synthesizeComposition({ type: "compositionupdate", data: "\u5996\u602a" }); synthesizeText( { "composition": { "string": "\u5996\u602a", @@ -648,7 +631,6 @@ function runCompositionTest() synthesizeComposition({ type: "compositionstart" }); // input first character - synthesizeComposition({ type: "compositionupdate", data: "\u3089" }); synthesizeText( { "composition": { "string": "\u3089", @@ -673,7 +655,6 @@ function runCompositionTest() caretRects[1] = caretRect; // input second character - synthesizeComposition({ type: "compositionupdate", data: "\u3089\u30FC" }); synthesizeText( { "composition": { "string": "\u3089\u30FC", @@ -707,8 +688,6 @@ function runCompositionTest() "runCompositionTest: caret width is wrong (#1-2)"); // input third character - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081", @@ -809,8 +788,6 @@ function runCompositionTest() is(caretRect.height, caretRects[1].height, "runCompositionTest: caret rects are different (#1-3-2, height)"); - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093", @@ -829,8 +806,6 @@ function runCompositionTest() // backspace - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081", @@ -848,8 +823,6 @@ function runCompositionTest() } // re-input - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093", @@ -866,8 +839,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093\u3055" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093\u3055", @@ -884,8 +855,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093\u3055\u3044" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044", @@ -902,8 +871,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053", @@ -920,8 +887,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053\u3046" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053\u3046", @@ -940,8 +905,6 @@ function runCompositionTest() } // convert - synthesizeComposition({ type: "compositionupdate", - data: "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8" }); synthesizeText( { "composition": { "string": "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8", @@ -984,8 +947,6 @@ function runCompositionTest() } // reset clauses - synthesizeComposition({ type: "compositionupdate", - data: "\u30E9\u30FC\u30E1\u30F3\u3055\u884C\u3053\u3046" }); synthesizeText( { "composition": { "string": "\u30E9\u30FC\u30E1\u30F3\u3055\u884C\u3053\u3046", @@ -1054,7 +1015,6 @@ function runCompositionTest() synthesizeComposition({ type: "compositionstart" }); // input characters - synthesizeComposition({ type: "compositionupdate", data: "\u3057" }); synthesizeText( { "composition": { "string": "\u3057", @@ -1072,7 +1032,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", data: "\u3058" }); synthesizeText( { "composition": { "string": "\u3058", @@ -1090,7 +1049,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", data: "\u3058\u3087" }); synthesizeText( { "composition": { "string": "\u3058\u3087", @@ -1108,8 +1066,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3058\u3087\u3046" }); synthesizeText( { "composition": { "string": "\u3058\u3087\u3046", @@ -1158,7 +1114,6 @@ function runCompositionTest() // start composition with selection synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u304A" }); synthesizeText( { "composition": { "string": "\u304A", @@ -1177,7 +1132,6 @@ function runCompositionTest() } // remove the composition string - synthesizeComposition({ type: "compositionupdate", data: "" }); synthesizeText( { "composition": { "string": "", @@ -1196,7 +1150,6 @@ function runCompositionTest() } // re-input the composition string - synthesizeComposition({ type: "compositionupdate", data: "\u3046" }); synthesizeText( { "composition": { "string": "\u3046", @@ -1215,7 +1168,6 @@ function runCompositionTest() } // cancel the composition - synthesizeComposition({ type: "compositionupdate", data: "" }); synthesizeText( { "composition": { "string": "", @@ -1274,7 +1226,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", data: "\u6700" }); synthesizeText( { "composition": { "string": "\u6700", @@ -1367,7 +1318,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", data: "\u9AD8" }); synthesizeText( { "composition": { "string": "\u9AD8", @@ -1404,7 +1354,6 @@ function runCompositionTest() // twice at canceling composition. synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u6700" }); synthesizeText( { "composition": { "string": "\u6700", @@ -1422,7 +1371,6 @@ function runCompositionTest() return; } - synthesizeComposition({ type: "compositionupdate", data: "" }); synthesizeText( { "composition": { "string": "", @@ -1596,7 +1544,6 @@ function runCompositionEventTest() initResults(); synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u3089" }); synthesizeText( { "composition": { "string": "\u3089", @@ -1648,7 +1595,6 @@ function runCompositionEventTest() is(inputEventData["input"], "\u3089", kDescription + "value of input element wasn't modified (input) #1"); - synthesizeComposition({ type: "compositionupdate", data: "\u3089\u30FC" }); synthesizeText( { "composition": { "string": "\u3089\u30FC", @@ -1745,7 +1691,6 @@ function runCompositionEventTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u3089" }); synthesizeText( { "composition": { "string": "\u3089", @@ -1826,7 +1771,6 @@ function runCompositionEventTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306D" }); synthesizeText( { "composition": { "string": "\u306D", @@ -1909,7 +1853,6 @@ function runCompositionEventTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2295,7 +2238,6 @@ function runForceCommitTest() events = []; synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2349,7 +2291,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2395,7 +2336,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2438,7 +2378,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2485,7 +2424,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2532,7 +2470,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2580,7 +2517,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2627,7 +2563,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }, iframe2.contentWindow); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }, iframe2.contentWindow); synthesizeText( { "composition": { "string": "\u306E", @@ -2672,7 +2607,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }, iframe2.contentWindow); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }, iframe2.contentWindow); synthesizeText( { "composition": { "string": "\u306E", @@ -2722,7 +2656,6 @@ function runForceCommitTest() synthesizeComposition({ type: "compositionstart" }, iframe2.contentWindow); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }, iframe2.contentWindow); synthesizeText( { "composition": { "string": "\u306E", @@ -2826,7 +2759,6 @@ function runIsComposingTest() synthesizeComposition({ type: "compositionstart" }); expectedIsComposing = true; description = "events after dispatching compositionstart"; - synthesizeComposition({ type: "compositionupdate", data: "\u3042" }); synthesizeText( { "composition": { "string": "\u3042", @@ -2888,7 +2820,6 @@ function runRemoveContentTest(aCallback) synthesizeComposition({ type: "compositionstart" }); - synthesizeComposition({ type: "compositionupdate", data: "\u306E" }); synthesizeText( { "composition": { "string": "\u306E", @@ -2988,8 +2919,6 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName) synthesizeComposition({ type: "compositionstart" }); // input characters - synthesizeComposition({ type: "compositionupdate", - data: "\u3078\u3093\u3057\u3093" }); synthesizeText( { "composition": { "string": "\u3078\u3093\u3057\u3093", @@ -3007,7 +2936,6 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName) } // convert them #1 - synthesizeComposition({ type: "compositionupdate", data: "\u8FD4\u4FE1" }); synthesizeText( { "composition": { "string": "\u8FD4\u4FE1", @@ -3026,7 +2954,6 @@ function runTestOnAnotherContext(aPanelOrFrame, aFocusedEditor, aTestName) } // convert them #2 - synthesizeComposition({ type: "compositionupdate", data: "\u5909\u8EAB" }); synthesizeText( { "composition": { "string": "\u5909\u8EAB", @@ -3145,7 +3072,6 @@ function runMaxLengthTest() synthesizeComposition({ type: "compositionstart" }); // input first character - synthesizeComposition({ type: "compositionupdate", data: "\u3089" }); synthesizeText( { "composition": { "string": "\u3089", @@ -3163,7 +3089,6 @@ function runMaxLengthTest() } // input second character - synthesizeComposition({ type: "compositionupdate", data: "\u3089\u30FC" }); synthesizeText( { "composition": { "string": "\u3089\u30FC", @@ -3181,8 +3106,6 @@ function runMaxLengthTest() } // input third character - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081", @@ -3200,8 +3123,6 @@ function runMaxLengthTest() } // input fourth character - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093", @@ -3220,8 +3141,6 @@ function runMaxLengthTest() // backspace - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081", @@ -3239,8 +3158,6 @@ function runMaxLengthTest() } // re-input - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093", @@ -3257,8 +3174,6 @@ function runMaxLengthTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093\u3055" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093\u3055", @@ -3275,8 +3190,6 @@ function runMaxLengthTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093\u3055\u3044" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044", @@ -3293,8 +3206,6 @@ function runMaxLengthTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053", @@ -3312,8 +3223,6 @@ function runMaxLengthTest() return; } - synthesizeComposition({ type: "compositionupdate", - data: "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053\u3046" }); synthesizeText( { "composition": { "string": "\u3089\u30FC\u3081\u3093\u3055\u3044\u3053\u3046", @@ -3332,8 +3241,6 @@ function runMaxLengthTest() } // convert - synthesizeComposition({ type: "compositionupdate", - data: "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8" }); synthesizeText( { "composition": { "string": "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8", @@ -3377,7 +3284,6 @@ function runMaxLengthTest() synthesizeComposition({ type: "compositionstart" }); // input characters - synthesizeComposition({ type: "compositionupdate", data: "\u3057" }); synthesizeText( { "composition": { "string": "\u3057", @@ -3395,7 +3301,6 @@ function runMaxLengthTest() } // commit the composition string - synthesizeComposition({ type: "compositionupdate", data: "\u3058" }); synthesizeText( { "composition": { "string": "\u3058", @@ -3453,7 +3358,6 @@ function runMaxLengthTest() synthesizeComposition({ type: "compositionstart" }); // input characters - synthesizeComposition({ type: "compositionupdate", data: "\u9B54" }); synthesizeText( { "composition": { "string": "\u9B54", @@ -3471,7 +3375,6 @@ function runMaxLengthTest() } // commit the composition string - synthesizeComposition({ type: "compositionupdate", data: "\u9B54" }); synthesizeText( { "composition": { "string": "\u9B54", @@ -3496,7 +3399,6 @@ function runMaxLengthTest() synthesizeComposition({ type: "compositionstart" }); // input characters - synthesizeComposition({ type: "compositionupdate", data: "\u9B54\u6CD5" }); synthesizeText( { "composition": { "string": "\u9B54\u6CD5", @@ -3514,7 +3416,6 @@ function runMaxLengthTest() } // commit the composition string - synthesizeComposition({ type: "compositionupdate", data: "\u9B54\u6CD5" }); synthesizeText( { "composition": { "string": "\u9B54\u6CD5",