From 861a9f127e04aa135649ed64f268d72da6a35fd9 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Tue, 2 Mar 2010 14:48:07 +1000
Subject: Add autotests for script block scoping.

---
 .../qdeclarativeecmascript/data/scriptScope.1.qml  | 13 ++++++++++
 .../qdeclarativeecmascript/data/scriptScope.2.qml  | 11 +++++++++
 .../qdeclarativeecmascript/data/scriptScope.js     |  5 ++++
 .../tst_qdeclarativeecmascript.cpp                 | 28 ++++++++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.js

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.1.qml
new file mode 100644
index 0000000..9b11fa9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.1.qml
@@ -0,0 +1,13 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property string result
+
+    Script{
+        function f() {
+            result = b
+        }
+        
+    }
+    onArgumentSignal: f()
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.2.qml
new file mode 100644
index 0000000..ec727e2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.2.qml
@@ -0,0 +1,11 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property string result
+    property string aProp: "hello"
+
+    Script{
+        source: "scriptScope.js"
+    }
+    onBasicSignal: f()
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.js
new file mode 100644
index 0000000..5689930
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptScope.js
@@ -0,0 +1,5 @@
+var aProp = "world";
+
+function f() {
+    result = aProp;
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 60c380c..8e7944d 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -122,6 +122,7 @@ private slots:
     void listToVariant();
     void multiEngineObject();
     void deletedObject();
+    void scriptScope();
 
     void bug1();
 
@@ -1657,6 +1658,33 @@ void tst_qdeclarativeecmascript::deletedObject()
     delete object;
 }
 
+void tst_qdeclarativeecmascript::scriptScope()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("scriptScope.1.qml"));
+
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        emit object->argumentSignal(19, "Hello world!", 10.3);
+        QEXPECT_FAIL("", "QTBUG-8641", Continue);
+        QCOMPARE(object->property("result").toString(), QLatin1String("undefined"));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("scriptScope.2.qml"));
+
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        emit object->basicSignal();
+        QEXPECT_FAIL("", "QTBUG-8641", Continue);
+        QCOMPARE(object->property("result").toString(), QLatin1String("world"));
+
+        delete object;
+    }
+}
+
 QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"
-- 
cgit v0.12