From: Aurindam Jana Date: Wed, 7 Sep 2011 10:44:00 +0000 (+0200) Subject: JSDebugging: Update Auto Test cases. X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=eb567b03b5e29bd0cd52c87cc1a59cc96ecfd7e8;p=konrad%2Fqtdeclarative.git JSDebugging: Update Auto Test cases. Removed multiple timers from qml file and updated test case verification. Change-Id: I27a9755a54c893658f76eeaf29f4813dafc71b7d Reviewed-on: http://codereview.qt-project.org/4345 Reviewed-by: Qt Sanity Bot Reviewed-by: Christian Stenger --- diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/test.qml b/tests/auto/declarative/qdeclarativedebugjs/data/test.qml index 2ccb0b8..386b366 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/data/test.qml +++ b/tests/auto/declarative/qdeclarativedebugjs/data/test.qml @@ -47,7 +47,7 @@ import "test.js" as Script Rectangle { id: root width: 10; height: 10; - Component.onCompleted: doSomethingElse() + Component.onCompleted: print("onCompleted") property int result:0 @@ -59,10 +59,11 @@ Rectangle { var c = [1,2,3]; var d = Script.add(a,c[2]); result += d; + doSomethingElse(); } Timer { - interval: 200; running: true; repeat: false + interval: 4000; running: true; repeat: true onTriggered: { doSomething(); Script.printMessage("onTriggered"); @@ -75,18 +76,11 @@ Rectangle { } function doSomethingElse() { - result = Script.add(result,5); + result = Script.add(result,8); eval("print(root.result)"); - } - - Timer { - interval: 4000; running: true; repeat: true - onTriggered: { - doSomethingElse(); + if (root.result > 15) dummy(); - } } - } diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp index bfefe48..d76fa74 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -297,7 +297,6 @@ void QJSDebugProcess::processAppOutput() continue; } } - qDebug() << line; } m_mutex.unlock(); } @@ -1177,7 +1176,7 @@ void tst_QDeclarativeDebugJS::setBreakpointInScriptOnTimerCallback() { //void setBreakpoint(QString type, QString target, int line = -1, int column = -1, bool enabled = false, QString condition = QString(), int ignoreCount = -1) - int sourceLine = 66; + int sourceLine = 67; client->setBreakpoint(QLatin1String(SCRIPT), QLatin1String(QMLFILE), sourceLine, -1, true); client->startDebugging(); @@ -1262,15 +1261,24 @@ void tst_QDeclarativeDebugJS::setBreakpointInScriptWithCondition() client->startDebugging(); QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); - //Verify the value of 'out' - client->evaluate(QLatin1String("out")); - QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(result()))); - - QString jsonString(client->response); + //Get the frame index + QString jsonString = client->response; QVariantMap value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); QVariantMap body = value.value("body").toMap(); + int frameIndex = body.value("index").toInt(); + + //Verify the value of 'result' + client->evaluate(QLatin1String("out"),frameIndex); + + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(result()))); + + jsonString = client->response; + value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); + + body = value.value("body").toMap(); + QVERIFY(body.value("value").toInt() > out); } @@ -1339,9 +1347,9 @@ void tst_QDeclarativeDebugJS::changeBreakpointOnCondition() { //void changeBreakpoint(int breakpoint, bool enabled = false, QString condition = QString(), int ignoreCount = -1) - int sourceLine1 = 77; - int sourceLine2 = 78; - int result = 5; + int sourceLine1 = 56; + int sourceLine2 = 60; + int result = 0; client->setBreakpoint(QLatin1String(SCRIPT), QLatin1String(QMLFILE), sourceLine1, -1, true); client->setBreakpoint(QLatin1String(SCRIPT), QLatin1String(QMLFILE), sourceLine2, -1, true); @@ -1356,7 +1364,7 @@ void tst_QDeclarativeDebugJS::changeBreakpointOnCondition() QList breakpointsHit = body.value("breakpoints").toList(); int breakpoint = breakpointsHit.at(0).toInt(); - client->changeBreakpoint(breakpoint,false,QLatin1String("result > 5")); + client->changeBreakpoint(breakpoint,false,QLatin1String("a = 0")); QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(result()))); @@ -1376,8 +1384,20 @@ void tst_QDeclarativeDebugJS::changeBreakpointOnCondition() QCOMPARE(body.value("sourceLine").toInt(), sourceLine2); + client->frame(); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(result()))); + + //Get the frame index + jsonString = client->response; + value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); + + body = value.value("body").toMap(); + + int frameIndex = body.value("index").toInt(); + //Verify the value of 'result' - client->evaluate(QLatin1String("result")); + client->evaluate(QLatin1String("root.result"),frameIndex); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(result()))); jsonString = client->response; @@ -1441,21 +1461,21 @@ void tst_QDeclarativeDebugJS::setExceptionBreak() QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(result()))); client->continueDebugging(QJSDebugClient::Continue); - QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()), 10000)); } void tst_QDeclarativeDebugJS::stepNext() { //void continueDebugging(StepAction stepAction, int stepCount = 1); - int sourceLine = 72; + int sourceLine = 57; client->setBreakpoint(QLatin1String(SCRIPT), QLatin1String(QMLFILE), sourceLine, -1, true); client->startDebugging(); QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); client->continueDebugging(QJSDebugClient::Next); - QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()), 10000)); QString jsonString(client->response); QVariantMap value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); @@ -1477,7 +1497,7 @@ void tst_QDeclarativeDebugJS::stepNextWithCount() QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); client->continueDebugging(QJSDebugClient::Next,2); - QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()), 10000)); QString jsonString(client->response); QVariantMap value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); @@ -1492,7 +1512,7 @@ void tst_QDeclarativeDebugJS::stepIn() { //void continueDebugging(StepAction stepAction, int stepCount = 1); - int sourceLine = 66; + int sourceLine = 67; int actualLine = 56; client->setBreakpoint(QLatin1String(SCRIPT), QLatin1String(QMLFILE), sourceLine, -1, true); @@ -1500,7 +1520,7 @@ void tst_QDeclarativeDebugJS::stepIn() QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); client->continueDebugging(QJSDebugClient::In); - QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()), 10000)); QString jsonString(client->response); QVariantMap value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); @@ -1516,14 +1536,14 @@ void tst_QDeclarativeDebugJS::stepOut() //void continueDebugging(StepAction stepAction, int stepCount = 1); int sourceLine = 56; - int actualLine = 67; + int actualLine = 68; client->setBreakpoint(QLatin1String(SCRIPT), QLatin1String(QMLFILE), sourceLine, -1, true); client->startDebugging(); QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); client->continueDebugging(QJSDebugClient::Out); - QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()), 10000)); QString jsonString(client->response); QVariantMap value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); @@ -1547,7 +1567,7 @@ void tst_QDeclarativeDebugJS::continueDebugging() QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); client->continueDebugging(QJSDebugClient::Continue); - QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()), 10000)); QString jsonString(client->response); QVariantMap value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); @@ -1627,15 +1647,26 @@ void tst_QDeclarativeDebugJS::evaluateInLocalScope() client->startDebugging(); QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(stopped()))); - client->evaluate(QLatin1String("root.someValue")); + client->frame(); QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(result()))); - //Verify the value of 'root.someValue' + //Get the frame index QString jsonString(client->response); QVariantMap value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); QVariantMap body = value.value("body").toMap(); + int frameIndex = body.value("index").toInt(); + + client->evaluate(QLatin1String("root.someValue"),frameIndex); + QVERIFY(QDeclarativeDebugTest::waitForSignal(client, SIGNAL(result()))); + + //Verify the value of 'root.someValue' + jsonString = client->response; + value = client->parser.call(QJSValue(), QJSValueList() << QJSValue(jsonString)).toVariant().toMap(); + + body = value.value("body").toMap(); + QCOMPARE(body.value("value").toInt(),10); }