[autotests] Add tests for DRM platform plugin
Summary: The addition of the test infrastructure is motivated by the regressions caused by adding mode switching and transformation support. A contributing factor to these regression is the fact that the DRM platform does not have any tests. It is difficult to test this code as it needs to work with hardware, thus we cannot use the real DRM library. Instead we need to use mocking. This change sets up some first basic tests with the help of a mockDrm library. In order to better test the code as units the Drm classes are slightly refactored. Most importantly the dependency to DrmBackend is removed wherever possible and replaced by a simple int fd which is mostly the only element used by the classes. This first test introduces basic testing of a DrmObject. It is intended to extend this to at least also test DrmPlane as a central piece of our Drm platform plugin. This will also extend the tests of DrmObject. Reviewers: #kwin, #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D8776master
parent
01c1870e9d
commit
d4ba05a22f
@ -0,0 +1,26 @@
|
|||||||
|
include_directories(${Libdrm_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
set(mockDRM_SRCS
|
||||||
|
mock_drm.cpp
|
||||||
|
../../plugins/platforms/drm/drm_buffer.cpp
|
||||||
|
../../plugins/platforms/drm/drm_object.cpp
|
||||||
|
../../plugins/platforms/drm/drm_object_connector.cpp
|
||||||
|
../../plugins/platforms/drm/drm_object_plane.cpp
|
||||||
|
../../plugins/platforms/drm/logging.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library(mockDrm STATIC ${mockDRM_SRCS})
|
||||||
|
target_link_libraries(mockDrm Qt5::Gui)
|
||||||
|
ecm_mark_as_test(mockDrm)
|
||||||
|
|
||||||
|
function(drmTest)
|
||||||
|
set(oneValueArgs NAME)
|
||||||
|
set(multiValueArgs SRCS )
|
||||||
|
cmake_parse_arguments(ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||||
|
add_executable(${ARGS_NAME} ${ARGS_SRCS})
|
||||||
|
target_link_libraries(${ARGS_NAME} mockDrm Qt5::Test)
|
||||||
|
add_test(kwin-drm-${ARGS_NAME} ${ARGS_NAME})
|
||||||
|
ecm_mark_as_test(${ARGS_NAME})
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
drmTest(NAME objecttest SRCS objecttest.cpp)
|
@ -0,0 +1,78 @@
|
|||||||
|
/********************************************************************
|
||||||
|
KWin - the KDE window manager
|
||||||
|
This file is part of the KDE project.
|
||||||
|
|
||||||
|
Copyright (C) 2017 Martin Flöser <mgraesslin@kde.org>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*********************************************************************/
|
||||||
|
#include "mock_drm.h"
|
||||||
|
|
||||||
|
#include <QMap>
|
||||||
|
#include <QVector>
|
||||||
|
|
||||||
|
static QMap<int, QVector<_drmModeProperty>> s_drmProperties{};
|
||||||
|
|
||||||
|
namespace MockDrm
|
||||||
|
{
|
||||||
|
|
||||||
|
void addDrmModeProperties(int fd, const QVector<_drmModeProperty> &properties)
|
||||||
|
{
|
||||||
|
s_drmProperties.insert(fd, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
int drmModeAtomicAddProperty(drmModeAtomicReqPtr req, uint32_t object_id, uint32_t property_id, uint64_t value)
|
||||||
|
{
|
||||||
|
Q_UNUSED(req)
|
||||||
|
Q_UNUSED(object_id)
|
||||||
|
Q_UNUSED(property_id)
|
||||||
|
Q_UNUSED(value)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
drmModePropertyPtr drmModeGetProperty(int fd, uint32_t propertyId)
|
||||||
|
{
|
||||||
|
auto it = s_drmProperties.find(fd);
|
||||||
|
if (it == s_drmProperties.end()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
auto it2 = std::find_if(it->constBegin(), it->constEnd(),
|
||||||
|
[propertyId] (const auto &property) {
|
||||||
|
return property.prop_id == propertyId;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
if (it2 == it->constEnd()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto *property = new _drmModeProperty;
|
||||||
|
property->prop_id = it2->prop_id;
|
||||||
|
property->flags = it2->flags;
|
||||||
|
strcpy(property->name, it2->name);
|
||||||
|
property->count_values = it2->count_values;
|
||||||
|
property->values = it2->values;
|
||||||
|
property->count_enums = it2->count_enums;
|
||||||
|
property->enums = it2->enums;
|
||||||
|
property->count_blobs = it2->count_blobs;
|
||||||
|
property->blob_ids = it2->blob_ids;
|
||||||
|
|
||||||
|
return property;
|
||||||
|
}
|
||||||
|
|
||||||
|
void drmModeFreeProperty(drmModePropertyPtr ptr)
|
||||||
|
{
|
||||||
|
delete ptr;
|
||||||
|
}
|
@ -0,0 +1,32 @@
|
|||||||
|
/********************************************************************
|
||||||
|
KWin - the KDE window manager
|
||||||
|
This file is part of the KDE project.
|
||||||
|
|
||||||
|
Copyright (C) 2017 Martin Flöser <mgraesslin@kde.org>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*********************************************************************/
|
||||||
|
#pragma once
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <xf86drmMode.h>
|
||||||
|
|
||||||
|
#include <QVector>
|
||||||
|
|
||||||
|
namespace MockDrm
|
||||||
|
{
|
||||||
|
|
||||||
|
void addDrmModeProperties(int fd, const QVector<_drmModeProperty> &properties);
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,218 @@
|
|||||||
|
/********************************************************************
|
||||||
|
KWin - the KDE window manager
|
||||||
|
This file is part of the KDE project.
|
||||||
|
|
||||||
|
Copyright (C) 2017 Martin Flöser <mgraesslin@kde.org>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*********************************************************************/
|
||||||
|
#include "mock_drm.h"
|
||||||
|
#include "../../plugins/platforms/drm/drm_object.h"
|
||||||
|
#include <QtTest>
|
||||||
|
|
||||||
|
class MockDrmObject : public KWin::DrmObject
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
MockDrmObject(uint32_t id, int fd)
|
||||||
|
: DrmObject(id, fd)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
~MockDrmObject() override {}
|
||||||
|
bool atomicInit() override;
|
||||||
|
bool initProps() override;
|
||||||
|
|
||||||
|
void setProperties(uint32_t count, uint32_t *props, uint64_t *values) {
|
||||||
|
m_count = count;
|
||||||
|
m_props = props;
|
||||||
|
m_values = values;
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray name(int prop) const {
|
||||||
|
auto property = DrmObject::m_props.at(prop);
|
||||||
|
if (!property) {
|
||||||
|
return QByteArray();
|
||||||
|
}
|
||||||
|
return property->name();
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t propertyId(int prop) const {
|
||||||
|
auto property = DrmObject::m_props.at(prop);
|
||||||
|
if (!property) {
|
||||||
|
return 0xFFFFFFFFu;
|
||||||
|
}
|
||||||
|
return property->propId();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
uint32_t m_count = 0;
|
||||||
|
uint32_t *m_props = nullptr;
|
||||||
|
uint64_t *m_values = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
bool MockDrmObject::atomicInit()
|
||||||
|
{
|
||||||
|
return initProps();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MockDrmObject::initProps()
|
||||||
|
{
|
||||||
|
setPropertyNames({"foo", "bar", "baz"});
|
||||||
|
drmModeObjectProperties properties{m_count, m_props, m_values};
|
||||||
|
for (int i = 0; i < 3; i++) {
|
||||||
|
initProp(i, &properties);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
class ObjectTest : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
private Q_SLOTS:
|
||||||
|
void testId_data();
|
||||||
|
void testId();
|
||||||
|
void testFd_data();
|
||||||
|
void testFd();
|
||||||
|
void testOutput();
|
||||||
|
void testInitProperties();
|
||||||
|
};
|
||||||
|
|
||||||
|
void ObjectTest::testId_data()
|
||||||
|
{
|
||||||
|
QTest::addColumn<quint32>("id");
|
||||||
|
|
||||||
|
QTest::newRow("0") << 0u;
|
||||||
|
QTest::newRow("1") << 1u;
|
||||||
|
QTest::newRow("10") << 10u;
|
||||||
|
QTest::newRow("uint max") << 0xFFFFFFFFu;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ObjectTest::testId()
|
||||||
|
{
|
||||||
|
QFETCH(quint32, id);
|
||||||
|
MockDrmObject object{id, -1};
|
||||||
|
QCOMPARE(object.id(), id);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ObjectTest::testFd_data()
|
||||||
|
{
|
||||||
|
QTest::addColumn<int>("fd");
|
||||||
|
|
||||||
|
QTest::newRow("-1") << -1;
|
||||||
|
QTest::newRow("0") << 0;
|
||||||
|
QTest::newRow("1") << 1;
|
||||||
|
QTest::newRow("2") << 2;
|
||||||
|
QTest::newRow("100") << 100;
|
||||||
|
QTest::newRow("int max") << 0x7FFFFFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ObjectTest::testFd()
|
||||||
|
{
|
||||||
|
QFETCH(int, fd);
|
||||||
|
MockDrmObject object{0, fd};
|
||||||
|
QCOMPARE(object.fd(), fd);
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace KWin
|
||||||
|
{
|
||||||
|
struct DrmOutput {
|
||||||
|
int foo;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
void ObjectTest::testOutput()
|
||||||
|
{
|
||||||
|
MockDrmObject object{0, 1};
|
||||||
|
|
||||||
|
QVERIFY(!object.output());
|
||||||
|
|
||||||
|
KWin::DrmOutput output{2};
|
||||||
|
object.setOutput(&output);
|
||||||
|
QCOMPARE(object.output(), &output);
|
||||||
|
QCOMPARE(object.output()->foo, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ObjectTest::testInitProperties()
|
||||||
|
{
|
||||||
|
MockDrmObject object{0, 20};
|
||||||
|
uint32_t propertiesIds[] = { 0, 1, 2, 3};
|
||||||
|
uint64_t values[] = { 0, 2, 10, 20 };
|
||||||
|
object.setProperties(4, propertiesIds, values);
|
||||||
|
|
||||||
|
MockDrm::addDrmModeProperties(20, QVector<_drmModeProperty>{
|
||||||
|
_drmModeProperty{
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
"foo\0",
|
||||||
|
0,
|
||||||
|
nullptr,
|
||||||
|
0,
|
||||||
|
nullptr,
|
||||||
|
0,
|
||||||
|
nullptr
|
||||||
|
},
|
||||||
|
_drmModeProperty{
|
||||||
|
1,
|
||||||
|
0,
|
||||||
|
"foobar\0",
|
||||||
|
0,
|
||||||
|
nullptr,
|
||||||
|
0,
|
||||||
|
nullptr,
|
||||||
|
0,
|
||||||
|
nullptr
|
||||||
|
},
|
||||||
|
_drmModeProperty{
|
||||||
|
2,
|
||||||
|
0,
|
||||||
|
"baz\0",
|
||||||
|
0,
|
||||||
|
nullptr,
|
||||||
|
0,
|
||||||
|
nullptr,
|
||||||
|
0,
|
||||||
|
nullptr
|
||||||
|
},
|
||||||
|
_drmModeProperty{
|
||||||
|
3,
|
||||||
|
0,
|
||||||
|
"foobarbaz\0",
|
||||||
|
0,
|
||||||
|
nullptr,
|
||||||
|
0,
|
||||||
|
nullptr,
|
||||||
|
0,
|
||||||
|
nullptr
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
object.atomicInit();
|
||||||
|
|
||||||
|
// verify the names
|
||||||
|
QCOMPARE(object.name(0), QByteArrayLiteral("foo"));
|
||||||
|
QCOMPARE(object.name(1), QByteArray());
|
||||||
|
QCOMPARE(object.name(2), QByteArrayLiteral("baz"));
|
||||||
|
|
||||||
|
// verify the property ids
|
||||||
|
QCOMPARE(object.propertyId(0), 0u);
|
||||||
|
QCOMPARE(object.propertyId(1), 0xFFFFFFFFu);
|
||||||
|
QCOMPARE(object.propertyId(2), 2u);
|
||||||
|
|
||||||
|
// doesn't have enums
|
||||||
|
QCOMPARE(object.propHasEnum(0, 0), false);
|
||||||
|
QCOMPARE(object.propHasEnum(1, 0), false);
|
||||||
|
QCOMPARE(object.propHasEnum(2, 0), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
QTEST_GUILESS_MAIN(ObjectTest)
|
||||||
|
#include "objecttest.moc"
|
Loading…
Reference in New Issue