Differential D16710 Diff 52182 autotests/integration/shell_client_test.cpp

Changeset View

Standalone View

View Options

autotests/integration/shell_client_test.cpp

Context not available.
72 void testMinimizeActiveWindow(); 72​ void testMinimizeActiveWindow();
73 void testFullscreen_data(); 73​ void testFullscreen_data();
74 void testFullscreen(); 74​ void testFullscreen();
75​ void testFullscreenRestore_data();
76​ void testFullscreenRestore();
75 void testUserCanSetFullscreen_data(); 77​ void testUserCanSetFullscreen_data();
76 void testUserCanSetFullscreen(); 78​ void testUserCanSetFullscreen();
77 void testUserSetFullscreenWlShell(); 79​ void testUserSetFullscreenWlShell();
Context not available.
524 QCOMPARE(c->isDecorated(), decoMode == ServerSideDecoration::Mode::Server); 526​ QCOMPARE(c->isDecorated(), decoMode == ServerSideDecoration::Mode::Server);
525} 527​}
526 528​
529​void TestShellClient::testFullscreenRestore_data()
530​{
531​ QTest::addColumn<Test::ShellSurfaceType>("type");
532​
533​ QTest::newRow("xdgShellV5") << Test::ShellSurfaceType::XdgShellV5;
534​ QTest::newRow("xdgShellV6") << Test::ShellSurfaceType::XdgShellV6;
535​ QTest::newRow("xdgShellWmBase") << Test::ShellSurfaceType::XdgShellStable;
536​}
537​
538​void TestShellClient::testFullscreenRestore()
539​{
540​ // this test verifies that windows created fullscreen can be later properly restored
541​ QScopedPointer<Surface> surface(Test::createSurface());
542​ QFETCH(Test::ShellSurfaceType, type);
543​ QScopedPointer<QObject> shellSurface(Test::createShellSurface(type, surface.data()));
544​
545​ XdgShellSurface *xdgShellSurface = nullptr;
546​ // fullscreen the window
547​ xdgShellSurface = qobject_cast<XdgShellSurface*>(shellSurface.data());
548​ xdgShellSurface->setFullscreen(true);
549​
550​ auto c = Test::renderAndWaitForShown(surface.data(), QSize(screens()->size(0)), Qt::blue);
551​ QVERIFY(c);
552​ QVERIFY(c->isFullScreen());
553​
554​ QSignalSpy fullscreenChangedSpy(c, &ShellClient::fullScreenChanged);
555​ QVERIFY(fullscreenChangedSpy.isValid());
556​ QSignalSpy geometryChangedSpy(c, &ShellClient::geometryChanged);
557​ QVERIFY(geometryChangedSpy.isValid());
558​ QSignalSpy sizeChangeRequestedSpy(shellSurface.data(), SIGNAL(sizeChanged(QSize)));
559​ QVERIFY(sizeChangeRequestedSpy.isValid());
560​ QSignalSpy configureRequestedSpy(shellSurface.data(), SIGNAL(configureRequested(QSize, KWayland::Client::XdgShellSurface::States, quint32)));
561​ QVERIFY(configureRequestedSpy.isValid());
562​
563​ // swap back to normal
564​ xdgShellSurface->setFullscreen(false);
565​
566​ QVERIFY(fullscreenChangedSpy.wait());
567​ QVERIFY(configureRequestedSpy.wait());
568​ QCOMPARE(configureRequestedSpy.count(), 4);
davidedmundsonUnsubmitted
Done

why should it be 4?

davidedmundson: why should it be 4?
569​ QCOMPARE(configureRequestedSpy.last().first().toSize(), QSize(0, 0));
570​ QVERIFY(!c->isFullScreen());
571​
572​ for (const auto &it: configureRequestedSpy) {
573​ xdgShellSurface->ackConfigure(it[2].toInt());
574​ }
575​
576​ Test::render(surface.data(), QSize(100, 50), Qt::red);
577​ QVERIFY(geometryChangedSpy.wait());
578​ QCOMPARE(geometryChangedSpy.count(), 1);
579​ QVERIFY(!c->isFullScreen());
580​ QCOMPARE(c->geometry(), QRect(QPoint(0, 0), QSize(100, 50)));
davidedmundsonUnsubmitted
Done

I don't see why the top left should always be 0,0.

That's writing tests for what the current code happens to do, not testing for what things should be doing. Arguably the window could be placed according to the placement algorithm.

Lets just check the size.

davidedmundson: I don't see why the top left should always be 0,0. That's writing tests for what the current…
581​}
582​
527void TestShellClient::testUserCanSetFullscreen_data() 583​void TestShellClient::testUserCanSetFullscreen_data()
528{ 584​{
529 QTest::addColumn<Test::ShellSurfaceType>("type"); 585​ QTest::addColumn<Test::ShellSurfaceType>("type");
Context not available.