wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 605183 - try to fix browser_drag_bookmarks_on_toolbar.js. Wait for focus and for drags. a=annoying-orange

Browse Source
This commit is contained in:
Marco Bonardo 2010-10-20 23:35:37 +02:00
parent 915b7c2e3a
commit 3719d4480c
1 changed files with 69 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
browser/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js
View File

@ -58,12 +58,11 @@ var dragDirections = { LEFT: 0, UP: 1, RIGHT: 2, DOWN: 3 };
* @param aDirection
* Direction for the dragging gesture, see dragDirections helper object.
*/
function synthesizeDragWithDirection(aElement, aExpectedDragData, aDirection) {
var trapped = false;
function synthesizeDragWithDirection(aElement, aExpectedDragData, aDirection, aCallback) {
// Dragstart listener function.
var trapDrag = function(event) {
trapped = true;
gBookmarksToolbar.addEventListener("dragstart", function(event)
{
info("A dragstart event has been trapped.");
var dataTransfer = event.dataTransfer;
is(dataTransfer.mozItemCount, aExpectedDragData.length,
"Number of dragged items should be the same.");
@ -88,7 +87,23 @@ function synthesizeDragWithDirection(aElement, aExpectedDragData, aDirection) {
event.preventDefault();
event.stopPropagation();
}
gBookmarksToolbar.removeEventListener("dragstart", arguments.callee, false);
// This is likely to cause a click event, and, in case we are dragging a
// bookmark, an unwanted page visit. Prevent the click event.
aElement.addEventListener("click", prevent, false);
EventUtils.synthesizeMouse(aElement,
startingPoint.x + xIncrement * 9,
startingPoint.y + yIncrement * 9,
{ type: "mouseup" });
aElement.removeEventListener("click", prevent, false);
// Cleanup eventually opened menus.
if (aElement.localName == "menu" && aElement.open)
aElement.open = false;
aCallback()
}, false);
var prevent = function(aEvent) {aEvent.preventDefault();}
@ -122,26 +137,10 @@ function synthesizeDragWithDirection(aElement, aExpectedDragData, aDirection) {
startingPoint.x + xIncrement * 1,
startingPoint.y + yIncrement * 1,
{ type: "mousemove" });
gBookmarksToolbar.addEventListener("dragstart", trapDrag, false);
EventUtils.synthesizeMouse(aElement,
startingPoint.x + xIncrement * 9,
startingPoint.y + yIncrement * 9,
{ type: "mousemove" });
ok(trapped, "A dragstart event has been trapped.");
gBookmarksToolbar.removeEventListener("dragstart", trapDrag, false);
// This is likely to cause a click event, and, in case we are dragging a
// bookmark, an unwanted page visit. Prevent the click event.
aElement.addEventListener("click", prevent, false);
EventUtils.synthesizeMouse(aElement,
startingPoint.x + xIncrement * 9,
startingPoint.y + yIncrement * 9,
{ type: "mouseup" });
aElement.removeEventListener("click", prevent, false);
// Cleanup eventually opened menus.
if (aElement.localName == "menu" && aElement.open)
aElement.open = false;
}
function getToolbarNodeForItemId(aItemId) {
@ -190,17 +189,28 @@ var gTests = [
isnot(element._placesNode, null, "Toolbar node has an associated Places node.");
var expectedData = getExpectedDataForPlacesNode(element._placesNode);
ok(true, "Dragging left");
synthesizeDragWithDirection(element, expectedData, dragDirections.LEFT);
ok(true, "Dragging right");
synthesizeDragWithDirection(element, expectedData, dragDirections.RIGHT);
ok(true, "Dragging up");
synthesizeDragWithDirection(element, expectedData, dragDirections.UP);
ok(true, "Dragging down");
synthesizeDragWithDirection(element, new Array(), dragDirections.DOWN);
// Cleanup.
PlacesUtils.bookmarks.removeItem(folderId);
info("Dragging left");
synthesizeDragWithDirection(element, expectedData, dragDirections.LEFT,
function ()
{
info("Dragging right");
synthesizeDragWithDirection(element, expectedData, dragDirections.RIGHT,
function ()
{
info("Dragging up");
synthesizeDragWithDirection(element, expectedData, dragDirections.UP,
function ()
{
info("Dragging down");
synthesizeDragWithDirection(element, new Array(), dragDirections.DOWN,
function () {
// Cleanup.
PlacesUtils.bookmarks.removeItem(folderId);
nextTest();
});
});
});
});
}
},
@ -221,17 +231,28 @@ var gTests = [
isnot(element._placesNode, null, "Toolbar node has an associated Places node.");
var expectedData = getExpectedDataForPlacesNode(element._placesNode);
ok(true, "Dragging left");
synthesizeDragWithDirection(element, expectedData, dragDirections.LEFT);
ok(true, "Dragging right");
synthesizeDragWithDirection(element, expectedData, dragDirections.RIGHT);
ok(true, "Dragging up");
synthesizeDragWithDirection(element, expectedData, dragDirections.UP);
ok(true, "Dragging down");
synthesizeDragWithDirection(element, expectedData, dragDirections.DOWN);
// Cleanup.
PlacesUtils.bookmarks.removeItem(itemId);
info("Dragging left");
synthesizeDragWithDirection(element, expectedData, dragDirections.LEFT,
function ()
{
info("Dragging right");
synthesizeDragWithDirection(element, expectedData, dragDirections.RIGHT,
function ()
{
info("Dragging up");
synthesizeDragWithDirection(element, expectedData, dragDirections.UP,
function ()
{
info("Dragging down");
synthesizeDragWithDirection(element, expectedData, dragDirections.DOWN,
function () {
// Cleanup.
PlacesUtils.bookmarks.removeItem(folderId);
nextTest();
});
});
});
});
}
},
];
@ -242,7 +263,7 @@ function nextTest() {
info("Start of test: " + test.desc);
test.run();
setTimeout(nextTest, 0);
waitForFocus(nextTest);
}
else {
// Collapse the personal toolbar if needed.
@ -256,11 +277,12 @@ let toolbar = document.getElementById("PersonalToolbar");
let wasCollapsed = toolbar.collapsed;
function test() {
waitForExplicitFinish();
// Uncollapse the personal toolbar if needed.
if (wasCollapsed)
setToolbarVisibility(toolbar, true);
waitForExplicitFinish();
nextTest();
waitForFocus(nextTest);
}