From 8f451329183db8bc157fea7fb29066687270c3fa Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Sat, 21 Feb 2015 04:27:59 +0000 Subject: [PATCH] Bug 1128722 - part 2, tests. --- .../tests/multi-range-user-select-ref.html | 8 +++++ .../base/tests/multi-range-user-select.html | 31 +++++++++++++++++++ .../base/tests/test_reftests_with_caret.html | 4 +++ 3 files changed, 43 insertions(+) diff --git a/layout/base/tests/multi-range-user-select-ref.html b/layout/base/tests/multi-range-user-select-ref.html index b50ffc65071..812bae04791 100644 --- a/layout/base/tests/multi-range-user-select-ref.html +++ b/layout/base/tests/multi-range-user-select-ref.html @@ -107,6 +107,10 @@ function runTest() { } else { addChildRanges([[0,160,0,170]], e); } + } else if (test == "#prev8") { + if (op == "AD") { + addChildRanges([[0,150,0,155], [0,68,0,70]], e); + } } } else { if (test == "#next1") { @@ -145,6 +149,10 @@ function runTest() { } else { sel.extend(e.firstChild, 170); } + } else if (test == "#next8") { + if (op == "AD") { + addChildRanges([[0,68,0,70], [0,150,0,155]], e); + } } } document.documentElement.removeAttribute("class"); diff --git a/layout/base/tests/multi-range-user-select.html b/layout/base/tests/multi-range-user-select.html index 89814abbd7e..936df758300 100644 --- a/layout/base/tests/multi-range-user-select.html +++ b/layout/base/tests/multi-range-user-select.html @@ -125,6 +125,21 @@ function runTest() { action(e, 500, 125); checkRanges([[6,0,6,10]], e); } + } else if (test == "#prev8") { + if (action == accelDragSelect) { + sel.removeAllRanges(); + var e = document.querySelector('#select'); + synthesizeMouse(e, 200, 125, {type: "mousedown", accelKey: true}); + synthesizeMouse(e, 200, 120, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 100, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 80, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 210, 60, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 60, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 60, {type: "mouseup", accelKey: true}); + var x3t = e.childNodes[3].firstChild; + var x5 = e.childNodes[5]; + checkRanges([[x3t,3,-1,4], [x5,0,x5.firstChild,5]], e); + } } } else { if (test == "#next1") { @@ -185,6 +200,22 @@ function runTest() { var r = sel.getRangeAt(2); checkRangePoints(r, [e.childNodes[5],0,e.childNodes[6],10], e); } + } else if (test == "#next8") { + if (action == accelDragSelect) { + sel.removeAllRanges(); + var e = document.querySelector('#select'); + synthesizeMouse(e, 200, 60, {type: "mousedown", accelKey: true}); + synthesizeMouse(e, 180, 60, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 80, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 100, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 120, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 190, 125, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 125, {type: "mousemove", accelKey: true}); + synthesizeMouse(e, 200, 125, {type: "mouseup", accelKey: true}); + var x3t = e.childNodes[3].firstChild; + var x5 = e.childNodes[5]; + checkRanges([[x3t,3,-1,4], [x5,0,x5.firstChild,5]], e); + } } } document.documentElement.removeAttribute("class"); diff --git a/layout/base/tests/test_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html index 3672c654078..a3e14966fea 100644 --- a/layout/base/tests/test_reftests_with_caret.html +++ b/layout/base/tests/test_reftests_with_caret.html @@ -194,6 +194,8 @@ if (navigator.platform.indexOf("Linux") >= 0 && // eDirPrevious, Accel+drag-select (adding an additional range) [ 'multi-range-user-select.html#prev1AD' , 'multi-range-user-select-ref.html#prev1AD' ] , [ 'multi-range-user-select.html#prev7AD' , 'multi-range-user-select-ref.html#prev7AD' ] , + // eDirPrevious, Accel+drag-select (bug 1128722) + [ 'multi-range-user-select.html#prev8AD' , 'multi-range-user-select-ref.html#prev8AD' ] , // eDirPrevious, VK_RIGHT / LEFT [ 'multi-range-user-select.html#prev1SR' , 'multi-range-user-select-ref.html#prev1SR' ] , [ 'multi-range-user-select.html#prev1SL' , 'multi-range-user-select-ref.html#prev1SL' ] , @@ -216,6 +218,8 @@ if (navigator.platform.indexOf("Linux") >= 0 && // eDirNext, Accel+drag-select (adding an additional range) [ 'multi-range-user-select.html#next1AD' , 'multi-range-user-select-ref.html#next1AD' ] , [ 'multi-range-user-select.html#next7AD' , 'multi-range-user-select-ref.html#next7AD' ] , + // eDirNext, Accel+drag-select (bug 1128722) + [ 'multi-range-user-select.html#next8AD' , 'multi-range-user-select-ref.html#next8AD' ] , // eDirNext, VK_RIGHT / LEFT [ 'multi-range-user-select.html#next1SR' , 'multi-range-user-select-ref.html#next1SR' ] , [ 'multi-range-user-select.html#next1SL' , 'multi-range-user-select-ref.html#next1SL' ] ,