1c6bf3e09e
This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to handle typedefs and accesses through pointers, too: const std::string o = "object"; auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); }; auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) { auto exprOfDeclaredType = [&](auto decl) { return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o); }; return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes)))); }; auto renameMethod = [&] (ArrayRef<StringRef> classes, StringRef from, StringRef to) { return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)), callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))), changeTo(cat(access(o, cat(to)), "()")), cat("use '", to, "' instead of '", from, "'")); }; renameMethod(<classes>, "count", "size"); renameMethod(<classes>, "length", "size"); except that the on() matcher has been replaced by one that doesn't ignoreParens(). a.k.a qt-port-to-std-compatible-api V5 with config Scope: 'Container'. Added two NOLINTNEXTLINEs in tst_qbitarray and tst_qcontiguouscache, to avoid porting calls that explicitly test count(). Change-Id: Icfb8808c2ff4a30187e9935a51cad26987451c22 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
239 lines
7.4 KiB
C++
239 lines
7.4 KiB
C++
// Copyright (C) 2016 The Qt Company Ltd.
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
|
|
#include <QTest>
|
|
#include <QTestEventLoop>
|
|
#include <QObject>
|
|
#include <QVariant>
|
|
#include <QList>
|
|
#include <QDBusConnection>
|
|
#include <QDBusVariant>
|
|
#include <QDBusPendingCallWatcher>
|
|
#include <QDBusMetaType>
|
|
|
|
class tst_QDBusLocalCalls: public QObject
|
|
{
|
|
Q_OBJECT
|
|
Q_CLASSINFO("D-Bus Interface", "local.tst_QDBusLocalCalls")
|
|
|
|
QDBusConnection conn;
|
|
public:
|
|
tst_QDBusLocalCalls();
|
|
|
|
public Q_SLOTS:
|
|
Q_SCRIPTABLE int echo(int value)
|
|
{ return value; }
|
|
|
|
Q_SCRIPTABLE QString echo(const QString &value)
|
|
{ return value; }
|
|
|
|
Q_SCRIPTABLE QDBusVariant echo(const QDBusVariant &value)
|
|
{ return value; }
|
|
|
|
Q_SCRIPTABLE QList<int> echo(const QList<int> &value) { return value; }
|
|
|
|
Q_SCRIPTABLE QString echo2(const QStringList &list, QString &out)
|
|
{ out = list[1]; return list[0]; }
|
|
|
|
Q_SCRIPTABLE void delayed(const QDBusMessage &msg)
|
|
{ msg.setDelayedReply(true); }
|
|
|
|
protected Q_SLOTS:
|
|
void replyReceived(QDBusPendingCallWatcher *watcher);
|
|
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void makeInvalidCalls();
|
|
void makeCalls_data();
|
|
void makeCalls();
|
|
void makeCallsVariant_data();
|
|
void makeCallsVariant();
|
|
void makeCallsTwoRets();
|
|
void makeCallsComplex();
|
|
void makeDelayedCalls();
|
|
void asyncReplySignal();
|
|
|
|
private:
|
|
QVariantList asyncReplyArgs;
|
|
QDBusMessage doCall(const QDBusMessage &call);
|
|
};
|
|
|
|
tst_QDBusLocalCalls::tst_QDBusLocalCalls()
|
|
: conn(QDBusConnection::sessionBus())
|
|
{
|
|
}
|
|
|
|
QDBusMessage tst_QDBusLocalCalls::doCall(const QDBusMessage &call)
|
|
{
|
|
QFETCH_GLOBAL(bool, useAsync);
|
|
if (useAsync) {
|
|
QDBusPendingCall ac = conn.asyncCall(call);
|
|
ac.waitForFinished();
|
|
return ac.reply();
|
|
} else {
|
|
return conn.call(call);
|
|
}
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::replyReceived(QDBusPendingCallWatcher *watcher)
|
|
{
|
|
asyncReplyArgs = watcher->reply().arguments();
|
|
QTestEventLoop::instance().exitLoop();
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::initTestCase()
|
|
{
|
|
QVERIFY(conn.isConnected());
|
|
QVERIFY(conn.registerObject("/", this, QDBusConnection::ExportScriptableSlots));
|
|
|
|
QTest::addColumn<bool>("useAsync");
|
|
QTest::newRow("sync") << false;
|
|
QTest::newRow("async") << true;
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::makeCalls_data()
|
|
{
|
|
QTest::addColumn<QVariant>("value");
|
|
QTest::newRow("int") << QVariant(42);
|
|
QTest::newRow("string") << QVariant("Hello, world");
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::makeCallsVariant_data()
|
|
{
|
|
makeCalls_data();
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::makeInvalidCalls()
|
|
{
|
|
{
|
|
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
|
|
"/", QString(), "echo");
|
|
QDBusMessage replyMsg = doCall(callMsg);
|
|
QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ErrorMessage));
|
|
|
|
QDBusError error(replyMsg);
|
|
QCOMPARE(int(error.type()), int(QDBusError::UnknownMethod));
|
|
}
|
|
|
|
{
|
|
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
|
|
"/no_object", QString(), "echo");
|
|
QDBusMessage replyMsg = doCall(callMsg);
|
|
QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ErrorMessage));
|
|
|
|
QDBusError error(replyMsg);
|
|
QCOMPARE(int(error.type()), int(QDBusError::UnknownObject));
|
|
}
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::makeCalls()
|
|
{
|
|
QFETCH(QVariant, value);
|
|
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
|
|
"/", QString(), "echo");
|
|
callMsg << value;
|
|
QDBusMessage replyMsg = doCall(callMsg);
|
|
|
|
QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage));
|
|
|
|
QVariantList replyArgs = replyMsg.arguments();
|
|
QCOMPARE(replyArgs.size(), 1);
|
|
QCOMPARE(replyArgs.at(0), value);
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::makeCallsVariant()
|
|
{
|
|
QFETCH(QVariant, value);
|
|
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
|
|
"/", QString(), "echo");
|
|
callMsg << QVariant::fromValue(QDBusVariant(value));
|
|
QDBusMessage replyMsg = doCall(callMsg);
|
|
|
|
QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage));
|
|
|
|
QVariantList replyArgs = replyMsg.arguments();
|
|
QCOMPARE(replyArgs.size(), 1);
|
|
|
|
const QVariant &reply = replyArgs.at(0);
|
|
QCOMPARE(reply.userType(), qMetaTypeId<QDBusVariant>());
|
|
QCOMPARE(qvariant_cast<QDBusVariant>(reply).variant(), value);
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::makeCallsTwoRets()
|
|
{
|
|
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
|
|
"/", QString(), "echo2");
|
|
callMsg << (QStringList() << "One" << "Two");
|
|
QDBusMessage replyMsg = doCall(callMsg);
|
|
|
|
QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage));
|
|
|
|
QVariantList replyArgs = replyMsg.arguments();
|
|
QCOMPARE(replyArgs.size(), 2);
|
|
QCOMPARE(replyArgs.at(0).toString(), QString::fromLatin1("One"));
|
|
QCOMPARE(replyArgs.at(1).toString(), QString::fromLatin1("Two"));
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::makeCallsComplex()
|
|
{
|
|
qDBusRegisterMetaType<QList<int> >();
|
|
qDBusRegisterMetaType<QList<int>>();
|
|
|
|
QList<int> value;
|
|
value << 1 << -42 << 47;
|
|
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
|
|
"/", QString(), "echo");
|
|
callMsg << QVariant::fromValue(value);
|
|
QDBusMessage replyMsg = doCall(callMsg);
|
|
|
|
QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage));
|
|
|
|
QVariantList replyArgs = replyMsg.arguments();
|
|
QCOMPARE(replyArgs.size(), 1);
|
|
const QVariant &reply = replyArgs.at(0);
|
|
QCOMPARE(reply.userType(), qMetaTypeId<QDBusArgument>());
|
|
QCOMPARE(qdbus_cast<QList<int> >(reply), value);
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::makeDelayedCalls()
|
|
{
|
|
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
|
|
"/", QString(), "delayed");
|
|
QTest::ignoreMessage(QtWarningMsg, "QDBusConnection: cannot call local method 'delayed' at object / (with signature '') on blocking mode");
|
|
QDBusMessage replyMsg = doCall(callMsg);
|
|
QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ErrorMessage));
|
|
|
|
QDBusError error(replyMsg);
|
|
QCOMPARE(int(error.type()), int(QDBusError::InternalError));
|
|
}
|
|
|
|
void tst_QDBusLocalCalls::asyncReplySignal()
|
|
{
|
|
QFETCH_GLOBAL(bool, useAsync);
|
|
if (!useAsync)
|
|
return; // this test only works in async mode
|
|
|
|
QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(),
|
|
"/", QString(), "echo");
|
|
callMsg << "Hello World";
|
|
QDBusPendingCall ac = conn.asyncCall(callMsg);
|
|
if (ac.isFinished())
|
|
QSKIP("Test ignored: the local-loop async call is already finished");
|
|
|
|
QDBusPendingCallWatcher watch(ac);
|
|
connect(&watch, SIGNAL(finished(QDBusPendingCallWatcher*)),
|
|
SLOT(replyReceived(QDBusPendingCallWatcher*)));
|
|
|
|
QTestEventLoop::instance().enterLoop(2);
|
|
QVERIFY(!QTestEventLoop::instance().timeout());
|
|
|
|
QVERIFY(ac.isFinished());
|
|
QVERIFY(!ac.isError());
|
|
|
|
QVERIFY(!asyncReplyArgs.isEmpty());
|
|
QCOMPARE(asyncReplyArgs.at(0).toString(), QString("Hello World"));
|
|
}
|
|
|
|
QTEST_MAIN(tst_QDBusLocalCalls)
|
|
#include "tst_qdbuslocalcalls.moc"
|