1 files changed, 83 insertions, 0 deletions

diff --git a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
index 3fe14fa216..63bfffacaa 100644
--- a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
+++ b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
@@ -33,6 +33,8 @@
 #include <QtTest/QtTest>
 
 #include <QJSEngine>
+#include <QQmlEngine>
+#include <QQmlComponent>
 #include <private/qv4engine_p.h>
 #include <private/qv4debugging_p.h>
 #include <private/qv8engine_p.h>
@@ -182,6 +184,14 @@ public:
 
         m_stackTrace = debugger->stackTrace();
 
+        while (!m_expressionRequests.isEmpty()) {
+            ExpressionRequest request = m_expressionRequests.takeFirst();
+            QVariantMap result;
+            collector.setDestination(&result);
+            debugger->evaluateExpression(request.frameNr, request.expression, &collector);
+            m_expressionResults << result[QString::fromLatin1("body")];
+        }
+
         if (m_captureContextInfo)
             captureContextInfo(debugger);
 
@@ -233,6 +243,13 @@ public:
     QList<QVariantMap> m_capturedLocals;
     QVariant m_thrownValue;
 
+    struct ExpressionRequest {
+        QString expression;
+        int frameNr;
+    };
+    QVector<ExpressionRequest> m_expressionRequests;
+    QVector<QVariant> m_expressionResults;
+
     // Utility methods:
     void dumpStackTrace() const
     {
@@ -259,6 +276,7 @@ private slots:
     void addBreakPointWhilePaused();
     void removeBreakPointForNextInstruction();
     void conditionalBreakPoint();
+    void conditionalBreakPointInQml();
 
     // context access:
     void readArguments();
@@ -269,6 +287,8 @@ private slots:
     // exceptions:
     void pauseOnThrow();
 
+    void evaluateExpression();
+
 private:
     void evaluateJavaScript(const QString &script, const QString &fileName, int lineNumber = 1)
     {
@@ -428,6 +448,42 @@ void tst_qv4debugger::conditionalBreakPoint()
     QCOMPARE(m_debuggerAgent->m_capturedLocals[0]["i"].toInt(), 11);
 }
 
+void tst_qv4debugger::conditionalBreakPointInQml()
+{
+    QQmlEngine engine;
+    QV4::ExecutionEngine *v4 = QV8Engine::getV4(&engine);
+    v4->enableDebugger();
+
+    QScopedPointer<QThread> debugThread(new QThread);
+    debugThread->start();
+    QScopedPointer<TestAgent> debuggerAgent(new TestAgent);
+    debuggerAgent->addDebugger(v4->debugger);
+    debuggerAgent->moveToThread(debugThread.data());
+
+    QQmlComponent component(&engine);
+    component.setData("import QtQml 2.0\n"
+                      "QtObject {\n"
+                      "    id: root\n"
+                      "    property int foo: 42\n"
+                      "    property bool success: false\n"
+                      "    Component.onCompleted: {\n"
+                      "        success = true;\n" // breakpoint here
+                      "    }\n"
+                      "}\n", QUrl("test.qml"));
+
+    debuggerAgent->addBreakPoint("test.qml", 7, /*enabled*/true, "root.foo == 42");
+
+    QScopedPointer<QObject> obj(component.create());
+    QCOMPARE(obj->property("success").toBool(), true);
+
+    QCOMPARE(debuggerAgent->m_statesWhenPaused.count(), 1);
+    QCOMPARE(debuggerAgent->m_statesWhenPaused.at(0).fileName, QStringLiteral("test.qml"));
+    QCOMPARE(debuggerAgent->m_statesWhenPaused.at(0).lineNumber, 7);
+
+    debugThread->quit();
+    debugThread->wait();
+}
+
 void tst_qv4debugger::readArguments()
 {
     m_debuggerAgent->m_captureContextInfo = true;
@@ -556,6 +612,33 @@ void tst_qv4debugger::pauseOnThrow()
     QCOMPARE(m_debuggerAgent->m_thrownValue.toString(), QString("hard"));
 }
 
+void tst_qv4debugger::evaluateExpression()
+{
+    QString script =
+            "function testFunction() {\n"
+            "    var x = 10\n"
+            "    return x\n" // breakpoint
+            "}\n"
+            "var x = 20\n"
+            "testFunction()\n";
+
+    TestAgent::ExpressionRequest request;
+    request.expression = "x";
+    request.frameNr = 0;
+    m_debuggerAgent->m_expressionRequests << request;
+    request.expression = "x";
+    request.frameNr = 1;
+    m_debuggerAgent->m_expressionRequests << request;
+
+    m_debuggerAgent->addBreakPoint("evaluateExpression", 3);
+
+    evaluateJavaScript(script, "evaluateExpression");
+
+    QCOMPARE(m_debuggerAgent->m_expressionResults.count(), 2);
+    QCOMPARE(m_debuggerAgent->m_expressionResults[0].toInt(), 10);
+    QCOMPARE(m_debuggerAgent->m_expressionResults[1].toInt(), 20);
+}
+
 QTEST_MAIN(tst_qv4debugger)
 
 #include "tst_qv4debugger.moc"