diff options
| author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-20 16:18:03 (GMT) |
|---|---|---|
| committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-20 16:20:44 (GMT) |
| commit | 4dcd9e5b61ad8ffcaab44cd8a274fdfa8c28f2ac (patch) | |
| tree | 7976f28c9109ce9fe6a47e58d2c08fa0551547df | |
| parent | 4d9bb3f082b6e8b9ae159028b41cd2caa80ce936 (diff) | |
| download | Qt-4dcd9e5b61ad8ffcaab44cd8a274fdfa8c28f2ac.zip Qt-4dcd9e5b61ad8ffcaab44cd8a274fdfa8c28f2ac.tar.gz Qt-4dcd9e5b61ad8ffcaab44cd8a274fdfa8c28f2ac.tar.bz2 | |
QEXPECT_FAIL was removed.
Autotest's correction after 3062cd6395ba13746aea452eb53447d915184e2d
Column numbers are calculated corectly
Reviewed-by: Kent Hansen
| -rw-r--r-- | tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp index 7bfac62..932803a 100644 --- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp +++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp @@ -89,7 +89,8 @@ private slots: void functionEntryAndExit_functionReturn_construct(); void functionEntryAndExit_functionReturn_call(); void functionEntryAndExit_objectCall(); - void positionChange(); + void positionChange_1(); + void positionChange_2(); void exceptionThrowAndCatch(); void eventOrder_assigment(); void eventOrder_functionDefinition(); @@ -1127,7 +1128,7 @@ void tst_QScriptEngineAgent::functionEntryAndExit_objectCall() delete spy; } -void tst_QScriptEngineAgent::positionChange() +void tst_QScriptEngineAgent::positionChange_1() { QScriptEngine eng; ScriptEngineSpy *spy = new ScriptEngineSpy(&eng, ~(ScriptEngineSpy::IgnorePositionChange)); @@ -1194,10 +1195,15 @@ void tst_QScriptEngineAgent::positionChange() QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange); QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId); QCOMPARE(spy->at(2).lineNumber, lineNumber + 1); - QEXPECT_FAIL("","JSC do not take \\n as new line in source code", Continue); QCOMPARE(spy->at(2).columnNumber, 1); } + delete spy; +} +void tst_QScriptEngineAgent::positionChange_2() +{ + QScriptEngine eng; + ScriptEngineSpy *spy = new ScriptEngineSpy(&eng, ~(ScriptEngineSpy::IgnorePositionChange)); { spy->clear(); int lineNumber = 789; @@ -1534,6 +1540,7 @@ void tst_QScriptEngineAgent::positionChange() QCOMPARE(spy->at(1).lineNumber, 1); QCOMPARE(spy->at(1).columnNumber, 20); } + delete spy; } void tst_QScriptEngineAgent::exceptionThrowAndCatch() |