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

autotests: Hopefully fix all ASAN issues in DataControlInterfaceTest

Browse source 
In general, the destructor is not needed since cleanup() destroys all
client and server resources.
This commit is contained in:
Vlad Zahorodnii 2020-09-11 14:28:48 +03:00
parent a8883c35a5
commit 3a72048547
1 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/wayland/autotests/server/test_datacontrol_interface.cpp
View file

@ -128,11 +128,6 @@ public:
class DataControlInterfaceTest : public QObject
{
Q_OBJECT
public:
DataControlInterfaceTest()
{
}
~DataControlInterfaceTest() override;
private Q_SLOTS:
void init();
@ -159,24 +154,6 @@ private:
QVector<SurfaceInterface *> m_surfaces;
};
DataControlInterfaceTest::~DataControlInterfaceTest()
{
if (m_queue) {
delete m_queue;
m_queue = nullptr;
}
if (m_thread) {
m_thread->quit();
m_thread->wait();
delete m_thread;
m_thread = nullptr;
}
delete m_seat;
m_connection->deleteLater();
m_connection = nullptr;
}
static const QString s_socketName = QStringLiteral("kwin-wayland-datacontrol-test-0");
void DataControlInterfaceTest::init()
@ -242,6 +219,8 @@ void DataControlInterfaceTest::cleanup()
variable = nullptr; \
}
CLEANUP(m_dataControlDeviceManager)
CLEANUP(m_clientSeat)
CLEANUP(m_clientCompositor)
CLEANUP(m_queue)
if (m_connection) {
m_connection->deleteLater();
@ -253,6 +232,8 @@ void DataControlInterfaceTest::cleanup()
delete m_thread;
m_thread = nullptr;
}
CLEANUP(m_seat)
CLEANUP(m_serverCompositor)
CLEANUP(m_display)
#undef CLEANUP
}