git.iko.soy/unity8
on xenial help sign in
tst_WindowResizeArea: Use default values for mouseFlick speed and iterations (LP: #1651580)
19b53d4Albert Astals Cid
tests/qmltests/Stage/tst_WindowResizeArea.qml+7−9
compare with xenial
unifiedsplit
@@ -264,7 +264,7 @@ Item {
264
264
265 var startDragX = initialWindowX + initialWindowWidth + 1
265 var startDragX = initialWindowX + initialWindowWidth + 1
266 var startDragY = initialWindowY + initialWindowHeight + 1
266 var startDragY = initialWindowY + initialWindowHeight + 1
267− mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);
267+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy);
268
268
269 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth + data.dx, fakeWindow.resizeAreaMinWidth));
269 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth + data.dx, fakeWindow.resizeAreaMinWidth));
270 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight + data.dy, fakeWindow.resizeAreaMinHeight));
270 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight + data.dy, fakeWindow.resizeAreaMinHeight));
@@ -290,7 +290,7 @@ Item {
290
290
291 var startDragX = initialWindowX - 1
291 var startDragX = initialWindowX - 1
292 var startDragY = initialWindowY - 1
292 var startDragY = initialWindowY - 1
293− mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);
293+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy);
294
294
295 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - data.dx, fakeWindow.resizeAreaMinWidth));
295 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - data.dx, fakeWindow.resizeAreaMinWidth));
296 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - data.dy, fakeWindow.resizeAreaMinHeight));
296 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - data.dy, fakeWindow.resizeAreaMinHeight));
@@ -318,10 +318,10 @@ Item {
318
318
319 var startDragX = initialWindowX + data.startX
319 var startDragX = initialWindowX + data.startX
320 var startDragY = initialWindowY + data.startY
320 var startDragY = initialWindowY + data.startY
321− mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, false, units.gu(.05), 10);
321+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, false);
322 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - Math.abs(data.dx), fakeWindow.resizeAreaMinWidth));
322 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - Math.abs(data.dx), fakeWindow.resizeAreaMinWidth));
323 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - Math.abs(data.dy), fakeWindow.resizeAreaMinHeight));
323 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - Math.abs(data.dy), fakeWindow.resizeAreaMinHeight));
324− mouseFlick(root, startDragX + data.dx, startDragY + data.dy, startDragX, startDragY, false, true, units.gu(.05), 10);
324+ mouseFlick(root, startDragX + data.dx, startDragY + data.dy, startDragX, startDragY, false, true);
325 tryCompare(fakeWindow, "width", initialWindowWidth);
325 tryCompare(fakeWindow, "width", initialWindowWidth);
326 tryCompare(fakeWindow, "height", initialWindowHeight);
326 tryCompare(fakeWindow, "height", initialWindowHeight);
327 }
327 }
@@ -385,7 +385,7 @@ Item {
385 windowRequestedHeightSpy.clear();
385 windowRequestedHeightSpy.clear();
386 verify(windowRequestedHeightSpy.valid);
386 verify(windowRequestedHeightSpy.valid);
387
387
388− mouseFlick(root, startDragX, startDragY, startDragX + deltaX, startDragY + deltaY, true, true, units.gu(.5), 10);
388+ mouseFlick(root, startDragX, startDragY, startDragX + deltaX, startDragY + deltaY);
389
389
390 compare(windowRequestedWidthSpy.count, 1);
390 compare(windowRequestedWidthSpy.count, 1);
391 compare(fakeWindow.width, initialWindowWidth + fakeWindow.widthIncrement);
391 compare(fakeWindow.width, initialWindowWidth + fakeWindow.widthIncrement);
@@ -416,8 +416,7 @@ Item {
416 var endDragX = (fakeWindow.maximumWidth * 2) + 1;
416 var endDragX = (fakeWindow.maximumWidth * 2) + 1;
417 var endDragY = (fakeWindow.maximumHeight * 2) + 1;
417 var endDragY = (fakeWindow.maximumHeight * 2) + 1;
418
418
419− mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY,
419+ mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY);
420− true/*pressMouse*/, true/*releaseMouse*/, units.gu(.5)/*speed*/, 20/*iterations*/);
421
420
422 compare(fakeWindow.requestedWidth, fakeWindow.maximumWidth);
421 compare(fakeWindow.requestedWidth, fakeWindow.maximumWidth);
423 compare(fakeWindow.requestedHeight, fakeWindow.maximumHeight);
422 compare(fakeWindow.requestedHeight, fakeWindow.maximumHeight);
@@ -446,8 +445,7 @@ Item {
446 var endDragX = (fakeWindow.minimumWidth * 0.5) + 1;
445 var endDragX = (fakeWindow.minimumWidth * 0.5) + 1;
447 var endDragY = (fakeWindow.minimumHeight * 0.5) + 1;
446 var endDragY = (fakeWindow.minimumHeight * 0.5) + 1;
448
447
449− mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY,
448+ mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY);
450− true/*pressMouse*/, true/*releaseMouse*/, units.gu(.5)/*speed*/, 20/*iterations*/);
451
449
452 compare(fakeWindow.requestedWidth, fakeWindow.minimumWidth);
450 compare(fakeWindow.requestedWidth, fakeWindow.minimumWidth);
453 compare(fakeWindow.requestedHeight, fakeWindow.minimumHeight);
451 compare(fakeWindow.requestedHeight, fakeWindow.minimumHeight);