1 files changed, 33 insertions, 8 deletions

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index c1de5ff594..c4b17aa60a 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -64,7 +64,8 @@ class QQmlProfilerTestClient : public QQmlProfilerClient
     Q_OBJECT
 
 public:
-    QQmlProfilerTestClient(QQmlDebugConnection *connection) : QQmlProfilerClient(connection) {}
+    QQmlProfilerTestClient(QQmlDebugConnection *connection) : QQmlProfilerClient(connection),
+        lastTimestamp(-1) {}
 
     QVector<QQmlProfilerData> qmlMessages;
     QVector<QQmlProfilerData> javascriptMessages;
@@ -72,6 +73,8 @@ public:
     QVector<QQmlProfilerData> asynchronousMessages;
     QVector<QQmlProfilerData> pixmapMessages;
 
+    qint64 lastTimestamp;
+
 signals:
     void recordingFinished();
 
@@ -114,6 +117,8 @@ void QQmlProfilerTestClient::traceFinished(qint64 time, int engineId)
 void QQmlProfilerTestClient::rangeStart(QQmlProfilerDefinitions::RangeType type, qint64 startTime)
 {
     QVERIFY(type >= 0 && type < QQmlProfilerDefinitions::MaximumRangeType);
+    QVERIFY(lastTimestamp <= startTime);
+    lastTimestamp = startTime;
     QQmlProfilerData data(startTime, QQmlProfilerDefinitions::RangeStart, type);
     if (type == QQmlProfilerDefinitions::Javascript)
         javascriptMessages.append(data);
@@ -125,6 +130,8 @@ void QQmlProfilerTestClient::rangeData(QQmlProfilerDefinitions::RangeType type,
                                       const QString &string)
 {
     QVERIFY(type >= 0 && type < QQmlProfilerDefinitions::MaximumRangeType);
+    QVERIFY(lastTimestamp <= time);
+    lastTimestamp = time;
     QQmlProfilerData data(time, QQmlProfilerDefinitions::RangeData, type, string);
     if (type == QQmlProfilerDefinitions::Javascript)
         javascriptMessages.append(data);
@@ -137,6 +144,8 @@ void QQmlProfilerTestClient::rangeLocation(QQmlProfilerDefinitions::RangeType ty
 {
     QVERIFY(type >= 0 && type < QQmlProfilerDefinitions::MaximumRangeType);
     QVERIFY(location.line >= -2);
+    QVERIFY(lastTimestamp <= time);
+    lastTimestamp = time;
     QQmlProfilerData data(time, QQmlProfilerDefinitions::RangeLocation, type, location.filename);
     data.line = location.line;
     data.column = location.column;
@@ -149,6 +158,8 @@ void QQmlProfilerTestClient::rangeLocation(QQmlProfilerDefinitions::RangeType ty
 void QQmlProfilerTestClient::rangeEnd(QQmlProfilerDefinitions::RangeType type, qint64 endTime)
 {
     QVERIFY(type >= 0 && type < QQmlProfilerDefinitions::MaximumRangeType);
+    QVERIFY(lastTimestamp <= endTime);
+    lastTimestamp = endTime;
     QQmlProfilerData data(endTime, QQmlProfilerDefinitions::RangeEnd, type);
     if (type == QQmlProfilerDefinitions::Javascript)
         javascriptMessages.append(data);
@@ -161,6 +172,8 @@ void QQmlProfilerTestClient::animationFrame(qint64 time, int frameRate, int anim
     QVERIFY(threadId >= 0);
     QVERIFY(frameRate != -1);
     QVERIFY(animationCount != -1);
+    QVERIFY(lastTimestamp <= time);
+    lastTimestamp = time;
     QQmlProfilerData data(time, QQmlProfilerDefinitions::Event,
                           QQmlProfilerDefinitions::AnimationFrame);
     data.framerate = frameRate;
@@ -178,6 +191,8 @@ void QQmlProfilerTestClient::sceneGraphEvent(QQmlProfilerDefinitions::SceneGraph
     Q_UNUSED(numericData3);
     Q_UNUSED(numericData4);
     Q_UNUSED(numericData5);
+    QVERIFY(lastTimestamp <= time);
+    lastTimestamp = time;
     asynchronousMessages.append(QQmlProfilerData(time, QQmlProfilerDefinitions::SceneGraphFrame,
                                                  type));
 }
@@ -186,6 +201,8 @@ void QQmlProfilerTestClient::pixmapCacheEvent(QQmlProfilerDefinitions::PixmapEve
                                              qint64 time, const QString &url, int numericData1,
                                              int numericData2)
 {
+    QVERIFY(lastTimestamp <= time);
+    lastTimestamp = time;
     QQmlProfilerData data(time, QQmlProfilerDefinitions::PixmapCacheEvent, type, url);
     switch (type) {
     case QQmlProfilerDefinitions::PixmapSizeKnown:
@@ -205,6 +222,8 @@ void QQmlProfilerTestClient::pixmapCacheEvent(QQmlProfilerDefinitions::PixmapEve
 void QQmlProfilerTestClient::memoryAllocation(QQmlProfilerDefinitions::MemoryType type, qint64 time,
                                              qint64 amount)
 {
+    QVERIFY(lastTimestamp <= time);
+    lastTimestamp = time;
     QQmlProfilerData data(time, QQmlProfilerDefinitions::MemoryAllocation, type);
     data.amount = amount;
     jsHeapMessages.append(data);
@@ -213,6 +232,8 @@ void QQmlProfilerTestClient::memoryAllocation(QQmlProfilerDefinitions::MemoryTyp
 void QQmlProfilerTestClient::inputEvent(QQmlProfilerDefinitions::InputEventType type, qint64 time,
                                         int a, int b)
 {
+    QVERIFY(lastTimestamp <= time);
+    lastTimestamp = time;
     qmlMessages.append(QQmlProfilerData(time, QQmlProfilerDefinitions::Event, type,
                                         QString::number(a) + QLatin1Char('x') +
                                         QString::number(b)));
@@ -588,12 +609,11 @@ void tst_QQmlProfilerService::scenegraphData()
     checkTraceReceived();
     checkJsHeap();
 
-
-    // check that at least one frame was rendered
-    // there should be a SGPolishAndSync + SGRendererFrame + SGRenderLoopFrame sequence
-    // (though we can't be sure to get the SGRenderLoopFrame in the threaded renderer)
+    // Check that at least one frame was rendered.
+    // There should be a SGContextFrame + SGRendererFrame + SGRenderLoopFrame sequence,
+    // but we can't be sure to get the SGRenderLoopFrame in the threaded renderer.
     //
-    // since the rendering happens in a different thread, there could be other unrelated events
+    // Since the rendering happens in a different thread, there could be other unrelated events
     // interleaved. Also, events could carry the same time stamps and be sorted in an unexpected way
     // if the clocks are acting up.
     qint64 contextFrameTime = -1;
@@ -622,8 +642,13 @@ void tst_QQmlProfilerService::scenegraphData()
 
     foreach (const QQmlProfilerData &msg, m_client->asynchronousMessages) {
         if (msg.detailType == QQmlProfilerDefinitions::SceneGraphRenderLoopFrame) {
-            QVERIFY(msg.time >= renderFrameTime);
-            break;
+            if (msg.time >= contextFrameTime) {
+                // Make sure SceneGraphRenderLoopFrame is not between SceneGraphContextFrame and
+                // SceneGraphRendererFrame. A SceneGraphRenderLoopFrame before everything else is
+                // OK as the scene graph might decide to do an initial rendering.
+                QVERIFY(msg.time >= renderFrameTime);
+                break;
+            }
         }
     }
 }