yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/src/wayland/autotests/client/test_wayland_output.cpp

630 lines
26 KiB
C++
Raw Normal View History

[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
/********************************************************************
Change to LGPLv2+ I'm the only copyright holder of the code in this repository, thus I can change from GPL to LGPL!
2014-09-17 13:57:56 +00:00
Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
Change to LGPLv2+ I'm the only copyright holder of the code in this repository, thus I can change from GPL to LGPL!
2014-09-17 13:57:56 +00:00
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) version 3, or any
later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), which shall
act as a proxy defined in Section 6 of version 3 of the license.
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
Change to LGPLv2+ I'm the only copyright holder of the code in this repository, thus I can change from GPL to LGPL!
2014-09-17 13:57:56 +00:00
This library is distributed in the hope that it will be useful,
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
but WITHOUT ANY WARRANTY; without even the implied warranty of
Change to LGPLv2+ I'm the only copyright holder of the code in this repository, thus I can change from GPL to LGPL!
2014-09-17 13:57:56 +00:00
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
Change to LGPLv2+ I'm the only copyright holder of the code in this repository, thus I can change from GPL to LGPL!
2014-09-17 13:57:56 +00:00
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
*********************************************************************/
// Qt
Remove qt include prefixx
2018-11-06 06:22:36 +00:00
#include <QtTest>
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
// KWin
Add a build system Framework style build system which generates two libraries: * KF5WaylandClient * KF5WaylandServer autotests are adjusted to compile again. They need to be changed to use the libraries once the export header gets generated.
2014-09-17 12:35:33 +00:00
#include "../../src/client/connection_thread.h"
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
#include "../../src/client/event_queue.h"
[autotests] Extend tests for Dpms REVIEW: 125018
2015-09-01 12:02:38 +00:00
#include "../../src/client/dpms.h"
Add a build system Framework style build system which generates two libraries: * KF5WaylandClient * KF5WaylandServer autotests are adjusted to compile again. They need to be changed to use the libraries once the export header gets generated.
2014-09-17 12:35:33 +00:00
#include "../../src/client/output.h"
#include "../../src/client/registry.h"
#include "../../src/server/display.h"
[autotests] Extend tests for Dpms REVIEW: 125018
2015-09-01 12:02:38 +00:00
#include "../../src/server/dpms_interface.h"
Add a build system Framework style build system which generates two libraries: * KF5WaylandClient * KF5WaylandServer autotests are adjusted to compile again. They need to be changed to use the libraries once the export header gets generated.
2014-09-17 12:35:33 +00:00
#include "../../src/server/output_interface.h"
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
// Wayland
#include <wayland-client-protocol.h>
class TestWaylandOutput : public QObject
{
Q_OBJECT
public:
explicit TestWaylandOutput(QObject *parent = nullptr);
private Q_SLOTS:
void init();
void cleanup();
void testRegistry();
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
void testModeChanges();
void testScaleChange();
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
void testSubPixel_data();
void testSubPixel();
void testTransform_data();
void testTransform();
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
[autotests] Extend tests for Dpms REVIEW: 125018
2015-09-01 12:02:38 +00:00
void testDpms_data();
void testDpms();
[autotest] Extend tests for Dpms modes Summary: Now also tests: * requesting mode from client side * update supported change on server side Reviewers: #plasma Subscribers: plasma-devel Projects: #plasma Differential Revision: https://phabricator.kde.org/D1357
2016-04-08 09:42:51 +00:00
void testDpmsRequestMode_data();
void testDpmsRequestMode();
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
private:
Use namespace KWayland::Server instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:10:38 +00:00
KWayland::Server::Display *m_display;
KWayland::Server::OutputInterface *m_serverOutput;
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::ConnectionThread *m_connection;
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
KWayland::Client::EventQueue *m_queue;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QThread *m_thread;
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
};
static const QString s_socketName = QStringLiteral("kwin-test-wayland-output-0");
TestWaylandOutput::TestWaylandOutput(QObject *parent)
: QObject(parent)
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
, m_display(nullptr)
, m_serverOutput(nullptr)
, m_connection(nullptr)
, m_thread(nullptr)
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
{
}
void TestWaylandOutput::init()
{
Use namespace KWayland::Server instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:10:38 +00:00
using namespace KWayland::Server;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
delete m_display;
m_display = new Display(this);
m_display->setSocketName(s_socketName);
m_display->start();
QVERIFY(m_display->isRunning());
m_serverOutput = m_display->createOutput(this);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->pixelSize(), QSize());
QCOMPARE(m_serverOutput->refreshRate(), 60000);
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
m_serverOutput->addMode(QSize(800, 600), OutputInterface::ModeFlags(OutputInterface::ModeFlag::Preferred));
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->pixelSize(), QSize(800, 600));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->addMode(QSize(1024, 768));
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
m_serverOutput->addMode(QSize(1280, 1024), OutputInterface::ModeFlags(), 90000);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->pixelSize(), QSize(800, 600));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->setCurrentMode(QSize(1024, 768));
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->pixelSize(), QSize(1024, 768));
QCOMPARE(m_serverOutput->refreshRate(), 60000);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->create();
[autotests] Extend tests for Dpms REVIEW: 125018
2015-09-01 12:02:38 +00:00
QCOMPARE(m_serverOutput->isDpmsSupported(), false);
QCOMPARE(m_serverOutput->dpmsMode(), OutputInterface::DpmsMode::On);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
// setup connection
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
m_connection = new KWayland::Client::ConnectionThread;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QSignalSpy connectedSpy(m_connection, SIGNAL(connected()));
m_connection->setSocketName(s_socketName);
m_thread = new QThread(this);
m_connection->moveToThread(m_thread);
m_thread->start();
m_connection->initConnection();
QVERIFY(connectedSpy.wait());
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
m_queue = new KWayland::Client::EventQueue(this);
QVERIFY(!m_queue->isValid());
m_queue->setup(m_connection);
QVERIFY(m_queue->isValid());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
}
void TestWaylandOutput::cleanup()
{
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
if (m_queue) {
delete m_queue;
m_queue = nullptr;
}
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
if (m_thread) {
m_thread->quit();
m_thread->wait();
delete m_thread;
m_thread = nullptr;
}
delete m_connection;
m_connection = nullptr;
delete m_serverOutput;
m_serverOutput = nullptr;
delete m_display;
m_display = nullptr;
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
}
void TestWaylandOutput::testRegistry()
{
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QSignalSpy globalPositionChangedSpy(m_serverOutput, &KWayland::Server::OutputInterface::globalPositionChanged);
QVERIFY(globalPositionChangedSpy.isValid());
QCOMPARE(m_serverOutput->globalPosition(), QPoint(0, 0));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->setGlobalPosition(QPoint(100, 50));
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->globalPosition(), QPoint(100, 50));
QCOMPARE(globalPositionChangedSpy.count(), 1);
// changing again should not trigger signal
m_serverOutput->setGlobalPosition(QPoint(100, 50));
QCOMPARE(globalPositionChangedSpy.count(), 1);
QSignalSpy physicalSizeChangedSpy(m_serverOutput, &KWayland::Server::OutputInterface::physicalSizeChanged);
QVERIFY(physicalSizeChangedSpy.isValid());
QCOMPARE(m_serverOutput->physicalSize(), QSize());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->setPhysicalSize(QSize(200, 100));
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->physicalSize(), QSize(200, 100));
QCOMPARE(physicalSizeChangedSpy.count(), 1);
// changing again should not trigger signal
m_serverOutput->setPhysicalSize(QSize(200, 100));
QCOMPARE(physicalSizeChangedSpy.count(), 1);
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QSignalSpy announced(&registry, SIGNAL(outputAnnounced(quint32,quint32)));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
registry.create(m_connection->display());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QVERIFY(registry.isValid());
registry.setup();
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
wl_display_flush(m_connection->display());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QVERIFY(announced.wait());
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Output output;
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QVERIFY(!output.isValid());
QCOMPARE(output.geometry(), QRect());
QCOMPARE(output.globalPosition(), QPoint());
QCOMPARE(output.manufacturer(), QString());
QCOMPARE(output.model(), QString());
QCOMPARE(output.physicalSize(), QSize());
QCOMPARE(output.pixelSize(), QSize());
QCOMPARE(output.refreshRate(), 0);
QCOMPARE(output.scale(), 1);
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QCOMPARE(output.subPixel(), KWayland::Client::Output::SubPixel::Unknown);
QCOMPARE(output.transform(), KWayland::Client::Output::Transform::Normal);
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QSignalSpy outputChanged(&output, SIGNAL(changed()));
QVERIFY(outputChanged.isValid());
[client] Track all created Outputs and add static get method Summary: This change starts to track all Outputs and introduces a static method to get an Output* for a wl_output* in case the wl_output* is known to Output. This is needed for the enter and leave events on wl_surface. Reviewers: #plasma_on_wayland Subscribers: plasma-devel Tags: #plasma_on_wayland Differential Revision: https://phabricator.kde.org/D2526
2016-08-22 08:02:28 +00:00
auto o = registry.bindOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>());
QVERIFY(!KWayland::Client::Output::get(o));
output.setup(o);
QCOMPARE(KWayland::Client::Output::get(o), &output);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
wl_display_flush(m_connection->display());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QVERIFY(outputChanged.wait());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.geometry(), QRect(100, 50, 1024, 768));
QCOMPARE(output.globalPosition(), QPoint(100, 50));
QCOMPARE(output.manufacturer(), QStringLiteral("org.kde.kwin"));
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QCOMPARE(output.model(), QStringLiteral("none"));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.physicalSize(), QSize(200, 100));
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QCOMPARE(output.pixelSize(), QSize(1024, 768));
QCOMPARE(output.refreshRate(), 60000);
QCOMPARE(output.scale(), 1);
// for xwayland output it's unknown
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QCOMPARE(output.subPixel(), KWayland::Client::Output::SubPixel::Unknown);
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
// for xwayland transform is normal
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QCOMPARE(output.transform(), KWayland::Client::Output::Transform::Normal);
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
}
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
void TestWaylandOutput::testModeChanges()
{
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
// verify the server modes
using namespace KWayland::Server;
const auto serverModes = m_serverOutput->modes();
QCOMPARE(serverModes.count(), 3);
QCOMPARE(serverModes.at(0).size, QSize(800, 600));
QCOMPARE(serverModes.at(1).size, QSize(1024, 768));
QCOMPARE(serverModes.at(2).size, QSize(1280, 1024));
QCOMPARE(serverModes.at(0).refreshRate, 60000);
QCOMPARE(serverModes.at(1).refreshRate, 60000);
QCOMPARE(serverModes.at(2).refreshRate, 90000);
QCOMPARE(serverModes.at(0).flags, OutputInterface::ModeFlags(OutputInterface::ModeFlag::Preferred));
QCOMPARE(serverModes.at(1).flags, OutputInterface::ModeFlags(OutputInterface::ModeFlag::Current));
QCOMPARE(serverModes.at(2).flags, OutputInterface::ModeFlags());
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
using namespace KWayland::Client;
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QSignalSpy announced(&registry, SIGNAL(outputAnnounced(quint32,quint32)));
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
registry.setEventQueue(m_queue);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(m_connection->display());
QVERIFY(announced.wait());
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Output output;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QSignalSpy outputChanged(&output, SIGNAL(changed()));
QVERIFY(outputChanged.isValid());
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
QSignalSpy modeAddedSpy(&output, SIGNAL(modeAdded(KWayland::Client::Output::Mode)));
QVERIFY(modeAddedSpy.isValid());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
output.setup(registry.bindOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>()));
wl_display_flush(m_connection->display());
QVERIFY(outputChanged.wait());
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
QCOMPARE(modeAddedSpy.count(), 3);
QCOMPARE(modeAddedSpy.at(0).first().value<Output::Mode>().size, QSize(800, 600));
QCOMPARE(modeAddedSpy.at(0).first().value<Output::Mode>().refreshRate, 60000);
QCOMPARE(modeAddedSpy.at(0).first().value<Output::Mode>().flags, Output::Mode::Flags(Output::Mode::Flag::Preferred));
QCOMPARE(modeAddedSpy.at(0).first().value<Output::Mode>().output, QPointer<Output>(&output));
QCOMPARE(modeAddedSpy.at(1).first().value<Output::Mode>().size, QSize(1280, 1024));
QCOMPARE(modeAddedSpy.at(1).first().value<Output::Mode>().refreshRate, 90000);
QCOMPARE(modeAddedSpy.at(1).first().value<Output::Mode>().flags, Output::Mode::Flags(Output::Mode::Flag::None));
QCOMPARE(modeAddedSpy.at(1).first().value<Output::Mode>().output, QPointer<Output>(&output));
QCOMPARE(modeAddedSpy.at(2).first().value<Output::Mode>().size, QSize(1024, 768));
QCOMPARE(modeAddedSpy.at(2).first().value<Output::Mode>().refreshRate, 60000);
QCOMPARE(modeAddedSpy.at(2).first().value<Output::Mode>().flags, Output::Mode::Flags(Output::Mode::Flag::Current));
QCOMPARE(modeAddedSpy.at(2).first().value<Output::Mode>().output, QPointer<Output>(&output));
const QList<Output::Mode> &modes = output.modes();
QCOMPARE(modes.size(), 3);
QCOMPARE(modes.at(0), modeAddedSpy.at(0).first().value<Output::Mode>());
QCOMPARE(modes.at(1), modeAddedSpy.at(1).first().value<Output::Mode>());
QCOMPARE(modes.at(2), modeAddedSpy.at(2).first().value<Output::Mode>());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.pixelSize(), QSize(1024, 768));
// change the current mode
outputChanged.clear();
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
QSignalSpy modeChangedSpy(&output, &KWayland::Client::Output::modeChanged);
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
QVERIFY(modeChangedSpy.isValid());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->setCurrentMode(QSize(800, 600));
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
QVERIFY(modeChangedSpy.wait());
if (modeChangedSpy.size() == 1) {
QVERIFY(modeChangedSpy.wait());
}
QCOMPARE(modeChangedSpy.size(), 2);
// the one which lost the current flag
QCOMPARE(modeChangedSpy.first().first().value<Output::Mode>().size, QSize(1024, 768));
QCOMPARE(modeChangedSpy.first().first().value<Output::Mode>().refreshRate, 60000);
QCOMPARE(modeChangedSpy.first().first().value<Output::Mode>().flags, Output::Mode::Flags());
// the one which got the current flag
QCOMPARE(modeChangedSpy.last().first().value<Output::Mode>().size, QSize(800, 600));
QCOMPARE(modeChangedSpy.last().first().value<Output::Mode>().refreshRate, 60000);
QCOMPARE(modeChangedSpy.last().first().value<Output::Mode>().flags, Output::Mode::Flags(Output::Mode::Flag::Current | Output::Mode::Flag::Preferred));
QVERIFY(!outputChanged.isEmpty());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.pixelSize(), QSize(800, 600));
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
const QList<Output::Mode> &modes2 = output.modes();
QCOMPARE(modes2.at(0).size, QSize(1280, 1024));
QCOMPARE(modes2.at(0).refreshRate, 90000);
QCOMPARE(modes2.at(0).flags, Output::Mode::Flag::None);
QCOMPARE(modes2.at(1).size, QSize(1024, 768));
QCOMPARE(modes2.at(1).refreshRate, 60000);
QCOMPARE(modes2.at(1).flags, Output::Mode::Flag::None);
QCOMPARE(modes2.at(2).size, QSize(800, 600));
QCOMPARE(modes2.at(2).refreshRate, 60000);
QCOMPARE(modes2.at(2).flags, Output::Mode::Flag::Current | Output::Mode::Flag::Preferred);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
// change once more
outputChanged.clear();
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
modeChangedSpy.clear();
m_serverOutput->setCurrentMode(QSize(1280, 1024), 90000);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->refreshRate(), 90000);
Add support for Modes in Output
2014-09-23 13:56:13 +00:00
QVERIFY(modeChangedSpy.wait());
if (modeChangedSpy.size() == 1) {
QVERIFY(modeChangedSpy.wait());
}
QCOMPARE(modeChangedSpy.size(), 2);
// the one which lost the current flag
QCOMPARE(modeChangedSpy.first().first().value<Output::Mode>().size, QSize(800, 600));
QCOMPARE(modeChangedSpy.first().first().value<Output::Mode>().refreshRate, 60000);
QCOMPARE(modeChangedSpy.first().first().value<Output::Mode>().flags, Output::Mode::Flags(Output::Mode::Flag::Preferred));
// the one which got the current flag
QCOMPARE(modeChangedSpy.last().first().value<Output::Mode>().size, QSize(1280, 1024));
QCOMPARE(modeChangedSpy.last().first().value<Output::Mode>().refreshRate, 90000);
QCOMPARE(modeChangedSpy.last().first().value<Output::Mode>().flags, Output::Mode::Flags(Output::Mode::Flag::Current));
QVERIFY(!outputChanged.isEmpty());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.pixelSize(), QSize(1280, 1024));
}
void TestWaylandOutput::testScaleChange()
{
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QSignalSpy announced(&registry, SIGNAL(outputAnnounced(quint32,quint32)));
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(m_connection->display());
QVERIFY(announced.wait());
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Output output;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QSignalSpy outputChanged(&output, SIGNAL(changed()));
QVERIFY(outputChanged.isValid());
output.setup(registry.bindOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>()));
wl_display_flush(m_connection->display());
QVERIFY(outputChanged.wait());
QCOMPARE(output.scale(), 1);
// change the scale
outputChanged.clear();
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->scale(), 1);
QSignalSpy serverScaleChanged(m_serverOutput, &KWayland::Server::OutputInterface::scaleChanged);
QVERIFY(serverScaleChanged.isValid());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->setScale(2);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->scale(), 2);
QCOMPARE(serverScaleChanged.count(), 1);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QVERIFY(outputChanged.wait());
QCOMPARE(output.scale(), 2);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
// changing to same value should not trigger
m_serverOutput->setScale(2);
QCOMPARE(serverScaleChanged.count(), 1);
QVERIFY(!outputChanged.wait(100));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
// change once more
outputChanged.clear();
m_serverOutput->setScale(4);
QVERIFY(outputChanged.wait());
QCOMPARE(output.scale(), 4);
}
void TestWaylandOutput::testSubPixel_data()
{
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
using namespace KWayland::Client;
Use namespace KWayland::Server instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:10:38 +00:00
using namespace KWayland::Server;
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QTest::addColumn<KWayland::Client::Output::SubPixel>("expected");
Use namespace KWayland::Server instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:10:38 +00:00
QTest::addColumn<KWayland::Server::OutputInterface::SubPixel>("actual");
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QTest::newRow("none") << Output::SubPixel::None << OutputInterface::SubPixel::None;
QTest::newRow("horizontal/rgb") << Output::SubPixel::HorizontalRGB << OutputInterface::SubPixel::HorizontalRGB;
QTest::newRow("horizontal/bgr") << Output::SubPixel::HorizontalBGR << OutputInterface::SubPixel::HorizontalBGR;
QTest::newRow("vertical/rgb") << Output::SubPixel::VerticalRGB << OutputInterface::SubPixel::VerticalRGB;
QTest::newRow("vertical/bgr") << Output::SubPixel::VerticalBGR << OutputInterface::SubPixel::VerticalBGR;
}
void TestWaylandOutput::testSubPixel()
{
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
using namespace KWayland::Client;
Use namespace KWayland::Server instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:10:38 +00:00
using namespace KWayland::Server;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QFETCH(OutputInterface::SubPixel, actual);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->subPixel(), OutputInterface::SubPixel::Unknown);
QSignalSpy serverSubPixelChangedSpy(m_serverOutput, &OutputInterface::subPixelChanged);
QVERIFY(serverSubPixelChangedSpy.isValid());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->setSubPixel(actual);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->subPixel(), actual);
QCOMPARE(serverSubPixelChangedSpy.count(), 1);
// changing to same value should not trigger the signal
m_serverOutput->setSubPixel(actual);
QCOMPARE(serverSubPixelChangedSpy.count(), 1);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QSignalSpy announced(&registry, SIGNAL(outputAnnounced(quint32,quint32)));
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(m_connection->display());
QVERIFY(announced.wait());
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Output output;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QSignalSpy outputChanged(&output, SIGNAL(changed()));
QVERIFY(outputChanged.isValid());
output.setup(registry.bindOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>()));
wl_display_flush(m_connection->display());
if (outputChanged.isEmpty()) {
QVERIFY(outputChanged.wait());
}
QTEST(output.subPixel(), "expected");
// change back to unknown
outputChanged.clear();
m_serverOutput->setSubPixel(OutputInterface::SubPixel::Unknown);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->subPixel(), OutputInterface::SubPixel::Unknown);
QCOMPARE(serverSubPixelChangedSpy.count(), 2);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
if (outputChanged.isEmpty()) {
QVERIFY(outputChanged.wait());
}
QCOMPARE(output.subPixel(), Output::SubPixel::Unknown);
}
void TestWaylandOutput::testTransform_data()
{
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
using namespace KWayland::Client;
Use namespace KWayland::Server instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:10:38 +00:00
using namespace KWayland::Server;
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QTest::addColumn<KWayland::Client::Output::Transform>("expected");
Use namespace KWayland::Server instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:10:38 +00:00
QTest::addColumn<KWayland::Server::OutputInterface::Transform>("actual");
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QTest::newRow("90") << Output::Transform::Rotated90 << OutputInterface::Transform::Rotated90;
QTest::newRow("180") << Output::Transform::Rotated180 << OutputInterface::Transform::Rotated180;
QTest::newRow("270") << Output::Transform::Rotated270 << OutputInterface::Transform::Rotated270;
QTest::newRow("Flipped") << Output::Transform::Flipped << OutputInterface::Transform::Flipped;
QTest::newRow("Flipped 90") << Output::Transform::Flipped90 << OutputInterface::Transform::Flipped90;
QTest::newRow("Flipped 180") << Output::Transform::Flipped180 << OutputInterface::Transform::Flipped180;
QTest::newRow("Flipped 280") << Output::Transform::Flipped270 << OutputInterface::Transform::Flipped270;
}
void TestWaylandOutput::testTransform()
{
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
using namespace KWayland::Client;
Use namespace KWayland::Server instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:10:38 +00:00
using namespace KWayland::Server;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QFETCH(OutputInterface::Transform, actual);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->transform(), OutputInterface::Transform::Normal);
QSignalSpy serverTransformChangedSpy(m_serverOutput, &OutputInterface::transformChanged);
QVERIFY(serverTransformChangedSpy.isValid());
m_serverOutput->setTransform(actual);
QCOMPARE(m_serverOutput->transform(), actual);
QCOMPARE(serverTransformChangedSpy.count(), 1);
// changing to same should not trigger signal
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_serverOutput->setTransform(actual);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(serverTransformChangedSpy.count(), 1);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QSignalSpy announced(&registry, SIGNAL(outputAnnounced(quint32,quint32)));
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(m_connection->display());
QVERIFY(announced.wait());
Add convenient create methods to Registry These methods allow to create the Interface objects and set them up directly.
2014-09-19 08:42:44 +00:00
KWayland::Client::Output *output = registry.createOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>(), &registry);
QSignalSpy outputChanged(output, SIGNAL(changed()));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QVERIFY(outputChanged.isValid());
wl_display_flush(m_connection->display());
if (outputChanged.isEmpty()) {
QVERIFY(outputChanged.wait());
}
Add convenient create methods to Registry These methods allow to create the Interface objects and set them up directly.
2014-09-19 08:42:44 +00:00
QTEST(output->transform(), "expected");
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
// change back to normal
outputChanged.clear();
m_serverOutput->setTransform(OutputInterface::Transform::Normal);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QCOMPARE(m_serverOutput->transform(), OutputInterface::Transform::Normal);
QCOMPARE(serverTransformChangedSpy.count(), 2);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
if (outputChanged.isEmpty()) {
QVERIFY(outputChanged.wait());
}
Add convenient create methods to Registry These methods allow to create the Interface objects and set them up directly.
2014-09-19 08:42:44 +00:00
QCOMPARE(output->transform(), Output::Transform::Normal);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
}
[autotests] Extend tests for Dpms REVIEW: 125018
2015-09-01 12:02:38 +00:00
void TestWaylandOutput::testDpms_data()
{
using namespace KWayland::Client;
using namespace KWayland::Server;
QTest::addColumn<KWayland::Client::Dpms::Mode>("client");
QTest::addColumn<KWayland::Server::OutputInterface::DpmsMode>("server");
QTest::newRow("Standby") << Dpms::Mode::Standby << OutputInterface::DpmsMode::Standby;
QTest::newRow("Suspend") << Dpms::Mode::Suspend << OutputInterface::DpmsMode::Suspend;
QTest::newRow("Off") << Dpms::Mode::Off << OutputInterface::DpmsMode::Off;
}
void TestWaylandOutput::testDpms()
{
using namespace KWayland::Client;
using namespace KWayland::Server;
m_display->createDpmsManager()->create();
// set Dpms on the Output
QSignalSpy serverDpmsSupportedChangedSpy(m_serverOutput, &OutputInterface::dpmsSupportedChanged);
QVERIFY(serverDpmsSupportedChangedSpy.isValid());
QCOMPARE(m_serverOutput->isDpmsSupported(), false);
m_serverOutput->setDpmsSupported(true);
QCOMPARE(serverDpmsSupportedChangedSpy.count(), 1);
QCOMPARE(m_serverOutput->isDpmsSupported(), true);
KWayland::Client::Registry registry;
registry.setEventQueue(m_queue);
QSignalSpy announced(&registry, &Registry::interfacesAnnounced);
QVERIFY(announced.isValid());
QSignalSpy dpmsAnnouncedSpy(&registry, &Registry::dpmsAnnounced);
QVERIFY(dpmsAnnouncedSpy.isValid());
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
m_connection->flush();
QVERIFY(announced.wait());
QCOMPARE(dpmsAnnouncedSpy.count(), 1);
Output *output = registry.createOutput(registry.interface(Registry::Interface::Output).name, registry.interface(Registry::Interface::Output).version, &registry);
DpmsManager *dpmsManager = registry.createDpmsManager(dpmsAnnouncedSpy.first().first().value<quint32>(), dpmsAnnouncedSpy.first().last().value<quint32>(), &registry);
QVERIFY(dpmsManager->isValid());
Dpms *dpms = dpmsManager->getDpms(output, &registry);
QSignalSpy clientDpmsSupportedChangedSpy(dpms, &Dpms::supportedChanged);
QVERIFY(clientDpmsSupportedChangedSpy.isValid());
QVERIFY(dpms->isValid());
QCOMPARE(dpms->isSupported(), false);
QCOMPARE(dpms->mode(), Dpms::Mode::On);
m_connection->flush();
QVERIFY(clientDpmsSupportedChangedSpy.wait());
QCOMPARE(clientDpmsSupportedChangedSpy.count(), 1);
QCOMPARE(dpms->isSupported(), true);
// and let's change to suspend
QSignalSpy serverDpmsModeChangedSpy(m_serverOutput, &OutputInterface::dpmsModeChanged);
QVERIFY(serverDpmsModeChangedSpy.isValid());
QSignalSpy clientDpmsModeChangedSpy(dpms, &Dpms::modeChanged);
QVERIFY(clientDpmsModeChangedSpy.isValid());
QCOMPARE(m_serverOutput->dpmsMode(), OutputInterface::DpmsMode::On);
QFETCH(OutputInterface::DpmsMode, server);
m_serverOutput->setDpmsMode(server);
QCOMPARE(m_serverOutput->dpmsMode(), server);
QCOMPARE(serverDpmsModeChangedSpy.count(), 1);
QVERIFY(clientDpmsModeChangedSpy.wait());
QCOMPARE(clientDpmsModeChangedSpy.count(), 1);
QTEST(dpms->mode(), "client");
[autotest] Extend tests for Dpms modes Summary: Now also tests: * requesting mode from client side * update supported change on server side Reviewers: #plasma Subscribers: plasma-devel Projects: #plasma Differential Revision: https://phabricator.kde.org/D1357
2016-04-08 09:42:51 +00:00
// test supported changed
QSignalSpy supportedChangedSpy(dpms, &Dpms::supportedChanged);
QVERIFY(supportedChangedSpy.isValid());
m_serverOutput->setDpmsSupported(false);
QVERIFY(supportedChangedSpy.wait());
QCOMPARE(supportedChangedSpy.count(), 1);
QVERIFY(!dpms->isSupported());
m_serverOutput->setDpmsSupported(true);
QVERIFY(supportedChangedSpy.wait());
QCOMPARE(supportedChangedSpy.count(), 2);
QVERIFY(dpms->isSupported());
// and switch back to on
m_serverOutput->setDpmsMode(OutputInterface::DpmsMode::On);
QVERIFY(clientDpmsModeChangedSpy.wait());
QCOMPARE(clientDpmsModeChangedSpy.count(), 2);
QCOMPARE(dpms->mode(), Dpms::Mode::On);
}
void TestWaylandOutput::testDpmsRequestMode_data()
{
using namespace KWayland::Client;
using namespace KWayland::Server;
QTest::addColumn<KWayland::Client::Dpms::Mode>("client");
QTest::addColumn<KWayland::Server::OutputInterface::DpmsMode>("server");
QTest::newRow("Standby") << Dpms::Mode::Standby << OutputInterface::DpmsMode::Standby;
QTest::newRow("Suspend") << Dpms::Mode::Suspend << OutputInterface::DpmsMode::Suspend;
QTest::newRow("Off") << Dpms::Mode::Off << OutputInterface::DpmsMode::Off;
QTest::newRow("On") << Dpms::Mode::On << OutputInterface::DpmsMode::On;
}
void TestWaylandOutput::testDpmsRequestMode()
{
// this test verifies that requesting a dpms change from client side emits the signal on server side
using namespace KWayland::Client;
using namespace KWayland::Server;
// setup code
m_display->createDpmsManager()->create();
// set Dpms on the Output
QSignalSpy serverDpmsSupportedChangedSpy(m_serverOutput, &OutputInterface::dpmsSupportedChanged);
QVERIFY(serverDpmsSupportedChangedSpy.isValid());
QCOMPARE(m_serverOutput->isDpmsSupported(), false);
m_serverOutput->setDpmsSupported(true);
QCOMPARE(serverDpmsSupportedChangedSpy.count(), 1);
QCOMPARE(m_serverOutput->isDpmsSupported(), true);
KWayland::Client::Registry registry;
registry.setEventQueue(m_queue);
QSignalSpy announced(&registry, &Registry::interfacesAnnounced);
QVERIFY(announced.isValid());
QSignalSpy dpmsAnnouncedSpy(&registry, &Registry::dpmsAnnounced);
QVERIFY(dpmsAnnouncedSpy.isValid());
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
m_connection->flush();
QVERIFY(announced.wait());
QCOMPARE(dpmsAnnouncedSpy.count(), 1);
Output *output = registry.createOutput(registry.interface(Registry::Interface::Output).name, registry.interface(Registry::Interface::Output).version, &registry);
DpmsManager *dpmsManager = registry.createDpmsManager(dpmsAnnouncedSpy.first().first().value<quint32>(), dpmsAnnouncedSpy.first().last().value<quint32>(), &registry);
QVERIFY(dpmsManager->isValid());
Dpms *dpms = dpmsManager->getDpms(output, &registry);
// and test request mode
QSignalSpy modeRequestedSpy(m_serverOutput, &OutputInterface::dpmsModeRequested);
QVERIFY(modeRequestedSpy.isValid());
QFETCH(Dpms::Mode, client);
dpms->requestMode(client);
QVERIFY(modeRequestedSpy.wait());
QTEST(modeRequestedSpy.last().first().value<OutputInterface::DpmsMode>(), "server");
[autotests] Extend tests for Dpms REVIEW: 125018
2015-09-01 12:02:38 +00:00
}
Switch all auto tests to QTEST_GUILESS_MAIN We don't need a QGuiApplication in the tests.
2014-09-23 10:00:17 +00:00
QTEST_GUILESS_MAIN(TestWaylandOutput)
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
#include "test_wayland_output.moc"
Reference in a new issue Copy permalink