summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <[email protected]>2025-06-02 15:24:00 +0200
committerMarc Mutz <[email protected]>2025-06-05 21:26:02 +0200
commit687fb924408f2043989b624e658620c59157e15e (patch)
treed2282979c3d7be177d42eb68d773a05198aa4beb
parentfd52f868accab86f800d632014300aaa4920663a (diff)
tst_QMetaObject: refactor indexOfMethod() testHEADdev
Removes duplication in preparation of adding more tests. Pick-to: 6.10 6.9 6.8 6.5 Task-number: QTBUG-135572 Change-Id: I9ebfc40e24256d2d92af3f593f905d97b273e187 Reviewed-by: Ahmad Samir <[email protected]> Reviewed-by: Thiago Macieira <[email protected]>
-rw-r--r--tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 7137cef7ec2..07bd4a12a51 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -2807,12 +2807,18 @@ void tst_QMetaObject::indexOfMethod_data()
QTest::addColumn<QObject *>("object");
QTest::addColumn<QByteArray>("name");
QTest::addColumn<bool>("isSignal");
- QTest::newRow("indexOfMethod_data") << (QObject*)this << QByteArray("indexOfMethod_data()") << false;
- QTest::newRow("deleteLater") << (QObject*)this << QByteArray("deleteLater()") << false;
- QTest::newRow("value6changed") << (QObject*)this << QByteArray("value6Changed()") << true;
- QTest::newRow("value7changed") << (QObject*)this << QByteArray("value7Changed(QString)") << true;
- QTest::newRow("destroyed") << (QObject*)this << QByteArray("destroyed()") << true;
- QTest::newRow("destroyed2") << (QObject*)this << QByteArray("destroyed(QObject*)") << true;
+
+ auto row = [this] (const char *fun, bool sig) {
+ QObject *o = this;
+ QTest::addRow("%s", fun) << o << QByteArray(fun) << sig;
+ };
+
+ row("indexOfMethod_data()", false);
+ row("deleteLater()", false);
+ row("value6Changed()", true);
+ row("value7Changed(QString)", true);
+ row("destroyed()", true);
+ row("destroyed(QObject*)", true);
}
void tst_QMetaObject::indexOfMethod()