diff options
Diffstat (limited to 'tests/auto/dbus/qdbusinterface')
5 files changed, 79 insertions, 6 deletions
diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt new file mode 100644 index 0000000000..c96944cd56 --- /dev/null +++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from qdbusinterface.pro. + +# special case begin +add_subdirectory(qmyserver) + +##################################################################### +## ../tst_qdbusinterface Test: +##################################################################### + +add_qt_test(tst_qdbusinterface + SOURCES + myobject.h + tst_qdbusinterface.cpp + LIBRARIES + Qt::CorePrivate + Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus +) + +#### Keys ignored in scope 1:.:.:qdbusinterface.pro:<TRUE>: +# CONFIG = "testcase" +# DESTDIR = "./" + +## Scopes: +##################################################################### + +extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked + DEFINES + QT_LINKED_LIBDBUS + PUBLIC_LIBRARIES + dbus-1 +) + +extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked + SOURCES + ../../../../src/dbus/qdbus_symbols.cpp +) + +# special case end diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt new file mode 100644 index 0000000000..671403999b --- /dev/null +++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qmyserver.pro. + +##################################################################### +## qmyserver_qdbusinterface Binary: +##################################################################### + +add_qt_executable(qmyserver_qdbusinterface + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + ../myobject.h + qmyserver.cpp + PUBLIC_LIBRARIES + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt new file mode 100644 index 0000000000..de633f2aa9 --- /dev/null +++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qmyserver.pro. + +##################################################################### +## qmyserver_qdbusinterface Binary: +##################################################################### + +add_qt_executable(qmyserver_qdbusinterface + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + NO_INSTALL # special case + SOURCES + ../myobject.h + qmyserver.cpp + PUBLIC_LIBRARIES + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro index 8f2d261899..406f3d7d36 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro +++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro @@ -1,6 +1,6 @@ SOURCES = qmyserver.cpp HEADERS = ../myobject.h -TARGET = qmyserver +TARGET = qmyserver_qdbusinterface DESTDIR = ./ QT = core dbus CONFIG -= app_bundle diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index 05480c6dd2..e416266b5f 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -31,6 +31,7 @@ #include <qcoreapplication.h> #include <qmetatype.h> #include <QtTest/QtTest> +#include <QtCore/qregularexpression.h> #include <QtCore/qvariant.h> #include <QtDBus/QtDBus> #include <QtDBus/private/qdbus_symbols_p.h> @@ -270,7 +271,7 @@ void tst_QDBusInterface::initTestCase() # define EXE "" #endif proc.setProcessChannelMode(QProcess::ForwardedErrorChannel); - proc.start(QFINDTESTDATA("qmyserver/qmyserver" EXE)); + proc.start(QFINDTESTDATA("qmyserver/qmyserver_qdbusinterface" EXE)); // FIXME CMake: This is most probably wrong now since the binary ends up in bin/ not in the build tree QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString())); QVERIFY(proc.waitForReadyRead()); @@ -451,14 +452,16 @@ void tst_QDBusInterface::introspectVirtualObject() QDBusMessage message = QDBusMessage::createMethodCall(con.baseService(), path, "org.freedesktop.DBus.Introspectable", "Introspect"); QDBusMessage reply = con.call(message, QDBus::Block, 5000); 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 reply2 = con.call(message2, QDBus::Block, 5000); QVERIFY(reply2.arguments().at(0).toString().contains( - QRegExp("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">" - ".*<method name=\"klingeling\" />\n" - ".*</interface>.*<interface name=") )); + QRegularExpression("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">" + ".*<method name=\"klingeling\" />\n" + ".*</interface>.*<interface name=", + QRegularExpression::DotMatchesEverythingOption))); } void tst_QDBusInterface::callMethod() |