From 1098bb33b3b4a1f56f8f564110a718d08d60f667 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 2 Jun 2025 15:24:00 +0200 Subject: [PATCH] tst_QMetaObject: refactor indexOfMethod() test Removes duplication in preparation of adding more tests. Pick-to: 6.8 6.5 Task-number: QTBUG-135572 Change-Id: I9ebfc40e24256d2d92af3f593f905d97b273e187 Reviewed-by: Ahmad Samir Reviewed-by: Thiago Macieira (cherry picked from commit 687fb924408f2043989b624e658620c59157e15e) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit bff88a139179e9fbe2eaf2d65e4b7a87203774de) --- .../kernel/qmetaobject/tst_qmetaobject.cpp | 18 ++++++++++++------ 1 file 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 43b934b0ab3..b342c9e1a62 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -2802,12 +2802,18 @@ void tst_QMetaObject::indexOfMethod_data() QTest::addColumn("object"); QTest::addColumn("name"); QTest::addColumn("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()