qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid leaking resources on test failures in QQmlDebugService test 

Change-Id: Id87094c538f80bf18f33dc656c1b98a35e23be89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Ulf Hermann 2017-08-16 11:59:30 +02:00
parent b160a38b7b
commit 7fc6f5c6bb
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
View File

@ -105,10 +105,13 @@ void tst_QQmlDebugService::initTestCase()
void tst_QQmlDebugService::checkPortRange() void tst_QQmlDebugService::checkPortRange()
{ {
QQmlDebugConnection *connection1 = new QQmlDebugConnection(); QScopedPointer<QQmlDebugConnection> connection1(new QQmlDebugConnection());
QQmlDebugProcess *process1 = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this); QScopedPointer<QQmlDebugProcess> process1(
new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
+ "/qmlscene", this));
process1->start(QStringList() << QLatin1String("-qmljsdebugger=port:3782,3792") << testFile("test.qml")); process1->start(QStringList() << QLatin1String("-qmljsdebugger=port:3782,3792")
<< testFile("test.qml"));
if (!process1->waitForSessionStart()) if (!process1->waitForSessionStart())
QFAIL("could not launch application, or did not get 'Waiting for connection'."); QFAIL("could not launch application, or did not get 'Waiting for connection'.");
@ -119,10 +122,13 @@ void tst_QQmlDebugService::checkPortRange()
QFAIL("could not connect to host!"); QFAIL("could not connect to host!");
// Second instance // Second instance
QQmlDebugConnection *connection2 = new QQmlDebugConnection(); QScopedPointer<QQmlDebugConnection> connection2(new QQmlDebugConnection());
QQmlDebugProcess *process2 = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this); QScopedPointer<QQmlDebugProcess> process2(
new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
+ "/qmlscene", this));
process2->start(QStringList() << QLatin1String("-qmljsdebugger=port:3782,3792") << testFile("test.qml")); process2->start(QStringList() << QLatin1String("-qmljsdebugger=port:3782,3792")
<< testFile("test.qml"));
if (!process2->waitForSessionStart()) if (!process2->waitForSessionStart())
QFAIL("could not launch application, or did not get 'Waiting for connection'."); QFAIL("could not launch application, or did not get 'Waiting for connection'.");
@ -131,11 +137,6 @@ void tst_QQmlDebugService::checkPortRange()
connection2->connectToHost("127.0.0.1", port2); connection2->connectToHost("127.0.0.1", port2);
if (!connection2->waitForConnected()) if (!connection2->waitForConnected())
QFAIL("could not connect to host!"); QFAIL("could not connect to host!");
delete connection1;
delete process1;
delete connection2;
delete process2;
} }
void tst_QQmlDebugService::name() void tst_QQmlDebugService::name()