From ff379a67cb891bf2c06ae549bc6e6b0ddfaf54e0 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 10 Dec 2013 12:02:40 +0100 Subject: Rename V8 profiler classes to V4 Change-Id: I54a71b83bdcaa4198b63a08572bc3d9d1bf8deea Reviewed-by: Simon Hausmann --- tests/auto/qml/debugger/debugger.pro | 2 +- .../debugger/qv4profilerservice/data/console.qml | 14 + .../qml/debugger/qv4profilerservice/data/exit.qml | 11 + .../qml/debugger/qv4profilerservice/data/test.qml | 5 + .../qv4profilerservice/qv4profilerservice.pro | 16 + .../qv4profilerservice/tst_qv4profilerservice.cpp | 334 +++++++++++++++++++++ .../debugger/qv8profilerservice/data/console.qml | 14 - .../qml/debugger/qv8profilerservice/data/exit.qml | 11 - .../qml/debugger/qv8profilerservice/data/test.qml | 5 - .../qv8profilerservice/qv8profilerservice.pro | 16 - .../qv8profilerservice/tst_qv8profilerservice.cpp | 334 --------------------- 11 files changed, 381 insertions(+), 381 deletions(-) create mode 100644 tests/auto/qml/debugger/qv4profilerservice/data/console.qml create mode 100644 tests/auto/qml/debugger/qv4profilerservice/data/exit.qml create mode 100644 tests/auto/qml/debugger/qv4profilerservice/data/test.qml create mode 100644 tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro create mode 100644 tests/auto/qml/debugger/qv4profilerservice/tst_qv4profilerservice.cpp delete mode 100644 tests/auto/qml/debugger/qv8profilerservice/data/console.qml delete mode 100644 tests/auto/qml/debugger/qv8profilerservice/data/exit.qml delete mode 100644 tests/auto/qml/debugger/qv8profilerservice/data/test.qml delete mode 100644 tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro delete mode 100644 tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp (limited to 'tests') diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro index aa3ad6a3a3..6838d01352 100644 --- a/tests/auto/qml/debugger/debugger.pro +++ b/tests/auto/qml/debugger/debugger.pro @@ -4,7 +4,7 @@ PUBLICTESTS += \ qqmlenginedebugservice \ qqmldebugjs \ qpacketprotocol \ -# qv8profilerservice \ +# qv4profilerservice \ # qdebugmessageservice \ qqmlenginedebuginspectorintegrationtest \ qqmlinspector \ diff --git a/tests/auto/qml/debugger/qv4profilerservice/data/console.qml b/tests/auto/qml/debugger/qv4profilerservice/data/console.qml new file mode 100644 index 0000000000..c23c820216 --- /dev/null +++ b/tests/auto/qml/debugger/qv4profilerservice/data/console.qml @@ -0,0 +1,14 @@ +import QtQuick 2.0 + + +Item { + function f() + { + } + + Component.onCompleted: { + console.profile(); + f(); + console.profileEnd(); + } +} diff --git a/tests/auto/qml/debugger/qv4profilerservice/data/exit.qml b/tests/auto/qml/debugger/qv4profilerservice/data/exit.qml new file mode 100644 index 0000000000..604265354c --- /dev/null +++ b/tests/auto/qml/debugger/qv4profilerservice/data/exit.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 + +Item { + Timer { + running: true + interval: 1 + onTriggered: { + Qt.quit(); + } + } +} diff --git a/tests/auto/qml/debugger/qv4profilerservice/data/test.qml b/tests/auto/qml/debugger/qv4profilerservice/data/test.qml new file mode 100644 index 0000000000..9c36e13c5b --- /dev/null +++ b/tests/auto/qml/debugger/qv4profilerservice/data/test.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +Item { + +} diff --git a/tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro b/tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro new file mode 100644 index 0000000000..459f931f94 --- /dev/null +++ b/tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro @@ -0,0 +1,16 @@ +CONFIG += testcase +TARGET = tst_qv4profilerservice +macx:CONFIG -= app_bundle + +SOURCES += tst_qv4profilerservice.cpp + +INCLUDEPATH += ../shared +include(../../../shared/util.pri) +include(../shared/debugutil.pri) + +TESTDATA = data/* + +QT += qml testlib gui-private + +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +CONFIG+=insignificant_test diff --git a/tests/auto/qml/debugger/qv4profilerservice/tst_qv4profilerservice.cpp b/tests/auto/qml/debugger/qv4profilerservice/tst_qv4profilerservice.cpp new file mode 100644 index 0000000000..23dfb3c75f --- /dev/null +++ b/tests/auto/qml/debugger/qv4profilerservice/tst_qv4profilerservice.cpp @@ -0,0 +1,334 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include "debugutil_p.h" +#include "qqmldebugclient.h" +#include "../../../shared/util.h" + +#define STR_PORT_FROM "13774" +#define STR_PORT_TO "13790" + +struct QV4ProfilerData +{ + int messageType; + QString filename; + QString functionname; + int lineNumber; + double totalTime; + double selfTime; + int treeLevel; + + QByteArray toByteArray() const; +}; + +class QV4ProfilerClient : public QQmlDebugClient +{ + Q_OBJECT + +public: + enum MessageType { + V4Entry, + V4Complete, + V4SnapshotChunk, + V4SnapshotComplete, + V4Started, + + V4MaximumMessage + }; + + enum ServiceState { NotRunning, Running } serviceState; + + QV4ProfilerClient(QQmlDebugConnection *connection) + : QQmlDebugClient(QLatin1String("V8Profiler"), connection) + , serviceState(NotRunning) + { + } + + void startProfiling(const QString &name) { + QByteArray message; + QDataStream stream(&message, QIODevice::WriteOnly); + stream << QByteArray("V8PROFILER") << QByteArray("start") << name; + sendMessage(message); + } + + void stopProfiling(const QString &name) { + QByteArray message; + QDataStream stream(&message, QIODevice::WriteOnly); + stream << QByteArray("V8PROFILER") << QByteArray("stop") << name; + sendMessage(message); + } + + void takeSnapshot() { + QByteArray message; + QDataStream stream(&message, QIODevice::WriteOnly); + stream << QByteArray("V8SNAPSHOT") << QByteArray("full"); + sendMessage(message); + } + + void deleteSnapshots() { + QByteArray message; + QDataStream stream(&message, QIODevice::WriteOnly); + stream << QByteArray("V8SNAPSHOT") << QByteArray("delete"); + sendMessage(message); + } + + QList traceMessages; + QList snapshotMessages; + +signals: + void started(); + void complete(); + void snapshot(); + +protected: + void messageReceived(const QByteArray &message); +}; + +class tst_QV4ProfilerService : public QQmlDataTest +{ + Q_OBJECT + +public: + tst_QV4ProfilerService() + : m_process(0) + , m_connection(0) + , m_client(0) + { + } + +private: + QQmlDebugProcess *m_process; + QQmlDebugConnection *m_connection; + QV4ProfilerClient *m_client; + + bool connect(bool block, const QString &testFile, QString *error); + +private slots: + void cleanup(); + + void blockingConnectWithTraceEnabled(); + void blockingConnectWithTraceDisabled(); + void nonBlockingConnect(); + void snapshot(); + void profileOnExit(); + void console(); +}; + +void QV4ProfilerClient::messageReceived(const QByteArray &message) +{ + QByteArray msg = message; + QDataStream stream(&msg, QIODevice::ReadOnly); + + int messageType; + stream >> messageType; + + QVERIFY(messageType >= 0); + QVERIFY(messageType < QV4ProfilerClient::V4MaximumMessage); + + switch (messageType) { + case QV4ProfilerClient::V4Entry: { + QCOMPARE(serviceState, Running); + QV4ProfilerData entry; + stream >> entry.filename >> entry.functionname >> entry.lineNumber >> entry.totalTime >> entry.selfTime >> entry.treeLevel; + traceMessages.append(entry); + break; + } + case QV4ProfilerClient::V4Complete: + QCOMPARE(serviceState, Running); + serviceState = NotRunning; + emit complete(); + break; + case QV4ProfilerClient::V4SnapshotChunk: { + QByteArray json; + stream >> json; + snapshotMessages.append(json); + break; + } + case QV4ProfilerClient::V4SnapshotComplete: + emit snapshot(); + break; + case QV4ProfilerClient::V4Started: + QCOMPARE(serviceState, NotRunning); + serviceState = Running; + emit started(); + break; + default: + QString failMessage = QString("Unknown message type: %1").arg(messageType); + QFAIL(qPrintable(failMessage)); + } + + QVERIFY(stream.atEnd()); +} + +bool tst_QV4ProfilerService::connect(bool block, const QString &testFile, + QString *error) +{ + const QString executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml"; + QStringList arguments; + + if (block) + arguments << QString("-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block"); + else + arguments << QString("-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO); + + arguments << QQmlDataTest::instance()->testFile(testFile); + + m_connection = new QQmlDebugConnection(); + m_client = new QV4ProfilerClient(m_connection); + + m_process = new QQmlDebugProcess(executable); + m_process->start(QStringList() << arguments); + if (!m_process->waitForSessionStart()) { + *error = QLatin1String("Could not launch application, or did not get 'Waiting for connection'."); + return false; + } + + m_connection->connectToHost(QLatin1String("127.0.0.1"), m_process->debugPort()); + if (!m_connection->waitForConnected()) { + *error = QLatin1String("Could not connect to debugger port."); + return false; + } + return true; +} + +void tst_QV4ProfilerService::cleanup() +{ + if (QTest::currentTestFailed()) { + qDebug() << "Process State:" << m_process->state(); + qDebug() << "Application Output:" << m_process->output(); + } + delete m_client; + delete m_process; + delete m_connection; +} + +void tst_QV4ProfilerService::blockingConnectWithTraceEnabled() +{ + QString error; + if (!connect(true, "test.qml", &error)) + QFAIL(qPrintable(error)); + + QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); + + m_client->startProfiling(""); + m_client->stopProfiling(""); + QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), + "No trace received in time."); +} + +void tst_QV4ProfilerService::blockingConnectWithTraceDisabled() +{ + QString error; + if (!connect(true, "test.qml", &error)) + QFAIL(qPrintable(error)); + + QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); + + m_client->stopProfiling(""); + QVERIFY2(!QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete()), 1000), + "Unexpected trace received."); + m_client->startProfiling(""); + m_client->stopProfiling(""); + QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), + "No trace received in time."); +} + +void tst_QV4ProfilerService::nonBlockingConnect() +{ + QString error; + if (!connect(false, "test.qml", &error)) + QFAIL(qPrintable(error)); + + QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); + + m_client->startProfiling(""); + m_client->stopProfiling(""); + QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), + "No trace received in time."); +} + +void tst_QV4ProfilerService::snapshot() +{ + QString error; + if (!connect(false, "test.qml", &error)) + QFAIL(qPrintable(error)); + + QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); + + m_client->takeSnapshot(); + QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(snapshot())), + "No trace received in time."); +} + +void tst_QV4ProfilerService::profileOnExit() +{ + QString error; + if (!connect(true, "exit.qml", &error)) + QFAIL(qPrintable(error)); + + QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); + + m_client->startProfiling(""); + QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), + "No trace received in time."); +} + +void tst_QV4ProfilerService::console() +{ + QString error; + if (!connect(true, "console.qml", &error)) + QFAIL(qPrintable(error)); + + QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); + + m_client->stopProfiling(""); + + QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), + "No trace received in time."); + QVERIFY(!m_client->traceMessages.isEmpty()); +} + +QTEST_MAIN(tst_QV4ProfilerService) + +#include "tst_qv4profilerservice.moc" diff --git a/tests/auto/qml/debugger/qv8profilerservice/data/console.qml b/tests/auto/qml/debugger/qv8profilerservice/data/console.qml deleted file mode 100644 index c23c820216..0000000000 --- a/tests/auto/qml/debugger/qv8profilerservice/data/console.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 - - -Item { - function f() - { - } - - Component.onCompleted: { - console.profile(); - f(); - console.profileEnd(); - } -} diff --git a/tests/auto/qml/debugger/qv8profilerservice/data/exit.qml b/tests/auto/qml/debugger/qv8profilerservice/data/exit.qml deleted file mode 100644 index 604265354c..0000000000 --- a/tests/auto/qml/debugger/qv8profilerservice/data/exit.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -Item { - Timer { - running: true - interval: 1 - onTriggered: { - Qt.quit(); - } - } -} diff --git a/tests/auto/qml/debugger/qv8profilerservice/data/test.qml b/tests/auto/qml/debugger/qv8profilerservice/data/test.qml deleted file mode 100644 index 9c36e13c5b..0000000000 --- a/tests/auto/qml/debugger/qv8profilerservice/data/test.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - -} diff --git a/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro b/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro deleted file mode 100644 index dc6f4c5038..0000000000 --- a/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG += testcase -TARGET = tst_qv8profilerservice -macx:CONFIG -= app_bundle - -SOURCES += tst_qv8profilerservice.cpp - -INCLUDEPATH += ../shared -include(../../../shared/util.pri) -include(../shared/debugutil.pri) - -TESTDATA = data/* - -QT += qml testlib gui-private - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -CONFIG+=insignificant_test diff --git a/tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp b/tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp deleted file mode 100644 index a461519c75..0000000000 --- a/tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp +++ /dev/null @@ -1,334 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include "debugutil_p.h" -#include "qqmldebugclient.h" -#include "../../../shared/util.h" - -#define STR_PORT_FROM "13774" -#define STR_PORT_TO "13790" - -struct QV8ProfilerData -{ - int messageType; - QString filename; - QString functionname; - int lineNumber; - double totalTime; - double selfTime; - int treeLevel; - - QByteArray toByteArray() const; -}; - -class QV8ProfilerClient : public QQmlDebugClient -{ - Q_OBJECT - -public: - enum MessageType { - V8Entry, - V8Complete, - V8SnapshotChunk, - V8SnapshotComplete, - V8Started, - - V8MaximumMessage - }; - - enum ServiceState { NotRunning, Running } serviceState; - - QV8ProfilerClient(QQmlDebugConnection *connection) - : QQmlDebugClient(QLatin1String("V8Profiler"), connection) - , serviceState(NotRunning) - { - } - - void startProfiling(const QString &name) { - QByteArray message; - QDataStream stream(&message, QIODevice::WriteOnly); - stream << QByteArray("V8PROFILER") << QByteArray("start") << name; - sendMessage(message); - } - - void stopProfiling(const QString &name) { - QByteArray message; - QDataStream stream(&message, QIODevice::WriteOnly); - stream << QByteArray("V8PROFILER") << QByteArray("stop") << name; - sendMessage(message); - } - - void takeSnapshot() { - QByteArray message; - QDataStream stream(&message, QIODevice::WriteOnly); - stream << QByteArray("V8SNAPSHOT") << QByteArray("full"); - sendMessage(message); - } - - void deleteSnapshots() { - QByteArray message; - QDataStream stream(&message, QIODevice::WriteOnly); - stream << QByteArray("V8SNAPSHOT") << QByteArray("delete"); - sendMessage(message); - } - - QList traceMessages; - QList snapshotMessages; - -signals: - void started(); - void complete(); - void snapshot(); - -protected: - void messageReceived(const QByteArray &message); -}; - -class tst_QV8ProfilerService : public QQmlDataTest -{ - Q_OBJECT - -public: - tst_QV8ProfilerService() - : m_process(0) - , m_connection(0) - , m_client(0) - { - } - -private: - QQmlDebugProcess *m_process; - QQmlDebugConnection *m_connection; - QV8ProfilerClient *m_client; - - bool connect(bool block, const QString &testFile, QString *error); - -private slots: - void cleanup(); - - void blockingConnectWithTraceEnabled(); - void blockingConnectWithTraceDisabled(); - void nonBlockingConnect(); - void snapshot(); - void profileOnExit(); - void console(); -}; - -void QV8ProfilerClient::messageReceived(const QByteArray &message) -{ - QByteArray msg = message; - QDataStream stream(&msg, QIODevice::ReadOnly); - - int messageType; - stream >> messageType; - - QVERIFY(messageType >= 0); - QVERIFY(messageType < QV8ProfilerClient::V8MaximumMessage); - - switch (messageType) { - case QV8ProfilerClient::V8Entry: { - QCOMPARE(serviceState, Running); - QV8ProfilerData entry; - stream >> entry.filename >> entry.functionname >> entry.lineNumber >> entry.totalTime >> entry.selfTime >> entry.treeLevel; - traceMessages.append(entry); - break; - } - case QV8ProfilerClient::V8Complete: - QCOMPARE(serviceState, Running); - serviceState = NotRunning; - emit complete(); - break; - case QV8ProfilerClient::V8SnapshotChunk: { - QByteArray json; - stream >> json; - snapshotMessages.append(json); - break; - } - case QV8ProfilerClient::V8SnapshotComplete: - emit snapshot(); - break; - case QV8ProfilerClient::V8Started: - QCOMPARE(serviceState, NotRunning); - serviceState = Running; - emit started(); - break; - default: - QString failMessage = QString("Unknown message type: %1").arg(messageType); - QFAIL(qPrintable(failMessage)); - } - - QVERIFY(stream.atEnd()); -} - -bool tst_QV8ProfilerService::connect(bool block, const QString &testFile, - QString *error) -{ - const QString executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml"; - QStringList arguments; - - if (block) - arguments << QString("-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO ",block"); - else - arguments << QString("-qmljsdebugger=port:" STR_PORT_FROM "," STR_PORT_TO); - - arguments << QQmlDataTest::instance()->testFile(testFile); - - m_connection = new QQmlDebugConnection(); - m_client = new QV8ProfilerClient(m_connection); - - m_process = new QQmlDebugProcess(executable); - m_process->start(QStringList() << arguments); - if (!m_process->waitForSessionStart()) { - *error = QLatin1String("Could not launch application, or did not get 'Waiting for connection'."); - return false; - } - - m_connection->connectToHost(QLatin1String("127.0.0.1"), m_process->debugPort()); - if (!m_connection->waitForConnected()) { - *error = QLatin1String("Could not connect to debugger port."); - return false; - } - return true; -} - -void tst_QV8ProfilerService::cleanup() -{ - if (QTest::currentTestFailed()) { - qDebug() << "Process State:" << m_process->state(); - qDebug() << "Application Output:" << m_process->output(); - } - delete m_client; - delete m_process; - delete m_connection; -} - -void tst_QV8ProfilerService::blockingConnectWithTraceEnabled() -{ - QString error; - if (!connect(true, "test.qml", &error)) - QFAIL(qPrintable(error)); - - QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); - - m_client->startProfiling(""); - m_client->stopProfiling(""); - QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), - "No trace received in time."); -} - -void tst_QV8ProfilerService::blockingConnectWithTraceDisabled() -{ - QString error; - if (!connect(true, "test.qml", &error)) - QFAIL(qPrintable(error)); - - QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); - - m_client->stopProfiling(""); - QVERIFY2(!QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete()), 1000), - "Unexpected trace received."); - m_client->startProfiling(""); - m_client->stopProfiling(""); - QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), - "No trace received in time."); -} - -void tst_QV8ProfilerService::nonBlockingConnect() -{ - QString error; - if (!connect(false, "test.qml", &error)) - QFAIL(qPrintable(error)); - - QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); - - m_client->startProfiling(""); - m_client->stopProfiling(""); - QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), - "No trace received in time."); -} - -void tst_QV8ProfilerService::snapshot() -{ - QString error; - if (!connect(false, "test.qml", &error)) - QFAIL(qPrintable(error)); - - QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); - - m_client->takeSnapshot(); - QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(snapshot())), - "No trace received in time."); -} - -void tst_QV8ProfilerService::profileOnExit() -{ - QString error; - if (!connect(true, "exit.qml", &error)) - QFAIL(qPrintable(error)); - - QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); - - m_client->startProfiling(""); - QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), - "No trace received in time."); -} - -void tst_QV8ProfilerService::console() -{ - QString error; - if (!connect(true, "console.qml", &error)) - QFAIL(qPrintable(error)); - - QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled); - - m_client->stopProfiling(""); - - QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), - "No trace received in time."); - QVERIFY(!m_client->traceMessages.isEmpty()); -} - -QTEST_MAIN(tst_QV8ProfilerService) - -#include "tst_qv8profilerservice.moc" -- cgit v1.2.3