diff options
Diffstat (limited to 'src/testlib/qsignalspy.h')
| -rw-r--r-- | src/testlib/qsignalspy.h | 169 |
1 files changed, 32 insertions, 137 deletions
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index d31370cbd0..b15831768b 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -10,6 +10,7 @@ #include <QtCore/qmetaobject.h> #include <QtTest/qtesteventloop.h> #include <QtCore/qvariant.h> +#include <QtCore/qmutex.h> QT_BEGIN_NAMESPACE @@ -18,91 +19,32 @@ class QVariant; class QSignalSpy: public QObject, public QList<QList<QVariant> > { + struct ObjectSignal { + const QObject *obj; + QMetaMethod sig; + }; + public: explicit QSignalSpy(const QObject *obj, const char *aSignal) - : m_waiting(false) - { - if (!isObjectValid(obj)) - return; - - if (!aSignal) { - qWarning("QSignalSpy: Null signal name is not valid"); - return; - } - - if (((aSignal[0] - '0') & 0x03) != QSIGNAL_CODE) { - qWarning("QSignalSpy: Not a valid signal, use the SIGNAL macro"); - return; - } - - const QByteArray ba = QMetaObject::normalizedSignature(aSignal + 1); - const QMetaObject * const mo = obj->metaObject(); - const int sigIndex = mo->indexOfMethod(ba.constData()); - if (sigIndex < 0) { - qWarning("QSignalSpy: No such signal: '%s'", ba.constData()); - return; - } - - if (!connectToSignal(obj, sigIndex)) - return; - - sig = ba; - initArgs(mo->method(sigIndex), obj); - } - -#ifdef Q_CLANG_QDOC + : QSignalSpy(verify(obj, aSignal)) {} +#ifdef Q_QDOC template <typename PointerToMemberFunction> QSignalSpy(const QObject *object, PointerToMemberFunction signal); #else template <typename Func> QSignalSpy(const typename QtPrivate::FunctionPointer<Func>::Object *obj, Func signal0) - : m_waiting(false) - { - if (!isObjectValid(obj)) - return; - - if (!signal0) { - qWarning("QSignalSpy: Null signal name is not valid"); - return; - } - - const QMetaObject * const mo = obj->metaObject(); - const QMetaMethod signalMetaMethod = QMetaMethod::fromSignal(signal0); - const int sigIndex = signalMetaMethod.methodIndex(); - - if (!isSignalMetaMethodValid(signalMetaMethod)) - return; - - if (!connectToSignal(obj, sigIndex)) - return; - - sig = signalMetaMethod.methodSignature(); - initArgs(mo->method(sigIndex), obj); - } -#endif // Q_CLANG_QDOC - - QSignalSpy(const QObject *obj, const QMetaMethod &signal) - : m_waiting(false) - { - if (isObjectValid(obj) && isSignalMetaMethodValid(signal) && - connectToSignal(obj, signal.methodIndex())) { - sig = signal.methodSignature(); - initArgs(signal, obj); - } - } + : QSignalSpy(verify(obj, QMetaMethod::fromSignal(signal0))) {} +#endif // Q_QDOC + QSignalSpy(const QObject *obj, QMetaMethod signal) + : QSignalSpy(verify(obj, signal)) {} inline bool isValid() const { return !sig.isEmpty(); } inline QByteArray signal() const { return sig; } - bool wait(int timeout = 5000) - { - Q_ASSERT(!m_waiting); - const qsizetype origCount = count(); - m_waiting = true; - m_loop.enterLoopMSecs(timeout); - m_waiting = false; - return count() > origCount; - } + bool wait(int timeout) + { return wait(std::chrono::milliseconds{timeout}); } + + Q_TESTLIB_EXPORT bool wait(std::chrono::milliseconds timeout = std::chrono::seconds{5}); int qt_metacall(QMetaObject::Call call, int methodId, void **a) override { @@ -120,76 +62,28 @@ public: } private: - bool connectToSignal(const QObject *sender, int sigIndex) + explicit QSignalSpy(ObjectSignal os) { - static const int memberOffset = QObject::staticMetaObject.methodCount(); - const bool connected = QMetaObject::connect( - sender, sigIndex, this, memberOffset, Qt::DirectConnection, nullptr); - - if (!connected) - qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect."); - - return connected; - } - - static bool isSignalMetaMethodValid(const QMetaMethod &signal) - { - const bool valid = signal.isValid() && signal.methodType() == QMetaMethod::Signal; - - if (!valid) - qWarning("QSignalSpy: Not a valid signal: '%s'", signal.methodSignature().constData()); + if (!os.obj) + return; + initArgs(os.sig, os.obj); + if (!connectToSignal(os.obj, os.sig.methodIndex())) + return; - return valid; + sig = os.sig.methodSignature(); } - static bool isObjectValid(const QObject *object) - { - const bool valid = !!object; - if (!valid) - qWarning("QSignalSpy: Cannot spy on a null object"); + Q_TESTLIB_EXPORT static ObjectSignal verify(const QObject *obj, QMetaMethod signal); + Q_TESTLIB_EXPORT static ObjectSignal verify(const QObject *obj, const char *aSignal); - return valid; - } + Q_TESTLIB_EXPORT bool connectToSignal(const QObject *sender, int sigIndex); - void initArgs(const QMetaMethod &member, const QObject *obj) - { - args.reserve(member.parameterCount()); - for (int i = 0; i < member.parameterCount(); ++i) { - QMetaType tp = member.parameterMetaType(i); - if (!tp.isValid() && obj) { - void *argv[] = { &tp, &i }; - QMetaObject::metacall(const_cast<QObject*>(obj), - QMetaObject::RegisterMethodArgumentMetaType, - member.methodIndex(), argv); - } - if (!tp.isValid()) { - qWarning("QSignalSpy: Unable to handle parameter '%s' of type '%s' of method '%s'," - " use qRegisterMetaType to register it.", - member.parameterNames().at(i).constData(), - member.parameterTypes().at(i).constData(), - member.name().constData()); - } - args << tp.id(); - } - } - - void appendArgs(void **a) - { - QList<QVariant> list; - list.reserve(args.count()); - for (int i = 0; i < args.count(); ++i) { - const QMetaType::Type type = static_cast<QMetaType::Type>(args.at(i)); - if (type == QMetaType::QVariant) - list << *reinterpret_cast<QVariant *>(a[i + 1]); - else - list << QVariant(QMetaType(type), a[i + 1]); - } - append(list); + Q_TESTLIB_EXPORT static bool isSignalMetaMethodValid(const QMetaMethod &signal); + Q_TESTLIB_EXPORT static bool isObjectValid(const QObject *object); - if (m_waiting) - m_loop.exitLoop(); - } + Q_TESTLIB_EXPORT void initArgs(const QMetaMethod &member, const QObject *obj); + Q_TESTLIB_EXPORT void appendArgs(void **a); // the full, normalized signal name QByteArray sig; @@ -197,7 +91,8 @@ private: QList<int> args; QTestEventLoop m_loop; - bool m_waiting; + bool m_waiting = false; + QMutex m_mutex; // protects m_waiting, args and the QList base class, between appendArgs() and wait() }; QT_END_NAMESPACE |