yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autotests: Fix PointerInputTest

Browse source 
The "Active screen follows mouse" option may make the test fail. We want
it to pass no matter what the current value of the option is.
This commit is contained in:
Vlad Zahorodnii 2020-12-03 11:37:28 +02:00
parent 919e878d35
commit c793d5d619
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
autotests/integration/pointer_input.cpp
View file

@ -319,8 +319,6 @@ void PointerInputTest::testUpdateFocusAfterScreenChange()
// this test verifies that a pointer enter event is generated when the cursor changes to another // this test verifies that a pointer enter event is generated when the cursor changes to another
// screen due to removal of screen // screen due to removal of screen
using namespace KWayland::Client; using namespace KWayland::Client;
// ensure cursor is on second screen
Cursors::self()->mouse()->setPos(1500, 300);
// create pointer and signal spy for enter and motion // create pointer and signal spy for enter and motion
auto pointer = m_seat->createPointer(m_seat); auto pointer = m_seat->createPointer(m_seat);
@ -328,6 +326,8 @@ void PointerInputTest::testUpdateFocusAfterScreenChange()
QVERIFY(pointer->isValid()); QVERIFY(pointer->isValid());
QSignalSpy enteredSpy(pointer, &Pointer::entered); QSignalSpy enteredSpy(pointer, &Pointer::entered);
QVERIFY(enteredSpy.isValid()); QVERIFY(enteredSpy.isValid());
QSignalSpy leftSpy(pointer, &Pointer::left);
QVERIFY(leftSpy.isValid());
// create a window // create a window
QSignalSpy clientAddedSpy(workspace(), &Workspace::clientAdded); QSignalSpy clientAddedSpy(workspace(), &Workspace::clientAdded);
@ -340,7 +340,13 @@ void PointerInputTest::testUpdateFocusAfterScreenChange()
QVERIFY(clientAddedSpy.wait()); QVERIFY(clientAddedSpy.wait());
AbstractClient *window = workspace()->activeClient(); AbstractClient *window = workspace()->activeClient();
QVERIFY(window); QVERIFY(window);
QVERIFY(window->frameGeometry().contains(Cursors::self()->mouse()->pos()));
QTRY_COMPARE(enteredSpy.count(), 1);
// move the cursor to the second screen
Cursors::self()->mouse()->setPos(1500, 300);
QVERIFY(!window->frameGeometry().contains(Cursors::self()->mouse()->pos())); QVERIFY(!window->frameGeometry().contains(Cursors::self()->mouse()->pos()));
QVERIFY(leftSpy.wait());
QSignalSpy screensChangedSpy(screens(), &Screens::changed); QSignalSpy screensChangedSpy(screens(), &Screens::changed);
QVERIFY(screensChangedSpy.isValid()); QVERIFY(screensChangedSpy.isValid());
@ -357,7 +363,7 @@ void PointerInputTest::testUpdateFocusAfterScreenChange()
QVERIFY(window->frameGeometry().contains(Cursors::self()->mouse()->pos())); QVERIFY(window->frameGeometry().contains(Cursors::self()->mouse()->pos()));
// and we should get an enter event // and we should get an enter event
QTRY_COMPARE(enteredSpy.count(), 1); QTRY_COMPARE(enteredSpy.count(), 2);
} }
void PointerInputTest::testModifierClickUnrestrictedMove_data() void PointerInputTest::testModifierClickUnrestrictedMove_data()