Skip to content

Commit 439f343

Browse files
sgaistgladhorn
authored andcommitted
test: migrate QDBusInterface test to QRegularExpression
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>
1 parent 8409844 commit 439f343

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp

+7-4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <qcoreapplication.h>
3232
#include <qmetatype.h>
3333
#include <QtTest/QtTest>
34+
#include <QtCore/qregularexpression.h>
3435
#include <QtCore/qvariant.h>
3536
#include <QtDBus/QtDBus>
3637
#include <QtDBus/private/qdbus_symbols_p.h>
@@ -451,14 +452,16 @@ void tst_QDBusInterface::introspectVirtualObject()
451452
QDBusMessage message = QDBusMessage::createMethodCall(con.baseService(), path, "org.freedesktop.DBus.Introspectable", "Introspect");
452453
QDBusMessage reply = con.call(message, QDBus::Block, 5000);
453454
QVERIFY(reply.arguments().at(0).toString().contains(
454-
QRegExp("<node>.*zitroneneis.*<interface name=") ));
455+
QRegularExpression("<node>.*zitroneneis.*<interface name=",
456+
QRegularExpression::DotMatchesEverythingOption)));
455457

456458
QDBusMessage message2 = QDBusMessage::createMethodCall(con.baseService(), path + "/foo", "org.freedesktop.DBus.Introspectable", "Introspect");
457459
QDBusMessage reply2 = con.call(message2, QDBus::Block, 5000);
458460
QVERIFY(reply2.arguments().at(0).toString().contains(
459-
QRegExp("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">"
460-
".*<method name=\"klingeling\" />\n"
461-
".*</interface>.*<interface name=") ));
461+
QRegularExpression("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">"
462+
".*<method name=\"klingeling\" />\n"
463+
".*</interface>.*<interface name=",
464+
QRegularExpression::DotMatchesEverythingOption)));
462465
}
463466

464467
void tst_QDBusInterface::callMethod()

0 commit comments

Comments
 (0)