From ccb6235ae842b7e63997210e5169cc00f4e0e5e8 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 8 Apr 2010 13:09:49 +1000
Subject: Remove usage of Script where not actually testing the obsolete
 construct.

---
 .../qdeclarativeecmascript/data/listProperties.qml |  13 +-
 .../qdeclarativelanguage/data/i18nScript.qml       |   9 +-
 .../qdeclarativexmlhttprequest/data/attr.qml       |  68 ++++-----
 .../qdeclarativexmlhttprequest/data/cdata.qml      | 136 ++++++++---------
 .../qdeclarativexmlhttprequest/data/document.qml   |  40 +++--
 .../qdeclarativexmlhttprequest/data/element.qml    | 168 ++++++++++-----------
 .../qdeclarativexmlhttprequest/data/text.qml       | 134 ++++++++--------
 tests/auto/declarative/sql/tst_sql.cpp             |   4 +-
 8 files changed, 279 insertions(+), 293 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
index 810f9b6..216e916 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
@@ -9,15 +9,12 @@ MyQmlObject {
         QtObject { property int a: 11 }
     ]
 
-    Script {
-        function calcTest1() {
-            var rv = 0;
-            for (var ii = 0; ii < root.objectListProperty.length; ++ii) {
-                rv += root.objectListProperty[ii].a;
-            }
-            return rv;
+    function calcTest1() {
+        var rv = 0;
+        for (var ii = 0; ii < root.objectListProperty.length; ++ii) {
+            rv += root.objectListProperty[ii].a;
         }
-
+        return rv;
     }
 
     property int test1: calcTest1();
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
index 942ed90..e77cb52 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
@@ -1,12 +1,9 @@
 import Test 1.0
 
 MyTypeObject {
-    Script {
-        function val() {
-            var áâãäå = 20
-            return "Test áâãäå: " + áâãäå
-        }
-        
+    function val() {
+        var áâãäå = 20
+        return "Test áâãäå: " + áâãäå
     }
     stringProperty: val()
 }
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
index 9049fc7..0b4badc 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
@@ -4,55 +4,53 @@ QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
-    Script {
-        function checkAttr(documentElement, attr)
-        {
-            if (attr == null)
-                return;
+    function checkAttr(documentElement, attr)
+    {
+        if (attr == null)
+            return;
 
-            if (attr.name != "attr")
-                return;
+        if (attr.name != "attr")
+            return;
 
-            if (attr.value != "myvalue")
-                return;
+        if (attr.value != "myvalue")
+            return;
 
-            if (attr.ownerElement.tagName != documentElement.tagName)
-                return;
+        if (attr.ownerElement.tagName != documentElement.tagName)
+            return;
 
-            if (attr.nodeName != "attr")
-                return;
+        if (attr.nodeName != "attr")
+            return;
 
-            if (attr.nodeValue != "myvalue")
-                return;
+        if (attr.nodeValue != "myvalue")
+            return;
 
-            if (attr.nodeType != 2)
-                return;
+        if (attr.nodeType != 2)
+            return;
 
-            if (attr.childNodes.length != 0)
-                return;
+        if (attr.childNodes.length != 0)
+            return;
 
-            if (attr.firstChild != null)
-                return;
+        if (attr.firstChild != null)
+            return;
 
-            if (attr.lastChild != null)
-                return;
+        if (attr.lastChild != null)
+            return;
 
-            if (attr.previousSibling != null)
-                return;
+        if (attr.previousSibling != null)
+            return;
 
-            if (attr.nextSibling != null)
-                return;
+        if (attr.nextSibling != null)
+            return;
 
-            if (attr.attributes != null)
-                return;
+        if (attr.attributes != null)
+            return;
 
-            xmlTest = true;
-        }
+        xmlTest = true;
+    }
 
-        function checkXML(document)
-        {
-            checkAttr(document.documentElement, document.documentElement.attributes[0]);
-        }
+    function checkXML(document)
+    {
+        checkAttr(document.documentElement, document.documentElement.attributes[0]);
     }
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
index b2d0209..928e514 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
@@ -4,108 +4,106 @@ QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
-    Script {
-        function checkCData(text, whitespacetext)
-        {
-            // This is essentially a copy of text.qml/checkText()
+    function checkCData(text, whitespacetext)
+    {
+        // This is essentially a copy of text.qml/checkText()
 
-            if (text == null)
-                return;
+        if (text == null)
+            return;
 
-            if (text.nodeName != "#cdata-section")
-                return;
+        if (text.nodeName != "#cdata-section")
+            return;
 
-            if (text.nodeValue != "Hello world!")
-                return;
+        if (text.nodeValue != "Hello world!")
+            return;
 
-            if (text.nodeType != 4)
-                return;
+        if (text.nodeType != 4)
+            return;
 
-            if (text.parentNode.nodeName != "item")
-                return;
+        if (text.parentNode.nodeName != "item")
+            return;
 
-            if (text.childNodes.length != 0)
-                return;
+        if (text.childNodes.length != 0)
+            return;
 
-            if (text.firstChild != null)
-                return;
+        if (text.firstChild != null)
+            return;
 
-            if (text.lastChild != null)
-                return;
+        if (text.lastChild != null)
+            return;
 
-            if (text.previousSibling != null)
-                return;
+        if (text.previousSibling != null)
+            return;
 
-            if (text.nextSibling != null)
-                return;
+        if (text.nextSibling != null)
+            return;
 
-            if (text.attributes != null)
-                return;
+        if (text.attributes != null)
+            return;
 
-            if (text.wholeText != "Hello world!")
-                return;
+        if (text.wholeText != "Hello world!")
+            return;
 
-            if (text.data != "Hello world!")
-                return;
+        if (text.data != "Hello world!")
+            return;
 
-            if (text.length != 12)
-                return;
+        if (text.length != 12)
+            return;
 
-            if (text.isElementContentWhitespace != false)
-                return;
+        if (text.isElementContentWhitespace != false)
+            return;
 
-            if (whitespacetext.nodeName != "#cdata-section")
-                return;
+        if (whitespacetext.nodeName != "#cdata-section")
+            return;
 
-            if (whitespacetext.nodeValue != "   ")
-                return;
+        if (whitespacetext.nodeValue != "   ")
+            return;
 
-            if (whitespacetext.nodeType != 4)
-                return;
+        if (whitespacetext.nodeType != 4)
+            return;
 
-            if (whitespacetext.parentNode.nodeName != "item")
-                return;
+        if (whitespacetext.parentNode.nodeName != "item")
+            return;
 
-            if (whitespacetext.childNodes.length != 0)
-                return;
+        if (whitespacetext.childNodes.length != 0)
+            return;
 
-            if (whitespacetext.firstChild != null)
-                return;
+        if (whitespacetext.firstChild != null)
+            return;
 
-            if (whitespacetext.lastChild != null)
-                return;
+        if (whitespacetext.lastChild != null)
+            return;
 
-            if (whitespacetext.previousSibling != null)
-                return;
+        if (whitespacetext.previousSibling != null)
+            return;
 
-            if (whitespacetext.nextSibling != null)
-                return;
+        if (whitespacetext.nextSibling != null)
+            return;
 
-            if (whitespacetext.attributes != null)
-                return;
+        if (whitespacetext.attributes != null)
+            return;
 
-            if (whitespacetext.wholeText != "   ")
-                return;
+        if (whitespacetext.wholeText != "   ")
+            return;
 
-            if (whitespacetext.data != "   ")
-                return;
+        if (whitespacetext.data != "   ")
+            return;
 
-            if (whitespacetext.length != 3)
-                return;
+        if (whitespacetext.length != 3)
+            return;
 
-            if (whitespacetext.isElementContentWhitespace != true)
-                return;
+        if (whitespacetext.isElementContentWhitespace != true)
+            return;
 
 
-            xmlTest = true;
-        }
+        xmlTest = true;
+    }
 
-        function checkXML(document)
-        {
-            checkCData(document.documentElement.childNodes[0].childNodes[0],
-                       document.documentElement.childNodes[1].childNodes[0]);
+    function checkXML(document)
+    {
+        checkCData(document.documentElement.childNodes[0].childNodes[0],
+                   document.documentElement.childNodes[1].childNodes[0]);
 
-        }
     }
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
index e372361..682ea9f 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
@@ -4,34 +4,32 @@ QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
-    Script {
-        function checkXML(document)
-        {
-            if (document.xmlVersion != "1.0")
-                return;
+    function checkXML(document)
+    {
+        if (document.xmlVersion != "1.0")
+            return;
 
-            if (document.xmlEncoding != "UTF-8")
-                return;
+        if (document.xmlEncoding != "UTF-8")
+            return;
 
-            if (document.xmlStandalone != true)
-                return;
+        if (document.xmlStandalone != true)
+            return;
 
-            if (document.documentElement == null)
-                return;
+        if (document.documentElement == null)
+            return;
 
-            if (document.nodeName != "#document")
-                return;
+        if (document.nodeName != "#document")
+            return;
 
-            if (document.nodeValue != null)
-                return;
+        if (document.nodeValue != null)
+            return;
 
-            if (document.parentNode != null)
-                return;
+        if (document.parentNode != null)
+            return;
 
-            // ### Test other node properties
-            // ### test encoding (what is a valid qt encoding?)
-            xmlTest = true;
-        }
+        // ### Test other node properties
+        // ### test encoding (what is a valid qt encoding?)
+        xmlTest = true;
     }
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
index 78c0374..200214f 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
@@ -4,122 +4,120 @@ QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
-    Script {
-        function checkElement(e, person, fruit)
-        {
-            if (e.tagName != "root")
-                return;
+    function checkElement(e, person, fruit)
+    {
+        if (e.tagName != "root")
+            return;
 
-            if (e.nodeName != "root")
-                return;
+        if (e.nodeName != "root")
+            return;
 
-            if (e.nodeValue != null)
-                return;
+        if (e.nodeValue != null)
+            return;
 
-            if (e.nodeType != 1)
-                return;
+        if (e.nodeType != 1)
+            return;
 
-            var childTagNames = [ "person", "fruit" ];
+        var childTagNames = [ "person", "fruit" ];
 
-            if (e.childNodes.length != childTagNames.length)
-                return;
+        if (e.childNodes.length != childTagNames.length)
+            return;
 
-            for (var ii = 0; ii < childTagNames.length; ++ii) {
-                if (e.childNodes[ii].tagName != childTagNames[ii])
-                    return;
-            }
-
-            if (e.childNodes[childTagNames.length + 1] != null)
+        for (var ii = 0; ii < childTagNames.length; ++ii) {
+            if (e.childNodes[ii].tagName != childTagNames[ii])
                 return;
+        }
 
-            // Check writing fails
-            e.childNodes[0] = null;
-            if (e.childNodes[0] == null)
-                return;
+        if (e.childNodes[childTagNames.length + 1] != null)
+            return;
 
-            e.childNodes[10] = 10;
-            if (e.childNodes[10] != null)
-                return;
+        // Check writing fails
+        e.childNodes[0] = null;
+        if (e.childNodes[0] == null)
+            return;
 
-            if (e.firstChild.tagName != e.childNodes[0].tagName)
-                return;
+        e.childNodes[10] = 10;
+        if (e.childNodes[10] != null)
+            return;
 
-            if (e.lastChild.tagName != e.childNodes[1].tagName)
-                return;
+        if (e.firstChild.tagName != e.childNodes[0].tagName)
+            return;
 
-            if (e.previousSibling != null)
-                return;
+        if (e.lastChild.tagName != e.childNodes[1].tagName)
+            return;
 
-            if (e.nextSibling != null)
-                return;
+        if (e.previousSibling != null)
+            return;
 
-            if (e.attributes == null)
-                return;
+        if (e.nextSibling != null)
+            return;
 
-            if (e.attributes.length != 2)
-                return;
+        if (e.attributes == null)
+            return;
 
-            var attr1 = e.attributes["attr"];
-            if (attr1.nodeValue != "value")
-                return;
+        if (e.attributes.length != 2)
+            return;
 
-            var attrIdx = e.attributes[0];
-            if (attrIdx.nodeValue != "value")
-                return;
+        var attr1 = e.attributes["attr"];
+        if (attr1.nodeValue != "value")
+            return;
 
-            var attr2 = e.attributes["attr2"];
-            if (attr2.nodeValue != "value2")
-                return;
+        var attrIdx = e.attributes[0];
+        if (attrIdx.nodeValue != "value")
+            return;
 
-            var attr3 = e.attributes["attr3"];
-            if (attr3 != null)
-                return;
+        var attr2 = e.attributes["attr2"];
+        if (attr2.nodeValue != "value2")
+            return;
 
-            var attrIdx2 = e.attributes[11];
-            if (attrIdx2 != null)
-                return;
+        var attr3 = e.attributes["attr3"];
+        if (attr3 != null)
+            return;
 
-            // Check writing fails
-            e.attributes[0] = null;
-            if (e.attributes[0] == null)
-                return;
+        var attrIdx2 = e.attributes[11];
+        if (attrIdx2 != null)
+            return;
 
-            e.attributes["attr"] = null;
-            if (e.attributes["attr"] == null)
-                return;
+        // Check writing fails
+        e.attributes[0] = null;
+        if (e.attributes[0] == null)
+            return;
 
-            e.attributes["attr3"] = 10;
-            if (e.attributes["attr3"] != null)
-                return;
+        e.attributes["attr"] = null;
+        if (e.attributes["attr"] == null)
+            return;
 
-            // Check person and fruit sub elements
-            if (person.parentNode.nodeName != "root")
-                return;
+        e.attributes["attr3"] = 10;
+        if (e.attributes["attr3"] != null)
+            return;
 
-            if (person.previousSibling != null)
-                return;
+        // Check person and fruit sub elements
+        if (person.parentNode.nodeName != "root")
+            return;
 
-            if (person.nextSibling.nodeName != "fruit")
-                return;
+        if (person.previousSibling != null)
+            return;
 
-            if (fruit.parentNode.nodeName != "root")
-                return;
+        if (person.nextSibling.nodeName != "fruit")
+            return;
 
-            if (fruit.previousSibling.nodeName != "person")
-                return;
+        if (fruit.parentNode.nodeName != "root")
+            return;
 
-            if (fruit.nextSibling != null)
-                return;
+        if (fruit.previousSibling.nodeName != "person")
+            return;
 
-            xmlTest = true;
-        }
+        if (fruit.nextSibling != null)
+            return;
 
-        function checkXML(document)
-        {
-            checkElement(document.documentElement, 
-                         document.documentElement.childNodes[0], 
-                         document.documentElement.childNodes[1]);
-        }
+        xmlTest = true;
+    }
+
+    function checkXML(document)
+    {
+        checkElement(document.documentElement, 
+                     document.documentElement.childNodes[0], 
+                     document.documentElement.childNodes[1]);
     }
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
index 4615a07..0eb31d5 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
@@ -4,105 +4,103 @@ QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
-    Script {
-        function checkText(text, whitespacetext)
-        {
-            if (text == null)
-                return;
+    function checkText(text, whitespacetext)
+    {
+        if (text == null)
+            return;
 
-            if (text.nodeName != "#text")
-                return;
+        if (text.nodeName != "#text")
+            return;
 
-            if (text.nodeValue != "Hello world!")
-                return;
+        if (text.nodeValue != "Hello world!")
+            return;
 
-            if (text.nodeType != 3)
-                return;
+        if (text.nodeType != 3)
+            return;
 
-            if (text.parentNode.nodeName != "item")
-                return;
+        if (text.parentNode.nodeName != "item")
+            return;
 
-            if (text.childNodes.length != 0)
-                return;
+        if (text.childNodes.length != 0)
+            return;
 
-            if (text.firstChild != null)
-                return;
+        if (text.firstChild != null)
+            return;
 
-            if (text.lastChild != null)
-                return;
+        if (text.lastChild != null)
+            return;
 
-            if (text.previousSibling != null)
-                return;
+        if (text.previousSibling != null)
+            return;
 
-            if (text.nextSibling != null)
-                return;
+        if (text.nextSibling != null)
+            return;
 
-            if (text.attributes != null)
-                return;
+        if (text.attributes != null)
+            return;
 
-            if (text.wholeText != "Hello world!")
-                return;
+        if (text.wholeText != "Hello world!")
+            return;
 
-            if (text.data != "Hello world!")
-                return;
+        if (text.data != "Hello world!")
+            return;
 
-            if (text.length != 12)
-                return;
+        if (text.length != 12)
+            return;
 
-            if (text.isElementContentWhitespace != false)
-                return;
+        if (text.isElementContentWhitespace != false)
+            return;
 
-            if (whitespacetext.nodeName != "#text")
-                return;
+        if (whitespacetext.nodeName != "#text")
+            return;
 
-            if (whitespacetext.nodeValue != "   ")
-                return;
+        if (whitespacetext.nodeValue != "   ")
+            return;
 
-            if (whitespacetext.nodeType != 3)
-                return;
+        if (whitespacetext.nodeType != 3)
+            return;
 
-            if (whitespacetext.parentNode.nodeName != "item")
-                return;
+        if (whitespacetext.parentNode.nodeName != "item")
+            return;
 
-            if (whitespacetext.childNodes.length != 0)
-                return;
+        if (whitespacetext.childNodes.length != 0)
+            return;
 
-            if (whitespacetext.firstChild != null)
-                return;
+        if (whitespacetext.firstChild != null)
+            return;
 
-            if (whitespacetext.lastChild != null)
-                return;
+        if (whitespacetext.lastChild != null)
+            return;
 
-            if (whitespacetext.previousSibling != null)
-                return;
+        if (whitespacetext.previousSibling != null)
+            return;
 
-            if (whitespacetext.nextSibling != null)
-                return;
+        if (whitespacetext.nextSibling != null)
+            return;
 
-            if (whitespacetext.attributes != null)
-                return;
+        if (whitespacetext.attributes != null)
+            return;
 
-            if (whitespacetext.wholeText != "   ")
-                return;
+        if (whitespacetext.wholeText != "   ")
+            return;
 
-            if (whitespacetext.data != "   ")
-                return;
+        if (whitespacetext.data != "   ")
+            return;
 
-            if (whitespacetext.length != 3)
-                return;
+        if (whitespacetext.length != 3)
+            return;
 
-            if (whitespacetext.isElementContentWhitespace != true)
-                return;
+        if (whitespacetext.isElementContentWhitespace != true)
+            return;
 
-            xmlTest = true;
-        }
+        xmlTest = true;
+    }
 
-        function checkXML(document)
-        {
-            checkText(document.documentElement.childNodes[0].childNodes[0],
-                      document.documentElement.childNodes[1].childNodes[0]);
+    function checkXML(document)
+    {
+        checkText(document.documentElement.childNodes[0].childNodes[0],
+                  document.documentElement.childNodes[1].childNodes[0]);
 
-        }
     }
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/sql/tst_sql.cpp
index e8a5e0c..1bab2d2 100644
--- a/tests/auto/declarative/sql/tst_sql.cpp
+++ b/tests/auto/declarative/sql/tst_sql.cpp
@@ -197,11 +197,13 @@ void tst_sql::testQml()
 
     QString qml=
         "import Qt 4.6\n"
-        "Text { Script { source: \""+jsfile+"\" } text: test() }";
+        "import \""+jsfile+"\" as JS\n"
+        "Text { text: JS.test() }";
 
     engine->setOfflineStoragePath(dbDir());
     QDeclarativeComponent component(engine);
     component.setData(qml.toUtf8(), QUrl::fromLocalFile(SRCDIR "/empty.qml")); // just a file for relative local imports
+    QVERIFY(!component.isError());
     QDeclarativeText *text = qobject_cast<QDeclarativeText*>(component.create());
     QVERIFY(text != 0);
     QCOMPARE(text->text(),QString("passed"));
-- 
cgit v0.12