diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-02-22 10:32:08 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-02-22 23:34:46 +0100 |
| commit | 6b5aa145969a30a98cba53ad8b8e5bd5e92aa154 (patch) | |
| tree | 5a90d23377f78f2f8e572df844f266ae9e8deda7 /tests/auto/qml/qqmlmetaobject | |
| parent | 1829d7c64c1d8d5b42241135bfead030521cb398 (diff) | |
tst_qqmlmetaobject: Clean up even when test fails
Change-Id: I017d44a23be40466068ee08c90a5bb3f721ba14f
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlmetaobject')
| -rw-r--r-- | tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp index 81c6b0d2a1..fa54d440b8 100644 --- a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp +++ b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp @@ -27,6 +27,7 @@ ****************************************************************************/ #include <QtTest/QtTest> +#include <QtCore/QScopedPointer> #include <QtQml/qqmlcomponent.h> #include <QtQml/qqmlengine.h> #include <QtQuickTestUtils/private/qmlutils_p.h> @@ -188,8 +189,9 @@ void tst_QQmlMetaObject::property() QQmlEngine engine; QQmlComponent component(&engine, testFileUrl(testFile)); - QObject *object = component.create(); - QVERIFY(object != nullptr); + QScopedPointer<QObject> obj(component.create()); + QVERIFY(obj); + QObject *object = obj.get(); const QMetaObject *mo = object->metaObject(); QVERIFY(mo->superClass() != nullptr); @@ -263,8 +265,6 @@ void tst_QQmlMetaObject::property() QVERIFY(!prop.write(object, prop.read(object))); QCOMPARE(changedSpy.count(), 0); } - - delete object; } void tst_QQmlMetaObject::method_data() @@ -359,8 +359,9 @@ void tst_QQmlMetaObject::method() QQmlEngine engine; QQmlComponent component(&engine, testFileUrl(testFile)); - QObject *object = component.create(); - QVERIFY(object != nullptr); + QScopedPointer<QObject> obj(component.create()); + QVERIFY(obj); + QObject *object = obj.get(); const QMetaObject *mo = object->metaObject(); QVERIFY(mo->superClass() != nullptr); @@ -384,8 +385,6 @@ void tst_QQmlMetaObject::method() QCOMPARE(QString::fromUtf8(method.typeName()), returnTypeName); QCOMPARE(method.returnType(), returnType); - - delete object; } QTEST_MAIN(tst_QQmlMetaObject) |