1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Add test for removing and adding a screen at runtime

Browse Source 
Task-number: QTBUG-79111
Change-Id: I4b8f08148850fe02972266936ba7d8d6ed1f36bb
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2019-10-28 12:05:09 +01:00
parent b5f100975d
commit 3ba851c777
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/auto/wayland/output/tst_output.cpp
View File

@ -53,6 +53,7 @@ private slots:
void windowScreens(); void windowScreens();
void removePrimaryScreen(); void removePrimaryScreen();
void screenOrder(); void screenOrder();
void removeAllScreens();
}; };
void tst_output::primaryScreen() void tst_output::primaryScreen()
@ -227,5 +228,47 @@ void tst_output::screenOrder()
}); });
} }
// This is different from tst_nooutput::noScreens because here we have a screen at platform
// integration initialization, which we then remove.
void tst_output::removeAllScreens()
{
QRasterWindow window1;
window1.resize(400, 320);
window1.show();
QCOMPOSITOR_TRY_VERIFY(xdgSurface(0) && xdgSurface(0)->m_committedConfigureSerial);
const QString wlOutputPrimaryScreenModel = QGuiApplication::primaryScreen()->model();
// Get screen info so we can restore it after
auto screenInfo = exec([=] { return output()->m_data; });
exec([=] { remove(output()); });
// Make sure the wl_output is actually removed before we continue
QTRY_VERIFY(!QGuiApplication::primaryScreen() || QGuiApplication::primaryScreen()->model() != wlOutputPrimaryScreenModel);
// Adding a window while there are no screens should also work
QRasterWindow window2;
window2.resize(400, 320);
window2.show();
exec([=] { add<Output>(screenInfo); });
// Things should be back to normal
QTRY_VERIFY(QGuiApplication::primaryScreen());
QTRY_COMPARE(QGuiApplication::primaryScreen()->model(), wlOutputPrimaryScreenModel);
// Test that we don't leave any fake screens around after we get a wl_output back.
QTRY_COMPARE(QGuiApplication::screens().size(), 1);
// Qt may choose to recreate/hide windows in response to changing screens, so give the client
// some time to potentially mess up before we verify that the windows are visible.
xdgPingAndWaitForPong();
// Windows should be visible after we've reconnected the screen
QCOMPOSITOR_TRY_VERIFY(xdgToplevel(0) && xdgToplevel(0)->m_xdgSurface->m_committedConfigureSerial);
QCOMPOSITOR_TRY_VERIFY(xdgToplevel(1) && xdgToplevel(1)->m_xdgSurface->m_committedConfigureSerial);
}
QCOMPOSITOR_TEST_MAIN(tst_output) QCOMPOSITOR_TEST_MAIN(tst_output)
#include "tst_output.moc" #include "tst_output.moc"