diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-15 01:00:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-15 01:00:09 +0100 |
| commit | fe1f81484bf9d9ace1d8125498a7ce889ba5bddc (patch) | |
| tree | 9fe0971d390bfa21e6c59a61dafd21ccaebb0118 /tests/auto/qml/debugger | |
| parent | 02c98b7590b060430dc5ce7e5821fa13087d25f7 (diff) | |
| parent | 89a1d4ff3f829635d80a90112f6b2d44cc274b1b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ie82b8a0f9158ef02bf11209b16e574dedf201e2e
Diffstat (limited to 'tests/auto/qml/debugger')
3 files changed, 32 insertions, 1 deletions
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/batchOverflow.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/batchOverflow.qml new file mode 100644 index 0000000000..dde1def947 --- /dev/null +++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/batchOverflow.qml @@ -0,0 +1,20 @@ +import QtQml 2.2 + +QtObject { + function iterate(dictionaryTable, j) { + var word = "a" + j.toString() + dictionaryTable[word] = null; + } + + Component.onCompleted: { + var dictionaryTable = {}; + for (var j = 0; j < 256; ++j) + iterate(dictionaryTable, j); + } + + property Timer timer: Timer { + interval: 1 + running: true; + onTriggered: Qt.quit(); + } +} diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro index 2a685ed877..0cd4b331f2 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro +++ b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro @@ -21,4 +21,5 @@ OTHER_FILES += \ data/javascript.qml \ data/timer.qml \ data/qstr.qml \ - data/memory.qml + data/memory.qml \ + data/batchOverflow.qml diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp index eb0b0c2fe2..7fc43671c2 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp +++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp @@ -225,6 +225,7 @@ private slots: void memory(); void compile(); void multiEngine(); + void batchOverflow(); private: bool m_recordFromStart = true; @@ -826,6 +827,15 @@ void tst_QQmlProfilerService::multiEngine() QCOMPARE(spy.count(), 1); } +void tst_QQmlProfilerService::batchOverflow() +{ + // The trace client checks that the events are received in order. + QCOMPARE(connect(true, "batchOverflow.qml"), ConnectSuccess); + checkProcessTerminated(); + checkTraceReceived(); + checkJsHeap(); +} + QTEST_MAIN(tst_QQmlProfilerService) #include "tst_qqmlprofilerservice.moc" |