1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: migrate QDBusInterface test to QRegularExpression

Browse Source 
This is part of the migration of qtbase from QRexExp to
QRegularExpression.

Task-number: QTBUG-72587
Change-Id: I47a047e27432c874b47bd25581806e1bc156e94f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
This commit is contained in:
Samuel Gaist 2019-06-10 09:17:06 +02:00 committed by Frederik Gladhorn
parent 8409844bd6
commit 439f343416
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
View File

@ -31,6 +31,7 @@
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qmetatype.h> #include <qmetatype.h>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtCore/qregularexpression.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtDBus/private/qdbus_symbols_p.h> #include <QtDBus/private/qdbus_symbols_p.h>
@ -451,14 +452,16 @@ void tst_QDBusInterface::introspectVirtualObject()
QDBusMessage message = QDBusMessage::createMethodCall(con.baseService(), path, "org.freedesktop.DBus.Introspectable", "Introspect"); QDBusMessage message = QDBusMessage::createMethodCall(con.baseService(), path, "org.freedesktop.DBus.Introspectable", "Introspect");
QDBusMessage reply = con.call(message, QDBus::Block, 5000); QDBusMessage reply = con.call(message, QDBus::Block, 5000);
QVERIFY(reply.arguments().at(0).toString().contains( QVERIFY(reply.arguments().at(0).toString().contains(
QRegExp("<node>.*zitroneneis.*<interface name=") )); QRegularExpression("<node>.*zitroneneis.*<interface name=",
QRegularExpression::DotMatchesEverythingOption)));
QDBusMessage message2 = QDBusMessage::createMethodCall(con.baseService(), path + "/foo", "org.freedesktop.DBus.Introspectable", "Introspect"); QDBusMessage message2 = QDBusMessage::createMethodCall(con.baseService(), path + "/foo", "org.freedesktop.DBus.Introspectable", "Introspect");
QDBusMessage reply2 = con.call(message2, QDBus::Block, 5000); QDBusMessage reply2 = con.call(message2, QDBus::Block, 5000);
QVERIFY(reply2.arguments().at(0).toString().contains( QVERIFY(reply2.arguments().at(0).toString().contains(
QRegExp("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">" QRegularExpression("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">"
".*<method name=\"klingeling\" />\n" ".*<method name=\"klingeling\" />\n"
".*</interface>.*<interface name=") )); ".*</interface>.*<interface name=",
QRegularExpression::DotMatchesEverythingOption)));
} }
void tst_QDBusInterface::callMethod() void tst_QDBusInterface::callMethod()