diff -r 000000000000 -r 1918ee327afb tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,172 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 <QtTest/QtTest>
+
+#ifdef QTEST_XMLPATTERNS
+
+#include <QSimpleXmlNodeModel>
+#include <QXmlNamePool>
+#include <QXmlQuery>
+#include <QXmlSerializer>
+#include <QXmlStreamReader>
+
+#include "TestSimpleNodeModel.h"
+
+/*!
+ \class tst_QSimpleXmlNodeModel
+ \internal
+ \since 4.4
+ \brief Tests class QSimpleXmlNodeModel.
+ */
+class tst_QSimpleXmlNodeModel : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void namePool() const;
+    void namePoolIsReference() const;
+    void defaultConstructor() const;
+    void objectSize() const;
+    void constCorrectness() const;
+    void stringValue() const;
+};
+
+void tst_QSimpleXmlNodeModel::namePool() const
+{
+    /* Check that the name pool we pass in, is what actually is returned. */
+    QXmlNamePool np;
+    const QXmlName name(np, QLatin1String("localName"),
+                            QLatin1String("http://example.com/XYZ"),
+                            QLatin1String("prefix432"));
+    TestSimpleNodeModel model(np);
+    const QXmlNamePool np2(model.namePool());
+
+    /* If it's a bug, this will more or less crash. */
+    QCOMPARE(name.namespaceUri(np2), QString::fromLatin1("http://example.com/XYZ"));
+    QCOMPARE(name.localName(np2), QString::fromLatin1("localName"));
+    QCOMPARE(name.prefix(np2), QString::fromLatin1("prefix432"));
+}
+
+void tst_QSimpleXmlNodeModel::namePoolIsReference() const
+{
+    /* Test is placed in TestSimpleNodeModel.h:~50. */
+}
+
+void tst_QSimpleXmlNodeModel::defaultConstructor() const
+{
+    QXmlNamePool np;
+}
+
+void tst_QSimpleXmlNodeModel::objectSize() const
+{
+    /* We shouldn't have added any members. */
+    QCOMPARE(sizeof(QSimpleXmlNodeModel), sizeof(QAbstractXmlNodeModel));
+}
+
+void tst_QSimpleXmlNodeModel::constCorrectness() const
+{
+    QXmlNamePool np;
+    const TestSimpleNodeModel instance(np);
+
+    instance.nextFromSimpleAxis(QSimpleXmlNodeModel::Parent, QXmlNodeModelIndex());
+    instance.attributes(QXmlNodeModelIndex());
+
+    instance.namePool();
+}
+
+/*!
+ Verify that if QAbstractXmlNodeModel::typedValue() return a null
+ QVariant, it is treated as that the node has no typed value.
+
+ This verifies the default implementation of QSimpleXmlNodeModel::stringValue().
+ */
+void tst_QSimpleXmlNodeModel::stringValue() const
+{
+    class TypedModel : public TestSimpleNodeModel
+    {
+    public:
+        TypedModel(const QXmlNamePool &np) : TestSimpleNodeModel(np)
+        {
+        }
+
+        virtual QXmlNodeModelIndex::NodeKind kind(const QXmlNodeModelIndex &) const
+        {
+            return QXmlNodeModelIndex::Element;
+        }
+
+        virtual QVariant typedValue(const QXmlNodeModelIndex &) const
+        {
+            return QVariant();
+        }
+
+        QXmlNodeModelIndex root() const
+        {
+            return createIndex(qint64(1));
+        }
+    };
+
+    QXmlNamePool np;
+    TypedModel model(np);
+
+    QXmlQuery query(np);
+    query.bindVariable(QLatin1String("node"), model.root());
+    query.setQuery(QLatin1String("declare variable $node external;"
+                                 "string($node), data($node)"));
+
+    QByteArray output;
+    QBuffer buffer(&output);
+    QVERIFY(buffer.open(QIODevice::WriteOnly));
+    QVERIFY(query.isValid());
+
+    QXmlSerializer serializer(query, &buffer);
+    QVERIFY(query.evaluateTo(&serializer));
+
+    QVERIFY(output.isEmpty());
+}
+
+QTEST_MAIN(tst_QSimpleXmlNodeModel)
+
+#include "tst_qsimplexmlnodemodel.moc"
+#else //QTEST_XMLPATTERNS
+QTEST_NOOP_MAIN
+#endif