aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-06-14 16:08:01 +1000
committerAaron Kennedy <aaron.kennedy@nokia.com>2011-06-14 16:08:01 +1000
commitdb9d54749f134495bd862ee901dd141d41fac291 (patch)
tree315075a46aa72b5cdec07a86a7cb29fa0342713d /tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
parent49cc32e6c91b0ebe935810f3d5d581e6e8dfcc46 (diff)
Update auto tests
Following merge, and after removing all QtScript usage from QDeclarativeEngine.
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp39
1 files changed, 0 insertions, 39 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 80701d52f2..81e54c0c5b 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -178,7 +178,6 @@ private slots:
void aliasBindingsAssignCorrectly();
void aliasBindingsOverrideTarget();
void aliasWritesOverrideBindings();
- void pushCleanContext();
void realToInt();
void include();
@@ -3553,44 +3552,6 @@ void tst_qdeclarativeecmascript::revision()
}
}
-// Test for QScriptDeclarativeClass::pushCleanContext()
-void tst_qdeclarativeecmascript::pushCleanContext()
-{
- QScriptEngine engine;
- engine.globalObject().setProperty("a", 6);
- QCOMPARE(engine.evaluate("a").toInt32(), 6);
-
- // First confirm pushContext() behaves as we expect
- QScriptValue object = engine.newObject();
- object.setProperty("a", 15);
- QScriptContext *context1 = engine.pushContext();
- context1->pushScope(object);
- QCOMPARE(engine.evaluate("a").toInt32(), 15);
-
- QScriptContext *context2 = engine.pushContext();
- Q_UNUSED(context2);
- QCOMPARE(engine.evaluate("a").toInt32(), 15);
- QScriptValue func1 = engine.evaluate("(function() { return a; })");
-
- // Now check that pushCleanContext() works
- QScriptDeclarativeClass::pushCleanContext(&engine);
- QCOMPARE(engine.evaluate("a").toInt32(), 6);
- QScriptValue func2 = engine.evaluate("(function() { return a; })");
-
- engine.popContext();
- QCOMPARE(engine.evaluate("a").toInt32(), 15);
-
- engine.popContext();
- QCOMPARE(engine.evaluate("a").toInt32(), 15);
-
- engine.popContext();
- QCOMPARE(engine.evaluate("a").toInt32(), 6);
-
- // Check that function objects created in these contexts work
- QCOMPARE(func1.call().toInt32(), 15);
- QCOMPARE(func2.call().toInt32(), 6);
-}
-
void tst_qdeclarativeecmascript::realToInt()
{
QDeclarativeComponent component(&engine, TEST_FILE("realToInt.qml"));