Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12

19 files changed, 618 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/README b/tests/auto/declarative/qdeclarativesqldatabase/data/README
new file mode 100644
index 0000000000..7efca3a972
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/README
@@ -0,0 +1,3 @@
+These tests are executed in sequence - the database persist until the end of the
+testing. This is done to better exercise the persistence of the database, since
+that is how it is used.
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js b/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
new file mode 100644
index 0000000000..680d7a652f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
@@ -0,0 +1,53 @@
+function test() {
+    var r="transaction_not_finished";
+
+    var db = openDatabaseSync("QmlTestDB-changeversion", "", "Test database from Qt autotests", 1000000,
+            function(db) {
+                db.changeVersion("","1.0")
+                db.transaction(function(tx){
+                    tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
+                })
+            });
+
+    db.transaction(function(tx){
+        tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
+        tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
+    });
+
+
+    db = openDatabaseSync("QmlTestDB-changeversion", "", "Test database from Qt autotests", 1000000);
+
+    if (db.version == "1.0")
+        db.changeVersion("1.0","2.0",function(tx)
+            {
+                tx.executeSql('CREATE TABLE Utterance(type TEXT, phrase TEXT)')
+                var rs = tx.executeSql('SELECT * FROM Greeting');
+                for (var i=0; i<rs.rows.length; ++i) {
+                    var type = "Greeting";
+                    var phrase = rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee;
+                    if (rs.rows.item(i).salutation == "Goodbye"
+                     || rs.rows.item(i).salutation == "Farewell"
+                     || rs.rows.item(i).salutation == "Good-bye") type = "Valediction";
+                    var ins = tx.executeSql('INSERT INTO Utterance VALUES(?,?)',[type,phrase]);
+                }
+                tx.executeSql('DROP TABLE Greeting');
+            });
+    else
+        return "db.version should be 1.0, but is " + db.version;
+
+    var db = openDatabaseSync("QmlTestDB-changeversion", "2.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(function(tx){
+        var rs = tx.executeSql('SELECT * FROM Utterance');
+        r = ""
+        for (var i=0; i<rs.rows.length; ++i) {
+            r += "(" + rs.rows.item(i).type + ": " + rs.rows.item(i).phrase + ")";
+        }
+        if (r == "(Greeting: Hello, world)(Valediction: Goodbye, cruel world)")
+            r = "passed"
+        else
+            r = "WRONG DATA: " + r;
+    })
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js b/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
new file mode 100644
index 0000000000..bd7d5c5022
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
@@ -0,0 +1,18 @@
+function test() {
+    var r="transaction_not_finished";
+
+    var db = openDatabaseSync("QmlTestDB-creation-a", "1.0", "Test database from Qt autotests", 1000000,
+            function(db) {
+                db.transaction(function(tx){
+                    tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
+                    r = "passed";
+                })
+            });
+
+    var db = openDatabaseSync("QmlTestDB-creation-a", "1.0", "Test database from Qt autotests", 1000000,
+            function(db) {
+                r = "FAILED: should have already been created";
+            });
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js b/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
new file mode 100644
index 0000000000..317b4c1564
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
@@ -0,0 +1,14 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-creation", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
new file mode 100644
index 0000000000..10a23f68f7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
@@ -0,0 +1,20 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-error-a", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    try {
+        db.transaction(
+            function(tx) {
+                var rs = tx.executeSql('SELECT * FROM NotExists');
+                r = "SHOULD NOT SUCCEED";
+            }
+        );
+    } catch (err) {
+        if (err.message == "no such table: NotExists Unable to execute statement")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
new file mode 100644
index 0000000000..4dd0ecf2af
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
@@ -0,0 +1,13 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-error-b", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('INSERT INTO Greeting VALUES("junk","junk")');
+            notexist[123] = "oops"
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
new file mode 100644
index 0000000000..0ab2a3544f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
@@ -0,0 +1,14 @@
+function test() {
+    var r="transaction_not_finished";
+    try {
+        var db = openDatabaseSync("QmlTestDB-creation", "2.0", "Test database from Qt autotests", 1000000);
+    } catch (err) {
+        if (err.code != SQLException.VERSION_ERR)
+            r = "WRONG ERROR CODE="+err.code;
+        else if (err.message != "SQL: database version mismatch")
+            r = "WRONG ERROR="+err.message;
+        else
+            r = "passed";
+    }
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
new file mode 100644
index 0000000000..b9cc6475a6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
@@ -0,0 +1,15 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-data/error-notransaction", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    try {
+        db.transaction();
+    } catch (err) {
+        if (err.message == "transaction: missing callback")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
new file mode 100644
index 0000000000..a7af3bddbc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
@@ -0,0 +1,17 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-data/error-notransaction", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+    var v;
+
+    try {
+        db.transaction(function(tx) { v = tx });
+        v.executeSql("SELECT 'bad'")
+    } catch (err) {
+        if (err.message == "executeSql called outside transaction()")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
new file mode 100644
index 0000000000..45947c08a7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
@@ -0,0 +1,29 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-iteration-forwardonly", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
+            tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
+        }
+    )
+
+    db.transaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            rs.forwardOnly = !rs.forwardOnly
+            var r1=""
+            for(var i = 0; i < rs.rows.length; i++)
+                r1 += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + ";"
+            if (r1 != "hello, world;hello, world;hello, world;hello, world;")
+            if (r1 != "Hello, world;Goodbye, cruel world;")
+                r = "SELECTED DATA WRONG: "+r1;
+            else
+                r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
new file mode 100644
index 0000000000..c34cbbb391
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
@@ -0,0 +1,28 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-iteration", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES ("Hello", "world")');
+            tx.executeSql('INSERT INTO Greeting VALUES ("Goodbye", "cruel world")');
+        }
+    )
+
+    db.transaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            var r1=""
+            for(var i = 0; i < rs.rows.length; i++)
+                r1 += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + ";"
+            if (r1 != "hello, world;hello, world;hello, world;hello, world;")
+            if (r1 != "Hello, world;Goodbye, cruel world;")
+                r = "SELECTED DATA WRONG: "+r1;
+            else
+                r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
new file mode 100644
index 0000000000..69ec67fb1a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
@@ -0,0 +1,27 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-readonly-error", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+        }
+    );
+
+    try {
+        db.readTransaction(
+            function(tx) {
+                tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+                r = "FAILED";
+            }
+        );
+    } catch (err) {
+        if (err.message == "Read-only Transaction")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
new file mode 100644
index 0000000000..5ee862c083
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
@@ -0,0 +1,24 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-readonly", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            r = "passed";
+        }
+    );
+
+    db.readTransaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            if (rs.rows.item(0).salutation == 'hello')
+                r = "passed";
+            else
+                r = "FAILED";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
new file mode 100644
index 0000000000..c1a8157b10
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
@@ -0,0 +1,14 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-reopen", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
new file mode 100644
index 0000000000..4f7248f094
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
@@ -0,0 +1,16 @@
+function test() {
+    var r="transaction_not_finished";
+    var db = openDatabaseSync("QmlTestDB-reopen", "1.0", "Test database from Qt autotests", 1000000);
+
+    db.transaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            if (rs.rows.item(0).salutation == 'hello')
+                r = "passed";
+            else
+                r = "FAILED";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js b/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
new file mode 100644
index 0000000000..9786821f47
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
@@ -0,0 +1,26 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-bindnames", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'goodbye', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'there' ]);
+        }
+    );
+
+    db.transaction(
+        function(tx) {
+            var rs = tx.executeSql('SELECT * FROM Greeting WHERE salutation=:p2 AND salutee=:p1', {':p1':'world', ':p2':'hello'});
+            if ( rs.rows.length != 2 )
+                r = "SELECT RETURNED WRONG VALUE "+rs.rows.length+rs.rows.item(0)+rs.rows.item(1)
+            else
+                r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js b/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
new file mode 100644
index 0000000000..f116efffd2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
@@ -0,0 +1,26 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-selection", "", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+        }
+    );
+
+    db.transaction(
+        function(tx) {
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+            var rs = tx.executeSql('SELECT * FROM Greeting');
+            if ( rs.rows.length != 4 )
+                r = "SELECT RETURNED WRONG VALUE "+rs.rows.length+rs.rows[0]+rs.rows[1]
+            else
+                r = "passed";
+        }
+    );
+
+    return r;
+}
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
new file mode 100644
index 0000000000..0d335a547d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
@@ -0,0 +1,17 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += sql script
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativesqldatabase.cpp
+
+symbian: {
+    importFiles.files = data
+    importFiles.path = .
+    DEPLOYMENT += importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
+CONFIG += parallel_test
+
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
new file mode 100644
index 0000000000..9e2dd4a244
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativeengine_p.h>
+#include <QtCore/qcryptographichash.h>
+#include <QtWebKit/qwebpage.h>
+#include <QtWebKit/qwebframe.h>
+#include <QtWebKit/qwebdatabase.h>
+#include <QtWebKit/qwebsecurityorigin.h>
+#include <QtSql/qsqldatabase.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+#define SRCDIR "."
+#endif
+
+class tst_qdeclarativesqldatabase : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativesqldatabase()
+    {
+        qApp->setApplicationName("tst_qdeclarativesqldatabase");
+        qApp->setOrganizationName("Nokia");
+        qApp->setOrganizationDomain("nokia.com");
+        engine = new QDeclarativeEngine;
+    }
+
+    ~tst_qdeclarativesqldatabase()
+    {
+        delete engine;
+    }
+
+private slots:
+    void initTestCase();
+
+    void checkDatabasePath();
+
+    void testQml_data();
+    void testQml();
+    void testQml_cleanopen_data();
+    void testQml_cleanopen();
+    void totalDatabases();
+
+    void cleanupTestCase();
+
+private:
+    QString dbDir() const;
+    QDeclarativeEngine *engine;
+};
+
+class QWebPageWithJavaScriptConsoleMessages : public QWebPage {
+public:
+    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
+    {
+        qWarning() << sourceID << ":" << lineNumber << ":" << message;
+    }
+};
+
+void removeRecursive(const QString& dirname)
+{
+    QDir dir(dirname);
+    QFileInfoList entries(dir.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoDotAndDotDot));
+    for (int i = 0; i < entries.count(); ++i)
+        if (entries[i].isDir())
+            removeRecursive(entries[i].filePath());
+        else
+            dir.remove(entries[i].fileName());
+    QDir().rmdir(dirname);
+}
+
+void tst_qdeclarativesqldatabase::initTestCase()
+{
+    removeRecursive(dbDir());
+    QDir().mkpath(dbDir());
+}
+
+void tst_qdeclarativesqldatabase::cleanupTestCase()
+{
+    removeRecursive(dbDir());
+}
+
+QString tst_qdeclarativesqldatabase::dbDir() const
+{
+    static QString tmpd = QDir::tempPath()+"/tst_qdeclarativesqldatabase_output-"
+        + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
+    return tmpd;
+}
+
+void tst_qdeclarativesqldatabase::checkDatabasePath()
+{
+    // Check default storage path (we can't use it since we don't want to mess with user's data)
+    QVERIFY(engine->offlineStoragePath().contains("tst_qdeclarativesqldatabase"));
+    QVERIFY(engine->offlineStoragePath().contains("OfflineStorage"));
+}
+
+static const int total_databases_created_by_tests = 12;
+void tst_qdeclarativesqldatabase::testQml_data()
+{
+    QTest::addColumn<QString>("jsfile"); // The input file
+
+    // Each test should use a newly named DB to avoid inter-test dependencies
+    QTest::newRow("creation") << "data/creation.js";
+    QTest::newRow("creation-a") << "data/creation-a.js";
+    QTest::newRow("creation") << "data/creation.js";
+    QTest::newRow("error-creation") << "data/error-creation.js"; // re-uses above DB
+    QTest::newRow("changeversion") << "data/changeversion.js";
+    QTest::newRow("readonly") << "data/readonly.js";
+    QTest::newRow("readonly-error") << "data/readonly-error.js";
+    QTest::newRow("selection") << "data/selection.js";
+    QTest::newRow("selection-bindnames") << "data/selection-bindnames.js";
+    QTest::newRow("iteration") << "data/iteration.js";
+    QTest::newRow("iteration-forwardonly") << "data/iteration-forwardonly.js";
+    QTest::newRow("error-a") << "data/error-a.js";
+    QTest::newRow("error-notransaction") << "data/error-notransaction.js";
+    QTest::newRow("error-outsidetransaction") << "data/error-outsidetransaction.js"; // reuse above
+    QTest::newRow("reopen1") << "data/reopen1.js";
+    QTest::newRow("reopen2") << "data/reopen2.js"; // re-uses above DB
+
+    // If you add a test, you should usually use a new database in the
+    // test - in which case increment total_databases_created_by_tests above.
+}
+
+/*
+void tst_qdeclarativesqldatabase::validateAgainstWebkit()
+{
+    // Validates tests against WebKit (HTML5) support.
+    //
+    QFETCH(QString, jsfile);
+    QFETCH(QString, result);
+    QFETCH(int, databases);
+
+    QFile f(jsfile);
+    QVERIFY(f.open(QIODevice::ReadOnly));
+    QString js=f.readAll();
+
+    QWebPageWithJavaScriptConsoleMessages webpage;
+    webpage.settings()->setOfflineStoragePath(dbDir());
+    webpage.settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
+
+    QEXPECT_FAIL("","WebKit doesn't support openDatabaseSync yet", Continue);
+    QCOMPARE(webpage.mainFrame()->evaluateJavaScript(js).toString(),result);
+
+    QTest::qWait(100); // WebKit crashes if you quit it too fast
+
+    QWebSecurityOrigin origin = webpage.mainFrame()->securityOrigin();
+    QList<QWebDatabase> dbs = origin.databases();
+    QCOMPARE(dbs.count(), databases);
+}
+*/
+
+void tst_qdeclarativesqldatabase::testQml()
+{
+    // Tests QML SQL Database support with tests
+    // that have been validated against Webkit.
+    //
+    QFETCH(QString, jsfile);
+
+    QString qml=
+        "import QtQuick 1.0\n"
+        "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"));
+}
+
+void tst_qdeclarativesqldatabase::testQml_cleanopen_data()
+{
+    QTest::addColumn<QString>("jsfile"); // The input file
+    QTest::newRow("reopen1") << "data/reopen1.js";
+    QTest::newRow("reopen2") << "data/reopen2.js";
+    QTest::newRow("error-creation") << "data/error-creation.js"; // re-uses creation DB
+}
+
+void tst_qdeclarativesqldatabase::testQml_cleanopen()
+{
+    // Same as testQml, but clean connections between tests,
+    // making it more like the tests are running in new processes.
+    testQml();
+
+    QDeclarativeEnginePrivate::getScriptEngine(engine)->collectGarbage(); // close databases
+    foreach (QString dbname, QSqlDatabase::connectionNames()) {
+        QSqlDatabase::removeDatabase(dbname);
+    }
+}
+
+void tst_qdeclarativesqldatabase::totalDatabases()
+{
+    QCOMPARE(QDir(dbDir()+"/Databases").entryInfoList(QDir::Files|QDir::NoDotAndDotDot).count(), total_databases_created_by_tests*2);
+}
+
+QTEST_MAIN(tst_qdeclarativesqldatabase)
+
+#include "tst_qdeclarativesqldatabase.moc"