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

[autotests] Add test case for decoration default mode

Browse source 
I incorrectly assumed we have a bug when no mode is requested. The test
case shows it works correctly.
This commit is contained in:
Martin Flöser 2018-02-19 22:10:17 +01:00
parent ddd406dfd9
commit 0886051622
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
autotests/integration/shell_client_test.cpp
View file

@ -89,6 +89,8 @@ private Q_SLOTS:
void testX11WindowId_data(); void testX11WindowId_data();
void testX11WindowId(); void testX11WindowId();
void testAppMenu(); void testAppMenu();
void testNoDecorationModeRequested_data();
void testNoDecorationModeRequested();
}; };
void TestShellClient::initTestCase() void TestShellClient::initTestCase()
@ -981,6 +983,33 @@ void TestShellClient::testAppMenu()
QVERIFY (QDBusConnection::sessionBus().unregisterService("org.kde.kappmenu")); QVERIFY (QDBusConnection::sessionBus().unregisterService("org.kde.kappmenu"));
} }
void TestShellClient::testNoDecorationModeRequested_data()
{
QTest::addColumn<Test::ShellSurfaceType>("type");
QTest::newRow("wlShell") << Test::ShellSurfaceType::WlShell;
QTest::newRow("xdgShellV6") << Test::ShellSurfaceType::XdgShellV6;
}
void TestShellClient::testNoDecorationModeRequested()
{
// this test verifies that the decoration follows the default mode if no mode is explicitly requested
QScopedPointer<Surface> surface(Test::createSurface());
QFETCH(Test::ShellSurfaceType, type);
QScopedPointer<QObject> shellSurface(Test::createShellSurface(type, surface.data()));
QScopedPointer<ServerSideDecoration> deco(Test::waylandServerSideDecoration()->create(surface.data()));
QSignalSpy decoSpy(deco.data(), &ServerSideDecoration::modeChanged);
QVERIFY(decoSpy.isValid());
if (deco->mode() != ServerSideDecoration::Mode::Server) {
QVERIFY(decoSpy.wait());
}
QCOMPARE(deco->mode(), ServerSideDecoration::Mode::Server);
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
QVERIFY(c);
QCOMPARE(c->noBorder(), false);
QCOMPARE(c->isDecorated(), true);
}
WAYLANDTEST_MAIN(TestShellClient) WAYLANDTEST_MAIN(TestShellClient)
#include "shell_client_test.moc" #include "shell_client_test.moc"