From 1f0b600b82eb90fc30339e5899fb0c21235af1bf Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Thu, 2 Sep 2010 15:32:04 +1000
Subject: Autotests: More cleanup of tests, and initial marking of components
 belonged to.

---
 tests/auto/aggregation/tst_aggregate.cpp           |    2 +
 tests/auto/auto.pro                                |    4 +-
 tests/auto/changeset/tst_changeset.cpp             |    2 +
 tests/auto/cplusplus/ast/tst_ast.cpp               |    1 +
 tests/auto/cplusplus/codegen/tst_codegen.cpp       |    2 +
 tests/auto/cplusplus/findusages/tst_findusages.cpp |    1 +
 tests/auto/cplusplus/lookup/tst_lookup.cpp         |    1 +
 tests/auto/cplusplus/preprocessor/preprocessor.pro |    1 -
 .../cplusplus/preprocessor/tst_preprocessor.cpp    |    1 +
 tests/auto/cplusplus/semantic/tst_semantic.cpp     |    1 +
 .../typeprettyprinter/tst_typeprettyprinter.cpp    |    1 +
 tests/auto/debugger/tst_dumpers.cpp                |  126 +-
 tests/auto/debugger/tst_gdb.cpp                    |    1 +
 tests/auto/debugger/tst_version.cpp                |    1 +
 tests/auto/fakevim/fakevim.pro                     |    4 +-
 tests/auto/fakevim/main.cpp                        |  885 ---
 tests/auto/fakevim/tst_fakevim.cpp                 |  885 +++
 .../highlighterengine/highlighterengine.pro        |   18 +-
 .../highlighterengine/tst_highlighterengine.cpp    |    2 +
 .../specificrules/tst_specificrules.cpp            |    1 +
 tests/auto/profilereader/main.cpp                  |   76 -
 tests/auto/profilereader/profilecache.h            |    2 +-
 tests/auto/profilereader/profilereader.pro         |   15 +-
 tests/auto/profilereader/tst_profilereader.cpp     |   74 +
 tests/auto/profilewriter/main.cpp                  |  299 -
 tests/auto/profilewriter/profilewriter.pro         |    5 +-
 tests/auto/profilewriter/tst_profilewriter.cpp     |  299 +
 tests/auto/qml/qmldesigner/coretests/coretests.pro |   10 +-
 tests/auto/qml/qmldesigner/coretests/testcore.cpp  | 6956 --------------------
 tests/auto/qml/qmldesigner/coretests/testcore.h    |  218 -
 .../qml/qmldesigner/coretests/tst_testcore.cpp     | 6956 ++++++++++++++++++++
 .../auto/qml/qmldesigner/coretests/tst_testcore.h  |  218 +
 tests/manual/gdbdebugger/gui/gui.pro               |    6 +-
 tests/manual/gdbdebugger/gui/main.cpp              |   41 -
 tests/manual/gdbdebugger/gui/tst_gui.cpp           |   41 +
 tests/manual/gdbdebugger/simple/app.cpp            | 2048 ------
 tests/manual/gdbdebugger/simple/plugin.cpp         |   41 -
 .../gdbdebugger/simple/simple_gdbtest_app.cpp      | 2048 ++++++
 .../gdbdebugger/simple/simple_gdbtest_app.pro      |    5 +-
 .../gdbdebugger/simple/simple_gdbtest_plugin.cpp   |   41 +
 .../gdbdebugger/simple/simple_gdbtest_plugin.pro   |    8 +-
 41 files changed, 10679 insertions(+), 10668 deletions(-)
 delete mode 100644 tests/auto/fakevim/main.cpp
 create mode 100644 tests/auto/fakevim/tst_fakevim.cpp
 delete mode 100644 tests/auto/profilereader/main.cpp
 create mode 100644 tests/auto/profilereader/tst_profilereader.cpp
 delete mode 100644 tests/auto/profilewriter/main.cpp
 create mode 100644 tests/auto/profilewriter/tst_profilewriter.cpp
 delete mode 100644 tests/auto/qml/qmldesigner/coretests/testcore.cpp
 delete mode 100644 tests/auto/qml/qmldesigner/coretests/testcore.h
 create mode 100644 tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
 create mode 100644 tests/auto/qml/qmldesigner/coretests/tst_testcore.h
 delete mode 100644 tests/manual/gdbdebugger/gui/main.cpp
 create mode 100644 tests/manual/gdbdebugger/gui/tst_gui.cpp
 delete mode 100644 tests/manual/gdbdebugger/simple/app.cpp
 delete mode 100644 tests/manual/gdbdebugger/simple/plugin.cpp
 create mode 100644 tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
 create mode 100644 tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp

diff --git a/tests/auto/aggregation/tst_aggregate.cpp b/tests/auto/aggregation/tst_aggregate.cpp
index b748b73c00..aa3c8646de 100644
--- a/tests/auto/aggregation/tst_aggregate.cpp
+++ b/tests/auto/aggregation/tst_aggregate.cpp
@@ -31,6 +31,8 @@
 
 #include <QtTest/QtTest>
 
+//TESTED_COMPONENT=src/libs/aggregation
+
 class tst_Aggregate : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 4e35b4e5c5..67cd164df0 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -5,11 +5,13 @@ SUBDIRS += \
     debugger \
     fakevim \
 #    profilereader \
+#    profilewriter \
     aggregation \
     changeset \
 #    icheckbuild \
     generichighlighter \
-    utils_stringutils
+    utils_stringutils \
+    qml
 
 contains (QT_CONFIG, declarative) {
 SUBDIRS += qml
diff --git a/tests/auto/changeset/tst_changeset.cpp b/tests/auto/changeset/tst_changeset.cpp
index b4161433ac..423f3966a9 100644
--- a/tests/auto/changeset/tst_changeset.cpp
+++ b/tests/auto/changeset/tst_changeset.cpp
@@ -31,6 +31,8 @@
 
 #include <QtTest/QtTest>
 
+//TESTED_COMPONENT=src/utils/changeset
+
 class tst_ChangeSet : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp
index c1caa651d7..53406e3a19 100644
--- a/tests/auto/cplusplus/ast/tst_ast.cpp
+++ b/tests/auto/cplusplus/ast/tst_ast.cpp
@@ -7,6 +7,7 @@
 #include <Parser.h>
 #include <AST.h>
 
+//TESTED_COMPONENT=src/libs/cplusplus
 using namespace CPlusPlus;
 
 class tst_AST: public QObject
diff --git a/tests/auto/cplusplus/codegen/tst_codegen.cpp b/tests/auto/cplusplus/codegen/tst_codegen.cpp
index c536305be6..e763886da2 100644
--- a/tests/auto/cplusplus/codegen/tst_codegen.cpp
+++ b/tests/auto/cplusplus/codegen/tst_codegen.cpp
@@ -13,6 +13,8 @@
 #include <QtDebug>
 #include <QTextDocument>
 
+//TESTED_COMPONENT=src/libs/cplusplus
+
 /*!
     Tests for various parts of the code generation. Well, okay, currently it only
     tests the InsertionPointLocator.
diff --git a/tests/auto/cplusplus/findusages/tst_findusages.cpp b/tests/auto/cplusplus/findusages/tst_findusages.cpp
index 4faccfa67b..be711cc2d7 100644
--- a/tests/auto/cplusplus/findusages/tst_findusages.cpp
+++ b/tests/auto/cplusplus/findusages/tst_findusages.cpp
@@ -15,6 +15,7 @@
 #include <Symbols.h>
 #include <Overview.h>
 
+//TESTED_COMPONENT=src/libs/cplusplus
 using namespace CPlusPlus;
 
 class CollectNames: public ASTVisitor
diff --git a/tests/auto/cplusplus/lookup/tst_lookup.cpp b/tests/auto/cplusplus/lookup/tst_lookup.cpp
index 0d4578b232..aef1afdba1 100644
--- a/tests/auto/cplusplus/lookup/tst_lookup.cpp
+++ b/tests/auto/cplusplus/lookup/tst_lookup.cpp
@@ -13,6 +13,7 @@
 #include <Symbols.h>
 #include <Overview.h>
 
+//TESTED_COMPONENT=src/libs/cplusplus
 using namespace CPlusPlus;
 
 template <template <typename, typename> class _Map, typename _T1, typename _T2>
diff --git a/tests/auto/cplusplus/preprocessor/preprocessor.pro b/tests/auto/cplusplus/preprocessor/preprocessor.pro
index 6e4af547bb..f471b51104 100644
--- a/tests/auto/cplusplus/preprocessor/preprocessor.pro
+++ b/tests/auto/cplusplus/preprocessor/preprocessor.pro
@@ -1,6 +1,5 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
 CONFIG += qtestlib testcase
-TARGET = tst_$$TARGET
 include(../shared/shared.pri)
 SOURCES += tst_preprocessor.cpp
diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
index d5e320cb9b..bf80428023 100644
--- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
+++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
@@ -1,6 +1,7 @@
 #include <QtTest>
 #include <pp.h>
 
+//TESTED_COMPONENT=src/libs/cplusplus
 using namespace CPlusPlus;
 
 class tst_Preprocessor: public QObject
diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp
index 5fb11f8ea7..a93b6ec3c6 100644
--- a/tests/auto/cplusplus/semantic/tst_semantic.cpp
+++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp
@@ -20,6 +20,7 @@
 #include <ExpressionUnderCursor.h>
 #include <Names.h>
 
+//TESTED_COMPONENT=src/libs/cplusplus
 using namespace CPlusPlus;
 
 class tst_Semantic: public QObject
diff --git a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
index 3a90198c10..a4d6d3319c 100644
--- a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
+++ b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
@@ -15,6 +15,7 @@
 #include <Scope.h>
 #include <TypePrettyPrinter.h>
 
+//TESTED_COMPONENT=src/libs/cplusplus
 using namespace CPlusPlus;
 
 class tst_TypePrettyPrinter: public QObject
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 167ce3190f..ae8d351a47 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -15,6 +15,8 @@
 #include <QtTest/QtTest>
 //#include <QtTest/qtest_gui.h>
 
+//TESTED_COMPONENT=src/plugins/debugger/gdb
+
 static const char *pointerPrintFormat()
 {
     return sizeof(quintptr) == sizeof(long) ? "0x%lx" : "0x%llx";
@@ -110,12 +112,12 @@ struct QString3 {
     QString s1, s2, s3;
 };
 
-class tst_Debugger : public QObject
+class tst_Dumpers : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_Debugger() {}
+    tst_Dumpers() {}
 
     void testMi(const char* input)
     {
@@ -213,7 +215,7 @@ private:
     void dumpQTextCodecHelper(QTextCodec *codec);
 };
 
-void tst_Debugger::infoBreak()
+void tst_Dumpers::infoBreak()
 {
     // This tests the regular expression used in GdbEngine::extractDataFromInfoBreak
     // to discover breakpoints in constructors.
@@ -358,7 +360,7 @@ QString niceType(QString type)
     return type;
 }
 
-void tst_Debugger::niceType()
+void tst_Dumpers::niceType()
 {
     // cf. watchutils.cpp
     QFETCH(QString, input);
@@ -366,7 +368,7 @@ void tst_Debugger::niceType()
     QCOMPARE(::niceType(input), simplified);
 }
 
-void tst_Debugger::niceType_data()
+void tst_Dumpers::niceType_data()
 {
     QTest::addColumn<QString>("input");
     QTest::addColumn<QString>("simplified");
@@ -450,7 +452,7 @@ static const void *deref(const void *p)
     return *reinterpret_cast<const char* const*>(p);
 }
 
-void tst_Debugger::dumperCompatibility()
+void tst_Dumpers::dumperCompatibility()
 {
     // Ensure that no arbitrary padding is introduced by QVectorTypedData.
     const size_t qVectorDataSize = 16;
@@ -618,7 +620,7 @@ void getMapNodeParams(size_t &nodeSize, size_t &valOffset)
 #endif
 }
 
-void tst_Debugger::dumpQAbstractItemHelper(QModelIndex &index)
+void tst_Dumpers::dumpQAbstractItemHelper(QModelIndex &index)
 {
     const QAbstractItemModel *model = index.model();
     const QString &rowStr = N(index.row());
@@ -657,7 +659,7 @@ void tst_Debugger::dumpQAbstractItemHelper(QModelIndex &index)
     testDumper(expected, &index, NS"QAbstractItem", true, indexSpecValue);
 }
 
-void tst_Debugger::dumpQAbstractItemAndModelIndex()
+void tst_Dumpers::dumpQAbstractItemAndModelIndex()
 {
     class PseudoTreeItemModel : public QAbstractItemModel
     {
@@ -805,7 +807,7 @@ void tst_Debugger::dumpQAbstractItemAndModelIndex()
         &index4, NS"QModelIndex", true);
 }
 
-void tst_Debugger::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
+void tst_Dumpers::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
 {
     QByteArray address = ptrToBa(&m);
     QByteArray expected = QByteArray("tiname='iname',addr='%',"
@@ -839,7 +841,7 @@ void tst_Debugger::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
     testDumper(expected, &m, NS"QAbstractItemModel", true);
 }
 
-void tst_Debugger::dumpQAbstractItemModel()
+void tst_Dumpers::dumpQAbstractItemModel()
 {
     // Case 1: No rows, one column.
     QStringList strList;
@@ -873,7 +875,7 @@ void tst_Debugger::dumpQAbstractItemModel()
     dumpQAbstractItemModelHelper(model);
 }
 
-void tst_Debugger::dumpQByteArray()
+void tst_Dumpers::dumpQByteArray()
 {
     // Case 1: Empty object.
     QByteArray ba;
@@ -919,7 +921,7 @@ void tst_Debugger::dumpQByteArray()
         &ba, NS"QByteArray", true);
 }
 
-void tst_Debugger::dumpQChar()
+void tst_Dumpers::dumpQChar()
 {
     // Case 1: Printable ASCII character.
     QChar c('X');
@@ -947,7 +949,7 @@ void tst_Debugger::dumpQChar()
         &c, NS"QChar", false);
 }
 
-void tst_Debugger::dumpQDateTimeHelper(const QDateTime &d, bool isNull)
+void tst_Dumpers::dumpQDateTimeHelper(const QDateTime &d, bool isNull)
 {
     QByteArray value;
     if (d.isNull())
@@ -973,7 +975,7 @@ void tst_Debugger::dumpQDateTimeHelper(const QDateTime &d, bool isNull)
     testDumper(expected, &d, NS"QDateTime", true);
 }
 
-void tst_Debugger::dumpQDateTime()
+void tst_Dumpers::dumpQDateTime()
 {
     // Case 1: Null object.
     QDateTime d;
@@ -984,7 +986,7 @@ void tst_Debugger::dumpQDateTime()
     dumpQDateTimeHelper(d, false);
 }
 
-void tst_Debugger::dumpQDir()
+void tst_Dumpers::dumpQDir()
 {
     // Case 1: Current working directory.
     QDir dir = QDir::current();
@@ -1006,7 +1008,7 @@ void tst_Debugger::dumpQDir()
 }
 
 
-void tst_Debugger::dumpQFile()
+void tst_Dumpers::dumpQFile()
 {
     // Case 1: Empty file name => Does not exist.
     QFile file1("");
@@ -1036,7 +1038,7 @@ void tst_Debugger::dumpQFile()
         &file3, NS"QFile", true);
 }
 
-void tst_Debugger::dumpQFileInfo()
+void tst_Dumpers::dumpQFileInfo()
 {
     QFileInfo fi(".");
     QByteArray expected("value='%',valueencoded='2',type='$T',numchild='3',"
@@ -1138,7 +1140,7 @@ void tst_Debugger::dumpQFileInfo()
     testDumper(expected, &fi, NS"QFileInfo", true);
 }
 
-void tst_Debugger::dumpQHash()
+void tst_Dumpers::dumpQHash()
 {
     QHash<QString, QList<int> > hash;
     hash.insert("Hallo", QList<int>());
@@ -1148,7 +1150,7 @@ void tst_Debugger::dumpQHash()
 }
 
 template <typename K, typename V>
-void tst_Debugger::dumpQHashNodeHelper(QHash<K, V> &hash)
+void tst_Dumpers::dumpQHashNodeHelper(QHash<K, V> &hash)
 {
     typename QHash<K, V>::iterator it = hash.begin();
     typedef QHashNode<K, V> HashNode;
@@ -1169,7 +1171,7 @@ void tst_Debugger::dumpQHashNodeHelper(QHash<K, V> &hash)
         getMapType<K, V>(), "", sizeof(it.key()), sizeof(it.value()));
 }
 
-void tst_Debugger::dumpQHashNode()
+void tst_Dumpers::dumpQHashNode()
 {
     // Case 1: simple type -> simple type.
     QHash<int, int> hash1;
@@ -1192,7 +1194,7 @@ void tst_Debugger::dumpQHashNode()
     dumpQHashNodeHelper(hash4);
 }
 
-void tst_Debugger::dumpQImageHelper(const QImage &img)
+void tst_Dumpers::dumpQImageHelper(const QImage &img)
 {
     QByteArray expected = "value='(%x%)',type='"NS"QImage',numchild='1',"
         "children=[{name='data',type='"NS"QImageData',addr='%'}]"
@@ -1202,7 +1204,7 @@ void tst_Debugger::dumpQImageHelper(const QImage &img)
     testDumper(expected, &img, NS"QImage", true);
 }
 
-void tst_Debugger::dumpQImage()
+void tst_Dumpers::dumpQImage()
 {
     // Case 1: Null image.
     QImage img;
@@ -1217,7 +1219,7 @@ void tst_Debugger::dumpQImage()
     dumpQImageHelper(img);
 }
 
-void tst_Debugger::dumpQImageDataHelper(QImage &img)
+void tst_Dumpers::dumpQImageDataHelper(QImage &img)
 {
     const QByteArray ba(QByteArray::fromRawData((const char*) img.bits(), img.numBytes()));
     QByteArray expected = QByteArray("tiname='$I',addr='$A',type='"NS"QImageData',").
@@ -1227,7 +1229,7 @@ void tst_Debugger::dumpQImageDataHelper(QImage &img)
     testDumper(expected, &img, NS"QImageData", false);
 }
 
-void tst_Debugger::dumpQImageData()
+void tst_Dumpers::dumpQImageData()
 {
     // Case 1: Null image.
     QImage img;
@@ -1243,7 +1245,7 @@ void tst_Debugger::dumpQImageData()
 }
 
 template <typename T>
-        void tst_Debugger::dumpQLinkedListHelper(QLinkedList<T> &l)
+        void tst_Dumpers::dumpQLinkedListHelper(QLinkedList<T> &l)
 {
     const int size = qMin(l.size(), 1000);
     const QString &sizeStr = N(size);
@@ -1281,7 +1283,7 @@ template <typename T>
     testDumper(expected, &l, NS"QLinkedList", true, elemTypeStr);
 }
 
-void tst_Debugger::dumpQLinkedList()
+void tst_Dumpers::dumpQLinkedList()
 {
     // Case 1: Simple element type.
     QLinkedList<int> l;
@@ -1404,7 +1406,7 @@ void tst_Debugger::dumpQLinkedList()
     }
 #    endif
 
-void tst_Debugger::dumpQList_int()
+void tst_Dumpers::dumpQList_int()
 {
     QList<int> ilist;
     testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1419,7 +1421,7 @@ void tst_Debugger::dumpQList_int()
         &ilist, NS"QList", true, "int");
 }
 
-void tst_Debugger::dumpQList_int_star()
+void tst_Dumpers::dumpQList_int_star()
 {
     QList<int *> ilist;
     testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1435,7 +1437,7 @@ void tst_Debugger::dumpQList_int_star()
         &ilist, NS"QList", true, "int*");
 }
 
-void tst_Debugger::dumpQList_char()
+void tst_Dumpers::dumpQList_char()
 {
     QList<char> clist;
     testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1450,7 +1452,7 @@ void tst_Debugger::dumpQList_char()
         &clist, NS"QList", true, "char");
 }
 
-void tst_Debugger::dumpQList_QString()
+void tst_Dumpers::dumpQList_QString()
 {
     QList<QString> slist;
     testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1465,7 +1467,7 @@ void tst_Debugger::dumpQList_QString()
         &slist, NS"QList", true, NS"QString");
 }
 
-void tst_Debugger::dumpQList_Int3()
+void tst_Dumpers::dumpQList_Int3()
 {
     QList<Int3> i3list;
     testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1480,7 +1482,7 @@ void tst_Debugger::dumpQList_Int3()
         &i3list, NS"QList", true, "Int3");
 }
 
-void tst_Debugger::dumpQList_QString3()
+void tst_Dumpers::dumpQList_QString3()
 {
     QList<QString3> s3list;
     testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1495,7 +1497,7 @@ void tst_Debugger::dumpQList_QString3()
         &s3list, NS"QList", true, "QString3");
 }
 
-void tst_Debugger::dumpQLocaleHelper(QLocale &loc)
+void tst_Dumpers::dumpQLocaleHelper(QLocale &loc)
 {
     QByteArray expected = QByteArray("value='%',type='$T',numchild='8',"
             "children=[{name='country',%},"
@@ -1526,7 +1528,7 @@ void tst_Debugger::dumpQLocaleHelper(QLocale &loc)
     testDumper(expected, &loc, NS"QLocale", true);
 }
 
-void tst_Debugger::dumpQLocale()
+void tst_Dumpers::dumpQLocale()
 {
     QLocale english(QLocale::English);
     dumpQLocaleHelper(english);
@@ -1542,7 +1544,7 @@ void tst_Debugger::dumpQLocale()
 }
 
 template <typename K, typename V>
-        void tst_Debugger::dumpQMapHelper(QMap<K, V> &map)
+        void tst_Dumpers::dumpQMapHelper(QMap<K, V> &map)
 {
     QByteArray sizeStr(valToString(map.size()));
     size_t nodeSize;
@@ -1595,7 +1597,7 @@ template <typename K, typename V>
                true, getMapType<K,V>(), "", 0, 0, nodeSize, valOff);
 }
 
-void tst_Debugger::dumpQMap()
+void tst_Dumpers::dumpQMap()
 {
     qDebug() << "QMap<int, int>";
     // Case 1: Simple type -> simple type.
@@ -1662,7 +1664,7 @@ void tst_Debugger::dumpQMap()
 }
 
 template <typename K, typename V>
-        void tst_Debugger::dumpQMapNodeHelper(QMap<K, V> &m)
+        void tst_Dumpers::dumpQMapNodeHelper(QMap<K, V> &m)
 {
     typename QMap<K, V>::iterator it = m.begin();
     const K &key = it.key();
@@ -1682,7 +1684,7 @@ template <typename K, typename V>
                true, getMapType<K,V>(), "", 0, 0, nodeSize, valOffset);
 }
 
-void tst_Debugger::dumpQMapNode()
+void tst_Dumpers::dumpQMapNode()
 {
     // Case 1: simple type -> simple type.
     QMap<int, int> map;
@@ -1705,7 +1707,7 @@ void tst_Debugger::dumpQMapNode()
     dumpQMapNodeHelper(map4);
 }
 
-void tst_Debugger::dumpQObject()
+void tst_Dumpers::dumpQObject()
 {
     QObject parent;
     testDumper("value='',valueencoded='2',type='$T',displayedtype='QObject',"
@@ -1764,7 +1766,7 @@ void tst_Debugger::dumpQObject()
         &child, NS"QObject", false);
 }
 
-void tst_Debugger::dumpQObjectChildListHelper(QObject &o)
+void tst_Dumpers::dumpQObjectChildListHelper(QObject &o)
 {
     const QObjectList children = o.children();
     const int size = children.size();
@@ -1784,7 +1786,7 @@ void tst_Debugger::dumpQObjectChildListHelper(QObject &o)
     testDumper(expected, &o, NS"QObjectChildList", true);
 }
 
-void tst_Debugger::dumpQObjectChildList()
+void tst_Dumpers::dumpQObjectChildList()
 {
     // Case 1: Object with no children.
     QObject o;
@@ -1799,7 +1801,7 @@ void tst_Debugger::dumpQObjectChildList()
     dumpQObjectChildListHelper(o);
 }
 
-void tst_Debugger::dumpQObjectMethodList()
+void tst_Dumpers::dumpQObjectMethodList()
 {
     QStringListModel m;
     testDumper("addr='<synthetic>',type='$T',numchild='24',"
@@ -1831,7 +1833,7 @@ void tst_Debugger::dumpQObjectMethodList()
     &m, NS"QObjectMethodList", true);
 }
 
-void tst_Debugger::dumpQObjectPropertyList()
+void tst_Dumpers::dumpQObjectPropertyList()
 {
     // Case 1: Model without a parent.
     QStringListModel m(QStringList() << "Test1" << "Test2");
@@ -1884,7 +1886,7 @@ public:
 
 typedef QVector<QObjectPrivate::ConnectionList> ConnLists;
 
-void tst_Debugger::dumpQObjectSignalHelper(QObject &o, int sigNum)
+void tst_Dumpers::dumpQObjectSignalHelper(QObject &o, int sigNum)
 {
     //qDebug() << o.objectName() << sigNum;
     QByteArray expected("addr='<synthetic>',numchild='1',type='"NS"QObjectSignal'");
@@ -1929,7 +1931,7 @@ void tst_Debugger::dumpQObjectSignalHelper(QObject &o, int sigNum)
     testDumper(expected, &o, NS"QObjectSignal", true, "", "", sigNum);
 }
 
-void tst_Debugger::dumpQObjectSignal()
+void tst_Dumpers::dumpQObjectSignal()
 {
     // Case 1: Simple QObject.
     QObject o;
@@ -1964,7 +1966,7 @@ void tst_Debugger::dumpQObjectSignal()
         dumpQObjectSignalHelper(m, signalIndex);
 }
 
-void tst_Debugger::dumpQObjectSignalList()
+void tst_Dumpers::dumpQObjectSignalList()
 {
     // Case 1: Simple QObject.
     QObject o;
@@ -2063,7 +2065,7 @@ QByteArray slotIndexList(const QObject *ob)
     return slotIndices;
 }
 
-void tst_Debugger::dumpQObjectSlot()
+void tst_Dumpers::dumpQObjectSlot()
 {
     // Case 1: Simple QObject.
     QObject o;
@@ -2119,7 +2121,7 @@ void tst_Debugger::dumpQObjectSlot()
 
 }
 
-void tst_Debugger::dumpQObjectSlotList()
+void tst_Dumpers::dumpQObjectSlotList()
 {
     // Case 1: Simple QObject.
     QObject o;
@@ -2170,7 +2172,7 @@ void tst_Debugger::dumpQObjectSlotList()
         &m, NS"QObjectSlotList", true);
 }
 
-void tst_Debugger::dumpQPixmap()
+void tst_Dumpers::dumpQPixmap()
 {
     // Case 1: Null Pixmap.
     QPixmap p;
@@ -2198,7 +2200,7 @@ void tst_Debugger::dumpQPixmap()
 
 #if QT_VERSION >= 0x040500
 template<typename T>
-void tst_Debugger::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
+void tst_Dumpers::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
 {
     struct Cheater : public QSharedPointer<T>
     {
@@ -2237,7 +2239,7 @@ void tst_Debugger::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
 }
 #endif
 
-void tst_Debugger::dumpQSharedPointer()
+void tst_Dumpers::dumpQSharedPointer()
 {
 #if QT_VERSION >= 0x040500
     // Case 1: Simple type.
@@ -2277,7 +2279,7 @@ void tst_Debugger::dumpQSharedPointer()
 #endif
 }
 
-void tst_Debugger::dumpQString()
+void tst_Dumpers::dumpQString()
 {
     QString s;
     testDumper("value='IiIgKG51bGwp',valueencoded='5',type='$T',numchild='0'",
@@ -2287,14 +2289,14 @@ void tst_Debugger::dumpQString()
         &s, NS"QString", false);
 }
 
-void tst_Debugger::dumpQVariant_invalid()
+void tst_Dumpers::dumpQVariant_invalid()
 {
     QVariant v;
     testDumper("value='(invalid)',type='$T',numchild='0'",
         &v, NS"QVariant", false);
 }
 
-void tst_Debugger::dumpQVariant_QString()
+void tst_Dumpers::dumpQVariant_QString()
 {
     QVariant v = "abc";
     testDumper("value='KFFTdHJpbmcpICJhYmMi',valueencoded='5',type='$T',"
@@ -2309,7 +2311,7 @@ void tst_Debugger::dumpQVariant_QString()
 */
 }
 
-void tst_Debugger::dumpQVariant_QStringList()
+void tst_Dumpers::dumpQVariant_QStringList()
 {
     QVariant v = QStringList() << "Hi";
     testDumper("value='(QStringList) ',type='$T',numchild='1',"
@@ -2319,7 +2321,7 @@ void tst_Debugger::dumpQVariant_QStringList()
         &v, NS"QVariant", true);
 }
 
-void tst_Debugger::dumpStdVector()
+void tst_Dumpers::dumpStdVector()
 {
     std::vector<std::list<int> *> vector;
     QByteArray inner = "std::list<int> *";
@@ -2344,7 +2346,7 @@ void tst_Debugger::dumpStdVector()
     vector.push_back(0);
 }
 
-void tst_Debugger::dumpQTextCodecHelper(QTextCodec *codec)
+void tst_Dumpers::dumpQTextCodecHelper(QTextCodec *codec)
 {
     const QByteArray name = codec->name().toBase64();
     QByteArray expected = QByteArray("value='%',valueencoded='1',type='$T',"
@@ -2354,7 +2356,7 @@ void tst_Debugger::dumpQTextCodecHelper(QTextCodec *codec)
     testDumper(expected, codec, NS"QTextCodec", true);
 }
 
-void tst_Debugger::dumpQTextCodec()
+void tst_Dumpers::dumpQTextCodec()
 {
     const QList<QByteArray> &codecNames = QTextCodec::availableCodecs();
     foreach (const QByteArray &codecName, codecNames)
@@ -2370,7 +2372,7 @@ template <typename T1, typename T2>
 }
 
 template <typename T>
-void tst_Debugger::dumpQWeakPointerHelper(QWeakPointer<T> &ptr)
+void tst_Dumpers::dumpQWeakPointerHelper(QWeakPointer<T> &ptr)
 {
     typedef QtSharedPointer::ExternalRefCountData Data;
     const size_t dataOffset = 0;
@@ -2394,7 +2396,7 @@ void tst_Debugger::dumpQWeakPointerHelper(QWeakPointer<T> &ptr)
 }
 #endif
 
-void tst_Debugger::dumpQWeakPointer()
+void tst_Dumpers::dumpQWeakPointer()
 {
 #if QT_VERSION >= 0x040500
     // Case 1: Simple type.
@@ -2433,7 +2435,7 @@ do {                                                      \
 } while (0)
 
 
-void tst_Debugger::initTestCase()
+void tst_Dumpers::initTestCase()
 {
     QVERIFY(sizeof(QWeakPointer<int>) == 2*sizeof(void *));
     QVERIFY(sizeof(QSharedPointer<int>) == 2*sizeof(void *));
@@ -2468,7 +2470,7 @@ void tst_Debugger::initTestCase()
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    tst_Debugger test;
+    tst_Dumpers test;
     return QTest::qExec(&test, argc, argv);
 }
 
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 0533d94e3e..ec68c52a4c 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -6,6 +6,7 @@
 //bool checkUninitialized = true;
 bool checkUninitialized = false;
 //#define DO_DEBUG 1
+//TESTED_COMPONENT=src/plugins/debugger/gdb
 
 #include "gdb/gdbmi.h"
 
diff --git a/tests/auto/debugger/tst_version.cpp b/tests/auto/debugger/tst_version.cpp
index d1b55c6bd8..465aa7656f 100644
--- a/tests/auto/debugger/tst_version.cpp
+++ b/tests/auto/debugger/tst_version.cpp
@@ -3,6 +3,7 @@
 
 #include <QtTest>
 
+//TESTED_COMPONENT=src/plugins/debugger/gdb
 
 class tst_Version : public QObject
 {
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index 6d119a9703..d3a2044d48 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -7,13 +7,13 @@ FAKEVIMDIR = ../../../src/plugins/fakevim
 UTILSDIR = ../../../src/libs
 
 SOURCES += \
-	main.cpp \
 	$$FAKEVIMDIR/fakevimhandler.cpp \
 	$$FAKEVIMDIR/fakevimactions.cpp \
 	$$FAKEVIMDIR/fakevimsyntax.cpp \
 	$$UTILSDIR/utils/savedaction.cpp \
 	$$UTILSDIR/utils/pathchooser.cpp \
 	$$UTILSDIR/utils/basevalidatinglineedit.cpp \
+        tst_fakevim.cpp
 
 HEADERS += \
 	$$FAKEVIMDIR/fakevimhandler.h \
@@ -24,5 +24,3 @@ HEADERS += \
 	$$UTILSDIR/utils/basevalidatinglineedit.h \
 
 INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
-
-TARGET=tst_$$TARGET
diff --git a/tests/auto/fakevim/main.cpp b/tests/auto/fakevim/main.cpp
deleted file mode 100644
index 8a49116918..0000000000
--- a/tests/auto/fakevim/main.cpp
+++ /dev/null
@@ -1,885 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include "fakevimhandler.h"
-
-#include <QtCore/QSet>
-
-#include <QtGui/QTextEdit>
-#include <QtGui/QPlainTextEdit>
-
-#include <QtTest/QtTest>
-
-using namespace FakeVim;
-using namespace FakeVim::Internal;
-
-#define EDITOR(s) (m_textedit ? m_textedit->s : m_plaintextedit->s)
-
-class tst_FakeVim : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_FakeVim(bool);
-    ~tst_FakeVim();
-
-public slots:
-    void changeStatusData(const QString &info) { m_statusData = info; }
-    void changeStatusMessage(const QString &info) { m_statusMessage = info; }
-    void changeExtraInformation(const QString &info) { m_infoMessage = info; }
-
-private slots:
-    // functional tests
-    void indentation();
-
-    // command mode
-    void command_oO();
-    void command_put_at_eol();
-    void command_Cxx_down_dot();
-    void command_Gyyp();
-    void command_J();
-    void command_Yp();
-    void command_cc();
-    void command_cw();
-    void command_cj();
-    void command_ck();
-    void command_c_dollar();
-    void command_C();
-    void command_dd();
-    void command_dd_2();
-    void command_d_dollar();
-    void command_dgg();
-    void command_dG();
-    void command_dj();
-    void command_dk();
-    void command_D();
-    void command_dfx_down();
-    void command_dollar();
-    void command_down();
-    void command_dw();
-    void command_e();
-    void command_i();
-    void command_left();
-    void command_ma_yank();
-    void command_r();
-    void command_right();
-    void command_up();
-    void command_w();
-    void command_x();
-    void command_yyp();
-    void command_y_dollar();
-
-    void visual_d();
-    void Visual_d();
-
-    // special tests
-    void test_i_cw_i();
-
-private:
-    void setup();
-    void send(const QString &command) { sendEx("normal " + command); }
-    void sendEx(const QString &command); // send an ex command
-
-    bool checkContentsHelper(QString expected, const char* file, int line);
-    bool checkHelper(bool isExCommand, QString cmd, QString expected,
-        const char* file, int line);
-    QString insertCursor(const QString &needle0);
-    QString cursor(const QString &line, int pos); // insert @ at cursor pos, negative counts from back
-
-    QString lmid(int i, int n = -1) const
-        { return QStringList(l.mid(i, n)).join("\n"); }
-
-    QTextEdit *m_textedit;
-    QPlainTextEdit *m_plaintextedit;
-    FakeVimHandler *m_handler;
-    QList<QTextEdit::ExtraSelection> m_selection;
-
-    QString m_statusMessage;
-    QString m_statusData;
-    QString m_infoMessage;
-
-    // the individual lines
-    static const QStringList l; // identifier intentionally kept short
-    static const QString lines;
-    static const QString escape;
-};
-
-const QString tst_FakeVim::lines =
-  /* 0         1         2         3        4 */
-  /* 0123456789012345678901234567890123457890 */
-    "\n"
-    "#include <QtCore>\n"
-    "#include <QtGui>\n"
-    "\n"
-    "int main(int argc, char *argv[])\n"
-    "{\n"
-    "    QApplication app(argc, argv);\n"
-    "\n"
-    "    return app.exec();\n"
-    "}\n";
-
-const QStringList tst_FakeVim::l = tst_FakeVim::lines.split('\n');
-
-const QString tst_FakeVim::escape = QChar(27);
-
-
-tst_FakeVim::tst_FakeVim(bool usePlainTextEdit)
-{
-    if (usePlainTextEdit) {
-        m_textedit = 0;
-        m_plaintextedit = new QPlainTextEdit;
-    } else {
-        m_textedit = new QTextEdit;
-        m_plaintextedit = 0;
-    }
-    m_handler = 0;
-}
-
-tst_FakeVim::~tst_FakeVim()
-{
-    delete m_handler;
-    delete m_textedit;
-    delete m_plaintextedit;
-}
-
-void tst_FakeVim::setup()
-{
-    delete m_handler;
-    m_handler = 0;
-    m_statusMessage.clear();
-    m_statusData.clear();
-    m_infoMessage.clear();
-    if (m_textedit) {
-        m_textedit->setPlainText(lines);
-        QTextCursor tc = m_textedit->textCursor();
-        tc.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor);
-        m_textedit->setTextCursor(tc);
-        m_textedit->setPlainText(lines);
-        m_handler = new FakeVimHandler(m_textedit);
-    } else {
-        m_plaintextedit->setPlainText(lines);
-        QTextCursor tc = m_plaintextedit->textCursor();
-        tc.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor);
-        m_plaintextedit->setTextCursor(tc);
-        m_plaintextedit->setPlainText(lines);
-        m_handler = new FakeVimHandler(m_plaintextedit);
-    }
-
-    QObject::connect(m_handler, SIGNAL(commandBufferChanged(QString)),
-        this, SLOT(changeStatusMessage(QString)));
-    QObject::connect(m_handler, SIGNAL(extraInformationChanged(QString)),
-        this, SLOT(changeExtraInformation(QString)));
-    QObject::connect(m_handler, SIGNAL(statusDataChanged(QString)),
-        this, SLOT(changeStatusData(QString)));
-
-    QCOMPARE(EDITOR(toPlainText()), lines);
-
-    sendEx("set iskeyword=@,48-57,_,192-255,a-z,A-Z");
-}
-
-void tst_FakeVim::sendEx(const QString &command)
-{
-    if (m_handler)
-        m_handler->handleCommand(command);
-    else
-        qDebug() << "NO HANDLER YET";
-}
-
-bool tst_FakeVim::checkContentsHelper(QString want, const char* file, int line)
-{
-    QString got = EDITOR(toPlainText());
-    int pos = EDITOR(textCursor().position());
-    got = got.left(pos) + "@" + got.mid(pos);
-    QStringList wantlist = want.split('\n');
-    QStringList gotlist = got.split('\n');
-    if (!QTest::qCompare(gotlist.size(), wantlist.size(), "", "", file, line)) {
-        qDebug() << "0 WANT: " << want;
-        qDebug() << "0 GOT: " << got;
-        return false;
-    }
-    for (int i = 0; i < wantlist.size() && i < gotlist.size(); ++i) {
-        QString g = QString("line %1: %2").arg(i + 1).arg(gotlist.at(i));
-        QString w = QString("line %1: %2").arg(i + 1).arg(wantlist.at(i));
-        if (!QTest::qCompare(g, w, "", "", file, line)) {
-            qDebug() << "1 WANT: " << want;
-            qDebug() << "1 GOT: " << got;
-            return false;
-        }
-    }
-    return true;
-}
-
-bool tst_FakeVim::checkHelper(bool ex, QString cmd, QString expected,
-    const char *file, int line)
-{
-    if (ex)
-        sendEx(cmd);
-    else
-        send(cmd);
-    return checkContentsHelper(expected, file, line);
-}
-
-
-#define checkContents(expected) \
-    do { if (!checkContentsHelper(expected, __FILE__, __LINE__)) return; } while (0)
-
-// Runs a "normal" command and checks the result.
-// Cursor position is marked by a '@' in the expected contents.
-#define check(cmd, expected) \
-    do { if (!checkHelper(false, cmd, expected, __FILE__, __LINE__)) \
-            return; } while (0)
-
-#define move(cmd, expected) \
-    do { if (!checkHelper(false, cmd, insertCursor(expected), __FILE__, __LINE__)) \
-            return; } while (0)
-
-// Runs an ex command and checks the result.
-// Cursor position is marked by a '@' in the expected contents.
-#define checkEx(cmd, expected) \
-    do { if (!checkHelper(true, cmd, expected, __FILE__, __LINE__)) \
-            return; } while (0)
-
-QString tst_FakeVim::insertCursor(const QString &needle0)
-{
-    QString needle = needle0;
-    needle.remove('@');
-    QString lines0 = lines;
-    int pos = lines0.indexOf(needle);
-    if (pos == -1)
-        qDebug() << "Cannot find: \n----\n" + needle + "\n----\n";
-    lines0.replace(pos, needle.size(), needle0);
-    return lines0;
-}
-
-QString tst_FakeVim::cursor(const QString &line, int pos)
-{
-    if (pos < 0)
-        pos = line.length() + pos;
-
-    return line.left(pos) + "@" + line.mid(pos);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Command mode
-//
-//////////////////////////////////////////////////////////////////////////
-
-void tst_FakeVim::indentation()
-{
-    setup();
-    sendEx("set expandtab");
-    sendEx("set tabstop=4");
-    sendEx("set shiftwidth=4");
-    QCOMPARE(m_handler->physicalIndentation("      \t\t\tx"), 6 + 3);
-    QCOMPARE(m_handler->logicalIndentation ("      \t\t\tx"), 4 + 3 * 4);
-    QCOMPARE(m_handler->physicalIndentation("     \t\t\tx"), 5 + 3);
-    QCOMPARE(m_handler->logicalIndentation ("     \t\t\tx"), 4 + 3 * 4);
-
-    QCOMPARE(m_handler->tabExpand(3), QLatin1String("   "));
-    QCOMPARE(m_handler->tabExpand(4), QLatin1String("    "));
-    QCOMPARE(m_handler->tabExpand(5), QLatin1String("     "));
-    QCOMPARE(m_handler->tabExpand(6), QLatin1String("      "));
-    QCOMPARE(m_handler->tabExpand(7), QLatin1String("       "));
-    QCOMPARE(m_handler->tabExpand(8), QLatin1String("        "));
-    QCOMPARE(m_handler->tabExpand(9), QLatin1String("         "));
-
-    sendEx("set expandtab");
-    sendEx("set tabstop=8");
-    sendEx("set shiftwidth=4");
-    QCOMPARE(m_handler->physicalIndentation("      \t\t\tx"), 6 + 3);
-    QCOMPARE(m_handler->logicalIndentation ("      \t\t\tx"), 0 + 3 * 8);
-    QCOMPARE(m_handler->physicalIndentation("     \t\t\tx"), 5 + 3);
-    QCOMPARE(m_handler->logicalIndentation ("     \t\t\tx"), 0 + 3 * 8);
-
-    QCOMPARE(m_handler->tabExpand(3), QLatin1String("   "));
-    QCOMPARE(m_handler->tabExpand(4), QLatin1String("    "));
-    QCOMPARE(m_handler->tabExpand(5), QLatin1String("     "));
-    QCOMPARE(m_handler->tabExpand(6), QLatin1String("      "));
-    QCOMPARE(m_handler->tabExpand(7), QLatin1String("       "));
-    QCOMPARE(m_handler->tabExpand(8), QLatin1String("        "));
-    QCOMPARE(m_handler->tabExpand(9), QLatin1String("         "));
-
-    sendEx("set noexpandtab");
-    sendEx("set tabstop=4");
-    sendEx("set shiftwidth=4");
-    QCOMPARE(m_handler->physicalIndentation("      \t\t\tx"), 6 + 3);
-    QCOMPARE(m_handler->logicalIndentation ("      \t\t\tx"), 4 + 3 * 4);
-    QCOMPARE(m_handler->physicalIndentation("     \t\t\tx"), 5 + 3);
-    QCOMPARE(m_handler->logicalIndentation ("     \t\t\tx"), 4 + 3 * 4);
-
-    QCOMPARE(m_handler->tabExpand(3), QLatin1String("   "));
-    QCOMPARE(m_handler->tabExpand(4), QLatin1String("\t"));
-    QCOMPARE(m_handler->tabExpand(5), QLatin1String("\t "));
-    QCOMPARE(m_handler->tabExpand(6), QLatin1String("\t  "));
-    QCOMPARE(m_handler->tabExpand(7), QLatin1String("\t   "));
-    QCOMPARE(m_handler->tabExpand(8), QLatin1String("\t\t"));
-    QCOMPARE(m_handler->tabExpand(9), QLatin1String("\t\t "));
-
-    sendEx("set noexpandtab");
-    sendEx("set tabstop=8");
-    sendEx("set shiftwidth=4");
-    QCOMPARE(m_handler->physicalIndentation("      \t\t\tx"), 6 + 3);
-    QCOMPARE(m_handler->logicalIndentation ("      \t\t\tx"), 0 + 3 * 8);
-    QCOMPARE(m_handler->physicalIndentation("     \t\t\tx"), 5 + 3);
-    QCOMPARE(m_handler->logicalIndentation ("     \t\t\tx"), 0 + 3 * 8);
-
-    QCOMPARE(m_handler->tabExpand(3), QLatin1String("   "));
-    QCOMPARE(m_handler->tabExpand(4), QLatin1String("    "));
-    QCOMPARE(m_handler->tabExpand(5), QLatin1String("     "));
-    QCOMPARE(m_handler->tabExpand(6), QLatin1String("      "));
-    QCOMPARE(m_handler->tabExpand(7), QLatin1String("       "));
-    QCOMPARE(m_handler->tabExpand(8), QLatin1String("\t"));
-    QCOMPARE(m_handler->tabExpand(9), QLatin1String("\t "));
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Command mode
-//
-//////////////////////////////////////////////////////////////////////////
-
-void tst_FakeVim::command_cc()
-{
-    setup();
-    move("j",                "@" + l[1]);
-    check("ccabc" + escape,  l[0] + "\nab@c\n" + lmid(2));
-    check("ccabc" + escape,  l[0] + "\nab@c\n" + lmid(2));
-    check(".",               l[0] + "\nab@c\n" + lmid(2));
-    check("j",               l[0] + "\nabc\n#i@nclude <QtGui>\n" + lmid(3));
-    check("3ccxyz" + escape, l[0] + "\nabc\nxy@z\n" + lmid(5));
-}
-
-void tst_FakeVim::command_cw()
-{
-    setup();
-    move("j",                "@" + l[1]);
-    check("cwx" + escape,    l[0] + "\n@xinclude <QtCore>\n" + lmid(2));
-}
-
-void tst_FakeVim::command_cj()
-{
-    setup();
-    move("j$",               cursor(l[1], -1));
-    check("cj" + escape,     l[0]+"\n@" + "\n" + lmid(3));
-    check("P",               lmid(0,1)+"\n" + "@"+lmid(1,2)+"\n" + "\n" +  lmid(3));
-    check("u",               l[0]+"\n@" + "\n" + lmid(3));
-
-    setup();
-    move("j$",               cursor(l[1], -1));
-    check("cjabc" + escape,  l[0]+"\nab@c\n" + lmid(3));
-    check("u",               lmid(0,1)+"\n" + cursor(l[1], -1)+"\n" + lmid(2));
-    check("gg",              "@" + lmid(0));
-    check(".",               "ab@c\n" + lmid(2));
-}
-
-void tst_FakeVim::command_ck()
-{
-    setup();
-    move("j$",               cursor(l[1], -1));
-    check("ck" + escape,     "@\n" + lmid(2));
-    check("P",               "@" + lmid(0,2)+"\n" + "\n" + lmid(2));
-}
-
-void tst_FakeVim::command_c_dollar()
-{
-    setup();
-    move("j",                "@" + l[1]);
-    move("$",                cursor(l[1], -1));
-    check("c$" + escape,     l[0]+"\n" + l[1].left(l[1].length()-2)+"@"+l[1][l[1].length()-2]+"\n" + lmid(2));
-    check("c$" + escape,     l[0]+"\n" + l[1].left(l[1].length()-3)+"@"+l[1][l[1].length()-3]+"\n" + lmid(2));
-    check("0c$abc" + escape, l[0]+"\n" + "ab@c\n" + lmid(2));
-    check("0c$abc" + escape, l[0]+"\n" + "ab@c\n" + lmid(2));
-}
-
-void tst_FakeVim::command_C()
-{
-    setup();
-    move("j",                "@" + l[1]);
-    check("Cabc" + escape,   l[0] + "\nab@c\n" + lmid(2));
-    check("Cabc" + escape,   l[0] + "\nabab@c\n" + lmid(2));
-    check("$Cabc" + escape,  l[0] + "\nababab@c\n" + lmid(2));
-    check("0C" + escape,     l[0] + "\n@\n" + lmid(2));
-    check("0Cabc" + escape,  l[0] + "\nab@c\n" + lmid(2));
-}
-
-void tst_FakeVim::command_dw()
-{
-    setup();
-    check("dw",  "@#include <QtCore>\n" + lmid(2));
-    check("dw",  "@include <QtCore>\n" + lmid(2));
-    check("dw",  "@<QtCore>\n" + lmid(2));
-    check("dw",  "@QtCore>\n" + lmid(2));
-    check("dw",  "@>\n" + lmid(2));
-    check("dw",  "@\n" + lmid(2)); // Real vim has this intermediate step, too
-    check("dw",  "@#include <QtGui>\n" + lmid(3));
-    check("dw",  "@include <QtGui>\n" + lmid(3));
-    check("dw",  "@<QtGui>\n" + lmid(3));
-    check("dw",  "@QtGui>\n" + lmid(3));
-    check("dw",  "@>\n" + lmid(3));
-}
-
-void tst_FakeVim::command_dd()
-{
-    setup();
-    move("j",    "@" + l[1]);
-    check("dd",  l[0] + "\n@" + lmid(2));
-    check(".",   l[0] + "\n@" + lmid(3));
-    check("3dd", l[0] + "\n    @QApplication app(argc, argv);\n" + lmid(7));
-    check("4l",  l[0] + "\n    QApp@lication app(argc, argv);\n" + lmid(7));
-    check("dd",  l[0] + "\n@" + lmid(7));
-    check(".",   l[0] + "\n    @return app.exec();\n" + lmid(9));
-    check("dd",  l[0] + "\n@" + lmid(9));
-}
-
-void tst_FakeVim::command_dd_2()
-{
-    setup();
-    move("j",    "@" + l[1]);
-    check("dd",  l[0] + "\n@" + lmid(2));
-    check("p",   l[0] + "\n" + l[2] + "\n@" + l[1] + "\n" + lmid(3));
-    check("u",   l[0] + "\n@" + lmid(2));
-}
-
-void tst_FakeVim::command_d_dollar()
-{
-    setup();
-    move("j$",               cursor(l[1], -1));
-    check("$d$",             l[0]+"\n" + l[1].left(l[1].length()-2)+"@"+l[1][l[1].length()-2]+"\n" + lmid(2));
-    check("0d$",             l[0] + "\n"+"@\n" + lmid(2));
-}
-
-void tst_FakeVim::command_dj()
-{
-    setup();
-    move("j$",               cursor(l[1], -1));
-    check("dj",              l[0]+"\n@" + lmid(3));
-    check("P",               lmid(0,1)+"\n" + "@"+lmid(1));
-    move("0",                "@" + l[1]);
-    check("dj",              l[0]+"\n@" + lmid(3));
-    check("P",               lmid(0,1)+"\n" + "@"+lmid(1));
-    move("05l",              l[1].left(5) + "@" + l[1].mid(5));
-    check("dj",              l[0]+"\n@" + lmid(3));
-    check("P",               lmid(0,1)+"\n" + "@"+lmid(1));
-    check("dj",              l[0]+"\n@" + lmid(3));
-    check("p",               lmid(0,1)+"\n" + lmid(3,1)+"\n" + "@"+lmid(1,2)+"\n" + lmid(4));
-}
-
-void tst_FakeVim::command_dk()
-{
-    setup();
-    move("j$",               cursor(l[1], -1));
-    check("dk",              "@" + lmid(2));
-    check("P",               "@" + lmid(0));
-    move("j0",               "@" + l[1]);
-    check("dk",              "@" + lmid(2));
-    check("P",               "@" + lmid(0));
-    move("j05l",             l[1].left(5) + "@" + l[1].mid(5));
-    check("dk",              "@" + lmid(2));
-    check("P",               "@" + lmid(0));
-    move("j05l",             l[1].left(5) + "@" + l[1].mid(5));
-    check("dk",              "@" + lmid(2));
-    check("p",               lmid(2,1)+"\n" + "@" + lmid(0,2)+"\n" + lmid(3));
-}
-
-void tst_FakeVim::command_dgg()
-{
-    setup();
-    check("G",               lmid(0, l.size()-2)+"\n" "@"+lmid(l.size()-2));
-    check("dgg",             "@");
-    check("u",               lmid(0, l.size()-2)+"\n" "@"+lmid(l.size()-2));
-}
-
-void tst_FakeVim::command_dG()
-{
-    setup();
-    check("dG",              "@");
-    check("u",               "@" + lmid(0));
-    move("j",                "@" + l[1]);
-    check("dG",              lmid(0,1)+"\n" + "@");
-    check("u",               l[0]+"\n" + "@" + lmid(1));
-    check("G",               lmid(0, l.size()-2)+"\n" + "@"+lmid(l.size()-2));
-    qWarning("FIXME");
-    return;
-    // include movement to first column, as otherwise the result depends on the 'startofline' setting
-    check("dG0",             lmid(0, l.size()-2)+"\n" + "@"+lmid(l.size()-2,1));
-    check("dG0",             lmid(0, l.size()-3)+"\n" + "@"+lmid(l.size()-3,1));
-}
-
-void tst_FakeVim::command_D()
-{
-    setup();
-    move("j",                "@" + l[1]);
-    check("$D",              l[0]+"\n" + l[1].left(l[1].length()-2)+"@"+l[1][l[1].length()-2]+"\n" + lmid(2));
-    check("0D",              l[0] + "\n@\n" + lmid(2));
-}
-
-void tst_FakeVim::command_dollar()
-{
-    setup();
-    move("j$",               cursor(l[1], -1));
-    move("j$",               cursor(l[2], -1));
-    move("2j", "@)");
-}
-
-void tst_FakeVim::command_down()
-{
-    setup();
-    move("j",  "@" + l[1]);
-    move("3j", "@int main");
-    move("4j", "@    return app.exec()");
-}
-
-void tst_FakeVim::command_dfx_down()
-{
-    setup();
-    check("j4l",  l[0] + "\n#inc@lude <QtCore>\n" + lmid(2));
-    check("df ",  l[0] + "\n#inc@<QtCore>\n" + lmid(2));
-    check("j",    l[0] + "\n#inc<QtCore>\n#inc@lude <QtGui>\n" + lmid(3));
-    check(".",    l[0] + "\n#inc<QtCore>\n#inc@<QtGui>\n" + lmid(3));
-    check("u",    l[0] + "\n#inc<QtCore>\n#inc@lude <QtGui>\n" + lmid(3));
-    check("u",    l[0] + "\n#inc@lude <QtCore>\n" + lmid(2));
-}
-
-void tst_FakeVim::command_Cxx_down_dot()
-{
-    setup();
-    check("j4l",          l[0] + "\n#inc@lude <QtCore>\n" + lmid(2));
-    check("Cxx" + escape, l[0] + "\n#incx@x\n" + lmid(2));
-    check("j",            l[0] + "\n#incxx\n#incl@ude <QtGui>\n" + lmid(3));
-    check(".",            l[0] + "\n#incxx\n#inclx@x\n" + lmid(3));
-}
-
-void tst_FakeVim::command_e()
-{
-    setup();
-    move("e",  "@#include <QtCore");
-    move("e",  "#includ@e <QtCore");
-    move("e",  "#include @<QtCore");
-    move("3e", "@#include <QtGui");
-    move("e",  "#includ@e <QtGui");
-    move("e",  "#include @<QtGui");
-    move("e",  "#include <QtGu@i");
-    move("4e", "int main@(int argc, char *argv[])");
-    move("e",  "int main(in@t argc, char *argv[])");
-    move("e",  "int main(int arg@c, char *argv[])");
-    move("e",  "int main(int argc@, char *argv[])");
-    move("e",  "int main(int argc, cha@r *argv[])");
-    move("e",  "int main(int argc, char @*argv[])");
-    move("e",  "int main(int argc, char *arg@v[])");
-    move("e",  "int main(int argc, char *argv[]@)");
-    move("e",  "@{");
-    move("10k","@\n"); // home.
-}
-
-void tst_FakeVim::command_i()
-{
-    setup();
-
-    // empty insertion at start of document
-    check("i" + escape, "@" + lines);
-    check("u", "@" + lines);
-
-    // small insertion at start of document
-    check("ix" + escape, "@x" + lines);
-    check("u", "@" + lines);
-    checkEx("redo", "@x" + lines);
-    check("u", "@" + lines);
-
-    // small insertion at start of document
-    check("ixxx" + escape, "xx@x" + lines);
-    check("u", "@" + lines);
-
-    // combine insertions
-    check("i1" + escape, "@1" + lines);
-    check("i2" + escape, "@21" + lines);
-    check("i3" + escape, "@321" + lines);
-    check("u",           "@21" + lines);
-    check("u",           "@1" + lines);
-    check("u",           "@" + lines);
-    check("ia" + escape, "@a" + lines);
-    check("ibx" + escape, "b@xa" + lines);
-    check("icyy" + escape, "bcy@yxa" + lines);
-    check("u", "b@xa" + lines);
-    check("u", "@a" + lines);
-    checkEx("redo", "b@xa" + lines);
-    check("u", "@a" + lines);
-}
-
-void tst_FakeVim::command_left()
-{
-    setup();
-    move("4j",  "@int main");
-    move("h",   "@int main"); // no move over left border
-    move("$",   "argv[]@)");
-    move("h",   "argv[@])");
-    move("3h",  "ar@gv[])");
-    move("50h", "@int main");
-}
-
-void tst_FakeVim::command_r()
-{
-    setup();
-    move("4j",   "@int main");
-    move("$",    "int main(int argc, char *argv[]@)");
-    check("rx",  lmid(0, 4) + "\nint main(int argc, char *argv[]@x\n" + lmid(5));
-    check("2h",  lmid(0, 4) + "\nint main(int argc, char *argv@[]x\n" + lmid(5));
-    check("4ra", lmid(0, 4) + "\nint main(int argc, char *argv@[]x\n" + lmid(5));
-    check("3rb", lmid(0, 4) + "\nint main(int argc, char *argvbb@b\n" + lmid(5));
-    check("2rc", lmid(0, 4) + "\nint main(int argc, char *argvbb@b\n" + lmid(5));
-    check("h2rc",lmid(0, 4) + "\nint main(int argc, char *argvbc@c\n" + lmid(5));
-}
-
-void tst_FakeVim::command_right()
-{
-    setup();
-    move("4j", "@int main");
-    move("l", "i@nt main");
-    move("3l", "int @main");
-    move("50l", "argv[]@)");
-}
-
-void tst_FakeVim::command_up()
-{
-    setup();
-    move("j", "@#include <QtCore");
-    move("3j", "@int main");
-    move("4j", "@    return app.exec()");
-}
-
-void tst_FakeVim::command_w()
-{
-    setup();
-    move("w",   "@#include <QtCore");
-    move("w",   "#@include <QtCore");
-    move("w",   "#include @<QtCore");
-    move("3w",  "@#include <QtGui");
-    move("w",   "#@include <QtGui");
-    move("w",   "#include @<QtGui");
-    move("w",   "#include <@QtGui");
-    move("4w",  "int @main(int argc, char *argv[])");
-    move("w",  "int main@(int argc, char *argv[])");
-    move("w",   "int main(@int argc, char *argv[])");
-    move("w",   "int main(int @argc, char *argv[])");
-    move("w",   "int main(int argc@, char *argv[])");
-    move("w",   "int main(int argc, @char *argv[])");
-    move("w",   "int main(int argc, char @*argv[])");
-    move("w",   "int main(int argc, char *@argv[])");
-    move("w",   "int main(int argc, char *argv@[])");
-    move("w",   "@{");
-}
-
-void tst_FakeVim::command_yyp()
-{
-    setup();
-    move("4j",   "@int main");
-    check("yyp", lmid(0, 4) + "\n" + lmid(4, 1) + "\n@" + lmid(4));
-}
-
-void tst_FakeVim::command_y_dollar()
-{
-    setup();
-    move("j",     "@" + l[1]);
-    check("$y$p", l[0]+"\n"+ l[1]+"@>\n" + lmid(2));
-    check("$y$p", l[0]+"\n"+ l[1]+">@>\n" + lmid(2));
-    check("$y$P", l[0]+"\n"+ l[1]+">@>>\n" + lmid(2));
-    check("$y$P", l[0]+"\n"+ l[1]+">>@>>\n" + lmid(2));
-}
-
-void tst_FakeVim::command_Yp()
-{
-    setup();
-    move("4j",   "@int main");
-    check("Yp", lmid(0, 4) + "\n" + lmid(4, 1) + "\n@" + lmid(4));
-}
-
-void tst_FakeVim::command_ma_yank()
-{
-    setup();
-    move("4j",   "@int main");
-    check("ygg", "@" + lmid(0));
-    move("4j",   "@int main");
-    check("p",    lmid(0,5) + "\n@" + lmid(0,4) +"\n" + lmid(4));
-
-    setup();
-    check("ma", "@" + lmid(0));
-    move("4j",   "@int main");
-    check("mb", lmid(0,4) + "\n@" + lmid(4));
-    check("\"ay'a", "@" + lmid(0));
-    check("'b", lmid(0,4) + "\n@" + lmid(4));
-    check("\"ap", lmid(0,5) + "\n@" + lmid(0,4) +"\n" + lmid(4));
-}
-
-void tst_FakeVim::command_Gyyp()
-{
-    setup();
-    check("G",   lmid(0, l.size()-2) + "\n@" + lmid(l.size()-2));
-    check("yyp", lmid(0) + "@" + lmid(9, 1)+"\n");
-}
-
-void tst_FakeVim::test_i_cw_i()
-{
-    setup();
-    move("j",                "@" + l[1]);
-    check("ixx" + escape,    l[0] + "\nx@x" + lmid(1));
-    check("cwyy" + escape,   l[0] + "\nxy@y" + lmid(1));
-    check("iaa" + escape,    l[0] + "\nxya@ay" + lmid(1));
-}
-
-void tst_FakeVim::command_J()
-{
-    setup();
-    move("4j4l",   "int @main");
-
-    check("J", lmid(0, 5) + "@ " + lmid(5));
-    check("u", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));
-    checkEx("redo", lmid(0, 5) + "@ " + lmid(5));
-
-    check("3J", lmid(0, 5) + " " + lmid(5, 1) + " " + lmid(6, 1).mid(4) + "@ " + lmid(7));
-    check("uu", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));
-    checkEx("redo", lmid(0, 5) + "@ " + lmid(5));
-}
-
-void tst_FakeVim::command_put_at_eol()
-{
-    setup();
-    move("j$",               cursor(l[1], -1));
-    check("y$",              lmid(0,1)+"\n" + cursor(l[1], -1)+"\n" + lmid(2));
-    check("p",               lmid(0,2)+"@>\n" + lmid(2));
-    check("p",               lmid(0,2)+">@>\n" + lmid(2));
-    check("$",               lmid(0,2)+">@>\n" + lmid(2));
-    check("P",               lmid(0,2)+">@>>\n" + lmid(2));
-}
-
-void tst_FakeVim::command_oO()
-{
-    setup();
-    check("gg",              "@" + lmid(0));
-    check("Ol1" + escape,    "l@1\n" + lmid(0));
-    check("gg",              "@l1\n" + lmid(0));
-    check("ol2" + escape,    "l1\n" "l@2\n" + lmid(0));
-    check("G",               "l1\n" "l2\n" + lmid(0,l.size()-2)+"\n" + "@"+lmid(l.size()-2));
-    check("G$",              "l1\n" "l2\n" + lmid(0,l.size()-2)+"\n" + "@"+lmid(l.size()-2));
-    check("ol-1" + escape,   "l1\n" "l2\n" + lmid(0) + "l-@1\n");
-    check("G",               "l1\n" "l2\n" + lmid(0) + "@l-1\n");
-    check("Ol-2" + escape,   "l1\n" "l2\n" + lmid(0) + "l-@2\n" + "l-1\n");
-}
-
-void tst_FakeVim::command_x()
-{
-    setup();
-    check("x", "@" + lmid(0));
-    move("j$", cursor(l[1], -1));
-    check("x", lmid(0,1)+"\n" + l[1].left(l[1].length()-2)+"@"+l[1].mid(l[1].length()-2,1)+"\n" + lmid(2));
-}
-
-void tst_FakeVim::visual_d()
-{
-    setup();
-    check("vd", "@" + lmid(0));
-    check("vx", "@" + lmid(0));
-    check("vjd", "@" + lmid(1).mid(1));
-    qWarning("FIXME");
-    check("ugg", "@" + lmid(0)); // FIXME: cursor should be at begin of doc w/o gg
-    move("j", "@" + l[1]);
-    check("vd", lmid(0, 1)+"\n" + "@" + lmid(1).mid(1));
-    check("u", lmid(0, 1)+"\n" + "@" + lmid(1));
-    check("vx", lmid(0, 1)+"\n" + "@" + lmid(1).mid(1));
-    check("u", lmid(0, 1)+"\n" + "@" + lmid(1));
-    check("vhx", lmid(0, 1)+"\n" + "@" + lmid(1).mid(1));
-    check("u", lmid(0, 1)+"\n" + "@" + lmid(1));
-    check("vlx", lmid(0, 1)+"\n" + "@" + lmid(1).mid(2));
-    check("P", lmid(0, 1)+"\n" + lmid(1).left(1)+"@"+lmid(1).mid(1));
-    check("vhd", lmid(0, 1)+"\n" + "@" + lmid(1).mid(2));
-    qWarning("FIXME");
-    check("u0", lmid(0, 1)+"\n" + "@" + lmid(1)); // FIXME: cursor should be at begin of line w/o 0
-    check("v$d", lmid(0, 1)+"\n" + "@" + lmid(2));
-    check("v$od", lmid(0, 1)+"\n" + "@" + lmid(3));
-    check("$v$x", lmid(0, 1)+"\n" + lmid(3,1) + "@" + lmid(4));
-    check("0v$d", lmid(0, 1)+"\n" + "@" + lmid(5));
-    check("$v0d", lmid(0, 1)+"\n" + "@\n" + lmid(6));
-    check("v$o0k$d", lmid(0, 1)+"\n" + "@" + lmid(6).mid(1));
-}
-
-void tst_FakeVim::Visual_d()
-{
-    setup();
-    check("Vd", "@" + lmid(1));
-    check("V2kd", "@" + lmid(2));
-    check("u", "@" + lmid(1));
-    check("u", "@" + lmid(0));
-    move("j", "@" + l[1]);
-    check("V$d", lmid(0,1)+"\n" + "@" + lmid(2));
-    check("$V$$d", lmid(0,1)+"\n" + "@" + lmid(3));
-    check("Vkx", "@" + lmid(4));
-    check("P", "@" + lmid(0,1)+"\n" + lmid(3));
-}
-
-
-/*
-
-#include <QtCore>
-#include <QtGui>
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    return app.exec();
-}
-*/
-
-//////////////////////////////////////////////////////////////////////////
-//
-// Main
-//
-//////////////////////////////////////////////////////////////////////////
-
-int main(int argc, char *argv[]) \
-{
-    int res = 0;
-    QApplication app(argc, argv); \
-
-    // Test with QPlainTextEdit.
-    tst_FakeVim plaintextedit(true);
-    res += QTest::qExec(&plaintextedit, argc, argv);
-
-#if 0
-    // Test with QTextEdit, too.
-    tst_FakeVim textedit(false);
-    res += QTest::qExec(&textedit, argc, argv);
-#endif
-
-    return res;
-}
-
-
-#include "main.moc"
diff --git a/tests/auto/fakevim/tst_fakevim.cpp b/tests/auto/fakevim/tst_fakevim.cpp
new file mode 100644
index 0000000000..de03f2415d
--- /dev/null
+++ b/tests/auto/fakevim/tst_fakevim.cpp
@@ -0,0 +1,885 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "fakevimhandler.h"
+
+#include <QtCore/QSet>
+
+#include <QtGui/QTextEdit>
+#include <QtGui/QPlainTextEdit>
+
+#include <QtTest/QtTest>
+
+//TESTED_COMPONENT=src/plugins/fakevim
+using namespace FakeVim;
+using namespace FakeVim::Internal;
+
+#define EDITOR(s) (m_textedit ? m_textedit->s : m_plaintextedit->s)
+
+class tst_FakeVim : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_FakeVim(bool);
+    ~tst_FakeVim();
+
+public slots:
+    void changeStatusData(const QString &info) { m_statusData = info; }
+    void changeStatusMessage(const QString &info) { m_statusMessage = info; }
+    void changeExtraInformation(const QString &info) { m_infoMessage = info; }
+
+private slots:
+    // functional tests
+    void indentation();
+
+    // command mode
+    void command_oO();
+    void command_put_at_eol();
+    void command_Cxx_down_dot();
+    void command_Gyyp();
+    void command_J();
+    void command_Yp();
+    void command_cc();
+    void command_cw();
+    void command_cj();
+    void command_ck();
+    void command_c_dollar();
+    void command_C();
+    void command_dd();
+    void command_dd_2();
+    void command_d_dollar();
+    void command_dgg();
+    void command_dG();
+    void command_dj();
+    void command_dk();
+    void command_D();
+    void command_dfx_down();
+    void command_dollar();
+    void command_down();
+    void command_dw();
+    void command_e();
+    void command_i();
+    void command_left();
+    void command_ma_yank();
+    void command_r();
+    void command_right();
+    void command_up();
+    void command_w();
+    void command_x();
+    void command_yyp();
+    void command_y_dollar();
+
+    void visual_d();
+    void Visual_d();
+
+    // special tests
+    void test_i_cw_i();
+
+private:
+    void setup();
+    void send(const QString &command) { sendEx("normal " + command); }
+    void sendEx(const QString &command); // send an ex command
+
+    bool checkContentsHelper(QString expected, const char* file, int line);
+    bool checkHelper(bool isExCommand, QString cmd, QString expected,
+        const char* file, int line);
+    QString insertCursor(const QString &needle0);
+    QString cursor(const QString &line, int pos); // insert @ at cursor pos, negative counts from back
+
+    QString lmid(int i, int n = -1) const
+        { return QStringList(l.mid(i, n)).join("\n"); }
+
+    QTextEdit *m_textedit;
+    QPlainTextEdit *m_plaintextedit;
+    FakeVimHandler *m_handler;
+    QList<QTextEdit::ExtraSelection> m_selection;
+
+    QString m_statusMessage;
+    QString m_statusData;
+    QString m_infoMessage;
+
+    // the individual lines
+    static const QStringList l; // identifier intentionally kept short
+    static const QString lines;
+    static const QString escape;
+};
+
+const QString tst_FakeVim::lines =
+  /* 0         1         2         3        4 */
+  /* 0123456789012345678901234567890123457890 */
+    "\n"
+    "#include <QtCore>\n"
+    "#include <QtGui>\n"
+    "\n"
+    "int main(int argc, char *argv[])\n"
+    "{\n"
+    "    QApplication app(argc, argv);\n"
+    "\n"
+    "    return app.exec();\n"
+    "}\n";
+
+const QStringList tst_FakeVim::l = tst_FakeVim::lines.split('\n');
+
+const QString tst_FakeVim::escape = QChar(27);
+
+
+tst_FakeVim::tst_FakeVim(bool usePlainTextEdit)
+{
+    if (usePlainTextEdit) {
+        m_textedit = 0;
+        m_plaintextedit = new QPlainTextEdit;
+    } else {
+        m_textedit = new QTextEdit;
+        m_plaintextedit = 0;
+    }
+    m_handler = 0;
+}
+
+tst_FakeVim::~tst_FakeVim()
+{
+    delete m_handler;
+    delete m_textedit;
+    delete m_plaintextedit;
+}
+
+void tst_FakeVim::setup()
+{
+    delete m_handler;
+    m_handler = 0;
+    m_statusMessage.clear();
+    m_statusData.clear();
+    m_infoMessage.clear();
+    if (m_textedit) {
+        m_textedit->setPlainText(lines);
+        QTextCursor tc = m_textedit->textCursor();
+        tc.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor);
+        m_textedit->setTextCursor(tc);
+        m_textedit->setPlainText(lines);
+        m_handler = new FakeVimHandler(m_textedit);
+    } else {
+        m_plaintextedit->setPlainText(lines);
+        QTextCursor tc = m_plaintextedit->textCursor();
+        tc.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor);
+        m_plaintextedit->setTextCursor(tc);
+        m_plaintextedit->setPlainText(lines);
+        m_handler = new FakeVimHandler(m_plaintextedit);
+    }
+
+    QObject::connect(m_handler, SIGNAL(commandBufferChanged(QString)),
+        this, SLOT(changeStatusMessage(QString)));
+    QObject::connect(m_handler, SIGNAL(extraInformationChanged(QString)),
+        this, SLOT(changeExtraInformation(QString)));
+    QObject::connect(m_handler, SIGNAL(statusDataChanged(QString)),
+        this, SLOT(changeStatusData(QString)));
+
+    QCOMPARE(EDITOR(toPlainText()), lines);
+
+    sendEx("set iskeyword=@,48-57,_,192-255,a-z,A-Z");
+}
+
+void tst_FakeVim::sendEx(const QString &command)
+{
+    if (m_handler)
+        m_handler->handleCommand(command);
+    else
+        qDebug() << "NO HANDLER YET";
+}
+
+bool tst_FakeVim::checkContentsHelper(QString want, const char* file, int line)
+{
+    QString got = EDITOR(toPlainText());
+    int pos = EDITOR(textCursor().position());
+    got = got.left(pos) + "@" + got.mid(pos);
+    QStringList wantlist = want.split('\n');
+    QStringList gotlist = got.split('\n');
+    if (!QTest::qCompare(gotlist.size(), wantlist.size(), "", "", file, line)) {
+        qDebug() << "0 WANT: " << want;
+        qDebug() << "0 GOT: " << got;
+        return false;
+    }
+    for (int i = 0; i < wantlist.size() && i < gotlist.size(); ++i) {
+        QString g = QString("line %1: %2").arg(i + 1).arg(gotlist.at(i));
+        QString w = QString("line %1: %2").arg(i + 1).arg(wantlist.at(i));
+        if (!QTest::qCompare(g, w, "", "", file, line)) {
+            qDebug() << "1 WANT: " << want;
+            qDebug() << "1 GOT: " << got;
+            return false;
+        }
+    }
+    return true;
+}
+
+bool tst_FakeVim::checkHelper(bool ex, QString cmd, QString expected,
+    const char *file, int line)
+{
+    if (ex)
+        sendEx(cmd);
+    else
+        send(cmd);
+    return checkContentsHelper(expected, file, line);
+}
+
+
+#define checkContents(expected) \
+    do { if (!checkContentsHelper(expected, __FILE__, __LINE__)) return; } while (0)
+
+// Runs a "normal" command and checks the result.
+// Cursor position is marked by a '@' in the expected contents.
+#define check(cmd, expected) \
+    do { if (!checkHelper(false, cmd, expected, __FILE__, __LINE__)) \
+            return; } while (0)
+
+#define move(cmd, expected) \
+    do { if (!checkHelper(false, cmd, insertCursor(expected), __FILE__, __LINE__)) \
+            return; } while (0)
+
+// Runs an ex command and checks the result.
+// Cursor position is marked by a '@' in the expected contents.
+#define checkEx(cmd, expected) \
+    do { if (!checkHelper(true, cmd, expected, __FILE__, __LINE__)) \
+            return; } while (0)
+
+QString tst_FakeVim::insertCursor(const QString &needle0)
+{
+    QString needle = needle0;
+    needle.remove('@');
+    QString lines0 = lines;
+    int pos = lines0.indexOf(needle);
+    if (pos == -1)
+        qDebug() << "Cannot find: \n----\n" + needle + "\n----\n";
+    lines0.replace(pos, needle.size(), needle0);
+    return lines0;
+}
+
+QString tst_FakeVim::cursor(const QString &line, int pos)
+{
+    if (pos < 0)
+        pos = line.length() + pos;
+
+    return line.left(pos) + "@" + line.mid(pos);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Command mode
+//
+//////////////////////////////////////////////////////////////////////////
+
+void tst_FakeVim::indentation()
+{
+    setup();
+    sendEx("set expandtab");
+    sendEx("set tabstop=4");
+    sendEx("set shiftwidth=4");
+    QCOMPARE(m_handler->physicalIndentation("      \t\t\tx"), 6 + 3);
+    QCOMPARE(m_handler->logicalIndentation ("      \t\t\tx"), 4 + 3 * 4);
+    QCOMPARE(m_handler->physicalIndentation("     \t\t\tx"), 5 + 3);
+    QCOMPARE(m_handler->logicalIndentation ("     \t\t\tx"), 4 + 3 * 4);
+
+    QCOMPARE(m_handler->tabExpand(3), QLatin1String("   "));
+    QCOMPARE(m_handler->tabExpand(4), QLatin1String("    "));
+    QCOMPARE(m_handler->tabExpand(5), QLatin1String("     "));
+    QCOMPARE(m_handler->tabExpand(6), QLatin1String("      "));
+    QCOMPARE(m_handler->tabExpand(7), QLatin1String("       "));
+    QCOMPARE(m_handler->tabExpand(8), QLatin1String("        "));
+    QCOMPARE(m_handler->tabExpand(9), QLatin1String("         "));
+
+    sendEx("set expandtab");
+    sendEx("set tabstop=8");
+    sendEx("set shiftwidth=4");
+    QCOMPARE(m_handler->physicalIndentation("      \t\t\tx"), 6 + 3);
+    QCOMPARE(m_handler->logicalIndentation ("      \t\t\tx"), 0 + 3 * 8);
+    QCOMPARE(m_handler->physicalIndentation("     \t\t\tx"), 5 + 3);
+    QCOMPARE(m_handler->logicalIndentation ("     \t\t\tx"), 0 + 3 * 8);
+
+    QCOMPARE(m_handler->tabExpand(3), QLatin1String("   "));
+    QCOMPARE(m_handler->tabExpand(4), QLatin1String("    "));
+    QCOMPARE(m_handler->tabExpand(5), QLatin1String("     "));
+    QCOMPARE(m_handler->tabExpand(6), QLatin1String("      "));
+    QCOMPARE(m_handler->tabExpand(7), QLatin1String("       "));
+    QCOMPARE(m_handler->tabExpand(8), QLatin1String("        "));
+    QCOMPARE(m_handler->tabExpand(9), QLatin1String("         "));
+
+    sendEx("set noexpandtab");
+    sendEx("set tabstop=4");
+    sendEx("set shiftwidth=4");
+    QCOMPARE(m_handler->physicalIndentation("      \t\t\tx"), 6 + 3);
+    QCOMPARE(m_handler->logicalIndentation ("      \t\t\tx"), 4 + 3 * 4);
+    QCOMPARE(m_handler->physicalIndentation("     \t\t\tx"), 5 + 3);
+    QCOMPARE(m_handler->logicalIndentation ("     \t\t\tx"), 4 + 3 * 4);
+
+    QCOMPARE(m_handler->tabExpand(3), QLatin1String("   "));
+    QCOMPARE(m_handler->tabExpand(4), QLatin1String("\t"));
+    QCOMPARE(m_handler->tabExpand(5), QLatin1String("\t "));
+    QCOMPARE(m_handler->tabExpand(6), QLatin1String("\t  "));
+    QCOMPARE(m_handler->tabExpand(7), QLatin1String("\t   "));
+    QCOMPARE(m_handler->tabExpand(8), QLatin1String("\t\t"));
+    QCOMPARE(m_handler->tabExpand(9), QLatin1String("\t\t "));
+
+    sendEx("set noexpandtab");
+    sendEx("set tabstop=8");
+    sendEx("set shiftwidth=4");
+    QCOMPARE(m_handler->physicalIndentation("      \t\t\tx"), 6 + 3);
+    QCOMPARE(m_handler->logicalIndentation ("      \t\t\tx"), 0 + 3 * 8);
+    QCOMPARE(m_handler->physicalIndentation("     \t\t\tx"), 5 + 3);
+    QCOMPARE(m_handler->logicalIndentation ("     \t\t\tx"), 0 + 3 * 8);
+
+    QCOMPARE(m_handler->tabExpand(3), QLatin1String("   "));
+    QCOMPARE(m_handler->tabExpand(4), QLatin1String("    "));
+    QCOMPARE(m_handler->tabExpand(5), QLatin1String("     "));
+    QCOMPARE(m_handler->tabExpand(6), QLatin1String("      "));
+    QCOMPARE(m_handler->tabExpand(7), QLatin1String("       "));
+    QCOMPARE(m_handler->tabExpand(8), QLatin1String("\t"));
+    QCOMPARE(m_handler->tabExpand(9), QLatin1String("\t "));
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Command mode
+//
+//////////////////////////////////////////////////////////////////////////
+
+void tst_FakeVim::command_cc()
+{
+    setup();
+    move("j",                "@" + l[1]);
+    check("ccabc" + escape,  l[0] + "\nab@c\n" + lmid(2));
+    check("ccabc" + escape,  l[0] + "\nab@c\n" + lmid(2));
+    check(".",               l[0] + "\nab@c\n" + lmid(2));
+    check("j",               l[0] + "\nabc\n#i@nclude <QtGui>\n" + lmid(3));
+    check("3ccxyz" + escape, l[0] + "\nabc\nxy@z\n" + lmid(5));
+}
+
+void tst_FakeVim::command_cw()
+{
+    setup();
+    move("j",                "@" + l[1]);
+    check("cwx" + escape,    l[0] + "\n@xinclude <QtCore>\n" + lmid(2));
+}
+
+void tst_FakeVim::command_cj()
+{
+    setup();
+    move("j$",               cursor(l[1], -1));
+    check("cj" + escape,     l[0]+"\n@" + "\n" + lmid(3));
+    check("P",               lmid(0,1)+"\n" + "@"+lmid(1,2)+"\n" + "\n" +  lmid(3));
+    check("u",               l[0]+"\n@" + "\n" + lmid(3));
+
+    setup();
+    move("j$",               cursor(l[1], -1));
+    check("cjabc" + escape,  l[0]+"\nab@c\n" + lmid(3));
+    check("u",               lmid(0,1)+"\n" + cursor(l[1], -1)+"\n" + lmid(2));
+    check("gg",              "@" + lmid(0));
+    check(".",               "ab@c\n" + lmid(2));
+}
+
+void tst_FakeVim::command_ck()
+{
+    setup();
+    move("j$",               cursor(l[1], -1));
+    check("ck" + escape,     "@\n" + lmid(2));
+    check("P",               "@" + lmid(0,2)+"\n" + "\n" + lmid(2));
+}
+
+void tst_FakeVim::command_c_dollar()
+{
+    setup();
+    move("j",                "@" + l[1]);
+    move("$",                cursor(l[1], -1));
+    check("c$" + escape,     l[0]+"\n" + l[1].left(l[1].length()-2)+"@"+l[1][l[1].length()-2]+"\n" + lmid(2));
+    check("c$" + escape,     l[0]+"\n" + l[1].left(l[1].length()-3)+"@"+l[1][l[1].length()-3]+"\n" + lmid(2));
+    check("0c$abc" + escape, l[0]+"\n" + "ab@c\n" + lmid(2));
+    check("0c$abc" + escape, l[0]+"\n" + "ab@c\n" + lmid(2));
+}
+
+void tst_FakeVim::command_C()
+{
+    setup();
+    move("j",                "@" + l[1]);
+    check("Cabc" + escape,   l[0] + "\nab@c\n" + lmid(2));
+    check("Cabc" + escape,   l[0] + "\nabab@c\n" + lmid(2));
+    check("$Cabc" + escape,  l[0] + "\nababab@c\n" + lmid(2));
+    check("0C" + escape,     l[0] + "\n@\n" + lmid(2));
+    check("0Cabc" + escape,  l[0] + "\nab@c\n" + lmid(2));
+}
+
+void tst_FakeVim::command_dw()
+{
+    setup();
+    check("dw",  "@#include <QtCore>\n" + lmid(2));
+    check("dw",  "@include <QtCore>\n" + lmid(2));
+    check("dw",  "@<QtCore>\n" + lmid(2));
+    check("dw",  "@QtCore>\n" + lmid(2));
+    check("dw",  "@>\n" + lmid(2));
+    check("dw",  "@\n" + lmid(2)); // Real vim has this intermediate step, too
+    check("dw",  "@#include <QtGui>\n" + lmid(3));
+    check("dw",  "@include <QtGui>\n" + lmid(3));
+    check("dw",  "@<QtGui>\n" + lmid(3));
+    check("dw",  "@QtGui>\n" + lmid(3));
+    check("dw",  "@>\n" + lmid(3));
+}
+
+void tst_FakeVim::command_dd()
+{
+    setup();
+    move("j",    "@" + l[1]);
+    check("dd",  l[0] + "\n@" + lmid(2));
+    check(".",   l[0] + "\n@" + lmid(3));
+    check("3dd", l[0] + "\n    @QApplication app(argc, argv);\n" + lmid(7));
+    check("4l",  l[0] + "\n    QApp@lication app(argc, argv);\n" + lmid(7));
+    check("dd",  l[0] + "\n@" + lmid(7));
+    check(".",   l[0] + "\n    @return app.exec();\n" + lmid(9));
+    check("dd",  l[0] + "\n@" + lmid(9));
+}
+
+void tst_FakeVim::command_dd_2()
+{
+    setup();
+    move("j",    "@" + l[1]);
+    check("dd",  l[0] + "\n@" + lmid(2));
+    check("p",   l[0] + "\n" + l[2] + "\n@" + l[1] + "\n" + lmid(3));
+    check("u",   l[0] + "\n@" + lmid(2));
+}
+
+void tst_FakeVim::command_d_dollar()
+{
+    setup();
+    move("j$",               cursor(l[1], -1));
+    check("$d$",             l[0]+"\n" + l[1].left(l[1].length()-2)+"@"+l[1][l[1].length()-2]+"\n" + lmid(2));
+    check("0d$",             l[0] + "\n"+"@\n" + lmid(2));
+}
+
+void tst_FakeVim::command_dj()
+{
+    setup();
+    move("j$",               cursor(l[1], -1));
+    check("dj",              l[0]+"\n@" + lmid(3));
+    check("P",               lmid(0,1)+"\n" + "@"+lmid(1));
+    move("0",                "@" + l[1]);
+    check("dj",              l[0]+"\n@" + lmid(3));
+    check("P",               lmid(0,1)+"\n" + "@"+lmid(1));
+    move("05l",              l[1].left(5) + "@" + l[1].mid(5));
+    check("dj",              l[0]+"\n@" + lmid(3));
+    check("P",               lmid(0,1)+"\n" + "@"+lmid(1));
+    check("dj",              l[0]+"\n@" + lmid(3));
+    check("p",               lmid(0,1)+"\n" + lmid(3,1)+"\n" + "@"+lmid(1,2)+"\n" + lmid(4));
+}
+
+void tst_FakeVim::command_dk()
+{
+    setup();
+    move("j$",               cursor(l[1], -1));
+    check("dk",              "@" + lmid(2));
+    check("P",               "@" + lmid(0));
+    move("j0",               "@" + l[1]);
+    check("dk",              "@" + lmid(2));
+    check("P",               "@" + lmid(0));
+    move("j05l",             l[1].left(5) + "@" + l[1].mid(5));
+    check("dk",              "@" + lmid(2));
+    check("P",               "@" + lmid(0));
+    move("j05l",             l[1].left(5) + "@" + l[1].mid(5));
+    check("dk",              "@" + lmid(2));
+    check("p",               lmid(2,1)+"\n" + "@" + lmid(0,2)+"\n" + lmid(3));
+}
+
+void tst_FakeVim::command_dgg()
+{
+    setup();
+    check("G",               lmid(0, l.size()-2)+"\n" "@"+lmid(l.size()-2));
+    check("dgg",             "@");
+    check("u",               lmid(0, l.size()-2)+"\n" "@"+lmid(l.size()-2));
+}
+
+void tst_FakeVim::command_dG()
+{
+    setup();
+    check("dG",              "@");
+    check("u",               "@" + lmid(0));
+    move("j",                "@" + l[1]);
+    check("dG",              lmid(0,1)+"\n" + "@");
+    check("u",               l[0]+"\n" + "@" + lmid(1));
+    check("G",               lmid(0, l.size()-2)+"\n" + "@"+lmid(l.size()-2));
+    qWarning("FIXME");
+    return;
+    // include movement to first column, as otherwise the result depends on the 'startofline' setting
+    check("dG0",             lmid(0, l.size()-2)+"\n" + "@"+lmid(l.size()-2,1));
+    check("dG0",             lmid(0, l.size()-3)+"\n" + "@"+lmid(l.size()-3,1));
+}
+
+void tst_FakeVim::command_D()
+{
+    setup();
+    move("j",                "@" + l[1]);
+    check("$D",              l[0]+"\n" + l[1].left(l[1].length()-2)+"@"+l[1][l[1].length()-2]+"\n" + lmid(2));
+    check("0D",              l[0] + "\n@\n" + lmid(2));
+}
+
+void tst_FakeVim::command_dollar()
+{
+    setup();
+    move("j$",               cursor(l[1], -1));
+    move("j$",               cursor(l[2], -1));
+    move("2j", "@)");
+}
+
+void tst_FakeVim::command_down()
+{
+    setup();
+    move("j",  "@" + l[1]);
+    move("3j", "@int main");
+    move("4j", "@    return app.exec()");
+}
+
+void tst_FakeVim::command_dfx_down()
+{
+    setup();
+    check("j4l",  l[0] + "\n#inc@lude <QtCore>\n" + lmid(2));
+    check("df ",  l[0] + "\n#inc@<QtCore>\n" + lmid(2));
+    check("j",    l[0] + "\n#inc<QtCore>\n#inc@lude <QtGui>\n" + lmid(3));
+    check(".",    l[0] + "\n#inc<QtCore>\n#inc@<QtGui>\n" + lmid(3));
+    check("u",    l[0] + "\n#inc<QtCore>\n#inc@lude <QtGui>\n" + lmid(3));
+    check("u",    l[0] + "\n#inc@lude <QtCore>\n" + lmid(2));
+}
+
+void tst_FakeVim::command_Cxx_down_dot()
+{
+    setup();
+    check("j4l",          l[0] + "\n#inc@lude <QtCore>\n" + lmid(2));
+    check("Cxx" + escape, l[0] + "\n#incx@x\n" + lmid(2));
+    check("j",            l[0] + "\n#incxx\n#incl@ude <QtGui>\n" + lmid(3));
+    check(".",            l[0] + "\n#incxx\n#inclx@x\n" + lmid(3));
+}
+
+void tst_FakeVim::command_e()
+{
+    setup();
+    move("e",  "@#include <QtCore");
+    move("e",  "#includ@e <QtCore");
+    move("e",  "#include @<QtCore");
+    move("3e", "@#include <QtGui");
+    move("e",  "#includ@e <QtGui");
+    move("e",  "#include @<QtGui");
+    move("e",  "#include <QtGu@i");
+    move("4e", "int main@(int argc, char *argv[])");
+    move("e",  "int main(in@t argc, char *argv[])");
+    move("e",  "int main(int arg@c, char *argv[])");
+    move("e",  "int main(int argc@, char *argv[])");
+    move("e",  "int main(int argc, cha@r *argv[])");
+    move("e",  "int main(int argc, char @*argv[])");
+    move("e",  "int main(int argc, char *arg@v[])");
+    move("e",  "int main(int argc, char *argv[]@)");
+    move("e",  "@{");
+    move("10k","@\n"); // home.
+}
+
+void tst_FakeVim::command_i()
+{
+    setup();
+
+    // empty insertion at start of document
+    check("i" + escape, "@" + lines);
+    check("u", "@" + lines);
+
+    // small insertion at start of document
+    check("ix" + escape, "@x" + lines);
+    check("u", "@" + lines);
+    checkEx("redo", "@x" + lines);
+    check("u", "@" + lines);
+
+    // small insertion at start of document
+    check("ixxx" + escape, "xx@x" + lines);
+    check("u", "@" + lines);
+
+    // combine insertions
+    check("i1" + escape, "@1" + lines);
+    check("i2" + escape, "@21" + lines);
+    check("i3" + escape, "@321" + lines);
+    check("u",           "@21" + lines);
+    check("u",           "@1" + lines);
+    check("u",           "@" + lines);
+    check("ia" + escape, "@a" + lines);
+    check("ibx" + escape, "b@xa" + lines);
+    check("icyy" + escape, "bcy@yxa" + lines);
+    check("u", "b@xa" + lines);
+    check("u", "@a" + lines);
+    checkEx("redo", "b@xa" + lines);
+    check("u", "@a" + lines);
+}
+
+void tst_FakeVim::command_left()
+{
+    setup();
+    move("4j",  "@int main");
+    move("h",   "@int main"); // no move over left border
+    move("$",   "argv[]@)");
+    move("h",   "argv[@])");
+    move("3h",  "ar@gv[])");
+    move("50h", "@int main");
+}
+
+void tst_FakeVim::command_r()
+{
+    setup();
+    move("4j",   "@int main");
+    move("$",    "int main(int argc, char *argv[]@)");
+    check("rx",  lmid(0, 4) + "\nint main(int argc, char *argv[]@x\n" + lmid(5));
+    check("2h",  lmid(0, 4) + "\nint main(int argc, char *argv@[]x\n" + lmid(5));
+    check("4ra", lmid(0, 4) + "\nint main(int argc, char *argv@[]x\n" + lmid(5));
+    check("3rb", lmid(0, 4) + "\nint main(int argc, char *argvbb@b\n" + lmid(5));
+    check("2rc", lmid(0, 4) + "\nint main(int argc, char *argvbb@b\n" + lmid(5));
+    check("h2rc",lmid(0, 4) + "\nint main(int argc, char *argvbc@c\n" + lmid(5));
+}
+
+void tst_FakeVim::command_right()
+{
+    setup();
+    move("4j", "@int main");
+    move("l", "i@nt main");
+    move("3l", "int @main");
+    move("50l", "argv[]@)");
+}
+
+void tst_FakeVim::command_up()
+{
+    setup();
+    move("j", "@#include <QtCore");
+    move("3j", "@int main");
+    move("4j", "@    return app.exec()");
+}
+
+void tst_FakeVim::command_w()
+{
+    setup();
+    move("w",   "@#include <QtCore");
+    move("w",   "#@include <QtCore");
+    move("w",   "#include @<QtCore");
+    move("3w",  "@#include <QtGui");
+    move("w",   "#@include <QtGui");
+    move("w",   "#include @<QtGui");
+    move("w",   "#include <@QtGui");
+    move("4w",  "int @main(int argc, char *argv[])");
+    move("w",  "int main@(int argc, char *argv[])");
+    move("w",   "int main(@int argc, char *argv[])");
+    move("w",   "int main(int @argc, char *argv[])");
+    move("w",   "int main(int argc@, char *argv[])");
+    move("w",   "int main(int argc, @char *argv[])");
+    move("w",   "int main(int argc, char @*argv[])");
+    move("w",   "int main(int argc, char *@argv[])");
+    move("w",   "int main(int argc, char *argv@[])");
+    move("w",   "@{");
+}
+
+void tst_FakeVim::command_yyp()
+{
+    setup();
+    move("4j",   "@int main");
+    check("yyp", lmid(0, 4) + "\n" + lmid(4, 1) + "\n@" + lmid(4));
+}
+
+void tst_FakeVim::command_y_dollar()
+{
+    setup();
+    move("j",     "@" + l[1]);
+    check("$y$p", l[0]+"\n"+ l[1]+"@>\n" + lmid(2));
+    check("$y$p", l[0]+"\n"+ l[1]+">@>\n" + lmid(2));
+    check("$y$P", l[0]+"\n"+ l[1]+">@>>\n" + lmid(2));
+    check("$y$P", l[0]+"\n"+ l[1]+">>@>>\n" + lmid(2));
+}
+
+void tst_FakeVim::command_Yp()
+{
+    setup();
+    move("4j",   "@int main");
+    check("Yp", lmid(0, 4) + "\n" + lmid(4, 1) + "\n@" + lmid(4));
+}
+
+void tst_FakeVim::command_ma_yank()
+{
+    setup();
+    move("4j",   "@int main");
+    check("ygg", "@" + lmid(0));
+    move("4j",   "@int main");
+    check("p",    lmid(0,5) + "\n@" + lmid(0,4) +"\n" + lmid(4));
+
+    setup();
+    check("ma", "@" + lmid(0));
+    move("4j",   "@int main");
+    check("mb", lmid(0,4) + "\n@" + lmid(4));
+    check("\"ay'a", "@" + lmid(0));
+    check("'b", lmid(0,4) + "\n@" + lmid(4));
+    check("\"ap", lmid(0,5) + "\n@" + lmid(0,4) +"\n" + lmid(4));
+}
+
+void tst_FakeVim::command_Gyyp()
+{
+    setup();
+    check("G",   lmid(0, l.size()-2) + "\n@" + lmid(l.size()-2));
+    check("yyp", lmid(0) + "@" + lmid(9, 1)+"\n");
+}
+
+void tst_FakeVim::test_i_cw_i()
+{
+    setup();
+    move("j",                "@" + l[1]);
+    check("ixx" + escape,    l[0] + "\nx@x" + lmid(1));
+    check("cwyy" + escape,   l[0] + "\nxy@y" + lmid(1));
+    check("iaa" + escape,    l[0] + "\nxya@ay" + lmid(1));
+}
+
+void tst_FakeVim::command_J()
+{
+    setup();
+    move("4j4l",   "int @main");
+
+    check("J", lmid(0, 5) + "@ " + lmid(5));
+    check("u", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));
+    checkEx("redo", lmid(0, 5) + "@ " + lmid(5));
+
+    check("3J", lmid(0, 5) + " " + lmid(5, 1) + " " + lmid(6, 1).mid(4) + "@ " + lmid(7));
+    check("uu", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));
+    checkEx("redo", lmid(0, 5) + "@ " + lmid(5));
+}
+
+void tst_FakeVim::command_put_at_eol()
+{
+    setup();
+    move("j$",               cursor(l[1], -1));
+    check("y$",              lmid(0,1)+"\n" + cursor(l[1], -1)+"\n" + lmid(2));
+    check("p",               lmid(0,2)+"@>\n" + lmid(2));
+    check("p",               lmid(0,2)+">@>\n" + lmid(2));
+    check("$",               lmid(0,2)+">@>\n" + lmid(2));
+    check("P",               lmid(0,2)+">@>>\n" + lmid(2));
+}
+
+void tst_FakeVim::command_oO()
+{
+    setup();
+    check("gg",              "@" + lmid(0));
+    check("Ol1" + escape,    "l@1\n" + lmid(0));
+    check("gg",              "@l1\n" + lmid(0));
+    check("ol2" + escape,    "l1\n" "l@2\n" + lmid(0));
+    check("G",               "l1\n" "l2\n" + lmid(0,l.size()-2)+"\n" + "@"+lmid(l.size()-2));
+    check("G$",              "l1\n" "l2\n" + lmid(0,l.size()-2)+"\n" + "@"+lmid(l.size()-2));
+    check("ol-1" + escape,   "l1\n" "l2\n" + lmid(0) + "l-@1\n");
+    check("G",               "l1\n" "l2\n" + lmid(0) + "@l-1\n");
+    check("Ol-2" + escape,   "l1\n" "l2\n" + lmid(0) + "l-@2\n" + "l-1\n");
+}
+
+void tst_FakeVim::command_x()
+{
+    setup();
+    check("x", "@" + lmid(0));
+    move("j$", cursor(l[1], -1));
+    check("x", lmid(0,1)+"\n" + l[1].left(l[1].length()-2)+"@"+l[1].mid(l[1].length()-2,1)+"\n" + lmid(2));
+}
+
+void tst_FakeVim::visual_d()
+{
+    setup();
+    check("vd", "@" + lmid(0));
+    check("vx", "@" + lmid(0));
+    check("vjd", "@" + lmid(1).mid(1));
+    qWarning("FIXME");
+    check("ugg", "@" + lmid(0)); // FIXME: cursor should be at begin of doc w/o gg
+    move("j", "@" + l[1]);
+    check("vd", lmid(0, 1)+"\n" + "@" + lmid(1).mid(1));
+    check("u", lmid(0, 1)+"\n" + "@" + lmid(1));
+    check("vx", lmid(0, 1)+"\n" + "@" + lmid(1).mid(1));
+    check("u", lmid(0, 1)+"\n" + "@" + lmid(1));
+    check("vhx", lmid(0, 1)+"\n" + "@" + lmid(1).mid(1));
+    check("u", lmid(0, 1)+"\n" + "@" + lmid(1));
+    check("vlx", lmid(0, 1)+"\n" + "@" + lmid(1).mid(2));
+    check("P", lmid(0, 1)+"\n" + lmid(1).left(1)+"@"+lmid(1).mid(1));
+    check("vhd", lmid(0, 1)+"\n" + "@" + lmid(1).mid(2));
+    qWarning("FIXME");
+    check("u0", lmid(0, 1)+"\n" + "@" + lmid(1)); // FIXME: cursor should be at begin of line w/o 0
+    check("v$d", lmid(0, 1)+"\n" + "@" + lmid(2));
+    check("v$od", lmid(0, 1)+"\n" + "@" + lmid(3));
+    check("$v$x", lmid(0, 1)+"\n" + lmid(3,1) + "@" + lmid(4));
+    check("0v$d", lmid(0, 1)+"\n" + "@" + lmid(5));
+    check("$v0d", lmid(0, 1)+"\n" + "@\n" + lmid(6));
+    check("v$o0k$d", lmid(0, 1)+"\n" + "@" + lmid(6).mid(1));
+}
+
+void tst_FakeVim::Visual_d()
+{
+    setup();
+    check("Vd", "@" + lmid(1));
+    check("V2kd", "@" + lmid(2));
+    check("u", "@" + lmid(1));
+    check("u", "@" + lmid(0));
+    move("j", "@" + l[1]);
+    check("V$d", lmid(0,1)+"\n" + "@" + lmid(2));
+    check("$V$$d", lmid(0,1)+"\n" + "@" + lmid(3));
+    check("Vkx", "@" + lmid(4));
+    check("P", "@" + lmid(0,1)+"\n" + lmid(3));
+}
+
+
+/*
+
+#include <QtCore>
+#include <QtGui>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    return app.exec();
+}
+*/
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Main
+//
+//////////////////////////////////////////////////////////////////////////
+
+int main(int argc, char *argv[])
+{
+    int res = 0;
+    QApplication app(argc, argv);
+
+    // Test with QPlainTextEdit.
+    tst_FakeVim plaintextedit(true);
+    res += QTest::qExec(&plaintextedit, argc, argv);
+
+#if 0
+    // Test with QTextEdit, too.
+    tst_FakeVim textedit(false);
+    res += QTest::qExec(&textedit, argc, argv);
+#endif
+
+    return res;
+}
+
+#include "tst_fakevim.moc"
diff --git a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
index dd59ded58a..80991e37d4 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
+++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
@@ -5,9 +5,9 @@ PLUGINSDIR = ../../../../src/plugins
 GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter
 
 SOURCES += \
-    $$PWD/tst_highlighterengine.cpp \
-    $$PWD/highlightermock.cpp \
-    $$PWD/formats.cpp \
+    tst_highlighterengine.cpp \
+    highlightermock.cpp \
+    formats.cpp \
     $$GENERICHIGHLIGHTERDIR/highlighter.cpp \
     $$GENERICHIGHLIGHTERDIR/context.cpp \
     $$GENERICHIGHLIGHTERDIR/dynamicrule.cpp \
@@ -19,11 +19,11 @@ SOURCES += \
     $$GENERICHIGHLIGHTERDIR/itemdata.cpp
 
 HEADERS += \
-    $$PWD/highlightermock.h \
-    $$PWD/basetextdocumentlayout.h \
-    $$PWD/formats.h \
-    $$PWD/tabsettings.h \
-    $$PWD/syntaxhighlighter.h \
+    highlightermock.h \
+    basetextdocumentlayout.h \
+    formats.h \
+    tabsettings.h \
+    syntaxhighlighter.h \
     $$GENERICHIGHLIGHTERDIR/highlighter.h \
     $$GENERICHIGHLIGHTERDIR/context.h \
     $$GENERICHIGHLIGHTERDIR/dynamicrule.h \
@@ -35,5 +35,3 @@ HEADERS += \
     $$GENERICHIGHLIGHTERDIR/itemdata.h
 
 INCLUDEPATH += $$GENERICHIGHLIGHTERDIR $$PWD
-
-TARGET=tst_$$TARGET
diff --git a/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp b/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp
index 31e9ff3f11..f618fabf07 100644
--- a/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp
+++ b/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp
@@ -49,6 +49,8 @@ Q_DECLARE_METATYPE(HighlightSequence)
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<HighlightSequence>)
 
+//TESTED_COMPONENT=src/plugins/texteditor/generichighlighter
+
 class tst_HighlighterEngine : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp
index c06b61fbaf..45197a97d0 100644
--- a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp
+++ b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp
@@ -34,6 +34,7 @@
 
 #include <QtTest/QtTest>
 
+//TESTED_COMPONENT=src/plugins/texteditor/generichighlighter
 using namespace TextEditor;
 using namespace Internal;
 
diff --git a/tests/auto/profilereader/main.cpp b/tests/auto/profilereader/main.cpp
deleted file mode 100644
index e06687a179..0000000000
--- a/tests/auto/profilereader/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include "profilereader.h"
-#include "profilecache.h"
-#include "proitems.h"
-
-#include <QtTest/QtTest>
-#include <QtCore/QSet>
-
-using Qt4ProjectManager::Internal::ProFileReader;
-using Qt4ProjectManager::Internal::ProFileCache;
-
-
-class tst_ProFileReader : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void readProFile();
-    void includeFiles();
-    void conditionalScopes();
-};
-
-void tst_ProFileReader::readProFile()
-{
-    ProFileReader reader;
-    QCOMPARE(reader.readProFile("nonexistant"), false);
-    QCOMPARE(reader.readProFile("data/includefiles/test.pro"), true);
-}
-
-void tst_ProFileReader::includeFiles()
-{
-    ProFileReader reader;
-    QCOMPARE(reader.readProFile("data/includefiles/test.pro"), true);
-    QCOMPARE(reader.includeFiles().size(), 2);
-}
-
-void tst_ProFileReader::conditionalScopes()
-{
-    ProFileReader reader;
-    QCOMPARE(reader.readProFile("data/includefiles/test.pro"), true);
-
-    QStringList scopedVariable = reader.values("SCOPED_VARIABLE");
-    QCOMPARE(scopedVariable.count(), 1);
-    QCOMPARE(scopedVariable.first(), QLatin1String("1"));
-}
-
-QTEST_MAIN(tst_ProFileReader)
-#include "main.moc"
diff --git a/tests/auto/profilereader/profilecache.h b/tests/auto/profilereader/profilecache.h
index 7f2c5c7ea7..b3d995701d 100644
--- a/tests/auto/profilereader/profilecache.h
+++ b/tests/auto/profilereader/profilecache.h
@@ -30,7 +30,7 @@
 #ifndef PROFILECACHE_H
 #define PROFILECACHE_H
 
-#include "proitems.h"
+#include <proitems.h>
 #include <QString>
 
 namespace Qt4ProjectManager {
diff --git a/tests/auto/profilereader/profilereader.pro b/tests/auto/profilereader/profilereader.pro
index 486ddd547d..3e807d1a17 100644
--- a/tests/auto/profilereader/profilereader.pro
+++ b/tests/auto/profilereader/profilereader.pro
@@ -1,17 +1,12 @@
-load(qttest_p4)
+TEMPLATE = app
+CONFIG += qt warn_on console depend_includepath
+CONFIG += qtestlib testcase
 
 SOURCES += \
-    proitems.cpp \
-    profileevaluator.cpp \
-    profilereader.cpp \
-    main.cpp
+    tst_profilereader.cpp
 
 HEADERS += \
-    profileevaluator.h \
-    proparserutils.h \
-    proitems.h \
-    abstractproitemvisitor.h \
-    profilereader.h \
     profilecache.h \
     qtversionmanager.h
+
 TARGET=tst_$$TARGET
diff --git a/tests/auto/profilereader/tst_profilereader.cpp b/tests/auto/profilereader/tst_profilereader.cpp
new file mode 100644
index 0000000000..520ecdbcac
--- /dev/null
+++ b/tests/auto/profilereader/tst_profilereader.cpp
@@ -0,0 +1,74 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "profilecache.h"
+
+#include <QtTest/QtTest>
+#include <QtCore/QSet>
+
+using Qt4ProjectManager::Internal::ProFileReader;
+using Qt4ProjectManager::Internal::ProFileCache;
+
+
+class tst_ProFileReader : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void readProFile();
+    void includeFiles();
+    void conditionalScopes();
+};
+
+void tst_ProFileReader::readProFile()
+{
+    ProFileReader reader;
+    QCOMPARE(reader.readProFile("nonexistant"), false);
+    QCOMPARE(reader.readProFile("data/includefiles/test.pro"), true);
+}
+
+void tst_ProFileReader::includeFiles()
+{
+    ProFileReader reader;
+    QCOMPARE(reader.readProFile("data/includefiles/test.pro"), true);
+    QCOMPARE(reader.includeFiles().size(), 2);
+}
+
+void tst_ProFileReader::conditionalScopes()
+{
+    ProFileReader reader;
+    QCOMPARE(reader.readProFile("data/includefiles/test.pro"), true);
+
+    QStringList scopedVariable = reader.values("SCOPED_VARIABLE");
+    QCOMPARE(scopedVariable.count(), 1);
+    QCOMPARE(scopedVariable.first(), QLatin1String("1"));
+}
+
+QTEST_MAIN(tst_ProFileReader)
+#include "tst_profilereader.moc"
diff --git a/tests/auto/profilewriter/main.cpp b/tests/auto/profilewriter/main.cpp
deleted file mode 100644
index 1bc0abd913..0000000000
--- a/tests/auto/profilewriter/main.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include "profileevaluator.h"
-#include "prowriter.h"
-
-#include <QtTest/QtTest>
-//#include <QtCore/QSet>
-
-#define BASE_DIR "/some/stuff"
-
-class tst_ProFileWriter : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void edit_data();
-    void edit();
-    void multiVar();
-};
-
-void tst_ProFileWriter::edit_data()
-{
-    QTest::addColumn<bool>("add");
-    QTest::addColumn<QStringList>("files");
-    QTest::addColumn<QString>("input");
-    QTest::addColumn<QString>("output");
-
-    struct Case {
-        bool add;
-        const char *title;
-        const char * const *files;
-        const char *input;
-        const char *output;
-    };
-
-    static const char *f_foo[] = { "foo", 0 };
-    static const char *f_foo_bar[] = { "foo", "bar", 0 };
-    static const Case cases[] = {
-        // Adding entries
-        {
-            true, "add new", f_foo,
-            "# test file",
-            "# test file\n"
-            "\n"
-            "SOURCES += \\\n"
-            "    foo"
-        },
-        {
-            true, "add new ignoring scoped", f_foo,
-            "unix:SOURCES = some files",
-            "unix:SOURCES = some files\n"
-            "\n"
-            "SOURCES += \\\n"
-            "    foo"
-        },
-        {
-            true, "add to existing", f_foo,
-            "SOURCES = some files",
-            "SOURCES = some files \\\n"
-            "    foo"
-        },
-        {
-            true, "add to existing after comment", f_foo,
-            "SOURCES = some files   # comment",
-            "SOURCES = some files \\   # comment\n"
-            "    foo"
-        },
-        {
-            true, "add to existing after comment line", f_foo,
-            "SOURCES = some \\\n"
-            "   # comment\n"
-            "    files",
-            "SOURCES = some \\\n"
-            "   # comment\n"
-            "    files \\\n"
-            "    foo"
-        },
-
-        // Removing entries
-        {
-            false, "remove fail", f_foo,
-            "SOURCES = bak bar",
-            "SOURCES = bak bar"
-        },
-        {
-            false, "remove one-line middle", f_foo,
-            "SOURCES = bak foo bar",
-            "SOURCES = bak bar"
-        },
-        {
-            false, "remove one-line trailing", f_foo,
-            "SOURCES = bak bar foo",
-            "SOURCES = bak bar"
-        },
-        {
-            false, "remove multi-line single leading", f_foo,
-            "SOURCES = foo \\\n"
-            "    bak \\\n"
-            "    bar",
-            "SOURCES = \\\n"
-            "    bak \\\n"
-            "    bar"
-        },
-        {
-            false, "remove multi-line single middle", f_foo,
-            "SOURCES = bak \\\n"
-            "    foo \\\n"
-            "    bar",
-            "SOURCES = bak \\\n"
-            "    bar"
-        },
-        {
-            false, "remove multi-line single trailing", f_foo,
-            "SOURCES = bak \\\n"
-            "    bar \\\n"
-            "    foo",
-            "SOURCES = bak \\\n"
-            "    bar"
-        },
-        {
-            false, "remove multi-line single leading with comment", f_foo,
-            "SOURCES = foo \\  # comment\n"
-            "    bak \\\n"
-            "    bar",
-            "SOURCES = \\  # foo # comment\n"
-            "    bak \\\n"
-            "    bar"
-        },
-        {
-            false, "remove multi-line single middle with comment", f_foo,
-            "SOURCES = bak \\\n"
-            "    foo \\  # comment\n"
-            "    bar",
-            "SOURCES = bak \\\n"
-            "    \\  # foo # comment\n"
-            "    bar"
-        },
-        {
-            false, "remove multi-line single trailing with comment", f_foo,
-            "SOURCES = bak \\\n"
-            "    bar \\\n"
-            "    foo  # comment",
-            "SOURCES = bak \\\n"
-            "    bar\n"
-            "     # foo # comment"
-        },
-        {
-            false, "remove multi-line single trailing after empty line", f_foo,
-            "SOURCES = bak \\\n"
-            "    bar \\\n"
-            "    \\\n"
-            "    foo",
-            "SOURCES = bak \\\n"
-            "    bar\n"
-        },
-        {
-            false, "remove multi-line single trailing after comment line", f_foo,
-            "SOURCES = bak \\\n"
-            "    bar \\\n"
-            "       # just a comment\n"
-            "    foo",
-            "SOURCES = bak \\\n"
-            "    bar\n"
-            "       # just a comment"
-        },
-        {
-            false, "remove multi-line single trailing after empty line with comment", f_foo,
-            "SOURCES = bak \\\n"
-            "    bar \\\n"
-            "    \\ # just a comment\n"
-            "    foo",
-            "SOURCES = bak \\\n"
-            "    bar\n"
-            "     # just a comment"
-        },
-        {
-            false, "remove multiple one-line middle", f_foo_bar,
-            "SOURCES = bak foo bar baz",
-            "SOURCES = bak baz"
-        },
-        {
-            false, "remove multiple one-line trailing", f_foo_bar,
-            "SOURCES = bak baz foo bar",
-            "SOURCES = bak baz"
-        },
-        {
-            false, "remove multiple one-line interleaved", f_foo_bar,
-            "SOURCES = bak foo baz bar",
-            "SOURCES = bak baz"
-        },
-        {
-            false, "remove multiple one-line middle with comment", f_foo_bar,
-            "SOURCES = bak foo bar baz   # comment",
-            "SOURCES = bak baz   # bar # foo # comment"
-        },
-        {
-            false, "remove multi-line multiple trailing with empty line with comment", f_foo_bar,
-            "SOURCES = bak \\\n"
-            "    bar \\\n"
-            "    \\ # just a comment\n"
-            "    foo",
-            "SOURCES = bak\n"
-            "     # just a comment"
-        },
-    };
-
-    for (uint i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) {
-        const Case *_case = &cases[i];
-        QStringList files;
-        for (const char * const *file = _case->files; *file; file++)
-            files << QString::fromLatin1(BASE_DIR "/") + QString::fromLatin1(*file);
-        QTest::newRow(_case->title)
-                << _case->add
-                << files
-                << QString::fromLatin1(_case->input)
-                << QString::fromLatin1(_case->output);
-    }
-}
-
-void tst_ProFileWriter::edit()
-{
-    QFETCH(bool, add);
-    QFETCH(QStringList, files);
-    QFETCH(QString, input);
-    QFETCH(QString, output);
-
-    QDir baseDir(BASE_DIR);
-    QStringList lines = input.split(QLatin1String("\n"));
-    QStringList vars; vars << QLatin1String("SOURCES");
-
-    ProFileOption option;
-    ProFileEvaluator reader(&option);
-    ProFile *proFile = reader.parsedProFile(BASE_DIR "/test.pro", input);
-    QVERIFY(proFile);
-    if (add)
-        Qt4ProjectManager::Internal::ProWriter::addFiles(proFile, &lines, baseDir, files, vars);
-    else
-        Qt4ProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, baseDir, files, vars);
-
-    QCOMPARE(lines.join(QLatin1String("\n")), output);
-}
-
-void tst_ProFileWriter::multiVar()
-{
-    QDir baseDir(BASE_DIR);
-    QString input = QLatin1String(
-            "SOURCES = foo bar\n"
-            "# comment line\n"
-            "HEADERS = baz bak"
-            );
-    QStringList lines = input.split(QLatin1String("\n"));
-    QString output = QLatin1String(
-            "SOURCES = bar\n"
-            "# comment line\n"
-            "HEADERS = baz"
-            );
-    QStringList files; files
-            << QString::fromLatin1(BASE_DIR "/foo")
-            << QString::fromLatin1(BASE_DIR "/bak");
-    QStringList vars; vars << QLatin1String("SOURCES") << QLatin1String("HEADERS");
-
-    ProFileOption option;
-    ProFileEvaluator reader(&option);
-    ProFile *proFile = reader.parsedProFile(BASE_DIR "/test.pro", input);
-    QVERIFY(proFile);
-    Qt4ProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, baseDir, files, vars);
-
-    QCOMPARE(lines.join(QLatin1String("\n")), output);
-}
-
-QTEST_MAIN(tst_ProFileWriter)
-#include "main.moc"
diff --git a/tests/auto/profilewriter/profilewriter.pro b/tests/auto/profilewriter/profilewriter.pro
index 774e09f666..9a2a551c8a 100644
--- a/tests/auto/profilewriter/profilewriter.pro
+++ b/tests/auto/profilewriter/profilewriter.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
-
 include(../../../src/shared/proparser/proparser.pri)
 
-SOURCES += main.cpp
+SOURCES += \
+    tst_profilewriter.cpp
 QT -= gui
diff --git a/tests/auto/profilewriter/tst_profilewriter.cpp b/tests/auto/profilewriter/tst_profilewriter.cpp
new file mode 100644
index 0000000000..faec041cad
--- /dev/null
+++ b/tests/auto/profilewriter/tst_profilewriter.cpp
@@ -0,0 +1,299 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "profileevaluator.h"
+#include "prowriter.h"
+
+#include <QtTest/QtTest>
+//#include <QtCore/QSet>
+
+#define BASE_DIR "/some/stuff"
+
+class tst_ProFileWriter : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void edit_data();
+    void edit();
+    void multiVar();
+};
+
+void tst_ProFileWriter::edit_data()
+{
+    QTest::addColumn<bool>("add");
+    QTest::addColumn<QStringList>("files");
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<QString>("output");
+
+    struct Case {
+        bool add;
+        const char *title;
+        const char * const *files;
+        const char *input;
+        const char *output;
+    };
+
+    static const char *f_foo[] = { "foo", 0 };
+    static const char *f_foo_bar[] = { "foo", "bar", 0 };
+    static const Case cases[] = {
+        // Adding entries
+        {
+            true, "add new", f_foo,
+            "# test file",
+            "# test file\n"
+            "\n"
+            "SOURCES += \\\n"
+            "    foo"
+        },
+        {
+            true, "add new ignoring scoped", f_foo,
+            "unix:SOURCES = some files",
+            "unix:SOURCES = some files\n"
+            "\n"
+            "SOURCES += \\\n"
+            "    foo"
+        },
+        {
+            true, "add to existing", f_foo,
+            "SOURCES = some files",
+            "SOURCES = some files \\\n"
+            "    foo"
+        },
+        {
+            true, "add to existing after comment", f_foo,
+            "SOURCES = some files   # comment",
+            "SOURCES = some files \\   # comment\n"
+            "    foo"
+        },
+        {
+            true, "add to existing after comment line", f_foo,
+            "SOURCES = some \\\n"
+            "   # comment\n"
+            "    files",
+            "SOURCES = some \\\n"
+            "   # comment\n"
+            "    files \\\n"
+            "    foo"
+        },
+
+        // Removing entries
+        {
+            false, "remove fail", f_foo,
+            "SOURCES = bak bar",
+            "SOURCES = bak bar"
+        },
+        {
+            false, "remove one-line middle", f_foo,
+            "SOURCES = bak foo bar",
+            "SOURCES = bak bar"
+        },
+        {
+            false, "remove one-line trailing", f_foo,
+            "SOURCES = bak bar foo",
+            "SOURCES = bak bar"
+        },
+        {
+            false, "remove multi-line single leading", f_foo,
+            "SOURCES = foo \\\n"
+            "    bak \\\n"
+            "    bar",
+            "SOURCES = \\\n"
+            "    bak \\\n"
+            "    bar"
+        },
+        {
+            false, "remove multi-line single middle", f_foo,
+            "SOURCES = bak \\\n"
+            "    foo \\\n"
+            "    bar",
+            "SOURCES = bak \\\n"
+            "    bar"
+        },
+        {
+            false, "remove multi-line single trailing", f_foo,
+            "SOURCES = bak \\\n"
+            "    bar \\\n"
+            "    foo",
+            "SOURCES = bak \\\n"
+            "    bar"
+        },
+        {
+            false, "remove multi-line single leading with comment", f_foo,
+            "SOURCES = foo \\  # comment\n"
+            "    bak \\\n"
+            "    bar",
+            "SOURCES = \\  # foo # comment\n"
+            "    bak \\\n"
+            "    bar"
+        },
+        {
+            false, "remove multi-line single middle with comment", f_foo,
+            "SOURCES = bak \\\n"
+            "    foo \\  # comment\n"
+            "    bar",
+            "SOURCES = bak \\\n"
+            "    \\  # foo # comment\n"
+            "    bar"
+        },
+        {
+            false, "remove multi-line single trailing with comment", f_foo,
+            "SOURCES = bak \\\n"
+            "    bar \\\n"
+            "    foo  # comment",
+            "SOURCES = bak \\\n"
+            "    bar\n"
+            "     # foo # comment"
+        },
+        {
+            false, "remove multi-line single trailing after empty line", f_foo,
+            "SOURCES = bak \\\n"
+            "    bar \\\n"
+            "    \\\n"
+            "    foo",
+            "SOURCES = bak \\\n"
+            "    bar\n"
+        },
+        {
+            false, "remove multi-line single trailing after comment line", f_foo,
+            "SOURCES = bak \\\n"
+            "    bar \\\n"
+            "       # just a comment\n"
+            "    foo",
+            "SOURCES = bak \\\n"
+            "    bar\n"
+            "       # just a comment"
+        },
+        {
+            false, "remove multi-line single trailing after empty line with comment", f_foo,
+            "SOURCES = bak \\\n"
+            "    bar \\\n"
+            "    \\ # just a comment\n"
+            "    foo",
+            "SOURCES = bak \\\n"
+            "    bar\n"
+            "     # just a comment"
+        },
+        {
+            false, "remove multiple one-line middle", f_foo_bar,
+            "SOURCES = bak foo bar baz",
+            "SOURCES = bak baz"
+        },
+        {
+            false, "remove multiple one-line trailing", f_foo_bar,
+            "SOURCES = bak baz foo bar",
+            "SOURCES = bak baz"
+        },
+        {
+            false, "remove multiple one-line interleaved", f_foo_bar,
+            "SOURCES = bak foo baz bar",
+            "SOURCES = bak baz"
+        },
+        {
+            false, "remove multiple one-line middle with comment", f_foo_bar,
+            "SOURCES = bak foo bar baz   # comment",
+            "SOURCES = bak baz   # bar # foo # comment"
+        },
+        {
+            false, "remove multi-line multiple trailing with empty line with comment", f_foo_bar,
+            "SOURCES = bak \\\n"
+            "    bar \\\n"
+            "    \\ # just a comment\n"
+            "    foo",
+            "SOURCES = bak\n"
+            "     # just a comment"
+        },
+    };
+
+    for (uint i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) {
+        const Case *_case = &cases[i];
+        QStringList files;
+        for (const char * const *file = _case->files; *file; file++)
+            files << QString::fromLatin1(BASE_DIR "/") + QString::fromLatin1(*file);
+        QTest::newRow(_case->title)
+                << _case->add
+                << files
+                << QString::fromLatin1(_case->input)
+                << QString::fromLatin1(_case->output);
+    }
+}
+
+void tst_ProFileWriter::edit()
+{
+    QFETCH(bool, add);
+    QFETCH(QStringList, files);
+    QFETCH(QString, input);
+    QFETCH(QString, output);
+
+    QDir baseDir(BASE_DIR);
+    QStringList lines = input.split(QLatin1String("\n"));
+    QStringList vars; vars << QLatin1String("SOURCES");
+
+    ProFileOption option;
+    ProFileEvaluator reader(&option);
+    ProFile *proFile = reader.parsedProFile(BASE_DIR "/test.pro", input);
+    QVERIFY(proFile);
+    if (add)
+        Qt4ProjectManager::Internal::ProWriter::addFiles(proFile, &lines, baseDir, files, vars);
+    else
+        Qt4ProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, baseDir, files, vars);
+
+    QCOMPARE(lines.join(QLatin1String("\n")), output);
+}
+
+void tst_ProFileWriter::multiVar()
+{
+    QDir baseDir(BASE_DIR);
+    QString input = QLatin1String(
+            "SOURCES = foo bar\n"
+            "# comment line\n"
+            "HEADERS = baz bak"
+            );
+    QStringList lines = input.split(QLatin1String("\n"));
+    QString output = QLatin1String(
+            "SOURCES = bar\n"
+            "# comment line\n"
+            "HEADERS = baz"
+            );
+    QStringList files; files
+            << QString::fromLatin1(BASE_DIR "/foo")
+            << QString::fromLatin1(BASE_DIR "/bak");
+    QStringList vars; vars << QLatin1String("SOURCES") << QLatin1String("HEADERS");
+
+    ProFileOption option;
+    ProFileEvaluator reader(&option);
+    ProFile *proFile = reader.parsedProFile(BASE_DIR "/test.pro", input);
+    QVERIFY(proFile);
+    Qt4ProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, baseDir, files, vars);
+
+    QCOMPARE(lines.join(QLatin1String("\n")), output);
+}
+
+QTEST_MAIN(tst_ProFileWriter)
+#include "tst_profilewriter.moc"
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 8dfcd5607d..ed6125692b 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -24,10 +24,12 @@ TARGET = tst_qmldesigner_core
 CONFIG += console
 CONFIG -= app_bundle
 TEMPLATE = app
-SOURCES += testcore.cpp \
+SOURCES += \
     ../testview.cpp \
-    testrewriterview.cpp
-HEADERS += testcore.h \
+    testrewriterview.cpp \
+    tst_testcore.cpp
+HEADERS += \
     ../testview.h \
-    testrewriterview.h
+    testrewriterview.h \
+    tst_testcore.h
 RESOURCES += ../data/testfiles.qrc
diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.cpp b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
deleted file mode 100644
index 8d1074065b..0000000000
--- a/tests/auto/qml/qmldesigner/coretests/testcore.cpp
+++ /dev/null
@@ -1,6956 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include "testcore.h"
-
-#include <QScopedPointer>
-#include <QLatin1String>
-#include <QGraphicsObject>
-
-#include <metainfo.h>
-#include <model.h>
-#include <modelmerger.h>
-#include <modelnode.h>
-#include <qmlanchors.h>
-#include <invalididexception.h>
-#include <invalidmodelnodeexception.h>
-#include <rewritingexception.h>
-#include <nodeinstanceview.h>
-#include <nodeinstance.h>
-#include <subcomponentmanager.h>
-#include <QDebug>
-
-#include "../testview.h"
-#include <variantproperty.h>
-#include <abstractproperty.h>
-#include <bindingproperty.h>
-#include <nodeproperty.h>
-
-#include <nodelistproperty.h>
-#include <nodeabstractproperty.h>
-#include <componenttextmodifier.h>
-
-#include <bytearraymodifier.h>
-#include "testrewriterview.h"
-
-#include <qmljs/qmljsinterpreter.h>
-
-#include <QPlainTextEdit>
-#include <private/qdeclarativestate_p.h>
-#include <private/qdeclarativemetatype_p.h>
-
-
-using namespace QmlDesigner;
-#include <cstdio>
-#include "../common/statichelpers.cpp"
-
-static void initializeMetaTypeSystem(const QString &resourcePath)
-{
-    const QDir typeFileDir(resourcePath + QLatin1String("/qml-type-descriptions"));
-    const QStringList xmlExtensions = QStringList() << QLatin1String("*.xml");
-    const QFileInfoList xmlFiles = typeFileDir.entryInfoList(xmlExtensions,
-                                                             QDir::Files,
-                                                             QDir::Name);
-
-    const QStringList errors = QmlJS::Interpreter::CppQmlTypesLoader::load(xmlFiles);
-    foreach (const QString &error, errors)
-        qWarning() << qPrintable(error);
-}
-
-TestCore::TestCore()
-    : QObject()
-{
-}
-
-void TestCore::initTestCase()
-{
-#ifndef QDEBUG_IN_TESTS
-    qInstallMsgHandler(testMessageOutput);
-#endif
-    Exception::setShouldAssert(false);
-
-    initializeMetaTypeSystem(QLatin1String(QTCREATORDIR "/share/qtcreator"));
-
-
-   // Load plugins
-
-#ifdef Q_OS_MAC
-    const QString pluginPath = QTCREATORDIR "/bin/Qt Creator.app/Contents/PlugIns/QmlDesigner";
-#else
-    const QString pluginPath = QTCREATORDIR "/lib/qmldesigner";
-#endif
-
-    qDebug() << pluginPath;
-    Q_ASSERT(QFileInfo(pluginPath).exists());
-    MetaInfo::setPluginPaths(QStringList() << pluginPath);
-}
-
-void TestCore::cleanupTestCase()
-{
-    MetaInfo::clearGlobal();
-}
-
-void TestCore::testModelCreateCoreModel()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> testView(new TestView);
-    QVERIFY(testView.data());
-    model->attachView(testView.data());
-
-    QVERIFY(testView->rootModelNode().isValid());
-    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
-    model->attachView(nodeInstanceView);
-    model->detachView(nodeInstanceView);
-}
-
-// TODO: this need to e updated for states
-void TestCore::loadEmptyCoreModel()
-{
-    QFile file(":/fx/empty.qml");
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText(file.readAll());
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-
-    QPlainTextEdit textEdit2;
-    textEdit2.setPlainText("import Qt 4.7; Item{}");
-    NotIndentingTextEditModifier modifier2(&textEdit2);
-
-    QScopedPointer<Model> model2(Model::create("Qt/item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
-    testRewriterView2->setTextModifier(&modifier2);
-    model2->attachView(testRewriterView2.data());
-
-    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
-}
-
-void TestCore::testRewriterView()
-{
-    try {
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item"));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestView> view(new TestView);
-        QVERIFY(view.data());
-        model->attachView(view.data());
-
-        ModelNode rootModelNode(view->rootModelNode());
-        QVERIFY(rootModelNode.isValid());
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-        ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
-        QVERIFY(childNode.isValid());
-        childNode.setId("childNode");
-
-        ModelNode childNode2(addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data"));
-        childNode2.setId("childNode2");
-        ModelNode childNode3(addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "data"));
-        childNode3.setId("childNode3");
-        ModelNode childNode4(addNodeListChild(childNode3, "Qt/Rectangle", 4, 7, "data"));
-        childNode4.setId("childNode4");
-
-        QVERIFY(childNode.isValid());
-        QVERIFY(childNode2.isValid());
-        QVERIFY(childNode3.isValid());
-        QVERIFY(childNode4.isValid());
-
-        testRewriterView->setModificationGroupActive(true);
-
-        childNode.destroy();
-
-        QVERIFY(!childNode.isValid());
-        QVERIFY(!childNode2.isValid());
-        QVERIFY(!childNode3.isValid());
-        QVERIFY(!childNode4.isValid());
-
-        QVERIFY(testRewriterView->modelToTextMerger()->isNodeScheduledForRemoval(childNode));
-        QVERIFY(!testRewriterView->modelToTextMerger()->isNodeScheduledForRemoval(childNode2));
-        QVERIFY(!testRewriterView->modelToTextMerger()->isNodeScheduledForRemoval(childNode3));
-        QVERIFY(!testRewriterView->modelToTextMerger()->isNodeScheduledForRemoval(childNode4));
-
-        QVERIFY(!rootModelNode.hasProperty(QLatin1String("data")));
-
-        testRewriterView->modelToTextMerger()->applyChanges();
-
-        childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-        QVERIFY(testRewriterView->modelToTextMerger()->isNodeScheduledForAddition(childNode));
-
-        testRewriterView->modelToTextMerger()->applyChanges();
-
-        childNode.variantProperty("x") = 70;
-        childNode.variantProperty("y") = 90;
-
-        QCOMPARE(testRewriterView->modelToTextMerger()->findAddedVariantProperty(childNode.variantProperty("x")).value(), QVariant(70));
-        QCOMPARE(testRewriterView->modelToTextMerger()->findAddedVariantProperty(childNode.variantProperty("y")).value(), QVariant(90));
-
-        model->detachView(testRewriterView.data());
-    } catch (Exception &e) {
-        QFAIL(qPrintable(e.description()));
-    }
-}
-
-void TestCore::testRewriterErrors()
-{
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-    textEdit.setPlainText("import Qt 4.7;\n\nError {\n}\n");
-    QVERIFY(!testRewriterView->errors().isEmpty());
-
-    textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
-    QVERIFY(testRewriterView->errors().isEmpty());
-}
-
-void TestCore::saveEmptyCoreModel()
-{
-    QList<QDeclarativeError> errors;
-    QFile file(":/fx/empty.qml");
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText(file.readAll());
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-
-
-    QBuffer buffer;
-    buffer.open(QIODevice::ReadWrite | QIODevice::Text);
-    modifier1.save(&buffer);
-
-    QPlainTextEdit textEdit2;
-    textEdit2.setPlainText("import Qt 4.7; Item{}");
-    NotIndentingTextEditModifier modifier2(&textEdit2);
-
-    QScopedPointer<Model> model2(Model::create("Qt/item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
-    testRewriterView2->setTextModifier(&modifier2);
-    model2->attachView(testRewriterView2.data());
-
-    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
-
-}
-
-void TestCore::loadAttributesInCoreModel()
-{
-    QList<QDeclarativeError> errors;
-    QFile file(":/fx/attributes.qml");
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText(file.readAll());
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-
-    QPlainTextEdit textEdit2;
-    textEdit2.setPlainText("import Qt 4.7; Item{}");
-    NotIndentingTextEditModifier modifier2(&textEdit2);
-
-    QScopedPointer<Model> model2(Model::create("Qt/item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
-    testRewriterView2->setTextModifier(&modifier2);
-    model2->attachView(testRewriterView2.data());
-
-    ModelNode rootModelNode = testRewriterView2->rootModelNode();
-
-    rootModelNode.setId("theItem");
-    rootModelNode.variantProperty("x").setValue(QVariant(300));
-    rootModelNode.variantProperty("visible").setValue(true);
-    rootModelNode.variantProperty("scale").setValue(0.5);
-
-    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
-}
-
-void TestCore::saveAttributesInCoreModel()
-{
-    QFile file(":/fx/attributes.qml");
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText(file.readAll());
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-
-    QVERIFY(testRewriterView1->errors().isEmpty());
-
-    QBuffer buffer;
-    buffer.open(QIODevice::ReadWrite | QIODevice::Text);
-    modifier1.save(&buffer);
-
-    QPlainTextEdit textEdit2;
-    textEdit2.setPlainText(buffer.data());
-    NotIndentingTextEditModifier modifier2(&textEdit2);
-
-    QScopedPointer<Model> model2(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
-    testRewriterView2->setTextModifier(&modifier2);
-    model2->attachView(testRewriterView2.data());
-
-    QVERIFY(testRewriterView2->errors().isEmpty());
-
-    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
-}
-
-void TestCore::testModelCreateRect()
-{
-     try {
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QVERIFY(view->rootModelNode().isValid());
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(childNode.isValid());
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
-    QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
-    QCOMPARE(childNode.simplifiedTypeName(), QString("Rectangle"));
-
-    QVERIFY(childNode.id().isEmpty());
-
-    childNode.setId("rect01");
-    QCOMPARE(childNode.id(), QString("rect01"));
-
-    childNode.variantProperty("x") = 100;
-    childNode.variantProperty("y") = 100;
-    childNode.variantProperty("width") = 100;
-    childNode.variantProperty("height") = 100;
-
-    QCOMPARE(childNode.propertyNames().count(), 4);
-    QCOMPARE(childNode.variantProperty("scale").value(), QVariant());
-
-     } catch (Exception &exception) {
-        QFAIL("Exception thrown");
-    }
-
-}
-
-void TestCore::testRewriterDynamicProperties()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  property int i\n"
-                                  "  property int ii: 1\n"
-                                  "  property bool b\n"
-                                  "  property bool bb: true\n"
-                                  "  property double d\n"
-                                  "  property double dd: 1.1\n"
-                                  "  property real r\n"
-                                  "  property real rr: 1.1\n"
-                                  "  property string s\n"
-                                  "  property string ss: \"hello\"\n"
-                                  "  property url u\n"
-                                  "  property url uu: \"www\"\n"
-                                  "  property color c\n"
-                                  "  property color cc: \"#ffffff\"\n"
-                                  "  property date t\n"
-                                  "  property date tt: \"2000-03-20\"\n"
-                                  "  property variant v\n"
-                                  "  property variant vv: \"Hello\"\n"
-                                  "}");
-
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText(qmlString);
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-
-    QVERIFY(testRewriterView1->errors().isEmpty());
-
-    //
-    // text2model
-    //
-    ModelNode rootModelNode = testRewriterView1->rootModelNode();
-    QCOMPARE(rootModelNode.properties().count(), 18);
-    QVERIFY(rootModelNode.hasVariantProperty("i"));
-    QCOMPARE(rootModelNode.variantProperty("i").dynamicTypeName(), QString("int"));
-    QCOMPARE(rootModelNode.variantProperty("i").value().type(), QVariant::Int);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("i").value().toInt(), 0);
-
-    QVERIFY(rootModelNode.hasVariantProperty("ii"));
-    QCOMPARE(rootModelNode.variantProperty("ii").dynamicTypeName(), QString("int"));
-    QCOMPARE(rootModelNode.variantProperty("ii").value().type(), QVariant::Int);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("ii").value().toInt(), 1);
-
-    QVERIFY(rootModelNode.hasVariantProperty("b"));
-    QCOMPARE(rootModelNode.variantProperty("b").dynamicTypeName(), QString("bool"));
-    QCOMPARE(rootModelNode.variantProperty("b").value().type(), QVariant::Bool);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("b").value().toBool(), false);
-
-    QVERIFY(rootModelNode.hasVariantProperty("bb"));
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("bb").value().toBool(), true);
-
-    QVERIFY(rootModelNode.hasVariantProperty("d"));
-    QCOMPARE(rootModelNode.variantProperty("d").dynamicTypeName(), QString("double"));
-    QCOMPARE(rootModelNode.variantProperty("d").value().type(), QVariant::Double);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("d").value().toDouble(), 0.0);
-
-    QVERIFY(rootModelNode.hasVariantProperty("dd"));
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("dd").value().toDouble(), 1.1);
-
-    QVERIFY(rootModelNode.hasVariantProperty("r"));
-    QCOMPARE(rootModelNode.variantProperty("r").dynamicTypeName(), QString("real"));
-    QCOMPARE(rootModelNode.variantProperty("r").value().type(), QVariant::Double);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("r").value().toDouble(), 0.0);
-
-    QVERIFY(rootModelNode.hasVariantProperty("rr"));
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("rr").value().toDouble(), 1.1);
-
-    QVERIFY(rootModelNode.hasVariantProperty("s"));
-    QCOMPARE(rootModelNode.variantProperty("s").dynamicTypeName(), QString("string"));
-    QCOMPARE(rootModelNode.variantProperty("s").value().type(), QVariant::String);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("s").value().toString(), QString());
-
-    QVERIFY(rootModelNode.hasVariantProperty("ss"));
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("ss").value().toString(), QString("hello"));
-
-    QVERIFY(rootModelNode.hasVariantProperty("u"));
-    QCOMPARE(rootModelNode.variantProperty("u").dynamicTypeName(), QString("url"));
-    QCOMPARE(rootModelNode.variantProperty("u").value().type(), QVariant::Url);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("u").value().toUrl(), QUrl());
-
-    QVERIFY(rootModelNode.hasVariantProperty("uu"));
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("uu").value().toUrl(), QUrl("www"));
-
-    QVERIFY(rootModelNode.hasVariantProperty("c"));
-    QCOMPARE(rootModelNode.variantProperty("c").dynamicTypeName(), QString("color"));
-    QCOMPARE(rootModelNode.variantProperty("c").value().type(), QVariant::Color);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("c").value().value<QColor>(), QColor());
-
-    QVERIFY(rootModelNode.hasVariantProperty("cc"));
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("cc").value().value<QColor>(), QColor(255, 255, 255));
-
-    QVERIFY(rootModelNode.hasVariantProperty("t"));
-    QCOMPARE(rootModelNode.variantProperty("t").dynamicTypeName(), QString("date"));
-    QCOMPARE(rootModelNode.variantProperty("t").value().type(), QVariant::Date);
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("t").value().value<QDate>(), QDate());
-
-    QVERIFY(rootModelNode.hasVariantProperty("tt"));
-    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("tt").value().value<QDate>(), QDate(2000, 3, 20));
-
-    QVERIFY(rootModelNode.hasVariantProperty("v"));
-    QCOMPARE(rootModelNode.variantProperty("v").dynamicTypeName(), QString("variant"));
-    const int type = rootModelNode.variantProperty("v").value().type();
-    QCOMPARE(type, QMetaType::type("QVariant"));
-
-    QVERIFY(rootModelNode.hasVariantProperty("vv"));
-    const QString inThere = testRewriterView1->rootModelNode().variantProperty("vv").value().value<QString>();
-    QCOMPARE(inThere, QString("Hello"));
-
-    // test model2text
-//    QPlainTextEdit textEdit2;
-//    textEdit2.setPlainText("import Qt 4.7; Item{}");
-//    NotIndentingTextEditModifier modifier2(&textEdit2);
-//
-//    QScopedPointer<Model> model2(Model::create("Qt/Item"));
-//
-//    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
-//    testRewriterView2->setTextModifier(&modifier2);
-//    model2->attachView(testRewriterView2.data());
-//
-//    testRewriterView2->rootModelNode().variantProperty("pushed").setDynamicTypeNameAndValue("bool", QVariant(false));
-//
-//    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
-}
-
-void TestCore::testRewriterGroupedProperties()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Text {\n"
-                                  "  font {\n"
-                                  "    pointSize: 10\n"
-                                  "    underline: true\n"
-                                  "  }\n"
-                                  "}\n");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier modifier1(&textEdit);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Text"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-
-    QVERIFY(testRewriterView1->errors().isEmpty());
-
-    //
-    // text2model
-    //
-    ModelNode rootModelNode = testRewriterView1->rootModelNode();
-    QCOMPARE(rootModelNode.property(QLatin1String("font.pointSize")).toVariantProperty().value().toDouble(), 10.0);
-    QCOMPARE(rootModelNode.property(QLatin1String("font.underline")).toVariantProperty().value().toBool(), true);
-
-    rootModelNode.removeProperty(QLatin1String("font.underline"));
-    QCOMPARE(rootModelNode.property(QLatin1String("font.pointSize")).toVariantProperty().value().toDouble(), 10.0);
-    QVERIFY(!rootModelNode.hasProperty(QLatin1String("font.underline")));
-
-    rootModelNode.variantProperty(QLatin1String("font.pointSize")).setValue(20.0);
-    QCOMPARE(rootModelNode.property(QLatin1String("font.pointSize")).toVariantProperty().value().toDouble(), 20.0);
-
-    rootModelNode.removeProperty(QLatin1String("font.pointSize"));
-    const QLatin1String expected("\n"
-                                 "import Qt 4.7\n"
-                                 "\n"
-                                 "Text {\n"
-                                 "}\n");
-
-    QCOMPARE(textEdit.toPlainText(), expected);
-}
-
-void TestCore::testRewriterPreserveOrder()
-{
-    const QLatin1String qmlString1("\n"
-        "import Qt 4.7\n"
-        "\n"
-        "Rectangle {\n"
-            "width: 640\n"
-            "height: 480\n"
-            "\n"
-            "states: [\n"
-                "State {\n"
-                    "name: \"State1\"\n"
-                "}\n"
-            "]\n"
-            "\n"
-            "Rectangle {\n"
-                "id: rectangle1\n"
-                "x: 18\n"
-                "y: 19\n"
-                "width: 100\n"
-                "height: 100\n"
-            "}\n"
-        "}\n");
-    const QLatin1String qmlString2("\n"
-        "import Qt 4.7\n"
-        "\n"
-        "Rectangle {\n"
-            "width: 640\n"
-            "height: 480\n"
-            "\n"
-            "Rectangle {\n"
-                "id: rectangle1\n"
-                "x: 18\n"
-                "y: 19\n"
-                "width: 100\n"
-                "height: 100\n"
-            "}\n"
-            "states: [\n"
-                "State {\n"
-                    "name: \"State1\"\n"
-                "}\n"
-            "]\n"
-            "\n"
-        "}\n");
-
-        {
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(qmlString2);
-        NotIndentingTextEditModifier modifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Text"));
-
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&modifier);
-        model->attachView(testRewriterView.data());
-
-        QVERIFY(testRewriterView->errors().isEmpty());
-
-        ModelNode rootModelNode = testRewriterView->rootModelNode();
-        QVERIFY(rootModelNode.isValid());
-
-        RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
-
-        ModelNode newModelNode = testRewriterView->createModelNode("Qt/Rectangle", 4, 7);
-
-        newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
-
-        newModelNode.setId("rectangle2");
-        QCOMPARE(newModelNode.id(), QString("rectangle2"));
-
-        newModelNode.variantProperty("x") = 10;
-        newModelNode.variantProperty("y") = 10;
-        newModelNode.variantProperty("width") = 100;
-        newModelNode.variantProperty("height") = 100;
-
-        transaction.commit();
-
-        QCOMPARE(newModelNode.id(), QString("rectangle2"));
-    }
-
-    {
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(qmlString1);
-        NotIndentingTextEditModifier modifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Text"));
-
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&modifier);
-        model->attachView(testRewriterView.data());
-
-        QVERIFY(testRewriterView->errors().isEmpty());
-
-        ModelNode rootModelNode = testRewriterView->rootModelNode();
-        QVERIFY(rootModelNode.isValid());
-
-        RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
-
-        ModelNode newModelNode = testRewriterView->createModelNode("Qt/Rectangle", 4, 7);
-
-        newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
-
-        newModelNode.setId("rectangle2");
-        QCOMPARE(newModelNode.id(), QString("rectangle2"));
-
-        newModelNode.variantProperty("x") = 10;
-        newModelNode.variantProperty("y") = 10;
-        newModelNode.variantProperty("width") = 100;
-        newModelNode.variantProperty("height") = 100;
-
-        transaction.commit();
-
-        QCOMPARE(newModelNode.id(), QString("rectangle2"));
-    }
-}
-
-void TestCore::testRewriterActionCompression()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  id: root\n"
-                                  "  Rectangle {\n"
-                                  "    id: rect1\n"
-                                  "    x: 10\n"
-                                  "    y: 10\n"
-                                  "  }\n"
-                                  "  Rectangle {\n"
-                                  "    id: rect2\n"
-                                  "    x: 10\n"
-                                  "    y: 10\n"
-                                  "  }\n"
-                                  "}\n");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier modifier1(&textEdit);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Rectangle"));
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView.data());
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-
-    ModelNode rootModelNode = testRewriterView->rootModelNode();
-    ModelNode rect1 = rootModelNode.property(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
-    ModelNode rect2 = rootModelNode.property(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(1);
-
-    QVERIFY(rect1.isValid());
-    QVERIFY(rect2.isValid());
-
-    RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
-    rect1.nodeListProperty(QLatin1String("data")).reparentHere(rect2);
-    rect2.variantProperty(QLatin1String("x")).setValue(1.0);
-    rect2.variantProperty(QLatin1String("y")).setValue(1.0);
-
-    rootModelNode.nodeListProperty(QLatin1String("data")).reparentHere(rect2);
-    rect2.variantProperty(QLatin1String("x")).setValue(9.0);
-    rect2.variantProperty(QLatin1String("y")).setValue(9.0);
-    transaction.commit();
-
-    const QLatin1String expected("\n"
-                                 "import Qt 4.7\n"
-                                 "\n"
-                                 "Rectangle {\n"
-                                 "  id: root\n"
-                                 "  Rectangle {\n"
-                                 "    id: rect1\n"
-                                 "    x: 10\n"
-                                 "    y: 10\n"
-                                 "  }\n"
-                                 "  Rectangle {\n"
-                                 "    id: rect2\n"
-                                 "    x: 9\n"
-                                 "    y: 9\n"
-                                 "  }\n"
-                                 "}\n");
-    QCOMPARE(textEdit.toPlainText(), expected);
-}
-
-void TestCore::testRewriterImports()
-{
-    QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/imports.qml";
-    QFile file(fileName);
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(file.readAll());
-    NotIndentingTextEditModifier modifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    model->setFileUrl(QUrl::fromLocalFile(fileName));
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&modifier);
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-
-    QVERIFY(model->imports().size() == 3);
-
-    // import Qt 4.7
-    Import import = model->imports().at(0);
-    QVERIFY(import.isLibraryImport());
-    QCOMPARE(import.url(), QString("Qt"));
-    QVERIFY(import.hasVersion());
-    QCOMPARE(import.version(), QString("4.7"));
-    QVERIFY(!import.hasAlias());
-
-    // import "subitems"
-    import = model->imports().at(1);
-    QVERIFY(import.isFileImport());
-    QCOMPARE(import.file(), QString("subitems"));
-    QVERIFY(!import.hasVersion());
-    QVERIFY(!import.hasAlias());
-
-    // import QtWebKit 1.0 as Web
-    import = model->imports().at(2);
-    QVERIFY(import.isLibraryImport());
-    QCOMPARE(import.url(), QString("QtWebKit"));
-    QVERIFY(import.hasVersion());
-    QCOMPARE(import.version(), QString("1.0"));
-    QVERIFY(import.hasAlias());
-    QCOMPARE(import.alias(), QString("Web"));
-}
-
-void TestCore::testRewriterChangeImports()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {}\n");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier modifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView(0, RewriterView::Amend));
-    testRewriterView->setTextModifier(&modifier);
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-
-    //
-    // Add / Remove an import in the model
-    //
-    Import webkitImport = Import::createLibraryImport("QtWebKit", "1.0");
-    model->addImport(webkitImport);
-
-    const QLatin1String qmlWithImport("\n"
-                                 "import Qt 4.7\n"
-                                 "import QtWebKit 1.0\n"
-                                 "\n"
-                                 "Rectangle {}\n");
-    QCOMPARE(textEdit.toPlainText(), qmlWithImport);
-
-    model->removeImport(webkitImport);
-
-    QCOMPARE(model->imports().size(), 1);
-    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
-
-    QCOMPARE(textEdit.toPlainText(), qmlString);
-
-
-    //
-    // Add / Remove an import in the model (with alias)
-    //
-    webkitImport = Import::createLibraryImport("QtWebKit", "1.0", "Web");
-    model->addImport(webkitImport);
-
-    const QLatin1String qmlWithAliasImport("\n"
-                                 "import Qt 4.7\n"
-                                 "import QtWebKit 1.0 as Web\n"
-                                 "\n"
-                                 "Rectangle {}\n");
-    QCOMPARE(textEdit.toPlainText(), qmlWithAliasImport);
-
-    model->removeImport(webkitImport);
-
-    QCOMPARE(model->imports().size(), 1);
-    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
-
-    QCOMPARE(textEdit.toPlainText(), qmlString);
-
-
-    //
-    // Add / Remove an import in text
-    //
-    textEdit.setPlainText(qmlWithImport);
-    QCOMPARE(model->imports().size(), 2);
-    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
-    QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0"));
-
-    textEdit.setPlainText(qmlWithAliasImport);
-    QCOMPARE(model->imports().size(), 2);
-    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
-    QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0", "Web"));
-
-    textEdit.setPlainText(qmlString);
-    QCOMPARE(model->imports().size(), 1);
-    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
-}
-
-void TestCore::testRewriterForGradientMagic()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    id: root\n"
-                                  "    x: 10;\n"
-                                  "    y: 10;\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle1\n"
-                                  "        x: 10;\n"
-                                  "        y: 10;\n"
-                                  "    }\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle2\n"
-                                  "        x: 100;\n"
-                                  "        y: 100;\n"
-                                  "        anchors.fill: root\n"
-                                  "    }\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle3\n"
-                                  "        x: 140;\n"
-                                  "        y: 180;\n"
-                                  "        gradient: Gradient {\n"
-                                  "             GradientStop {\n"
-                                  "                 position: 0\n"
-                                  "                 color: \"white\"\n"
-                                  "             }\n"
-                                  "             GradientStop {\n"
-                                  "                  position: 1\n"
-                                  "                  color: \"black\"\n"
-                                  "             }\n"
-                                  "        }\n"
-                                  "    }\n"
-                                  "}");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier modifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Text"));
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&modifier);
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-
-    ModelNode rootModelNode = testRewriterView->rootModelNode();
-    QVERIFY(rootModelNode.isValid());
-
-    ModelNode myRect = testRewriterView->modelNodeForId(QLatin1String("rectangle3"));
-    QVERIFY(myRect.isValid());
-    myRect.variantProperty("rotation") = QVariant(45);
-    QVERIFY(myRect.isValid());
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model1.data());
-
-    QScopedPointer<TestView> view1(new TestView);
-    model1->attachView(view1.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Item {}");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-
-    QVERIFY(testRewriterView1->errors().isEmpty());
-
-    RewriterTransaction transaction(view1->beginRewriterTransaction());
-
-    ModelMerger merger(view1.data());
-
-    QVERIFY(myRect.isValid());
-    merger.replaceModel(myRect);
-    transaction.commit();
-}
-
-void TestCore::loadSubItems()
-{
-    QFile file(QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/topitem.qml");
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText(file.readAll());
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-}
-
-void TestCore::createInvalidCoreModel()
-{
-    QScopedPointer<Model> invalidModel(Model::create("ItemSUX"));
-    //QVERIFY(!invalidModel.data()); //#no direct ype checking in model atm
-
-    QScopedPointer<Model> invalidModel2(Model::create("InvalidNode"));
-    //QVERIFY(!invalidModel2.data());
-}
-
-void TestCore::testModelCreateSubNode()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QList<TestView::MethodCall> expectedCalls;
-    expectedCalls << TestView::MethodCall("modelAttached", QStringList() << QString::number(reinterpret_cast<long>(model.data())));
-    QCOMPARE(view->methodCalls(), expectedCalls);
-
-    QVERIFY(view->rootModelNode().isValid());
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(childNode.isValid());
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
-    QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
-    QCOMPARE(childNode.simplifiedTypeName(), QString("Rectangle"));
-
-    expectedCalls << TestView::MethodCall("nodeCreated", QStringList() << "");
-    expectedCalls << TestView::MethodCall("nodeReparented", QStringList() << "" << "data" << "" << "PropertiesAdded");
-    QCOMPARE(view->methodCalls(), expectedCalls);
-
-    QVERIFY(childNode.id().isEmpty());
-    childNode.setId("blah");
-    QCOMPARE(childNode.id(), QString("blah"));
-
-    expectedCalls << TestView::MethodCall("nodeIdChanged", QStringList() << "blah" << "blah" << "");
-    QCOMPARE(view->methodCalls(), expectedCalls);
-
-    try {
-        childNode.setId("invalid id");
-        QFAIL("Setting an invalid id does not throw an excxeption");
-    } catch (Exception &exception) {
-        QCOMPARE(exception.type(), QString("InvalidIdException"));
-    }
-
-    QCOMPARE(childNode.id(), QString("blah"));
-    QCOMPARE(view->methodCalls(), expectedCalls);
-
-    childNode.setId(QString());
-    QVERIFY(childNode.id().isEmpty());
-}
-
-
-void TestCore::testTypicalRewriterOperations()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode = view->rootModelNode();
-    QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 0);
-
-    QVERIFY(rootModelNode.property("test").isValid());
-    QVERIFY(!rootModelNode.property("test").isVariantProperty());
-    QVERIFY(!rootModelNode.property("test").isBindingProperty());
-
-    QVERIFY(rootModelNode.variantProperty("test").isValid());
-    QVERIFY(!rootModelNode.hasProperty("test"));
-
-    rootModelNode.variantProperty("test") = 70;
-
-    QVERIFY(rootModelNode.hasProperty("test"));
-    QVERIFY(rootModelNode.property("test").isVariantProperty());
-    QCOMPARE(rootModelNode.variantProperty("test").value(), QVariant(70));
-
-    rootModelNode.bindingProperty("test") = "parent.x";
-    QVERIFY(!rootModelNode.property("test").isVariantProperty());
-    QVERIFY(rootModelNode.property("test").isBindingProperty());
-
-    QCOMPARE(rootModelNode.bindingProperty("test").expression(), QString("parent.x"));
-
-    ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4 ,6, "data"));
-    rootModelNode.nodeListProperty("test").reparentHere(childNode);
-    QCOMPARE(childNode.parentProperty(), rootModelNode.nodeAbstractProperty("test"));
-    QVERIFY(rootModelNode.property("test").isNodeAbstractProperty());
-    QVERIFY(rootModelNode.property("test").isNodeListProperty());
-    QVERIFY(!rootModelNode.property("test").isBindingProperty());
-    QVERIFY(childNode.parentProperty().isNodeListProperty());
-    QCOMPARE(childNode, childNode.parentProperty().toNodeListProperty().toModelNodeList().first());
-    QCOMPARE(rootModelNode, childNode.parentProperty().parentModelNode());
-    QCOMPARE(childNode.parentProperty().name(), QString("test"));
-
-    QVERIFY(!rootModelNode.property("test").isVariantProperty());
-    rootModelNode.variantProperty("test") = 90;
-    QVERIFY(rootModelNode.property("test").isVariantProperty());
-    QCOMPARE(rootModelNode.variantProperty("test").value(), QVariant(90));
-
-}
-
-void TestCore::testBasicStates()
-{
-    char qmlString[] = "import Qt 4.7\n"
-                       "Rectangle {\n"
-                       "id: root;\n"
-                            "Rectangle {\n"
-                                "id: rect1;\n"
-                            "}\n"
-                            "Rectangle {\n"
-                                "id: rect2;\n"
-                            "}\n"
-                            "states: [\n"
-                                "State {\n"
-                                    "name: \"state1\"\n"
-                                    "PropertyChanges {\n"
-                                        "target: rect1\n"
-                                    "}\n"
-                                    "PropertyChanges {\n"
-                                        "target: rect2\n"
-                                    "}\n"
-                                "}\n"
-                                ","
-                                "State {\n"
-                                    "name: \"state2\"\n"
-                                    "PropertyChanges {\n"
-                                        "target: rect1\n"
-                                    "}\n"
-                                    "PropertyChanges {\n"
-                                        "target: rect2;\n"
-                                        "x: 10;\n"
-                                    "}\n"
-                                "}\n"
-                            "]\n"
-                       "}\n";
-
-    Exception::setShouldAssert(true);
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-
-    model->attachView(testRewriterView.data());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
-
-    QVERIFY(rootModelNode.hasProperty("data"));
-
-    QVERIFY(rootModelNode.property("data").isNodeListProperty());
-
-    QCOMPARE(rootModelNode.nodeListProperty("data").toModelNodeList().count(), 2);
-
-    ModelNode rect1 = rootModelNode.nodeListProperty("data").toModelNodeList().first();
-    ModelNode rect2 = rootModelNode.nodeListProperty("data").toModelNodeList().last();
-
-    QVERIFY(QmlItemNode(rect1).isValid());
-    QVERIFY(QmlItemNode(rect2).isValid());
-
-    QVERIFY(QmlItemNode(rootModelNode).isValid());
-
-    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 2);
-    QCOMPARE(QmlItemNode(rootModelNode).states().names().count(), 2);
-    QCOMPARE(QmlItemNode(rootModelNode).states().names().first(), QString("state1"));
-    QCOMPARE(QmlItemNode(rootModelNode).states().names().last(), QString("state2"));
-
-    //
-    // QmlModelState API tests
-    //
-    QmlModelState state1 = QmlItemNode(rootModelNode).states().state("state1");
-    QmlModelState state2 = QmlItemNode(rootModelNode).states().state("state2");
-
-    QVERIFY(state1.isValid());
-    QVERIFY(state2.isValid());
-
-    QCOMPARE(state1.propertyChanges().count(), 2);
-    QCOMPARE(state2.propertyChanges().count(), 2);
-
-    QVERIFY(!state1.hasPropertyChanges(rootModelNode));
-
-    QVERIFY(state1.propertyChanges(rect1).isValid());
-    QVERIFY(state1.propertyChanges(rect2).isValid());
-
-    state1.propertyChanges(rect2).modelNode().hasProperty("x");
-
-    QCOMPARE(QmlItemNode(rect1).allAffectingStates().count(), 2);
-    QCOMPARE(QmlItemNode(rect2).allAffectingStates().count(), 2);
-    QCOMPARE(QmlItemNode(rootModelNode).allAffectingStates().count(), 0);
-    QCOMPARE(QmlItemNode(rect1).allAffectingStatesOperations().count(), 2);
-    QCOMPARE(QmlItemNode(rect2).allAffectingStatesOperations().count(), 2);
-
-    //
-    // check real state2 object
-    //
-
-    NodeInstance state2Instance = view->instanceForModelNode(state2.modelNode());
-    QVERIFY(state2Instance.isValid());
-    QDeclarativeState *stateObject = qobject_cast<QDeclarativeState*>(const_cast<QObject*>(state2Instance.testHandle()));
-    QDeclarativeListProperty<QDeclarativeStateOperation> changesList = stateObject->changes();
-    QCOMPARE(changesList.count(&changesList), 2);
-    QCOMPARE(changesList.at(&changesList, 0)->actions().size(), 0);
-    QCOMPARE(changesList.at(&changesList, 1)->actions().size(), 1);
-
-
-    //
-    // actual state switching
-    //
-
-    // base state
-    QCOMPARE(view->currentState(), view->baseState());
-    NodeInstance rect2Instance = view->instanceForModelNode(rect2);
-    QVERIFY(rect2Instance.isValid());
-    QCOMPARE(rect2Instance.property("x").toInt(), 0);
-
-    int expectedViewMethodCount = view->methodCalls().count();
-
-    // base state-> state2
-    view->setCurrentState(state2);
-    QCOMPARE(view->currentState(), state2);
-    QCOMPARE(view->methodCalls().size(), ++expectedViewMethodCount);
-    QCOMPARE(view->methodCalls().last(), TestView::MethodCall("stateChanged", QStringList() << "state2" << QString()));
-    QCOMPARE(rect2Instance.property("x").toInt(), 10);
-
-    // state2 -> state1
-    view->setCurrentState(state1);
-    QCOMPARE(view->currentState(), state1);
-    expectedViewMethodCount += 2; // Since commit fa640f66db we're always going through the base state
-    QCOMPARE(view->methodCalls().size(), expectedViewMethodCount);
-    QCOMPARE(view->methodCalls().at(view->methodCalls().size()-2), TestView::MethodCall("stateChanged", QStringList() << QString() << "state2"));
-    QCOMPARE(view->methodCalls().at(view->methodCalls().size()-1), TestView::MethodCall("stateChanged", QStringList() << "state1" << QString()));
-    QCOMPARE(rect2Instance.property("x").toInt(), 0);
-
-    // state1 -> baseState
-    view->setCurrentState(view->baseState());
-    QCOMPARE(view->currentState(), view->baseState());
-    QCOMPARE(view->methodCalls().size(), ++expectedViewMethodCount);
-    QCOMPARE(view->methodCalls().last(), TestView::MethodCall("stateChanged", QStringList() << QString() << "state1"));
-    QCOMPARE(rect2Instance.property("x").toInt(), 0);
-}
-
-void TestCore::testModelBasicOperations()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode = view->rootModelNode();
-    QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 0);
-
-    rootModelNode.variantProperty("width").setValue(10);
-    rootModelNode.variantProperty("height").setValue(10);
-
-    QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 10);
-    QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 10);
-
-    QVERIFY(rootModelNode.hasProperty("width"));
-    rootModelNode.removeProperty("width");
-    QVERIFY(!rootModelNode.hasProperty("width"));
-
-    QVERIFY(!rootModelNode.hasProperty("children"));
-    ModelNode childNode1(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "children"));
-    ModelNode childNode2(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
-
-    QVERIFY(childNode1.isValid());
-    QVERIFY(childNode2.isValid());
-
-    QVERIFY(childNode1.parentProperty().parentModelNode().isValid());
-    QVERIFY(childNode2.parentProperty().parentModelNode().isValid());
-
-    QVERIFY(rootModelNode.hasProperty("children"));
-    childNode2.setParentProperty(rootModelNode, "children");
-    QVERIFY(!rootModelNode.hasProperty("data"));
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
-    QVERIFY(rootModelNode.hasProperty("children"));
-    childNode2.setParentProperty(rootModelNode, "data");
-    childNode1.setParentProperty(rootModelNode, "data");
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
-    QVERIFY(!rootModelNode.hasProperty("children"));
-    QVERIFY(rootModelNode.hasProperty("data"));
-
-    QVERIFY(childNode2.isValid());
-    QVERIFY(childNode2.parentProperty().parentModelNode().isValid());
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
-
-    childNode1.setParentProperty(rootModelNode, "children");
-    rootModelNode.removeProperty("data");
-    QVERIFY(!childNode2.isValid());
-    QVERIFY(!rootModelNode.hasProperty("data"));
-
-    QVERIFY(childNode1.isValid());
-    rootModelNode.nodeProperty("front").setModelNode(childNode1);
-    QVERIFY(rootModelNode.hasProperty("front"));
-    QCOMPARE(childNode1.parentProperty().parentModelNode(), rootModelNode);
-    rootModelNode.removeProperty("front");
-    QVERIFY(!childNode1.isValid());
-}
-
-void TestCore::testModelResolveIds()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    rootNode.setId("rootNode");
-
-    ModelNode childNode1(addNodeListChild(rootNode, "Qt/Rectangle", 4, 7, "children"));
-
-    ModelNode childNode2(addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "children"));
-    childNode2.setId("childNode2");
-    childNode2.bindingProperty("test").setExpression("parent.parent");
-
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
-    childNode1.setId("childNode1");
-    childNode2.bindingProperty("test").setExpression("childNode1.parent");
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
-    childNode2.bindingProperty("test").setExpression("rootNode");
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
-
-    ModelNode childNode3(addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "children"));
-    childNode3.setId("childNode3");
-    childNode2.nodeProperty("front").setModelNode(childNode3);
-    childNode2.bindingProperty("test").setExpression("childNode3.parent");
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode2);
-    childNode2.bindingProperty("test").setExpression("childNode3.parent.parent");
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode1);
-    childNode2.bindingProperty("test").setExpression("childNode3.parent.parent.parent");
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
-    childNode2.bindingProperty("test").setExpression("childNode3");
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode3);
-    childNode2.bindingProperty("test").setExpression("front");
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode3);
-    childNode2.bindingProperty("test").setExpression("back");
-    QVERIFY(!childNode2.bindingProperty("test").resolveToModelNode().isValid());
-    childNode2.bindingProperty("test").setExpression("childNode3.parent.front");
-    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode3);
-
-    childNode2.variantProperty("x") = 10;
-    QCOMPARE(childNode2.variantProperty("x").value().toInt(), 10);
-
-    childNode2.bindingProperty("test").setExpression("childNode3.parent.x");
-    QVERIFY(childNode2.bindingProperty("test").resolveToProperty().isVariantProperty());
-    QCOMPARE(childNode2.bindingProperty("test").resolveToProperty().toVariantProperty().value().toInt(), 10);
-
-    childNode2.bindingProperty("test").setExpression("childNode3.parent.test");
-    QVERIFY(childNode2.bindingProperty("test").resolveToProperty().isBindingProperty());
-    QCOMPARE(childNode2.bindingProperty("test").resolveToProperty().toBindingProperty().expression(), QString("childNode3.parent.test"));
-}
-
-void TestCore::testModelNodeListProperty()
-{
-    //
-    // Test NodeListProperty API
-    //
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootNode = view->rootModelNode();
-
-    //
-    // Item {}
-    //
-    NodeListProperty rootChildren = rootNode.nodeListProperty("children");
-    QVERIFY(!rootNode.hasProperty("children"));
-    QVERIFY(rootChildren.isValid());
-    QVERIFY(!rootChildren.isNodeListProperty());
-    QVERIFY(rootChildren.isEmpty());
-
-    ModelNode rectNode = view->createModelNode("Qt/Rectangle", 4, 7);
-    rootChildren.reparentHere(rectNode);
-
-    //
-    // Item { children: [ Rectangle {} ] }
-    //
-    QVERIFY(rootNode.hasProperty("children"));
-    QVERIFY(rootChildren.isValid());
-    QVERIFY(rootChildren.isNodeListProperty());
-    QVERIFY(!rootChildren.isEmpty());
-
-    ModelNode mouseAreaNode = view->createModelNode("Qt/Item", 4, 7);
-    NodeListProperty rectChildren = rectNode.nodeListProperty("children");
-    rectChildren.reparentHere(mouseAreaNode);
-
-    //
-    // Item { children: [ Rectangle { children : [ MouseArea {} ] } ] }
-    //
-    QVERIFY(rectNode.hasProperty("children"));
-    QVERIFY(rectChildren.isValid());
-    QVERIFY(rectChildren.isNodeListProperty());
-    QVERIFY(!rectChildren.isEmpty());
-
-    rectNode.destroy();
-
-    //
-    // Item { }
-    //
-    QVERIFY(!rectNode.isValid());
-    QVERIFY(!mouseAreaNode.isValid());
-    QVERIFY(!rootNode.hasProperty("children"));
-    QVERIFY(rootChildren.isValid());
-    QVERIFY(!rootChildren.isNodeListProperty());
-    QVERIFY(rootChildren.isEmpty());
-    QVERIFY(!rectChildren.isValid());
-}
-
-void TestCore::testBasicOperationsWithView()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
-    model->attachView(nodeInstanceView);
-
-    ModelNode rootModelNode = view->rootModelNode();
-    QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 0);
-    NodeInstance rootInstance = nodeInstanceView->instanceForNode(rootModelNode);
-
-    // no width, height specified implicitly is set to 100x100
-    QCOMPARE(rootInstance.size().width(), 100.0);
-    QCOMPARE(rootInstance.size().height(), 100.0);
-
-    QVERIFY(rootInstance.isValid());
-    QVERIFY(rootInstance.isQmlGraphicsItem());
-
-    QVERIFY(rootModelNode.isValid());
-
-    rootModelNode.variantProperty("width").setValue(10);
-    rootModelNode.variantProperty("height").setValue(10);
-
-    QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 10);
-    QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 10);
-
-    QCOMPARE(rootInstance.size().width(), 10.0);
-    QCOMPARE(rootInstance.size().height(), 10.0);
-
-    ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
-    ModelNode childNode2(addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data"));
-    QVERIFY(childNode2.parentProperty().parentModelNode() == childNode);
-
-    QVERIFY(childNode.isValid());
-
-    {
-        NodeInstance childInstance2 = nodeInstanceView->instanceForNode(childNode2);
-        NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
-
-        QVERIFY(childInstance.isValid());
-        QVERIFY(childInstance.isQmlGraphicsItem());
-        QVERIFY(qobject_cast<QGraphicsObject*>(childInstance2.testHandle())->parentItem()->toGraphicsObject() == childInstance.testHandle());
-        QVERIFY(qobject_cast<QGraphicsObject*>(childInstance.testHandle())->parentItem()->toGraphicsObject() == rootInstance.testHandle());
-        QCOMPARE(childInstance.size().width(), 0.0);
-        QCOMPARE(childInstance.size().height(), 0.0);
-
-
-        childNode.variantProperty("width").setValue(100);
-        childNode.variantProperty("height").setValue(100);
-
-        QCOMPARE(childNode.variantProperty("width").value().toInt(), 100);
-        QCOMPARE(childNode.variantProperty("height").value().toInt(), 100);
-
-        QCOMPARE(childInstance.size().width(), 100.0);
-        QCOMPARE(childInstance.size().height(), 100.0);
-
-        childNode.destroy();
-        QVERIFY(!childNode.isValid());
-        QVERIFY(!childNode2.isValid());
-        QVERIFY(childInstance.testHandle() == 0);
-        QVERIFY(childInstance2.testHandle() == 0);
-        QVERIFY(!childInstance.isValid());
-        QVERIFY(!childInstance2.isValid());
-    }
-
-    childNode = addNodeListChild(rootModelNode, "Qt/Image", 4, 7, "data");
-    QVERIFY(childNode.isValid());
-    QCOMPARE(childNode.type(), QString("Qt/Image"));
-    childNode2 = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(childNode2.isValid());
-    childNode2.setParentProperty(rootModelNode, "data");
-    QVERIFY(childNode2.isValid());
-
-    {
-        NodeInstance childInstance2 = nodeInstanceView->instanceForNode(childNode2);
-        NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
-
-        QVERIFY(childInstance.isValid());
-        QVERIFY(childInstance.isQmlGraphicsItem());
-        QVERIFY(qobject_cast<QGraphicsObject*>(childInstance2.testHandle())->parentItem()->toGraphicsObject() == rootInstance.testHandle());
-        QVERIFY(qobject_cast<QGraphicsObject*>(childInstance.testHandle())->parentItem()->toGraphicsObject() == rootInstance.testHandle());
-        QCOMPARE(childInstance.size().width(), 0.0);
-        QCOMPARE(childInstance.size().height(), 0.0);
-
-        QCOMPARE(rootModelNode, childNode2.parentProperty().parentModelNode());
-
-        childNode.variantProperty("width").setValue(20);
-        QCOMPARE(childInstance.property("width").toInt(), 20);
-
-        QCOMPARE(childNode.variantProperty("width").value().toInt(), 20);
-        childNode.removeProperty("width");
-        QVERIFY(!childNode.hasProperty("width"));
-
-        rootModelNode.removeProperty("data");
-        QVERIFY(!childNode.isValid());
-        QVERIFY(!childNode2.isValid());
-        QVERIFY(childInstance.testHandle() == 0);
-        QVERIFY(childInstance2.testHandle() == 0);
-        QVERIFY(!childInstance.isValid());
-        QVERIFY(!childInstance2.isValid());
-    }
-
-    model->detachView(nodeInstanceView);
-}
-
-void TestCore::testQmlModelView()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QmlModelView *view = new TestView(model.data());
-    QVERIFY(view);
-    model->attachView(view);
-    QVERIFY(view->model());
-    QVERIFY(view->rootQmlObjectNode().isValid());
-    QVERIFY(!view->rootQmlObjectNode().hasNodeParent());
-    QVERIFY(!view->rootQmlObjectNode().hasInstanceParent());
-    QVERIFY(view->rootQmlObjectNode().isRootModelNode());
-
-    PropertyListType propertyList;
-    propertyList.append(qMakePair(QString("x"), QVariant(20)));
-    propertyList.append(qMakePair(QString("y"), QVariant(20)));
-    propertyList.append(qMakePair(QString("width"), QVariant(20)));
-    propertyList.append(qMakePair(QString("height"), QVariant(20)));
-
-    QmlObjectNode node1 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-
-    QVERIFY(node1.isValid());
-    QVERIFY(!node1.hasNodeParent());
-    QVERIFY(!node1.hasInstanceParent());
-
-    QCOMPARE(node1.instanceValue("x").toInt(), 20);
-    QCOMPARE(node1.instanceValue("y").toInt(), 20);
-
-    node1.setParentProperty(view->rootQmlObjectNode().nodeAbstractProperty("children"));
-
-    QVERIFY(node1.hasNodeParent());
-    QVERIFY(node1.hasInstanceParent());
-    QVERIFY(node1.instanceParent() == view->rootQmlObjectNode());
-
-
-    QmlObjectNode node2 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-
-    QVERIFY(node2.isValid());
-    QVERIFY(!node2.hasNodeParent());
-    QVERIFY(!node2.hasInstanceParent());
-
-    node2.setParentProperty(view->rootQmlObjectNode().nodeAbstractProperty("children"));
-
-    QVERIFY(node2.hasNodeParent());
-    QVERIFY(node2.hasInstanceParent());
-    QVERIFY(node2.instanceParent() == view->rootQmlObjectNode());
-
-
-    node2.setParentProperty(node1.nodeAbstractProperty("children"));
-
-    QVERIFY(node2.hasNodeParent());
-    QVERIFY(node2.hasInstanceParent());
-    QVERIFY(node2.instanceParent() == node1);
-
-        node2.setParentProperty(view->rootQmlObjectNode().nodeAbstractProperty("children"));
-
-    QCOMPARE(node1.instanceValue("x").toInt(), 20);
-
-    node1.setVariantProperty("x", 2);
-
-    QCOMPARE(node1.instanceValue("x").toInt(), 2);
-
-
-    QmlObjectNode node3 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-    QmlObjectNode node4 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-    QmlObjectNode node5 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-    QmlObjectNode node6 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-    QmlObjectNode node7 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-    QmlObjectNode node8 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-
-    node3.setParentProperty(node2.nodeAbstractProperty("children"));
-    node4.setParentProperty(node3.nodeAbstractProperty("children"));
-    node5.setParentProperty(node4.nodeAbstractProperty("children"));
-    node6.setParentProperty(node5.nodeAbstractProperty("children"));
-    node7.setParentProperty(node6.nodeAbstractProperty("children"));
-    node8.setParentProperty(node7.nodeAbstractProperty("children"));
-
-    QCOMPARE(node2.nodeAbstractProperty("children").allSubNodes().count(), 6);
-    QVERIFY(node8.isValid());
-    node3.destroy();
-    QVERIFY(!node8.isValid());
-    QCOMPARE(node2.nodeAbstractProperty("children").allSubNodes().count(), 0);
-
-    node1.setId("node1");
-
-    node2.setVariantProperty("x", 20);
-    node2.setBindingProperty("x", "node1.x");
-    QCOMPARE(node2.instanceValue("x").toInt(), 2);
-    node1.setVariantProperty("x", 10);
-    QCOMPARE(node2.instanceValue("x").toInt(), 10);
-
-    node1.destroy();
-    QVERIFY(!node1.isValid());
-
-    QCOMPARE(node2.instanceValue("x").toInt(), 10); // is this right? or should it be a invalid qvariant?
-
-    node1 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-    node1.setId("node1");
-
-    QCOMPARE(node2.instanceValue("x").toInt(), 20);
-
-    node3 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
-    node3.setParentProperty(node2.nodeAbstractProperty("children"));
-    QCOMPARE(node3.instanceValue("width").toInt(), 20);
-    node3.setVariantProperty("width", 0);
-    QCOMPARE(node3.instanceValue("width").toInt(), 0);
-
-    QCOMPARE(node3.instanceValue("x").toInt(), 20);
-    QVERIFY(!QDeclarativeMetaType::toQObject(node3.instanceValue("anchors.fill")));
-    node3.setBindingProperty("anchors.fill", "parent");
-    QVERIFY(QDeclarativeMetaType::toQObject(node3.instanceValue("anchors.fill")));
-    QCOMPARE(node3.instanceValue("x").toInt(), 0);
-    QCOMPARE(node3.instanceValue("width").toInt(), 20);
-
-    node3.setParentProperty(node1.nodeAbstractProperty("children"));
-    node1.setVariantProperty("width", 50);
-    node2.setVariantProperty("width", 100);
-    QCOMPARE(node3.instanceValue("width").toInt(), 50);
-
-}
-
-void TestCore::testModelRemoveNode()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
-    model->attachView(nodeInstanceView);
-
-    QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 0);
-
-
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(childNode.isValid());
-    QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 1);
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
-    QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
-
-    {
-        NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
-        QVERIFY(childInstance.isValid());
-        QVERIFY(childInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
-    }
-
-    ModelNode subChildNode = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(subChildNode.isValid());
-    QCOMPARE(childNode.allDirectSubModelNodes().count(), 1);
-    QVERIFY(childNode.allDirectSubModelNodes().contains(subChildNode));
-    QVERIFY(subChildNode.parentProperty().parentModelNode() == childNode);
-
-    {
-        NodeInstance subChildInstance = nodeInstanceView->instanceForNode(subChildNode);
-        QVERIFY(subChildInstance.isValid());
-        QVERIFY(subChildInstance.parent() == nodeInstanceView->instanceForNode(childNode));
-    }
-
-    childNode.destroy();
-
-    QVERIFY(!nodeInstanceView->hasInstanceForNode(childNode));
-
-    QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 0);
-    QVERIFY(!view->rootModelNode().allDirectSubModelNodes().contains(childNode));
-    QVERIFY(!childNode.isValid());
-    QVERIFY(!subChildNode.isValid());
-
-    try {
-        view->rootModelNode().destroy();
-        QFAIL("remove the rootModelNode should be throw a exception");
-    } catch (Exception &exception) {
-        QCOMPARE(exception.type(), QString("InvalidArgumentException"));
-    }
-
-    QVERIFY(view->rootModelNode().isValid());
-
-    // delete node not in hierarchy
-    childNode = view->createModelNode("Qt/Item", 4, 7);
-    childNode.destroy();
-
-    model->detachView(nodeInstanceView);
-}
-
-void TestCore::reparentingNode()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode = view->rootModelNode();
-    QVERIFY(rootModelNode.isValid());
-    rootModelNode.setId("rootModelNode");
-    QCOMPARE(rootModelNode.id(), QString("rootModelNode"));
-
-
-    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
-    model->attachView(nodeInstanceView);
-
-    ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    QCOMPARE(childNode.parentProperty().parentModelNode(), rootModelNode);
-    QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode));
-
-    {
-        NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
-        QVERIFY(childInstance.isValid());
-        QVERIFY(childInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
-    }
-
-    ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Item", 4, 7, "data");
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
-    QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
-
-    {
-        NodeInstance childIstance2 = nodeInstanceView->instanceForNode(childNode2);
-        QVERIFY(childIstance2.isValid());
-        QVERIFY(childIstance2.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
-    }
-
-    childNode.setParentProperty(childNode2, "data");
-
-    QCOMPARE(childNode.parentProperty().parentModelNode(), childNode2);
-    QVERIFY(childNode2.allDirectSubModelNodes().contains(childNode));
-    QVERIFY(!rootModelNode.allDirectSubModelNodes().contains(childNode));
-    QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
-
-    {
-        NodeInstance childIstance = nodeInstanceView->instanceForNode(childNode);
-        QVERIFY(childIstance.isValid());
-        QVERIFY(childIstance.parent() == nodeInstanceView->instanceForNode(childNode2));
-    }
-
-    childNode2.setParentProperty(rootModelNode, "data");
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
-    QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
-
-    {
-        NodeInstance childIstance2 = nodeInstanceView->instanceForNode(childNode2);
-        QVERIFY(childIstance2.isValid());
-        QVERIFY(childIstance2.parent() == nodeInstanceView->instanceForNode(rootModelNode));
-    }
-
-    QCOMPARE(childNode.parentProperty().parentModelNode(), childNode2);
-
-    model->detachView(nodeInstanceView);
-}
-
-void TestCore::reparentingNodeLikeDragAndDrop()
-{
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
-    model->attachView(nodeInstanceView);
-    view->rootModelNode().setId("rootModelNode");
-    QCOMPARE(view->rootModelNode().id(), QString("rootModelNode"));
-
-    ModelNode rectNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
-    rectNode.setId("rect_1");
-    rectNode.variantProperty("x").setValue(20);
-    rectNode.variantProperty("y").setValue(30);
-    rectNode.variantProperty("width").setValue(40);
-    rectNode.variantProperty("height").setValue(50);
-
-    RewriterTransaction transaction(view->beginRewriterTransaction());
-
-    ModelNode textNode = addNodeListChild(view->rootModelNode(), "Qt/Text", 4, 7, "data");
-    QCOMPARE(textNode.parentProperty().parentModelNode(), view->rootModelNode());
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(textNode));
-
-    textNode.setId("rext_1");
-    textNode.variantProperty("x").setValue(10);
-    textNode.variantProperty("y").setValue(10);
-    textNode.variantProperty("width").setValue(50);
-    textNode.variantProperty("height").setValue(20);
-
-    textNode.variantProperty("x").setValue(30);
-    textNode.variantProperty("y").setValue(30);
-
-    {
-        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
-        QVERIFY(textInstance.isValid());
-        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
-        QCOMPARE(textInstance.position().x(), 30.0);
-        QCOMPARE(textInstance.position().y(), 30.0);
-        QCOMPARE(textInstance.size().width(), 50.0);
-        QCOMPARE(textInstance.size().height(), 20.0);
-    }
-
-    textNode.setParentProperty(rectNode, "data");
-    QCOMPARE(textNode.parentProperty().parentModelNode(), rectNode);
-    QVERIFY(rectNode.allDirectSubModelNodes().contains(textNode));
-
-    {
-        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
-        QVERIFY(textInstance.isValid());
-        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(rectNode));
-        QCOMPARE(textInstance.position().x(), 30.0);
-        QCOMPARE(textInstance.position().y(), 30.0);
-        QCOMPARE(textInstance.size().width(), 50.0);
-        QCOMPARE(textInstance.size().height(), 20.0);
-    }
-
-    textNode.setParentProperty(view->rootModelNode(), "data");
-    QCOMPARE(textNode.parentProperty().parentModelNode(), view->rootModelNode());
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(textNode));
-
-    {
-        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
-        QVERIFY(textInstance.isValid());
-        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
-        QCOMPARE(textInstance.position().x(), 30.0);
-        QCOMPARE(textInstance.position().y(), 30.0);
-        QCOMPARE(textInstance.size().width(), 50.0);
-        QCOMPARE(textInstance.size().height(), 20.0);
-    }
-
-    textNode.setParentProperty(rectNode, "data");
-    QCOMPARE(textNode.parentProperty().parentModelNode(), rectNode);
-    QVERIFY(rectNode.allDirectSubModelNodes().contains(textNode));
-
-    {
-        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
-        QVERIFY(textInstance.isValid());
-        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(rectNode));
-        QCOMPARE(textInstance.position().x(), 30.0);
-        QCOMPARE(textInstance.position().y(), 30.0);
-        QCOMPARE(textInstance.size().width(), 50.0);
-        QCOMPARE(textInstance.size().height(), 20.0);
-    }
-
-    {
-        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
-        QVERIFY(textInstance.isValid());
-        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(rectNode));
-        QCOMPARE(textInstance.position().x(), 30.0);
-        QCOMPARE(textInstance.position().y(), 30.0);
-        QCOMPARE(textInstance.size().width(), 50.0);
-        QCOMPARE(textInstance.size().height(), 20.0);
-    }
-
-    transaction.commit();
-
-    if(!textNode.isValid())
-        QFAIL("textnode node is not valid anymore");
-    else
-        QCOMPARE(textNode.parentProperty().parentModelNode(), rectNode);
-    QVERIFY(rectNode.allDirectSubModelNodes().contains(textNode));
-
-    model->detachView(nodeInstanceView);
-}
-
-void TestCore::testModelReorderSiblings()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
-    model->attachView(nodeInstanceView);
-
-    ModelNode rootModelNode = view->rootModelNode();
-    QVERIFY(rootModelNode.isValid());
-
-    ModelNode a = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(a.isValid());
-    ModelNode b = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(b.isValid());
-    ModelNode c = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(c.isValid());
-
-    {
-        QVERIFY(nodeInstanceView->instanceForNode(a).parent() == nodeInstanceView->instanceForNode(rootModelNode));
-        QVERIFY(nodeInstanceView->instanceForNode(b).parent() == nodeInstanceView->instanceForNode(rootModelNode));
-        QVERIFY(nodeInstanceView->instanceForNode(c).parent() == nodeInstanceView->instanceForNode(rootModelNode));
-    }
-
-    NodeListProperty listProperty(rootModelNode.nodeListProperty("data"));
-
-    listProperty.slide(listProperty.toModelNodeList().indexOf(a), 2); //a.slideToIndex(2);
-
-    QVERIFY(a.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(a), 2);
-    QVERIFY(b.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(b), 0);
-    QVERIFY(c.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(c), 1);
-
-    listProperty.slide(listProperty.toModelNodeList().indexOf(c), 0); //c.slideToIndex(0);
-
-    QVERIFY(a.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(a), 2);
-    QVERIFY(b.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(b), 1);
-    QVERIFY(c.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(c), 0);
-
-    {
-        QVERIFY(nodeInstanceView->instanceForNode(a).parent() == nodeInstanceView->instanceForNode(rootModelNode));
-        QVERIFY(nodeInstanceView->instanceForNode(b).parent() == nodeInstanceView->instanceForNode(rootModelNode));
-        QVERIFY(nodeInstanceView->instanceForNode(c).parent() == nodeInstanceView->instanceForNode(rootModelNode));
-    }
-
-    model->detachView(nodeInstanceView);
-}
-
-void TestCore::testModelRootNode()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    try {
-        ModelNode rootModelNode = view->rootModelNode();
-        QVERIFY(rootModelNode.isValid());
-        QVERIFY(rootModelNode.isRootNode());
-        ModelNode topChildNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-        QVERIFY(topChildNode.isValid());
-        QVERIFY(rootModelNode.isRootNode());
-        ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-        QVERIFY(childNode.isValid());
-        QVERIFY(rootModelNode.isValid());
-        QVERIFY(rootModelNode.isRootNode());
-        childNode.setParentProperty(topChildNode, "data");
-        QVERIFY(topChildNode.isValid());
-        QVERIFY(childNode.isValid());
-        QVERIFY(rootModelNode.isValid());
-        QVERIFY(rootModelNode.isRootNode());
-    } catch (const QmlDesigner::Exception &exception) {
-        QString errorMsg = tr("Exception: %1 %2 %3:%4").arg(exception.type(), exception.function(), exception.file()).arg(exception.line());
-        QFAIL(errorMsg.toLatin1().constData());
-    }
-}
-
-void TestCore::reparentingNodeInModificationGroup()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
-    ModelNode childNode2 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
-    childNode.variantProperty("x").setValue(10);
-    childNode.variantProperty("y").setValue(10);
-
-    QCOMPARE(childNode.parentProperty().parentModelNode(), view->rootModelNode());
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), view->rootModelNode());
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode2));
-
-//    ModificationGroupToken token = model->beginModificationGroup();
-    childNode.variantProperty("x").setValue(20);
-    childNode.variantProperty("y").setValue(20);
-    childNode.setParentProperty(childNode2, "data");
-    childNode.variantProperty("x").setValue(30);
-    childNode.variantProperty("y").setValue(30);
-    childNode.variantProperty("x").setValue(1000000);
-    childNode.variantProperty("y").setValue(1000000);
-//    model->endModificationGroup(token);
-
-    QCOMPARE(childNode.parentProperty().parentModelNode(), childNode2);
-    QVERIFY(childNode2.allDirectSubModelNodes().contains(childNode));
-    QVERIFY(!view->rootModelNode().allDirectSubModelNodes().contains(childNode));
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode2));
-
-    childNode.setParentProperty(view->rootModelNode(), "data");
-    QVERIFY(childNode.isValid());
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), view->rootModelNode());
-
-    childNode2.setParentProperty(childNode, "data");
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), childNode);
-    QVERIFY(childNode2.isValid());
-    QVERIFY(childNode.allDirectSubModelNodes().contains(childNode2));
-
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), childNode);
-    childNode2.setParentProperty(view->rootModelNode(), "data");
-    QCOMPARE(childNode2.parentProperty().parentModelNode(), view->rootModelNode());
-    QVERIFY(childNode2.isValid());
-    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode2));
-}
-
-void TestCore::testModelAddAndRemoveProperty()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode node = view->rootModelNode();
-    QVERIFY(node.isValid());
-
-    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
-    model->attachView(nodeInstanceView);
-
-    node.variantProperty("blah").setValue(-1);
-    QCOMPARE(node.variantProperty("blah").value().toInt(), -1);
-    QVERIFY(node.hasProperty("blah"));
-    QCOMPARE(node.variantProperty("blah").value().toInt(), -1);
-
-    node.variantProperty("customValue").setValue(42);
-    QCOMPARE(node.variantProperty("customValue").value().toInt(), 42);
-
-    node.variantProperty("x").setValue(42);
-    QCOMPARE(node.variantProperty("x").value().toInt(), 42);
-
-    {
-        NodeInstance nodeInstance = nodeInstanceView->instanceForNode(node);
-        QCOMPARE(nodeInstance.property("x").toInt(), 42);
-    }
-
-    node.removeProperty("customValue");
-    QVERIFY(!node.hasProperty("customValue"));
-
-    node.variantProperty("foo").setValue("bar");
-    QVERIFY(node.hasProperty("foo"));
-    QCOMPARE(node.variantProperty("foo").value().toString(), QString("bar"));
-
-    model->detachView(nodeInstanceView);
-}
-
-void TestCore::testModelViewNotification()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view1(new TestView);
-    QVERIFY(view1.data());
-
-    QScopedPointer<TestView> view2(new TestView);
-    QVERIFY(view2.data());
-
-    model->attachView(view2.data());
-    model->attachView(view1.data());
-
-    QCOMPARE(view1->methodCalls().size(), 1);
-    QCOMPARE(view1->methodCalls().at(0).name,QString("modelAttached"));
-    QCOMPARE(view2->methodCalls().size(), 1);
-    QCOMPARE(view2->methodCalls().at(0).name,QString("modelAttached"));
-
-    QList<TestView::MethodCall> expectedCalls;
-    expectedCalls << TestView::MethodCall("modelAttached", QStringList() << QString::number(reinterpret_cast<long>(model.data())));
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    ModelNode childNode = addNodeListChild(view2->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
-    expectedCalls << TestView::MethodCall("nodeCreated", QStringList() << "");
-    expectedCalls << TestView::MethodCall("nodeReparented", QStringList() << "" << "data" << "" << "PropertiesAdded");
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    childNode.setId("supernode");
-    expectedCalls << TestView::MethodCall("nodeIdChanged", QStringList() << "supernode" << "supernode" << "");
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    childNode.variantProperty("visible").setValue(false);
-    expectedCalls << TestView::MethodCall("variantPropertiesChanged", QStringList() << "visible" << "PropertiesAdded");
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    childNode.setId("supernode2");
-    expectedCalls << TestView::MethodCall("nodeIdChanged", QStringList() << "supernode2" << "supernode2" << "supernode");
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    childNode.variantProperty("visible").setValue(false); // its tae some value so no notification should be sent
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    childNode.variantProperty("visible").setValue(true);
-    expectedCalls << TestView::MethodCall("variantPropertiesChanged", QStringList() << "visible" << "");
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    childNode.bindingProperty("visible").setExpression("false");
-    expectedCalls << TestView::MethodCall("propertiesAboutToBeRemoved", QStringList() << "visible");
-    expectedCalls << TestView::MethodCall("bindingPropertiesChanged", QStringList() << "visible" << "PropertiesAdded");
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    childNode.destroy();
-    expectedCalls << TestView::MethodCall("nodeAboutToBeRemoved", QStringList() << "supernode2");
-    expectedCalls << TestView::MethodCall("nodeRemoved", QStringList() << QString() << "data" << "EmptyPropertiesRemoved");
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-    QCOMPARE(view2->methodCalls(), expectedCalls);
-
-    model->detachView(view1.data());
-    expectedCalls << TestView::MethodCall("modelAboutToBeDetached", QStringList() << QString::number(reinterpret_cast<long>(model.data())));
-    QCOMPARE(view1->methodCalls(), expectedCalls);
-}
-
-
-void TestCore::testRewriterTransaction()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    RewriterTransaction transaction = view->beginRewriterTransaction();
-    QVERIFY(transaction.isValid());
-
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(childNode.isValid());
-
-    childNode.destroy();
-    QVERIFY(!childNode.isValid());
-
-    {
-        RewriterTransaction transaction2 = view->beginRewriterTransaction();
-        QVERIFY(transaction2.isValid());
-
-        ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
-        QVERIFY(childNode.isValid());
-
-        childNode.destroy();
-        QVERIFY(!childNode.isValid());
-
-        RewriterTransaction transaction3(transaction2);
-        QVERIFY(!transaction2.isValid());
-        QVERIFY(transaction3.isValid());
-
-        transaction2 = transaction3;
-        QVERIFY(transaction2.isValid());
-        QVERIFY(!transaction3.isValid());
-
-        transaction3 = transaction3;
-        transaction2 = transaction2;
-        QVERIFY(transaction2.isValid());
-        QVERIFY(!transaction3.isValid());
-    }
-
-    QVERIFY(transaction.isValid());
-    transaction.commit();
-    QVERIFY(!transaction.isValid());
-}
-
-void TestCore::testRewriterId()
-{
-    char qmlString[] = "import Qt 4.7\n"
-                       "Rectangle {\n"
-                       "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-
-
-    model->attachView(testRewriterView.data());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
-
-    QVERIFY(rootModelNode.isValid());
-
-    ModelNode newNode(view->createModelNode("Qt/Rectangle", 4, 7));
-    newNode.setId("testId");
-
-    rootModelNode.nodeListProperty("data").reparentHere(newNode);
-
-    const QLatin1String expected("import Qt 4.7\n"
-                                  "Rectangle {\n"
-                                  "Rectangle {\n"
-                                  "    id: testId\n"
-                                  "}\n"
-                                  "}\n");
-
-    QCOMPARE(textEdit.toPlainText(), expected);
-}
-
-void TestCore::testRewriterNodeReparentingTransaction1()
-{
-     char qmlString[] = "import Qt 4.7\n"
-                       "Rectangle {\n"
-                       "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(rootModelNode.isValid());
-
-    ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-
-    ModelNode reparentNode = addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "data");
-
-    RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
-
-    childNode2.nodeListProperty("data").reparentHere(reparentNode);
-    childNode3.nodeListProperty("data").reparentHere(reparentNode);
-    childNode4.nodeListProperty("data").reparentHere(reparentNode);
-
-    reparentNode.destroy();
-
-    rewriterTransaction.commit();
-}
-
-void TestCore::testRewriterNodeReparentingTransaction2()
-{
-     char qmlString[] = "import Qt 4.7\n"
-                       "Rectangle {\n"
-                       "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(rootModelNode.isValid());
-
-    ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-
-    childNode2.variantProperty("x") = 200;
-    childNode2.variantProperty("y") = 50;
-    childNode2.variantProperty("color") = QColor(Qt::red);
-    childNode2.setId("childNode2");
-
-    childNode1.variantProperty("x") = 100;
-    childNode1.variantProperty("y") = 10;
-    childNode1.variantProperty("color") = QColor(Qt::blue);
-    childNode1.setId("childNode1");
-
-    RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
-
-    childNode1.nodeListProperty("data").reparentHere(childNode2);
-    childNode2.variantProperty("x") = 300;
-    childNode2.variantProperty("y") = 150;
-
-    rewriterTransaction.commit();
-
-    rewriterTransaction = view->beginRewriterTransaction();
-
-    rootModelNode.nodeListProperty("data").reparentHere(childNode2);
-    childNode2.variantProperty("x") = 100;
-    childNode2.variantProperty("y") = 200;
-
-    rewriterTransaction.commit();
-
-    rewriterTransaction = view->beginRewriterTransaction();
-
-    rootModelNode.nodeListProperty("data").reparentHere(childNode2);
-    childNode2.variantProperty("x") = 150;
-    childNode2.variantProperty("y") = 250;
-    childNode1.nodeListProperty("data").reparentHere(childNode2);
-
-    rewriterTransaction.commit();
-}
-
-void TestCore::testRewriterNodeReparentingTransaction3()
-{
-    char qmlString[] = "import Qt 4.7\n"
-                      "Rectangle {\n"
-                      "}\n";
-
-   QPlainTextEdit textEdit;
-   textEdit.setPlainText(qmlString);
-   NotIndentingTextEditModifier textModifier(&textEdit);
-
-   QScopedPointer<Model> model(Model::create("Qt/Item"));
-   QVERIFY(model.data());
-
-   QScopedPointer<TestView> view(new TestView);
-   QVERIFY(view.data());
-   model->attachView(view.data());
-
-   ModelNode rootModelNode(view->rootModelNode());
-   QVERIFY(rootModelNode.isValid());
-   QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-   QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-   testRewriterView->setTextModifier(&textModifier);
-
-   model->attachView(testRewriterView.data());
-
-   QVERIFY(rootModelNode.isValid());
-
-   ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-   ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-   ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-   ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-
-   RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
-
-   childNode1.nodeListProperty("data").reparentHere(childNode4);
-   childNode4.variantProperty("x") = 151;
-   childNode4.variantProperty("y") = 251;
-   childNode2.nodeListProperty("data").reparentHere(childNode4);
-   childNode4.variantProperty("x") = 152;
-   childNode4.variantProperty("y") = 252;
-   childNode3.nodeListProperty("data").reparentHere(childNode4);
-   childNode4.variantProperty("x") = 153;
-   childNode4.variantProperty("y") = 253;
-   rootModelNode.nodeListProperty("data").reparentHere(childNode4);
-   childNode4.variantProperty("x") = 154;
-   childNode4.variantProperty("y") = 254;
-
-   rewriterTransaction.commit();
-}
-
-void TestCore::testRewriterNodeReparentingTransaction4()
-{
-    char qmlString[] = "import Qt 4.7\n"
-                      "Rectangle {\n"
-                      "}\n";
-
-   QPlainTextEdit textEdit;
-   textEdit.setPlainText(qmlString);
-   NotIndentingTextEditModifier textModifier(&textEdit);
-
-   QScopedPointer<Model> model(Model::create("Qt/Item"));
-   QVERIFY(model.data());
-
-   QScopedPointer<TestView> view(new TestView);
-   QVERIFY(view.data());
-   model->attachView(view.data());
-
-   ModelNode rootModelNode(view->rootModelNode());
-   QVERIFY(rootModelNode.isValid());
-   QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-   QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-   testRewriterView->setTextModifier(&textModifier);
-
-   model->attachView(testRewriterView.data());
-
-   QVERIFY(rootModelNode.isValid());
-
-   ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-   ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-   ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-   ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-   ModelNode childNode5 = addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "data");
-
-   RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
-
-   childNode1.nodeListProperty("data").reparentHere(childNode4);
-   childNode4.variantProperty("x") = 151;
-   childNode4.variantProperty("y") = 251;
-   childNode2.nodeListProperty("data").reparentHere(childNode4);
-   childNode4.variantProperty("x") = 152;
-   childNode4.variantProperty("y") = 252;
-   childNode3.nodeListProperty("data").reparentHere(childNode4);
-   childNode4.variantProperty("x") = 153;
-   childNode4.variantProperty("y") = 253;
-   childNode5.nodeListProperty("data").reparentHere(childNode4);
-   childNode4.variantProperty("x") = 154;
-   childNode4.variantProperty("y") = 254;
-
-   rewriterTransaction.commit();
-}
-
-void TestCore::testRewriterAddNodeTransaction()
-{
-    char qmlString[] = "import Qt 4.7\n"
-                       "Rectangle {\n"
-                       "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(rootModelNode.isValid());
-
-
-    ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-
-    RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
-
-    ModelNode newNode = view->createModelNode("Qt/Rectangle", 4, 7);
-    newNode.variantProperty("x") = 100;
-    newNode.variantProperty("y") = 100;
-
-    rootModelNode.nodeListProperty("data").reparentHere(newNode);
-    childNode.nodeListProperty("data").reparentHere(newNode);
-
-    rewriterTransaction.commit();
-}
-
-void TestCore::testRewriterComponentId()
-{
-    char qmlString[] = "import Qt 4.7\n"
-        "Rectangle {\n"
-        "   Component {\n"
-        "       id: testComponent\n"
-        "       Item {\n"
-        "       }\n"
-        "   }\n"
-        "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
-
-    ModelNode component(rootModelNode.allDirectSubModelNodes().first());
-    QVERIFY(component.isValid());
-    QCOMPARE(component.type(), QString("Qt/Component"));
-    QCOMPARE(component.id(), QString("testComponent"));
-}
-
-void TestCore::testRewriterTransactionRewriter()
-{
-    char qmlString[] = "import Qt 4.7\n"
-                       "Rectangle {\n"
-                       "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(rootModelNode.isValid());
-
-    ModelNode childNode1;
-    ModelNode childNode2;
-
-    {
-        RewriterTransaction transaction = view->beginRewriterTransaction();
-        childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-        childNode1.variantProperty("x") = 10;
-        childNode1.variantProperty("y") = 10;
-    }
-
-    QVERIFY(childNode1.isValid());
-    QCOMPARE(childNode1.variantProperty("x").value(), QVariant(10));
-    QCOMPARE(childNode1.variantProperty("y").value(), QVariant(10));
-
-
-    {
-        RewriterTransaction transaction = view->beginRewriterTransaction();
-        childNode2 = addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "data");
-        childNode2.destroy();
-    }
-
-    QVERIFY(!childNode2.isValid());
-    QVERIFY(childNode1.isValid());
-}
-
-void TestCore::testRewriterPropertyDeclarations()
-{
-    // Work in progress. See task https://qtrequirements.europe.nokia.com/browse/BAUHAUS-170"
-
-    //
-    // test properties defined in qml
-    //
-    // [default] property <type> <name>[: defaultValue]
-    //
-    // where type is (int | bool | double | real | string | url | color | date | variant)
-    //
-
-    // Unsupported:
-    //  property variant varProperty2: boolProperty
-    //  property variant myArray: [ Rectangle {} ]
-    //  property variant someGradient: Gradient {}
-
-    char qmlString[] = "import Qt 4.7\n"
-        "Item {\n"
-        "   property int intProperty\n"
-        "   property bool boolProperty: true\n"
-        "   property variant varProperty1\n"
-        "   default property url urlProperty\n"
-        "   intProperty: 2\n"
-        "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-
-    //
-    // parsing
-    //
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-
-    QCOMPARE(rootModelNode.properties().size(), 4);
-
-    VariantProperty intProperty = rootModelNode.property(QLatin1String("intProperty")).toVariantProperty();
-    QVERIFY(intProperty.isValid());
-    QVERIFY(intProperty.isVariantProperty());
-
-    VariantProperty boolProperty = rootModelNode.property(QLatin1String("boolProperty")).toVariantProperty();
-    QVERIFY(boolProperty.isValid());
-    QVERIFY(boolProperty.isVariantProperty());
-    QCOMPARE(boolProperty.value(), QVariant(true));
-
-    VariantProperty varProperty1 = rootModelNode.property(QLatin1String("varProperty1")).toVariantProperty();
-    QVERIFY(varProperty1.isValid());
-    QVERIFY(varProperty1.isVariantProperty());
-
-    VariantProperty urlProperty = rootModelNode.property(QLatin1String("urlProperty")).toVariantProperty();
-    QVERIFY(urlProperty.isValid());
-    QVERIFY(urlProperty.isVariantProperty());
-    QCOMPARE(urlProperty.value(), QVariant(QUrl()));
-}
-
-void TestCore::testRewriterPropertyAliases()
-{
-    //
-    // test property aliases defined in qml, i.e.
-    //
-    // [default] property alias <name>: <alias reference>
-    //
-    // where type is (int | bool | double | real | string | url | color | date | variant)
-    //
-
-    char qmlString[] = "import Qt 4.7\n"
-        "Item {\n"
-        "   property alias theText: t.text\n"
-        "   default alias property yPos: t.y\n"
-        "   Text { id: t; text: \"zoo\"}\n"
-        "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-
-    QList<AbstractProperty> properties  = rootModelNode.properties();
-    QCOMPARE(properties.size(), 0); // TODO: How to represent alias properties? As Bindings?
-}
-
-void TestCore::testRewriterPositionAndOffset()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    id: root\n"
-                                  "    x: 10;\n"
-                                  "    y: 10;\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle1\n"
-                                  "        x: 10;\n"
-                                  "        y: 10;\n"
-                                  "    }\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle2\n"
-                                  "        x: 100;\n"
-                                  "        y: 100;\n"
-                                  "        anchors.fill: root\n"
-                                  "    }\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle3\n"
-                                  "        x: 140;\n"
-                                  "        y: 180;\n"
-                                  "        gradient: Gradient {\n"
-                                  "             GradientStop {\n"
-                                  "                 position: 0\n"
-                                  "                 color: \"white\"\n"
-                                  "             }\n"
-                                  "             GradientStop {\n"
-                                  "                  position: 1\n"
-                                  "                  color: \"black\"\n"
-                                  "             }\n"
-                                  "        }\n"
-                                  "    }\n"
-                                  "}");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-
-    QString string = QString(qmlString).mid(testRewriterView->nodeOffset(rootNode), testRewriterView->nodeLength(rootNode));
-    const QString qmlExpected0("Rectangle {\n"
-                               "    id: root\n"
-                               "    x: 10;\n"
-                               "    y: 10;\n"
-                               "    Rectangle {\n"
-                               "        id: rectangle1\n"
-                               "        x: 10;\n"
-                               "        y: 10;\n"
-                               "    }\n"
-                               "    Rectangle {\n"
-                               "        id: rectangle2\n"
-                               "        x: 100;\n"
-                               "        y: 100;\n"
-                               "        anchors.fill: root\n"
-                               "    }\n"
-                               "    Rectangle {\n"
-                               "        id: rectangle3\n"
-                               "        x: 140;\n"
-                               "        y: 180;\n"
-                               "        gradient: Gradient {\n"
-                               "             GradientStop {\n"
-                               "                 position: 0\n"
-                               "                 color: \"white\"\n"
-                               "             }\n"
-                               "             GradientStop {\n"
-                               "                  position: 1\n"
-                               "                  color: \"black\"\n"
-                               "             }\n"
-                               "        }\n"
-                               "    }\n"
-                               "}");
-    QCOMPARE(string, qmlExpected0);
-
-    ModelNode lastRectNode = rootNode.allDirectSubModelNodes().last();
-    ModelNode gradientNode = lastRectNode.allDirectSubModelNodes().first();
-    ModelNode gradientStop = gradientNode.allDirectSubModelNodes().first();
-
-    int offset = testRewriterView->nodeOffset(gradientNode);
-    int length = testRewriterView->nodeLength(gradientNode);
-    string = QString(qmlString).mid(offset, length);
-    const QString qmlExpected1(     "Gradient {\n"
-                               "             GradientStop {\n"
-                               "                 position: 0\n"
-                               "                 color: \"white\"\n"
-                               "             }\n"
-                               "             GradientStop {\n"
-                               "                  position: 1\n"
-                               "                  color: \"black\"\n"
-                               "             }\n"
-                               "        }");
-    QCOMPARE(string, qmlExpected1);
-
-    string = QString(qmlString).mid(testRewriterView->nodeOffset(gradientStop), testRewriterView->nodeLength(gradientStop));
-    const QString qmlExpected2(             "GradientStop {\n"
-                               "                 position: 0\n"
-                               "                 color: \"white\"\n"
-                               "             }");
-
-    QCOMPARE(string, qmlExpected2);
-}
-
-void TestCore::testRewriterComponentTextModifier()
-{
-    const QString qmlString("import Qt 4.7\n"
-                            "Rectangle {\n"
-                            "    id: root\n"
-                            "    x: 10;\n"
-                            "    y: 10;\n"
-                            "    Rectangle {\n"
-                            "        id: rectangle1\n"
-                            "        x: 10;\n"
-                            "        y: 10;\n"
-                            "    }\n"
-                            "    Component {\n"
-                            "        id: rectangleComponent\n"
-                            "        Rectangle {\n"
-                            "            x: 100;\n"
-                            "            y: 100;\n"
-                            "        }\n"
-                            "    }\n"
-                            "}");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-
-    ModelNode componentNode  = rootNode.allDirectSubModelNodes().last();
-
-    int componentStartOffset = testRewriterView->nodeOffset(componentNode);
-    int componentEndOffset = componentStartOffset + testRewriterView->nodeLength(componentNode);
-
-    int rootStartOffset = testRewriterView->nodeOffset(rootNode);
-
-    ComponentTextModifier componentTextModifier(&textModifier, componentStartOffset, componentEndOffset, rootStartOffset);
-
-     const QString qmlExpected("import Qt 4.7\n"
-                            "            "
-                            "             "
-                            "           "
-                            "           "
-                            "                "
-                            "                       "
-                            "               "
-                            "               "
-                            "      "
-                            "    Component {\n"
-                            "        id: rectangleComponent\n"
-                            "        Rectangle {\n"
-                            "            x: 100;\n"
-                            "            y: 100;\n"
-                            "        }\n"
-                            "    } "
-                            " ");
-
-    QCOMPARE(componentTextModifier.text(), qmlExpected);
-
-    QScopedPointer<Model> componentModel(Model::create("Qt/Item", 4, 7));
-    QScopedPointer<TestRewriterView> testRewriterViewComponent(new TestRewriterView());
-    testRewriterViewComponent->setTextModifier(&componentTextModifier);
-    componentModel->attachView(testRewriterViewComponent.data());
-
-    ModelNode componentrootNode = testRewriterViewComponent->rootModelNode();
-    QVERIFY(componentrootNode.isValid());
-    QCOMPARE(componentrootNode.type(), QLatin1String("Qt/Component"));
-}
-
-void TestCore::testRewriterPreserveType()
-{
-    const QString qmlString("import Qt 4.7\n"
-                            "Rectangle {\n"
-                            "    id: root\n"
-                            "    Text {\n"
-                            "        font.bold: true\n"
-                            "        font.pointSize: 14\n"
-                            "    }\n"
-                            "}");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-
-    ModelNode textNode = rootNode.allDirectSubModelNodes().first();
-    QCOMPARE(QVariant::Bool, textNode.variantProperty("font.bold").value().type());
-    QCOMPARE(QVariant::Double, textNode.variantProperty("font.pointSize").value().type());
-    textNode.variantProperty("font.bold") = QVariant(false);
-    textNode.variantProperty("font.bold") = QVariant(true);
-    textNode.variantProperty("font.pointSize") = QVariant(13.0);
-
-    ModelNode newTextNode = addNodeListChild(rootNode, "Qt/Text", 4, 7, "data");
-
-    newTextNode.variantProperty("font.bold") = QVariant(true);
-    newTextNode.variantProperty("font.pointSize") = QVariant(13.0);
-
-    QCOMPARE(QVariant::Bool, newTextNode.variantProperty("font.bold").value().type());
-    QCOMPARE(QVariant::Double, newTextNode.variantProperty("font.pointSize").value().type());
-}
-
-void TestCore::testRewriterForArrayMagic()
-{
-    try {
-        const QLatin1String qmlString("import Qt 4.7\n"
-                                      "\n"
-                                      "Rectangle {\n"
-                                      "    states: State {\n"
-                                      "        name: \"s1\"\n"
-                                      "    }\n"
-                                      "}\n");
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(qmlString);
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestView> view(new TestView);
-        model->attachView(view.data());
-
-        // read in
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-        ModelNode rootNode = view->rootModelNode();
-        QVERIFY(rootNode.isValid());
-        QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-        QVERIFY(rootNode.property(QLatin1String("states")).isNodeListProperty());
-
-        QmlItemNode rootItem(rootNode);
-        QVERIFY(rootItem.isValid());
-
-        QmlModelState state1(rootItem.states().addState("s2"));
-        QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
-
-        const QLatin1String expected("import Qt 4.7\n"
-                                     "\n"
-                                     "Rectangle {\n"
-                                     "    states: [\n"
-                                     "    State {\n"
-                                     "        name: \"s1\"\n"
-                                     "    },\n"
-                                     "    State {\n"
-                                     "        name: \"s2\"\n"
-                                     "    }\n"
-                                     "    ]\n"
-                                     "}\n");
-        QCOMPARE(textEdit.toPlainText(), expected);
-    } catch (Exception &e) {
-        qDebug() << "Exception:" << e.description() << "at line" << e.line() << "in function" << e.function() << "in file" << e.file();
-        QFAIL(qPrintable(e.description()));
-    }
-}
-
-void TestCore::testRewriterWithSignals()
-{
-    const QLatin1String qmlString("import Qt 4.7\n"
-                                  "\n"
-                                  "TextEdit {\n"
-                                  "    onTextChanged: { print(\"foo\"); }\n"
-                                  "}\n");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/TextEdit"));
-
-    QmlItemNode rootItem(rootNode);
-    QVERIFY(rootItem.isValid());
-
-    QCOMPARE(rootNode.properties().count(), 0);
-}
-
-void TestCore::testRewriterNodeSliding()
-{
-    const QLatin1String qmlString("import Qt 4.7\n"
-                                  "Rectangle {\n"
-                                  "    id: root\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle1\n"
-                                  "        x: 10;\n"
-                                  "        y: 10;\n"
-                                  "    }\n"
-                                  "\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle2\n"
-                                  "        x: 100;\n"
-                                  "        y: 100;\n"
-                                  "    }\n"
-                                  "}");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-    QCOMPARE(rootNode.id(), QLatin1String("root"));
-
-    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0).id(), QLatin1String("rectangle1"));
-    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(1).id(), QLatin1String("rectangle2"));
-
-    rootNode.nodeListProperty(QLatin1String("data")).slide(0, 1);
-
-    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0).id(), QLatin1String("rectangle2"));
-    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(1).id(), QLatin1String("rectangle1"));
-
-    rootNode.nodeListProperty(QLatin1String("data")).slide(1, 0);
-
-    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0).id(), QLatin1String("rectangle1"));
-    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(1).id(), QLatin1String("rectangle2"));
-}
-
-void TestCore::testRewriterExceptionHandling()
-{
-    const QLatin1String qmlString("import Qt 4.7\n"
-                                  "Text {\n"
-                                  "}");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Text", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
-
-    try
-    {
-        RewriterTransaction transaction = view->beginRewriterTransaction();
-        rootNode.variantProperty("text") = QVariant("text");
-        rootNode.variantProperty("bla") = QVariant("blah");
-        transaction.commit();
-        QFAIL("RewritingException should be thrown");
-    } catch (RewritingException &e) {
-        QVERIFY(rootNode.isValid());
-        QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
-        QVERIFY(!rootNode.hasProperty("bla"));
-        QVERIFY(!rootNode.hasProperty("text"));
-    }
-}
-
-void TestCore::testRewriterFirstDefinitionInside()
-{
-    const QString qmlString("import Qt 4.7\n"
-                            "Rectangle {\n"
-                            "    id: root\n"
-                            "    x: 10;\n"
-                            "    y: 10;\n"
-                            "    Rectangle {\n"
-                            "        id: rectangle1\n"
-                            "        x: 10;\n"
-                            "        y: 10;\n"
-                            "    }\n"
-                            "    Component {\n"
-                            "        id: rectangleComponent\n"
-                            "        Rectangle {\n"
-                            "            x: 100;\n"
-                            "            y: 100;\n"
-                            "        }\n"
-                            "    }\n"
-                            "}");
-
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-
-    ModelNode componentNode  = rootNode.allDirectSubModelNodes().last();
-
-    QString string = "";
-    for (int i = testRewriterView->firstDefinitionInsideOffset(componentNode); i < testRewriterView->firstDefinitionInsideOffset(componentNode) +  testRewriterView->firstDefinitionInsideLength(componentNode);i++)
-        string +=QString(qmlString)[i];
-
-    const QString qmlExpected("Rectangle {\n"
-                              "            x: 100;\n"
-                              "            y: 100;\n"
-                              "        }");
-    QCOMPARE(string, qmlExpected);
-
-}
-
-void TestCore::testCopyModelRewriter1()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    id: root\n"
-                                  "    x: 10;\n"
-                                  "    y: 10;\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle1\n"
-                                  "        x: 10;\n"
-                                  "        y: 10;\n"
-                                  "    }\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle2\n"
-                                  "        x: 100;\n"
-                                  "        y: 100;\n"
-                                  "        anchors.fill: root\n"
-                                  "    }\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle3\n"
-                                  "        x: 140;\n"
-                                  "        y: 180;\n"
-                                  "        gradient: Gradient {\n"
-                                  "             GradientStop {\n"
-                                  "                 position: 0\n"
-                                  "                 color: \"white\"\n"
-                                  "             }\n"
-                                  "             GradientStop {\n"
-                                  "                  position: 1\n"
-                                  "                  color: \"black\"\n"
-                                  "             }\n"
-                                  "        }\n"
-                                  "    }\n"
-                                  "}");
-
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model1.data());
-
-    QScopedPointer<TestView> view1(new TestView);
-    model1->attachView(view1.data());
-
-    // read in 1
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&textModifier1);
-    model1->attachView(testRewriterView1.data());
-
-    ModelNode rootNode1 = view1->rootModelNode();
-    QVERIFY(rootNode1.isValid());
-    QCOMPARE(rootNode1.type(), QLatin1String("Qt/Rectangle"));
-
-    QPlainTextEdit textEdit2;
-    textEdit2.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier2(&textEdit2);
-
-    QScopedPointer<Model> model2(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model2.data());
-
-    QScopedPointer<TestView> view2(new TestView);
-    model2->attachView(view2.data());
-
-    // read in 2
-    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
-    testRewriterView2->setTextModifier(&textModifier2);
-    model2->attachView(testRewriterView2.data());
-
-    ModelNode rootNode2 = view2->rootModelNode();
-    QVERIFY(rootNode2.isValid());
-    QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
-
-
-    //
-
-    ModelNode childNode(rootNode1.allDirectSubModelNodes().first());
-    QVERIFY(childNode.isValid());
-
-    RewriterTransaction transaction(view1->beginRewriterTransaction());
-
-    ModelMerger merger(view1.data());
-
-    ModelNode insertedNode(merger.insertModel(rootNode2));
-    transaction.commit();
-
-    QCOMPARE(insertedNode.id(), QString("root1"));
-
-    QVERIFY(insertedNode.isValid());
-    childNode.nodeListProperty("data").reparentHere(insertedNode);
-
-
-
-    const QLatin1String expected(
-
-        "\n"
-        "import Qt 4.7\n"
-        "\n"
-        "Rectangle {\n"
-        "    id: root\n"
-        "    x: 10;\n"
-        "    y: 10;\n"
-        "    Rectangle {\n"
-        "        id: rectangle1\n"
-        "        x: 10;\n"
-        "        y: 10;\n"
-        "\n"
-        "        Rectangle {\n"
-        "            id: root1\n"
-        "            x: 10\n"
-        "            y: 10\n"
-        "            Rectangle {\n"
-        "                id: rectangle4\n"
-        "                x: 10\n"
-        "                y: 10\n"
-        "            }\n"
-        "\n"
-        "            Rectangle {\n"
-        "                id: rectangle5\n"
-        "                x: 100\n"
-        "                y: 100\n"
-        "                anchors.fill: root1\n"
-        "            }\n"
-        "\n"
-        "            Rectangle {\n"
-        "                id: rectangle6\n"
-        "                x: 140\n"
-        "                y: 180\n"
-        "                gradient: Gradient {\n"
-        "                    GradientStop {\n"
-        "                        position: 0\n"
-        "                        color: \"#ffffff\"\n"
-        "                    }\n"
-        "\n"
-        "                    GradientStop {\n"
-        "                        position: 1\n"
-        "                        color: \"#000000\"\n"
-        "                    }\n"
-        "                }\n"
-        "            }\n"
-        "        }\n"
-        "    }\n"
-        "    Rectangle {\n"
-        "        id: rectangle2\n"
-        "        x: 100;\n"
-        "        y: 100;\n"
-        "        anchors.fill: root\n"
-        "    }\n"
-        "    Rectangle {\n"
-        "        id: rectangle3\n"
-        "        x: 140;\n"
-        "        y: 180;\n"
-        "        gradient: Gradient {\n"
-        "             GradientStop {\n"
-        "                 position: 0\n"
-        "                 color: \"white\"\n"
-        "             }\n"
-        "             GradientStop {\n"
-        "                  position: 1\n"
-        "                  color: \"black\"\n"
-        "             }\n"
-        "        }\n"
-        "    }\n"
-        "}");
-
-    QCOMPARE(textEdit1.toPlainText(), expected);
-}
-
-void TestCore::testCopyModelRewriter2()
-{
-   const QLatin1String qmlString1("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "id: root\n"
-                                  "x: 10\n"
-                                  "y: 10\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    id: rectangle1\n"
-                                  "    x: 10\n"
-                                  "    y: 10\n"
-                                  "}\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    id: rectangle2\n"
-                                  "    x: 100\n"
-                                  "    y: 100\n"
-                                  "    anchors.fill: rectangle1\n"
-                                  "}\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    id: rectangle3\n"
-                                  "    x: 140\n"
-                                  "    y: 180\n"
-                                  "    gradient: Gradient {\n"
-                                  "        GradientStop {\n"
-                                  "            position: 0\n"
-                                  "            color: \"#ffffff\"\n"
-                                  "        }\n"
-                                  "\n"
-                                  "        GradientStop {\n"
-                                  "            position: 1\n"
-                                  "            color: \"#000000\"\n"
-                                  "        }\n"
-                                  "    }\n"
-                                  "}\n"
-                                  "}");
-
-
-    const QLatin1String qmlString2("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText(qmlString1);
-    NotIndentingTextEditModifier textModifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model1.data());
-
-    QScopedPointer<TestView> view1(new TestView);
-    model1->attachView(view1.data());
-
-    // read in 1
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&textModifier1);
-    model1->attachView(testRewriterView1.data());
-
-    ModelNode rootNode1 = view1->rootModelNode();
-    QVERIFY(rootNode1.isValid());
-    QCOMPARE(rootNode1.type(), QLatin1String("Qt/Rectangle"));
-
-
-        // read in 2
-
-    QPlainTextEdit textEdit2;
-    textEdit2.setPlainText(qmlString2);
-    NotIndentingTextEditModifier textModifier2(&textEdit2);
-
-    QScopedPointer<Model> model2(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model2.data());
-
-    QScopedPointer<TestView> view2(new TestView);
-    model2->attachView(view2.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
-    testRewriterView2->setTextModifier(&textModifier2);
-    model2->attachView(testRewriterView2.data());
-
-    ModelNode rootNode2 = view2->rootModelNode();
-    QVERIFY(rootNode2.isValid());
-    QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
-
-
-    //
-
-    ModelMerger merger(view2.data());
-
-    merger.replaceModel(rootNode1);
-    QVERIFY(rootNode2.isValid());
-    QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
-
-    QCOMPARE(textEdit2.toPlainText(), qmlString1);
-}
-
-void TestCore::testSubComponentManager()
-{
-    QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/usingmybutton.qml";
-    QFile file(fileName);
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(file.readAll());
-    NotIndentingTextEditModifier modifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    model->setFileUrl(QUrl::fromLocalFile(fileName));
-    QScopedPointer<SubComponentManager> subComponentManager(new SubComponentManager(model->metaInfo(), 0));
-    subComponentManager->update(QUrl::fromLocalFile(fileName), modifier.text().toUtf8());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&modifier);
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-
-    QVERIFY(testRewriterView->rootModelNode().isValid());
-
-
-    QVERIFY(model->metaInfo().nodeMetaInfo("Qt/Rectangle").properties(true).keys().contains("border.width"));
-
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Pen"));
-    NodeMetaInfo myButtonMetaInfo = model->metaInfo().nodeMetaInfo("MyButton");
-    QVERIFY(myButtonMetaInfo.isValid());
-    QVERIFY(myButtonMetaInfo.properties(true).keys().contains("border.width"));
-    QVERIFY(myButtonMetaInfo.property("border.width", true).isValid());
-}
-
-void TestCore::testAnchorsAndRewriting()
-{
-        const QString qmlString("import Qt 4.7\n"
-                            "Rectangle {\n"
-                            "    id: root\n"
-                            "    x: 10;\n"
-                            "    y: 10;\n"
-                            "    Rectangle {\n"
-                            "        id: rectangle1\n"
-                            "        x: 10;\n"
-                            "        y: 10;\n"
-                            "    }\n"
-                            "    Component {\n"
-                            "        id: rectangleComponent\n"
-                            "        Rectangle {\n"
-                            "            x: 100;\n"
-                            "            y: 100;\n"
-                            "        }\n"
-                            "    }\n"
-                            "}");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-
-    QmlItemNode rootItemNode = view->rootQmlItemNode();
-    QVERIFY(rootItemNode.isValid());
-
-    QmlItemNode childNode = rootItemNode.allDirectSubModelNodes().first();
-    QVERIFY(childNode.isValid());
-
-    childNode.anchors().setMargin(AnchorLine::Left, 280);
-    childNode.anchors().setAnchor(AnchorLine::Left, rootItemNode, AnchorLine::Left);
-    childNode.anchors().setMargin(AnchorLine::Right, 200);
-    childNode.anchors().setAnchor(AnchorLine::Right, rootItemNode, AnchorLine::Right);
-    childNode.anchors().setMargin(AnchorLine::Bottom, 50);
-    childNode.anchors().setAnchor(AnchorLine::Bottom, rootItemNode, AnchorLine::Bottom);
-
-    {
-        RewriterTransaction transaction = view->beginRewriterTransaction();
-        
-        childNode.anchors().setMargin(AnchorLine::Top, 100);
-        childNode.anchors().setAnchor(AnchorLine::Top, rootItemNode, AnchorLine::Top);
-    }
-}
-
-void TestCore::testAnchorsAndRewritingCenter()
-{
-      const QString qmlString("import Qt 4.7\n"
-                            "Rectangle {\n"
-                            "    id: root\n"
-                            "    x: 10;\n"
-                            "    y: 10;\n"
-                            "    Rectangle {\n"
-                            "        id: rectangle1\n"
-                            "        x: 10;\n"
-                            "        y: 10;\n"
-                            "    }\n"
-                            "    Component {\n"
-                            "        id: rectangleComponent\n"
-                            "        Rectangle {\n"
-                            "            x: 100;\n"
-                            "            y: 100;\n"
-                            "        }\n"
-                            "    }\n"
-                            "}");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-
-    QmlItemNode rootItemNode = view->rootQmlItemNode();
-    QVERIFY(rootItemNode.isValid());
-
-    QmlItemNode childNode = rootItemNode.allDirectSubModelNodes().first();
-    QVERIFY(childNode.isValid());
-
-    childNode.anchors().setAnchor(AnchorLine::VerticalCenter, rootItemNode, AnchorLine::VerticalCenter);
-    childNode.anchors().setAnchor(AnchorLine::HorizontalCenter, rootItemNode, AnchorLine::HorizontalCenter);
-}
-
-void TestCore::loadQml()
-{
-char qmlString[] = "import Qt 4.7\n"
-                       "Rectangle {\n"
-                            "id: root;\n"
-                            "width: 200;\n"
-                            "height: 200;\n"
-                            "color: \"white\";\n"
-                            "Text {\n"
-                                "id: text1\n"
-                                "text: \"Hello World\"\n"
-                                "anchors.centerIn: parent\n"
-                                "Item {\n"
-                                    "id: item\n"
-                                 "}\n"
-                            "}\n"
-                            "Rectangle {\n"
-                                "id: rectangle;\n"
-                                "gradient: Gradient {\n"
-                                    "GradientStop {\n"
-                                        "position: 0\n"
-                                        "color: \"white\"\n"
-                                     "}\n"
-                                     "GradientStop {\n"
-                                        "position: 1\n"
-                                        "color: \"black\"\n"
-                                     "}\n"
-                                "}\n"
-                            "}\n"
-                             "Text {\n"
-                                "text: \"text\"\n"
-                                "x: 66\n"
-                                "y: 43\n"
-                                "width: 80\n"
-                                "height: 20\n"
-                                "id: text2\n"
-                            "}\n"
-                       "}\n";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-
-    model->attachView(testRewriterView.data());
-
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
-    QCOMPARE(rootModelNode.id(), QString("root"));
-    QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
-    QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
-    QVERIFY(rootModelNode.hasProperty("data"));
-    QVERIFY(rootModelNode.property("data").isNodeListProperty());
-    QVERIFY(!rootModelNode.nodeListProperty("data").toModelNodeList().isEmpty());
-    QCOMPARE(rootModelNode.nodeListProperty("data").toModelNodeList().count(), 3);
-    ModelNode textNode1 = rootModelNode.nodeListProperty("data").toModelNodeList().first();
-    QVERIFY(textNode1.isValid());
-    QCOMPARE(textNode1.type(), QString("Qt/Text"));
-    QCOMPARE(textNode1.id(), QString("text1"));
-    QCOMPARE(textNode1.variantProperty("text").value().toString(), QString("Hello World"));
-    QVERIFY(textNode1.hasProperty("anchors.centerIn"));
-    QVERIFY(textNode1.property("anchors.centerIn").isBindingProperty());
-    QCOMPARE(textNode1.bindingProperty("anchors.centerIn").expression(), QString("parent"));
-    QVERIFY(textNode1.hasProperty("data"));
-    QVERIFY(textNode1.property("data").isNodeListProperty());
-    QVERIFY(!textNode1.nodeListProperty("data").toModelNodeList().isEmpty());
-    ModelNode itemNode = textNode1.nodeListProperty("data").toModelNodeList().first();
-    QVERIFY(itemNode.isValid());
-    QCOMPARE(itemNode.id(), QString("item"));
-    QVERIFY(!itemNode.hasProperty("data"));
-
-    ModelNode rectNode = rootModelNode.nodeListProperty("data").toModelNodeList().at(1);
-    QVERIFY(rectNode.isValid());
-    QCOMPARE(rectNode.type(), QString("Qt/Rectangle"));
-    QCOMPARE(rectNode.id(), QString("rectangle"));
-    QVERIFY(rectNode.hasProperty("gradient"));
-    QVERIFY(rectNode.property("gradient").isNodeProperty());
-    ModelNode gradientNode = rectNode.nodeProperty("gradient").modelNode();
-    QVERIFY(gradientNode.isValid());
-    QCOMPARE(gradientNode.type(), QString("Qt/Gradient"));
-    QVERIFY(gradientNode.hasProperty("stops"));
-    QVERIFY(gradientNode.property("stops").isNodeListProperty());
-    QCOMPARE(gradientNode.nodeListProperty("stops").toModelNodeList().count(), 2);
-
-    ModelNode stop1 = gradientNode.nodeListProperty("stops").toModelNodeList().first();
-    ModelNode stop2 = gradientNode.nodeListProperty("stops").toModelNodeList().last();
-
-    QVERIFY(stop1.isValid());
-    QVERIFY(stop2.isValid());
-
-    QCOMPARE(stop1.type(), QString("Qt/GradientStop"));
-    QCOMPARE(stop2.type(), QString("Qt/GradientStop"));
-
-    QCOMPARE(stop1.variantProperty("position").value().toInt(), 0);
-    QCOMPARE(stop2.variantProperty("position").value().toInt(), 1);
-
-    ModelNode textNode2 = rootModelNode.nodeListProperty("data").toModelNodeList().last();
-    QVERIFY(textNode2.isValid());
-    QCOMPARE(textNode2.type(), QString("Qt/Text"));
-    QCOMPARE(textNode2.id(), QString("text2"));
-    QCOMPARE(textNode2.variantProperty("width").value().toInt(), 80);
-    QCOMPARE(textNode2.variantProperty("height").value().toInt(), 20);
-    QCOMPARE(textNode2.variantProperty("x").value().toInt(), 66);
-    QCOMPARE(textNode2.variantProperty("y").value().toInt(), 43);
-    QCOMPARE(textNode2.variantProperty("text").value().toString(), QString("text"));
-}
-
-void TestCore::testMetaInfo()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    // test whether default type is registered
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
-
-    // test whether types from plugins are registered
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("QtWebKit/WebView", 1, 0));
-
-    // test whether non-qml type is registered
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 4, 7)); // Qt 4.7 namespace
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // webkit 1.0 namespace
-}
-
-void TestCore::testMetaInfoSimpleType()
-{
-    //
-    // Test type registered with qmlRegisterType:
-    //
-    // qmlRegisterType<QDeclarativeItem>("Qt",4,7,"Item")
-    //
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
-
-    NodeMetaInfo itemMetaInfo = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
-    NodeMetaInfo itemMetaInfo2 = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
-    QCOMPARE(itemMetaInfo, itemMetaInfo2);
-
-    QVERIFY(itemMetaInfo.isValid());
-    QCOMPARE(itemMetaInfo.typeName(), QLatin1String("Qt/Item"));
-    QCOMPARE(itemMetaInfo.majorVersion(), 4);
-    QCOMPARE(itemMetaInfo.minorVersion(), 7);
-
-    // super classes
-    NodeMetaInfo graphicsObjectInfo = itemMetaInfo.directSuperClass();
-    QVERIFY(graphicsObjectInfo.isValid());
-    QCOMPARE(graphicsObjectInfo.typeName(), QLatin1String("QGraphicsObject"));
-    QCOMPARE(graphicsObjectInfo.majorVersion(), -1);
-    QCOMPARE(graphicsObjectInfo.minorVersion(), -1);
-
-    QCOMPARE(itemMetaInfo.superClasses().size(), 2); // QGraphicsObject, Qt/QtObject
-    QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 4, 7));
-    QVERIFY(itemMetaInfo.isSubclassOf("Qt/QtObject", 4, 7));
-
-    // availableInVersion
-    QVERIFY(itemMetaInfo.availableInVersion(4, 7));
-    QVERIFY(itemMetaInfo.availableInVersion(4, 8));
-    QVERIFY(itemMetaInfo.availableInVersion(5, 0));
-    QVERIFY(itemMetaInfo.availableInVersion(-1, -1));
-    QVERIFY(!itemMetaInfo.availableInVersion(4, 6));
-    QVERIFY(!itemMetaInfo.availableInVersion(3, 7));
-}
-
-void TestCore::testMetaInfoUncreatableType()
-{
-    // Test type registered with qmlRegisterUncreatableType or qmlRegisterTypeNotAvailable:
-    //
-    // qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
-    //
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Animation"));
-    NodeMetaInfo animationTypeInfo = model->metaInfo().nodeMetaInfo("Qt/Animation", 4, 7);
-    QVERIFY(animationTypeInfo.isValid());
-
-    QVERIFY(animationTypeInfo.isValid());
-    QCOMPARE(animationTypeInfo.typeName(), QLatin1String("Qt/Animation"));
-    QCOMPARE(animationTypeInfo.majorVersion(), 4);
-    QCOMPARE(animationTypeInfo.minorVersion(), 7);
-
-    NodeMetaInfo qObjectTypeInfo = animationTypeInfo.directSuperClass();
-    QVERIFY(qObjectTypeInfo.isValid());
-    QCOMPARE(qObjectTypeInfo.typeName(), QLatin1String("Qt/QtObject"));
-    QCOMPARE(qObjectTypeInfo.majorVersion(), 4);
-    QCOMPARE(qObjectTypeInfo.minorVersion(), 7);
-    QCOMPARE(animationTypeInfo.superClasses().size(), 1);
-}
-
-void TestCore::testMetaInfoExtendedType()
-{
-    // Test type registered with qmlRegisterExtendedType
-    //
-    // qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
-    //
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/QGraphicsWidget"));
-    NodeMetaInfo graphicsWidgetTypeInfo = model->metaInfo().nodeMetaInfo("Qt/QGraphicsWidget", 4, 7);
-    QVERIFY(graphicsWidgetTypeInfo.isValid());
-    QVERIFY(graphicsWidgetTypeInfo.hasProperty("layout")); // from QGraphicsWidgetDeclarativeUI
-    QVERIFY(graphicsWidgetTypeInfo.hasProperty("font")); // from QGraphicsWidget
-    QVERIFY(graphicsWidgetTypeInfo.hasProperty("enabled")); // from QGraphicsItem
-
-    NodeMetaInfo graphicsObjectTypeInfo = graphicsWidgetTypeInfo.directSuperClass();
-    QVERIFY(graphicsObjectTypeInfo.isValid());
-    QCOMPARE(graphicsObjectTypeInfo.typeName(), QLatin1String("QGraphicsObject"));
-    QCOMPARE(graphicsObjectTypeInfo.majorVersion(), -1);
-    QCOMPARE(graphicsObjectTypeInfo.minorVersion(), -1);
-    QCOMPARE(graphicsWidgetTypeInfo.superClasses().size(), 2);
-}
-
-void TestCore::testMetaInfoInterface()
-{
-    // Test type registered with qmlRegisterInterface
-    //
-
-    QSKIP("TODO: Test not implemented yet", SkipAll);
-}
-
-void TestCore::testMetaInfoCustomType()
-{
-    // Test type registered with qmlRegisterCustomType:
-    //
-    // qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/PropertyChanges"));
-    NodeMetaInfo propertyChangesInfo = model->metaInfo().nodeMetaInfo("Qt/PropertyChanges", 4, 7);
-    QVERIFY(propertyChangesInfo.isValid());
-    QVERIFY(propertyChangesInfo.hasProperty("target")); // from QDeclarativePropertyChanges
-    QVERIFY(propertyChangesInfo.hasProperty("restoreEntryValues")); // from QDeclarativePropertyChanges
-    QVERIFY(propertyChangesInfo.hasProperty("explicit")); // from QDeclarativePropertyChanges
-
-    NodeMetaInfo stateOperationInfo = propertyChangesInfo.directSuperClass();
-    QVERIFY(stateOperationInfo.isValid());
-    QCOMPARE(stateOperationInfo.typeName(), QLatin1String("QDeclarativeStateOperation"));
-    QCOMPARE(stateOperationInfo.majorVersion(), -1);
-    QCOMPARE(stateOperationInfo.minorVersion(), -1);
-    QCOMPARE(propertyChangesInfo.superClasses().size(), 2);
-
-    // DeclarativePropertyChanges just has 3 properties
-    QCOMPARE(propertyChangesInfo.properties().size() - stateOperationInfo.properties().size(), 3);
-}
-
-void TestCore::testMetaInfoEnums()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Text"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Text"));
-
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("transformOrigin"));
-
-    QVERIFY(view->rootModelNode().metaInfo().property("transformOrigin").isEnumType());
-    QCOMPARE(view->rootModelNode().metaInfo().property("transformOrigin").type(), QLatin1String("TransformOrigin"));
-    QVERIFY(view->rootModelNode().metaInfo().property("transformOrigin").enumerator().elementNames().contains(QLatin1String("Bottom")));
-    QVERIFY(view->rootModelNode().metaInfo().property("transformOrigin").enumerator().elementNames().contains(QLatin1String("Top")));
-
-    QVERIFY(view->rootModelNode().metaInfo().property("horizontalAlignment").isEnumType());
-    QCOMPARE(view->rootModelNode().metaInfo().property("horizontalAlignment").type(), QLatin1String("HAlignment"));
-    QVERIFY(view->rootModelNode().metaInfo().property("horizontalAlignment").enumerator().elementNames().contains(QLatin1String("AlignLeft")));
-    QVERIFY(view->rootModelNode().metaInfo().property("horizontalAlignment").enumerator().elementNames().contains(QLatin1String("AlignRight")));
-}
-
-void TestCore::testMetaInfoProperties()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Text"));
-    QVERIFY(model.data());
-
-    NodeMetaInfo textNodeMetaInfo = model->metaInfo().nodeMetaInfo("Qt/TextEdit", 4, 7);
-    QVERIFY(textNodeMetaInfo.hasProperty("text"));   // QDeclarativeTextEdit
-    QVERIFY(textNodeMetaInfo.hasProperty("parent"));     // QDeclarativeItem
-    QVERIFY(textNodeMetaInfo.hasProperty("x"));          // QGraphicsObject
-    QVERIFY(textNodeMetaInfo.hasProperty("objectName")); // Qt/QObject
-    QVERIFY(!textNodeMetaInfo.hasProperty("bla"));
-
-    QVERIFY(textNodeMetaInfo.property("text").isValid());
-    QVERIFY(textNodeMetaInfo.property("text").isReadable());
-    QVERIFY(textNodeMetaInfo.property("text").isWriteable());
-    QVERIFY(textNodeMetaInfo.property("x").isValid());
-    QVERIFY(textNodeMetaInfo.property("x").isReadable());
-    QVERIFY(textNodeMetaInfo.property("x").isWriteable());
-}
-
-void TestCore::testMetaInfoDotProperties()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Text"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Text"));
-
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Pen"));
-
-    QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Text"));
-    QVERIFY(!view->rootModelNode().metaInfo().property("text").isValueType());
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("font"));
-    QVERIFY(view->rootModelNode().metaInfo().property("font").isValueType());
-
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("font.bold", true));
-    QVERIFY(view->rootModelNode().metaInfo().properties(true).keys().contains("font.bold"));
-    QVERIFY(!view->rootModelNode().metaInfo().properties().keys().contains("font.bold"));
-    QVERIFY(view->rootModelNode().metaInfo().properties(true).keys().contains("font.pointSize"));
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("font.pointSize", true));
-    QVERIFY(view->rootModelNode().metaInfo().property("font.pointSize", true).isValid());
-
-    ModelNode rectNode(addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data"));
-
-
-    QVERIFY(rectNode.metaInfo().properties(true).keys().contains("pos.x"));
-    QVERIFY(!rectNode.metaInfo().properties().keys().contains("pos.x"));
-    QVERIFY(rectNode.metaInfo().properties(true).keys().contains("pos.y"));
-    QVERIFY(!rectNode.metaInfo().properties().keys().contains("pos.y"));
-    QVERIFY(!rectNode.metaInfo().properties().keys().contains("anchors.topMargin"));
-    QVERIFY(rectNode.metaInfo().properties(true).keys().contains("border.width"));
-    QVERIFY(rectNode.metaInfo().hasProperty("border"));
-    QVERIFY(!rectNode.metaInfo().property("border").isValueType());
-    QVERIFY(rectNode.metaInfo().hasProperty("border.width", true));
-    QVERIFY(rectNode.metaInfo().property("border.width", true).isValid());
-    QVERIFY(rectNode.metaInfo().property("border.width", true).isValid());
-    QVERIFY(rectNode.metaInfo().property("anchors.topMargin", true).isValid());
-}
-
-void TestCore::testMetaInfoListProperties()
-{
-     QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item"));
-    QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Item"));
-
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("states"));
-    QVERIFY(view->rootModelNode().metaInfo().property("states").isListProperty());
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("children"));
-    QVERIFY(view->rootModelNode().metaInfo().property("children").isListProperty());
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("data"));
-    QVERIFY(view->rootModelNode().metaInfo().property("data").isListProperty());
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("resources"));
-    QVERIFY(view->rootModelNode().metaInfo().property("resources").isListProperty());
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("transitions"));
-    QVERIFY(view->rootModelNode().metaInfo().property("transitions").isListProperty());
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("transform"));
-    QVERIFY(view->rootModelNode().metaInfo().property("transform").isListProperty());
-
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("effect"));
-    QVERIFY(!view->rootModelNode().metaInfo().property("effect").isListProperty());
-    QVERIFY(view->rootModelNode().metaInfo().hasProperty("parent"));
-    QVERIFY(!view->rootModelNode().metaInfo().property("parent").isListProperty());
-}
-
-void TestCore::testStatesRewriter()
-{
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText("import Qt 4.7; Item {}\n");
-    NotIndentingTextEditModifier modifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    TestRewriterView *testRewriterView = new TestRewriterView(model.data());
-    testRewriterView->setTextModifier(&modifier);
-    model->attachView(testRewriterView);
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-
-    ModelNode rootModelNode(view->rootModelNode());
-
-    QVERIFY(rootModelNode.isValid());
-
-    QVERIFY(QmlItemNode(rootModelNode).isValid());
-
-    QVERIFY(QmlItemNode(rootModelNode).states().allStates().isEmpty());
-
-    QmlModelState state1 = QmlItemNode(rootModelNode).states().addState("state 1");
-    QVERIFY(state1.isValid());
-    QVERIFY(!QmlItemNode(rootModelNode).states().allStates().isEmpty());
-    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 1);
-
-    QmlModelState state2 = QmlItemNode(rootModelNode).states().addState("state 2");
-    QVERIFY(state2.isValid());
-
-    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 2);
-
-    QmlItemNode(rootModelNode).states().removeState("state 1");
-    QVERIFY(!state1.isValid());
-
-    QmlItemNode(rootModelNode).states().removeState("state 2");
-    QVERIFY(!state2.isValid());
-
-    QVERIFY(QmlItemNode(rootModelNode).states().allStates().isEmpty());
-
-}
-
-
-void TestCore::testGradientsRewriter()
-{
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText("\nimport Qt 4.7\n\nItem {\n}\n");
-    NotIndentingTextEditModifier modifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    TestRewriterView *testRewriterView = new TestRewriterView(model.data());
-    testRewriterView->setTextModifier(&modifier);
-    model->attachView(testRewriterView);
-
-    QVERIFY(testRewriterView->errors().isEmpty());
-
-    ModelNode rootModelNode(view->rootModelNode());
-
-    QVERIFY(rootModelNode.isValid());
-
-    ModelNode rectNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
-
-    const QLatin1String expected1("\nimport Qt 4.7\n"
-                                  "\n"
-                                  "Item {\n"
-                                  "Rectangle {\n"
-                                  "}\n"
-                                  "}\n");
-    QCOMPARE(textEdit.toPlainText(), expected1);
-
-    ModelNode gradientNode(addNodeChild(rectNode, "Qt/Gradient", 4, 7, "gradient"));
-
-    QVERIFY(rectNode.hasNodeProperty("gradient"));
-
-    const QLatin1String expected2("\nimport Qt 4.7\n"
-                                  "\n"
-                                  "Item {\n"
-                                  "Rectangle {\n"
-                                  "gradient: Gradient {\n"
-                                  "}\n"
-                                  "}\n"
-                                  "}\n");
-    QCOMPARE(textEdit.toPlainText(), expected2);
-
-    NodeListProperty stops(gradientNode.nodeListProperty("stops"));
-
-    QList<QPair<QString, QVariant> > propertyList;
-
-    propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
-    propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::red))));
-
-    ModelNode gradientStop1(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
-    QVERIFY(gradientStop1.isValid());
-    stops.reparentHere(gradientStop1);
-
-    const QLatin1String expected3("\nimport Qt 4.7\n"
-                                  "\n"
-                                  "Item {\n"
-                                  "Rectangle {\n"
-                                  "gradient: Gradient {\n"
-                                  "GradientStop {\n"
-                                  "    position: 0\n"
-                                  "    color: \"#ff0000\"\n"
-                                  "}\n"
-                                  "}\n"
-                                  "}\n"
-                                  "}\n");
-
-    QCOMPARE(textEdit.toPlainText(), expected3);
-
-    propertyList.clear();
-    propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.5)));
-    propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
-
-    ModelNode gradientStop2(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
-    QVERIFY(gradientStop2.isValid());
-    stops.reparentHere(gradientStop2);
-
-    const QLatin1String expected4("\nimport Qt 4.7\n"
-                                  "\n"
-                                  "Item {\n"
-                                  "Rectangle {\n"
-                                  "gradient: Gradient {\n"
-                                  "GradientStop {\n"
-                                  "    position: 0\n"
-                                  "    color: \"#ff0000\"\n"
-                                  "}\n"
-                                  "\n"
-                                  "GradientStop {\n"
-                                  "    position: 0.5\n"
-                                  "    color: \"#0000ff\"\n"
-                                  "}\n"
-                                  "}\n"
-                                  "}\n"
-                                  "}\n");
-
-    QCOMPARE(textEdit.toPlainText(), expected4);
-
-    propertyList.clear();
-    propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.8)));
-    propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::yellow))));
-
-    ModelNode gradientStop3(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
-    QVERIFY(gradientStop3.isValid());
-    stops.reparentHere(gradientStop3);
-
-    const QLatin1String expected5("\nimport Qt 4.7\n"
-                                  "\n"
-                                  "Item {\n"
-                                  "Rectangle {\n"
-                                  "gradient: Gradient {\n"
-                                  "GradientStop {\n"
-                                  "    position: 0\n"
-                                  "    color: \"#ff0000\"\n"
-                                  "}\n"
-                                  "\n"
-                                  "GradientStop {\n"
-                                  "    position: 0.5\n"
-                                  "    color: \"#0000ff\"\n"
-                                  "}\n"
-                                  "\n"
-                                  "GradientStop {\n"
-                                  "    position: 0.8\n"
-                                  "    color: \"#ffff00\"\n"
-                                  "}\n"
-                                  "}\n"
-                                  "}\n"
-                                  "}\n");
-
-    QCOMPARE(textEdit.toPlainText(), expected5);
-
-    gradientNode.removeProperty("stops");
-
-    const QLatin1String expected6("\nimport Qt 4.7\n"
-                                  "\n"
-                                  "Item {\n"
-                                  "Rectangle {\n"
-                                  "gradient: Gradient {\n"
-                                  "}\n"
-                                  "}\n"
-                                  "}\n");
-
-    QCOMPARE(textEdit.toPlainText(), expected6);
-
-    QVERIFY(!gradientNode.hasProperty(QLatin1String("stops")));
-
-    propertyList.clear();
-    propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
-    propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
-
-    gradientStop1 = gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList);
-    QVERIFY(gradientStop1.isValid());
-
-    stops.reparentHere(gradientStop1);
-}
-
-void TestCore::testQmlModelStates()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-
-
-    ModelNode rootModelNode(view->rootModelNode());
-
-    QVERIFY(rootModelNode.isValid());
-
-    QVERIFY(QmlItemNode(rootModelNode).isValid());
-
-    QVERIFY(QmlItemNode(rootModelNode).states().allStates().isEmpty());
-
-    QmlModelState newState = QmlItemNode(rootModelNode).states().addState("testState");
-    QVERIFY(newState.isValid());
-    QVERIFY(!QmlItemNode(rootModelNode).states().allStates().isEmpty());
-    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 1);
-
-    QCOMPARE(newState.name(), QString("testState"));
-    QCOMPARE(newState, QmlItemNode(rootModelNode).states().state("testState"));
-
-    QmlItemNode(rootModelNode).states().removeState("testState");
-    QVERIFY(!newState.isValid());
-    QVERIFY(QmlItemNode(rootModelNode).states().allStates().isEmpty());
-
-}
-
-void TestCore::testInstancesStates()
-{
-//
-//    import Qt 4.7
-//
-//    Rectangle {
-//      Text {
-//        id: targetObject
-//        text: "base state"
-//      }
-//
-//      states: [
-//        State {
-//          name: "state1"
-//          PropertyChanges {
-//            target: targetObj
-//            x: 10
-//            text: "state1"
-//          }
-//        }
-//        State {
-//          name: "state2"
-//          PropertyChanges {
-//            target: targetObj
-//            text: "state2"
-//          }
-//        }
-//      ]
-//    }
-//
-
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
-    QVERIFY(model.data());
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    //
-    // build up model
-    //
-    ModelNode rootNode = view->rootModelNode();
-
-    ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
-    textNode.setId("targetObject");
-    textNode.variantProperty("text").setValue("base state");
-
-    rootNode.nodeListProperty("data").reparentHere(textNode);
-
-    ModelNode propertyChanges1Node = view->createModelNode("Qt/PropertyChanges", 4, 7);
-    propertyChanges1Node.bindingProperty("target").setExpression("targetObject");
-    propertyChanges1Node.variantProperty("x").setValue(10);
-    propertyChanges1Node.variantProperty("text").setValue("state1");
-
-    ModelNode state1Node = view->createModelNode("Qt/State", 4, 7);
-    state1Node.variantProperty("name").setValue("state1");
-    state1Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
-
-    rootNode.nodeListProperty("states").reparentHere(state1Node);
-
-    ModelNode propertyChanges2Node = view->createModelNode("Qt/PropertyChanges", 4, 7);
-    propertyChanges2Node.bindingProperty("target").setExpression("targetObject");
-    propertyChanges2Node.variantProperty("text").setValue("state2");
-
-    ModelNode state2Node = view->createModelNode("Qt/State", 4, 7);
-    state2Node.variantProperty("name").setValue("state2");
-    state2Node.nodeListProperty("changes").reparentHere(propertyChanges2Node);
-
-    rootNode.nodeListProperty("states").reparentHere(state2Node);
-
-    //
-    // load into instance view
-    //
-    QScopedPointer<NodeInstanceView> instanceView(new NodeInstanceView);
-
-    model->attachView(instanceView.data());
-
-    //
-    // check that list of actions is not empty (otherwise the CustomParser has not been run properly)
-    //
-    NodeInstance state1Instance = instanceView->instanceForNode(state1Node);
-    QVERIFY(state1Instance.isValid());
-    QDeclarativeState *state1 = const_cast<QDeclarativeState*>(qobject_cast<const QDeclarativeState*>(state1Instance.testHandle()));
-    QVERIFY(state1);
-    QDeclarativeListProperty<QDeclarativeStateOperation> state1Changes = state1->changes();
-    QCOMPARE(state1Changes.count(&state1Changes), 1);
-    QCOMPARE(state1Changes.at(&state1Changes, 0)->actions().size(), 2);
-
-    NodeInstance state2Instance = instanceView->instanceForNode(state2Node);
-    QVERIFY(state2Instance.isValid());
-    QDeclarativeState *state2 = const_cast<QDeclarativeState*>(qobject_cast<const QDeclarativeState*>(state1Instance.testHandle()));
-    QVERIFY(state2);
-    QDeclarativeListProperty<QDeclarativeStateOperation> state2Changes = state2->changes();
-    QCOMPARE(state2Changes.count(&state2Changes), 1);
-    QCOMPARE(state2Changes.at(&state2Changes, 0)->actions().size(), 2);
-
-    NodeInstance textInstance = instanceView->instanceForNode(textNode);
-
-    //
-    // State switching
-    //
-
-    // base state
-    QVERIFY(textInstance.isValid());
-    QCOMPARE(state1Instance == instanceView->activeStateInstance(), false);
-    QCOMPARE(state2Instance == instanceView->activeStateInstance(), false);
-    QCOMPARE(textInstance.property("x").toInt(), 0);
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-
-    // base state -> state
-    instanceView->activateState(state1Instance);
-    QCOMPARE(state1Instance == instanceView->activeStateInstance(), true);
-    QCOMPARE(state2Instance == instanceView->activeStateInstance(), false);
-    QCOMPARE(textInstance.property("x").toInt(), 10);
-    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
-
-    // state 1 -> state 2
-    instanceView->activateState(state2Instance);
-    QCOMPARE(state1Instance == instanceView->activeStateInstance(), false);
-    QCOMPARE(state2Instance == instanceView->activeStateInstance(), true);
-    QCOMPARE(textInstance.property("x").toInt(), 0);
-    QCOMPARE(textInstance.property("text").toString(), QString("state2"));
-
-    // state 1 -> base state
-    instanceView->activateBaseState();
-    QCOMPARE(state1Instance == instanceView->activeStateInstance(), false);
-    QCOMPARE(state2Instance == instanceView->activeStateInstance(), false);
-    QCOMPARE(textInstance.property("x").toInt(), 0);
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-
-    //
-    // Add/Change/Remove properties in current state
-    //
-    instanceView->activateState(state1Instance);
-
-    propertyChanges1Node.variantProperty("x").setValue(20);
-    QCOMPARE(textInstance.property("x").toInt(), 20);
-    propertyChanges1Node.variantProperty("x").setValue(10);  // undo
-    QCOMPARE(textInstance.property("x").toInt(), 10);
-
-    QCOMPARE(textInstance.property("y").toInt(), 0);
-    propertyChanges1Node.variantProperty("y").setValue(50);
-    QCOMPARE(textInstance.property("y").toInt(), 50);
-    propertyChanges1Node.removeProperty("y");
-    QCOMPARE(textInstance.property("y").toInt(), 0);
-
-    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
-    propertyChanges1Node.removeProperty("text");
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-    propertyChanges1Node.variantProperty("text").setValue("state1");   // undo
-    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
-
-////    Following is not supported. We work around this
-////    by _always_ changing to the base state before doing any changes to the
-////    state structure.
-
-    //
-    // Reparenting state actions (while state is active)
-    //
-
-    // move property changes of current state out of state
-    ModelNode state3Node = view->createModelNode("Qt/State", 4, 7);
-    QDeclarativeListReference changes(state1, "changes");
-    QCOMPARE(changes.count(), 1);
-    state3Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
-
-    QCOMPARE(changes.count(), 0);
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-
-    // undo
-    state1Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
-    QCOMPARE(changes.count(), 1);
-    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
-
-
-    // change base state if in state1
-
-    textNode.variantProperty("text").setValue("state1 and base state");
-    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
-    instanceView->activateBaseState();
-    QCOMPARE(textInstance.property("text").toString(), QString("state1 and base state"));
-    textNode.variantProperty("text").setValue("base state");
-
-    // expressions
-    ModelNode textNode2 = view->createModelNode("Qt/Text", 4, 7);
-    textNode2.setId("targetObject2");
-    textNode2.variantProperty("text").setValue("textNode2");
-
-
-    rootNode.nodeListProperty("data").reparentHere(textNode2);
-
-    propertyChanges1Node.bindingProperty("text").setExpression("targetObject2.text");
-
-    instanceView->activateState(state1Instance);
-
-    QCOMPARE(textInstance.property("text").toString(), QString("textNode2"));
-    propertyChanges1Node.removeProperty("text");
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-    propertyChanges1Node.variantProperty("text").setValue("state1");
-    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
-
-    propertyChanges1Node.bindingProperty("text").setExpression("targetObject2.text");
-    QCOMPARE(textInstance.property("text").toString(), QString("textNode2"));
-
-    instanceView->activateBaseState();
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-
-    propertyChanges1Node.variantProperty("text").setValue("state1");
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-    textNode.bindingProperty("text").setExpression("targetObject2.text");
-    QCOMPARE(textInstance.property("text").toString(), QString("textNode2"));
-
-    instanceView->activateState(state1Instance);
-    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
-
-    instanceView->activateBaseState();
-    QCOMPARE(textInstance.property("text").toString(), QString("textNode2"));
-    textNode.variantProperty("text").setValue("base state");
-
-    instanceView->activateState(state1Instance);
-    //
-    // Removing state actions (while state is active)
-    //
-
-    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
-    propertyChanges1Node.destroy();
-    QCOMPARE(changes.count(), 0);
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-
-    //
-    // Removing state (while active)
-    //
-
-    instanceView->activateState(state2Instance);
-    QCOMPARE(textInstance.property("text").toString(), QString("state2"));
-    state2Node.destroy();
-
-    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
-
-}
-
-void TestCore::testStates()
-{
-//
-//    import Qt 4.7
-//
-//    Rectangle {
-//      Text {
-//        id: targetObject
-//        text: "base state"
-//      }
-//      states: [
-//        State {
-//          name: "state 1"
-//          PropertyChanges {
-//            target: targetObj
-//            text: "state 1"
-//          }
-//        }
-//      ]
-//    }
-//
-
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
-    QVERIFY(model.data());
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    // build up model
-    ModelNode rootNode = view->rootModelNode();
-
-    ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
-    textNode.setId("targetObject");
-    textNode.variantProperty("text").setValue("base state");
-
-    rootNode.nodeListProperty("data").reparentHere(textNode);
-
-    QVERIFY(rootNode.isValid());
-    QVERIFY(textNode.isValid());
-
-    QmlItemNode rootItem(rootNode);
-    QmlItemNode textItem(textNode);
-
-    QVERIFY(rootItem.isValid());
-    QVERIFY(textItem.isValid());
-
-    QmlModelState state1(rootItem.states().addState("state 1")); //add state "state 1"
-    QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
-
-    QVERIFY(view->currentState().isBaseState());
-
-    NodeInstance textInstance = view->nodeInstanceView()->instanceForNode(textNode);
-    QVERIFY(textInstance.isValid());
-
-    NodeInstance state1Instance = view->nodeInstanceView()->instanceForNode(state1);
-    QVERIFY(state1Instance.isValid());
-    QCOMPARE(state1Instance == view->nodeInstanceView()->activeStateInstance(), false);
-    QCOMPARE(state1Instance.property("name").toString(), QString("state 1"));
-
-    view->setCurrentState(state1); //set currentState "state 1"
-
-    QCOMPARE(view->currentState(), state1);
-
-    QCOMPARE(state1Instance == view->nodeInstanceView()->activeStateInstance(), true);
-
-    QVERIFY(!textItem.propertyAffectedByCurrentState("text"));
-
-    textItem.setVariantProperty("text", QVariant("state 1")); //set text in state !
-
-    QDeclarativeState *qmlState1 = const_cast<QDeclarativeState*>(qobject_cast<const QDeclarativeState*>(state1Instance.testHandle()));
-    QVERIFY(qmlState1);
-    QDeclarativeListProperty<QDeclarativeStateOperation> state1Changes = qmlState1->changes();
-    QCOMPARE(state1Changes.count(&state1Changes), 1);
-    QCOMPARE(state1Changes.at(&state1Changes, 0)->actions().size(), 1);
-
-    QmlPropertyChanges changes(state1.propertyChanges(textNode));
-    QVERIFY(changes.modelNode().hasProperty("text"));
-    QCOMPARE(changes.modelNode().variantProperty("text").value(), QVariant("state 1"));
-    QCOMPARE(changes.modelNode().bindingProperty("target").expression(), QString("targetObject"));
-    QCOMPARE(changes.target(), textNode);
-    QCOMPARE(changes.modelNode().type(), QString("Qt/PropertyChanges"));
-
-    QCOMPARE(changes.modelNode().parentProperty().name(), QString("changes"));
-    QCOMPARE(changes.modelNode().parentProperty().parentModelNode(), state1.modelNode());
-
-    QCOMPARE(state1Instance == view->nodeInstanceView()->activeStateInstance(), true);
-
-    QVERIFY(textItem.propertyAffectedByCurrentState("text"));
-
-    QCOMPARE(textInstance.property("text").toString(), QString("state 1"));
-    QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
-
-    QVERIFY(textNode.hasProperty("text"));
-    QCOMPARE(textNode.variantProperty("text").value(), QVariant("base state"));
-}
-
-void TestCore::testStatesBaseState()
-{
-//
-//    import Qt 4.7
-//
-//    Rectangle {
-//      Text {
-//        id: targetObject
-//        text: "base state"
-//      }
-//      states: [
-//        State {
-//          name: "state 1"
-//          PropertyChanges {
-//            target: targetObj
-//            text: "state 1"
-//          }
-//        }
-//      ]
-//    }
-//
-
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
-    QVERIFY(model.data());
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    // build up model
-    ModelNode rootNode = view->rootModelNode();
-
-    ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
-    textNode.setId("targetObject");
-    textNode.variantProperty("text").setValue("base state");
-
-    rootNode.nodeListProperty("data").reparentHere(textNode);
-
-    QVERIFY(rootNode.isValid());
-    QVERIFY(textNode.isValid());
-
-    QmlItemNode rootItem(rootNode);
-    QmlItemNode textItem(textNode);
-
-    QVERIFY(rootItem.isValid());
-    QVERIFY(textItem.isValid());
-
-    QmlModelState state1(rootItem.states().addState("state 1")); //add state "state 1"
-    QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
-
-    QVERIFY(view->currentState().isBaseState());
-
-    view->setCurrentState(state1); //set currentState "state 1"
-    QCOMPARE(view->currentState(), state1);
-    textItem.setVariantProperty("text", QVariant("state 1")); //set text in state !
-    QVERIFY(textItem.propertyAffectedByCurrentState("text"));
-    QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
-
-    ModelNode newNode = view->createModelNode("Qt/Rectangle", 4, 7);
-    QVERIFY(!QmlObjectNode(newNode).currentState().isBaseState());
-
-    view->setCurrentState(view->baseState()); //set currentState base state
-    QVERIFY(view->currentState().isBaseState());
-
-    textNode.variantProperty("text").setValue("base state changed");
-
-    view->setCurrentState(state1); //set currentState "state 1"
-    QCOMPARE(view->currentState(), state1);
-    QVERIFY(!view->currentState().isBaseState());
-    QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
-
-    view->setCurrentState(view->baseState()); //set currentState base state
-    QVERIFY(view->currentState().isBaseState());
-
-    QCOMPARE(textItem.instanceValue("text"), QVariant("base state changed"));
-}
-
-
-void TestCore::testInstancesIdResolution()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
-    QVERIFY(model.data());
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    //    import Qt 4.7
-    //
-    //    Rectangle {
-    //      id: root
-    //      width: 100
-    //      height: 100
-    //      Rectangle {
-    //        id: item1
-    //        width: root.width
-    //        height: item2.height
-    //      }
-    //    }
-
-    ModelNode rootNode = view->rootModelNode();
-    rootNode.setId("root");
-    rootNode.variantProperty("width").setValue(100);
-    rootNode.variantProperty("height").setValue(100);
-
-    ModelNode item1Node = view->createModelNode("Qt/Rectangle", 4, 7);
-    item1Node.setId("item1");
-    item1Node.bindingProperty("width").setExpression("root.width");
-    item1Node.bindingProperty("height").setExpression("item2.height");
-
-    rootNode.nodeListProperty("data").reparentHere(item1Node);
-
-    NodeInstance item1Instance = view->instanceForModelNode(item1Node);
-    QVERIFY(item1Instance.isValid());
-
-    QCOMPARE(item1Instance.property("width").toInt(), 100);
-    QCOMPARE(item1Instance.property("height").toInt(), 0); // item2 is still unknown
-
-    // Add item2:
-    //      Rectangle {
-    //        id: item2
-    //        width: root.width / 2
-    //        height: root.height
-    //      }
-
-    ModelNode item2Node = view->createModelNode("Qt/Rectangle", 4, 7);
-    item2Node.setId("item2");
-    item2Node.bindingProperty("width").setExpression("root.width / 2");
-    item2Node.bindingProperty("height").setExpression("root.height");
-
-    rootNode.nodeListProperty("data").reparentHere(item2Node);
-
-    NodeInstance item2Instance = view->instanceForModelNode(item2Node);
-    QVERIFY(item2Instance.isValid());
-
-    QCOMPARE(item2Instance.property("width").toInt(), 50);
-    QCOMPARE(item2Instance.property("height").toInt(), 100);
-    QCOMPARE(item1Instance.property("height").toInt(), 100);
-
-    // Remove item2 again
-    item2Node.destroy();
-    QVERIFY(!item2Instance.isValid());
-    QVERIFY(!item2Instance.testHandle());
-
-    // Add item3:
-    //      Rectangle {
-    //        id: item3
-    //        height: 80
-    //      }
-
-    ModelNode item3Node = view->createModelNode("Qt/Rectangle", 4, 7);
-    item3Node.setId("item3");
-    item3Node.variantProperty("height").setValue(80);
-    rootNode.nodeListProperty("data").reparentHere(item3Node);
-
-    // Change item1.height: item3.height
-
-    item1Node.bindingProperty("height").setExpression("item3.height");
-    QCOMPARE(item1Instance.property("height").toInt(), 80);
-}
-
-
-void TestCore::testInstancesNotInScene()
-{
-    //
-    // test whether deleting an instance which is not in the scene crashes
-    //
-
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
-    QVERIFY(model.data());
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
-    node1.setId("node1");
-
-    ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
-    node2.setId("node2");
-
-    node1.nodeListProperty("children").reparentHere(node2);
-
-    node1.destroy();
-}
-
-void TestCore::testQmlModelStatesInvalidForRemovedNodes()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QVERIFY(QmlItemNode(rootModelNode).isValid());
-
-    rootModelNode.setId("rootModelNode");
-
-    QmlModelState state1 = QmlItemNode(rootModelNode).states().addState("state1");
-    QVERIFY(state1.isValid());
-    QCOMPARE(state1.name(), QString("state1"));
-
-    ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(childNode.isValid());
-    childNode.setId("childNode");
-
-    ModelNode subChildNode = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
-    QVERIFY(subChildNode.isValid());
-    subChildNode.setId("subChildNode");
-
-    QVERIFY(!state1.hasPropertyChanges(subChildNode));
-    QmlPropertyChanges changeSet = state1.propertyChanges(subChildNode);
-    QVERIFY(changeSet.isValid());
-
-    QmlItemNode(childNode).destroy();
-    QVERIFY(!childNode.isValid());
-    QVERIFY(!subChildNode.isValid());
-    QVERIFY(!changeSet.isValid());
-}
-
-void TestCore::testInstancesAttachToExistingModel()
-{
-    //
-    // Test attaching nodeinstanceview to an existing model
-    //
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    ModelNode rectangleNode = addNodeListChild(rootNode, "Qt/Rectangle", 4, 7, "data");
-
-    rectangleNode.variantProperty("width").setValue(100);
-
-    QVERIFY(rectangleNode.isValid());
-    QVERIFY(rectangleNode.hasProperty("width"));
-
-    // Attach NodeInstanceView
-
-    QScopedPointer<NodeInstanceView> instanceView(new NodeInstanceView);
-    QVERIFY(instanceView.data());
-    model->attachView(instanceView.data());
-
-    NodeInstance rootInstance = instanceView->instanceForNode(rootNode);
-    NodeInstance rectangleInstance = instanceView->instanceForNode(rectangleNode);
-    QVERIFY(rootInstance.isValid());
-    QVERIFY(rectangleInstance.isValid());
-    QCOMPARE(QVariant(100), rectangleInstance.property("width"));
-    QVERIFY(rootInstance.testHandle());
-    QVERIFY(rectangleInstance.testHandle());
-    QCOMPARE(rootInstance.testHandle(), qobject_cast<QGraphicsObject*>(rectangleInstance.testHandle())->parentItem()->toGraphicsObject());
-}
-
-void TestCore::testQmlModelAddMultipleStates()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QVERIFY(QmlItemNode(rootModelNode).isValid());
-
-    QmlModelState state1 = QmlItemNode(rootModelNode).states().addState("state1");
-    QVERIFY(state1.isValid());
-    QCOMPARE(state1.name(), QString("state1"));
-
-    QmlModelState state2 = QmlItemNode(rootModelNode).states().addState("state2");
-    QVERIFY(state2.isValid());
-    QCOMPARE(state1.name(), QString("state1"));
-    QCOMPARE(state2.name(), QString("state2"));
-
-    QmlModelState state3 = QmlItemNode(rootModelNode).states().addState("state3");
-    QVERIFY(state3.isValid());
-    QCOMPARE(state1.name(), QString("state1"));
-    QCOMPARE(state2.name(), QString("state2"));
-    QCOMPARE(state3.name(), QString("state3"));
-
-    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 3);
-}
-
-void TestCore::testQmlModelRemoveStates()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QVERIFY(QmlItemNode(rootModelNode).isValid());
-
-    QmlModelState state1 = QmlItemNode(rootModelNode).states().addState("state1");
-    QmlModelState state2 = QmlItemNode(rootModelNode).states().addState("state2");
-    QmlModelState state3 = QmlItemNode(rootModelNode).states().addState("state3");
-
-    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 3);
-
-    QmlItemNode(rootModelNode).states().removeState("state2");
-    QVERIFY(!state2.isValid());
-    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 2);
-
-    QmlItemNode(rootModelNode).states().removeState("state3");
-    QVERIFY(!state3.isValid());
-    state1.modelNode().destroy();
-    QVERIFY(!state1.isValid());
-    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 0);
-}
-
-void TestCore::testQmlModelStateWithName()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 200; } } ] }\n");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    TestRewriterView *testRewriterView1 = new TestRewriterView(model1.data());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1);
-
-    QVERIFY(testRewriterView1->errors().isEmpty());
-
-    TestView *view = new TestView(model1.data());
-    model1->attachView(view);
-    QmlItemNode rootNode = view->rootModelNode();
-    QCOMPARE(rootNode.states().allStates().size(), 1);
-
-    QmlModelState modelState = rootNode.states().allStates().at(0);
-    QVERIFY(!modelState.isBaseState());
-    QCOMPARE(rootNode.instanceValue("width").toInt(), 100);
-
-    QVERIFY(rootNode.isInBaseState());
-    QVERIFY(rootNode.propertyAffectedByCurrentState("width"));
-    view->setCurrentState(rootNode.states().allStates().at(0));
-    rootNode.setVariantProperty("width", 112);
-
-    const QLatin1String expected1("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 112 } } ] }\n");
-    QCOMPARE(textEdit1.toPlainText(), expected1);
-
-    QVERIFY(!rootNode.isInBaseState());
-    QCOMPARE(rootNode.instanceValue("width").toInt(), 112);
-
-    view->setCurrentState(view->baseState());
-    QCOMPARE(rootNode.instanceValue("width").toInt(), 100);
-
-    view->setCurrentState(rootNode.states().allStates().at(0));
-    QCOMPARE(rootNode.instanceValue("width").toInt(), 112);
-
-
-    modelState.destroy();
-    QCOMPARE(rootNode.states().allStates().size(), 0);
-}
-
-void TestCore::testRewriterAutomaticSemicolonAfterChangedProperty()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Rectangle {\n    width: 640\n    height: 480\n}\n");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    TestRewriterView *testRewriterView1 = new TestRewriterView(model1.data());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1);
-
-    QVERIFY(testRewriterView1->errors().isEmpty());
-
-    ModelNode rootModelNode = testRewriterView1->rootModelNode();
-    rootModelNode.variantProperty("height").setValue(1480);
-    QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 1480);
-
-    QVERIFY(testRewriterView1->errors().isEmpty());
-}
-
-void TestCore::defaultPropertyValues()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QCOMPARE(view->rootModelNode().variantProperty("x").value().toDouble(), 0.0);
-    QCOMPARE(view->rootModelNode().variantProperty("width").value().toDouble(), 0.0);
-
-    ModelNode rectNode(addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data"));
-
-    QCOMPARE(rectNode.variantProperty("y").value().toDouble(), 0.0);
-    QCOMPARE(rectNode.variantProperty("width").value().toDouble(), 0.0);
-
-    ModelNode imageNode(addNodeListChild(view->rootModelNode(), "Qt/Image", 4, 7, "data"));
-
-    QCOMPARE(imageNode.variantProperty("y").value().toDouble(), 0.0);
-    QCOMPARE(imageNode.variantProperty("width").value().toDouble(), 0.0);
-}
-
-void TestCore::testModelPropertyValueTypes()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Rectangle { width: 100; radius: 1.5; color: \"red\"; }");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model1(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model1->attachView(testRewriterView1.data());
-
-    QVERIFY(testRewriterView1->errors().isEmpty());
-
-    ModelNode rootModelNode(testRewriterView1->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-
-    QCOMPARE(rootModelNode.variantProperty("width").value().type(), QVariant::Double);
-    QCOMPARE(rootModelNode.variantProperty("radius").value().type(), QVariant::Double);
-    QCOMPARE(rootModelNode.variantProperty("color").value().type(), QVariant::Color);
-}
-
-void TestCore::testModelNodeInHierarchy()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QVERIFY(view->rootModelNode().isInHierarchy());
-    ModelNode node1 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
-    QVERIFY(node1.isInHierarchy());
-    ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
-    QVERIFY(!node2.isInHierarchy());
-    node2.nodeListProperty("data").reparentHere(node1);
-    QVERIFY(!node2.isInHierarchy());
-    view->rootModelNode().nodeListProperty("data").reparentHere(node2);
-    QVERIFY(node1.isInHierarchy());
-    QVERIFY(node2.isInHierarchy());
-}
-
-void TestCore::testModelNodeIsAncestorOf()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    //
-    //  import Qt 4.7
-    //  Item {
-    //    Item {
-    //      id: item2
-    //    }
-    //    Item {
-    //      id: item3
-    //      Item {
-    //        id: item4
-    //      }
-    //    }
-    //  }
-    //
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    view->rootModelNode().setId("item1");
-    ModelNode item2 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
-    item2.setId("item2");
-    ModelNode item3 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
-    item3.setId("item3");
-    ModelNode item4 = addNodeListChild(item3, "Qt/Item", 4, 7, "data");
-    item4.setId("item4");
-
-    QVERIFY(view->rootModelNode().isAncestorOf(item2));
-    QVERIFY(view->rootModelNode().isAncestorOf(item3));
-    QVERIFY(view->rootModelNode().isAncestorOf(item4));
-    QVERIFY(!item2.isAncestorOf(view->rootModelNode()));
-    QVERIFY(!item2.isAncestorOf(item4));
-    QVERIFY(item3.isAncestorOf(item4));
-}
-
-void TestCore::testModelDefaultProperties()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-
-    QCOMPARE(rootModelNode.metaInfo().defaultProperty(), QString("data"));
-}
-
-void TestCore::loadAnchors()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model->attachView(testRewriterView1.data());
-
-    TestView *testView = new TestView(model.data());
-    model->attachView(testView);
-
-    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
-    QmlItemNode anchoredNode(rootQmlItemNode.children().first());
-    QVERIFY(anchoredNode.isValid());
-
-    QmlAnchors anchors(anchoredNode.anchors());
-    QVERIFY(anchors.instanceHasAnchor(AnchorLine::Left));
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Top));
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Right));
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Bottom));
-    QVERIFY(anchors.instanceHasAnchor(AnchorLine::HorizontalCenter));
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::VerticalCenter));
-
-    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 20.0);
-
-
-    QCOMPARE(anchoredNode.instancePosition().x(), 0.0);
-    QCOMPARE(anchoredNode.instancePosition().y(), 0.0);
-    QCOMPARE(anchoredNode.instanceBoundingRect().width(), 100.0);
-    QCOMPARE(anchoredNode.instanceBoundingRect().height(), 0.0);
-
-
-    model->detachView(testView);
-}
-
-void TestCore::changeAnchors()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model->attachView(testRewriterView1.data());
-
-    TestView *testView = new TestView(model.data());
-    model->attachView(testView);
-
-    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
-    QmlItemNode anchoredNode(rootQmlItemNode.children().first());
-    QVERIFY(anchoredNode.isValid());
-
-    QmlAnchors anchors(anchoredNode.anchors());
-    QVERIFY(anchors.instanceHasAnchor(AnchorLine::Left));
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Top));
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Right));
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Bottom));
-    QVERIFY(anchors.instanceHasAnchor(AnchorLine::HorizontalCenter));
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::VerticalCenter));
-    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 20.0);
-
-
-    QCOMPARE(anchoredNode.instancePosition().x(), 0.0);
-    QCOMPARE(anchoredNode.instancePosition().y(), 0.0);
-    QCOMPARE(anchoredNode.instanceBoundingRect().width(), 100.0);
-    QCOMPARE(anchoredNode.instanceBoundingRect().height(), 0.0);
-
-
-    anchors.removeAnchor(AnchorLine::Top);
-
-    anchoredNode.setBindingProperty("anchors.bottom", "parent.bottom");
-    QVERIFY(anchors.instanceHasAnchor(AnchorLine::Bottom));
-    anchors.setAnchor(AnchorLine::Right, rootQmlItemNode, AnchorLine::Right);
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Right));
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Invalid);
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Right).qmlItemNode().isValid());
-
-    anchors.setMargin(AnchorLine::Right, 10.0);
-    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 10.0);
-
-    anchors.setMargin(AnchorLine::Right, 0.0);
-    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 0.0);
-
-    anchors.setMargin(AnchorLine::Right, 20.0);
-    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 20.0);
-
-    QCOMPARE(anchoredNode.instancePosition().x(), 0.0);
-    QCOMPARE(anchoredNode.instancePosition().y(), 100.0);
-    QCOMPARE(anchoredNode.instanceBoundingRect().width(), 100.0);
-    QCOMPARE(anchoredNode.instanceBoundingRect().height(), 0.0);
-
-    model->detachView(testView);
-}
-
-void TestCore::anchorToSibling()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Item { Rectangle {} Rectangle { id: secondChild } }");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model->attachView(testRewriterView1.data());
-
-    TestView *testView = new TestView(model.data());
-    model->attachView(testView);
-
-    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
-    QmlItemNode anchoredNode(rootQmlItemNode.children().first());
-    QVERIFY(anchoredNode.isValid());
-
-    QmlAnchors anchors(anchoredNode.anchors());
-
-    QmlItemNode firstChild(rootQmlItemNode.children().first());
-    QVERIFY(firstChild.isValid());
-    QCOMPARE(firstChild.validId(), QString("rectangle1"));
-
-    QmlItemNode secondChild(rootQmlItemNode.children().at(1));
-    QVERIFY(secondChild.isValid());
-    QCOMPARE(secondChild.validId(), QString("secondChild"));
-
-    secondChild.anchors().setAnchor(AnchorLine::Top, firstChild, AnchorLine::Bottom);
-
-    QmlItemNode secondChildTopAnchoredNode = secondChild.anchors().instanceAnchor(AnchorLine::Top).qmlItemNode();
-    QVERIFY(secondChildTopAnchoredNode.isValid());
-    QVERIFY2(secondChildTopAnchoredNode == firstChild, QString("expected %1 got %2").arg(firstChild.id(), secondChildTopAnchoredNode.id()).toLatin1().data());
-
-    secondChild.anchors().setMargin(AnchorLine::Top, 10.0);
-    QCOMPARE(secondChild.anchors().instanceMargin(AnchorLine::Top), 10.0);
-
-    QVERIFY(firstChild.anchors().possibleAnchorLines(AnchorLine::Bottom, secondChild) == AnchorLine::Invalid);
-    QVERIFY(firstChild.anchors().possibleAnchorLines(AnchorLine::Left, secondChild) == AnchorLine::HorizontalMask);
-    QVERIFY(secondChild.anchors().possibleAnchorLines(AnchorLine::Top, firstChild) == AnchorLine::VerticalMask);
-    QVERIFY(secondChild.anchors().possibleAnchorLines(AnchorLine::Left, firstChild) == AnchorLine::HorizontalMask);
-}
-
-void TestCore::removeFillAnchorByDetaching()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model->attachView(testRewriterView1.data());
-
-    TestView *testView = new TestView(model.data());
-    model->attachView(testView);
-
-    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
-
-    QmlItemNode firstChild(rootQmlItemNode.children().first());
-    QVERIFY(firstChild.isValid());
-    QCOMPARE(firstChild.id(), QString("child"));
-
-    // Verify the synthesized anchors:
-    QmlAnchors anchors(firstChild);
-    QVERIFY(anchors.instanceHasAnchor(AnchorLine::Left));
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Left).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).type(), AnchorLine::Left);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Top).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).type(), AnchorLine::Top);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Right).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Right);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Bottom).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).type(), AnchorLine::Bottom);
-
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
-
-    QCOMPARE(firstChild.instancePosition().x(), 0.0);
-    QCOMPARE(firstChild.instancePosition().y(), 0.0);
-    QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0);
-    QCOMPARE(firstChild.instanceBoundingRect().height(), 100.0);
-
-    // Remove 2 anchors:
-    RewriterTransaction transaction = testView->beginRewriterTransaction();
-    anchors.removeAnchor(AnchorLine::Bottom);
-    anchors.removeAnchor(AnchorLine::Top);
-    transaction.commit();
-
-    // Verify again:
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Left).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).type(), AnchorLine::Left);
-
-    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Top));
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Top).isValid());
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Right).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Right);
-
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Bottom).isValid());
-
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
-
-    QCOMPARE(firstChild.instancePosition().x(), 0.0);
-    QCOMPARE(firstChild.instancePosition().y(), 0.0);
-    QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0);
-    QCOMPARE(firstChild.instanceBoundingRect().height(), 0.0);
-
-
-    model->detachView(testView);
-}
-
-void TestCore::removeFillAnchorByChanging()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model->attachView(testRewriterView1.data());
-
-    TestView *testView = new TestView(model.data());
-    model->attachView(testView);
-
-    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
-
-    QmlItemNode firstChild(rootQmlItemNode.children().first());
-    QVERIFY(firstChild.isValid());
-    QCOMPARE(firstChild.id(), QString("child"));
-
-    // Verify the synthesized anchors:
-    QmlAnchors anchors(firstChild);
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Left).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).type(), AnchorLine::Left);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Top).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).type(), AnchorLine::Top);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Right).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Right);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Bottom).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).type(), AnchorLine::Bottom);
-
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
-
-    QCOMPARE(firstChild.instancePosition().x(), 0.0);
-    QCOMPARE(firstChild.instancePosition().y(), 0.0);
-    QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0);
-    QCOMPARE(firstChild.instanceBoundingRect().height(), 100.0);
-
-    // Change 2 anchors:
-    anchors.setAnchor(AnchorLine::Bottom, rootQmlItemNode, AnchorLine::Top);
-    anchors.setAnchor(AnchorLine::Top, rootQmlItemNode, AnchorLine::Bottom);
-
-    // Verify again:
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Left).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).type(), AnchorLine::Left);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Top).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).type(), AnchorLine::Bottom);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Right).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Right);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::Bottom).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).type(), AnchorLine::Top);
-
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
-
-
-    QCOMPARE(firstChild.instancePosition().x(), 0.0);
-    QCOMPARE(firstChild.instancePosition().y(), 100.0);
-    QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0);
-    QCOMPARE(firstChild.instanceBoundingRect().height(), -100.0);
-
-
-    model->detachView(testView);
-}
-
-void TestCore::testModelBindings()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
-    model->attachView(nodeInstanceView);
-
-    ModelNode rootModelNode = nodeInstanceView->rootModelNode();
-    QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 0);
-    NodeInstance rootInstance = nodeInstanceView->instanceForNode(rootModelNode);
-
-    // default width/height is forced to 100
-    QCOMPARE(rootInstance.size().width(), 100.0);
-    QCOMPARE(rootInstance.size().height(), 100.0);
-
-    rootModelNode.variantProperty("width") = 200;
-    rootModelNode.variantProperty("height") = 100;
-
-    QCOMPARE(rootInstance.size().width(), 200.0);
-    QCOMPARE(rootInstance.size().height(), 100.0);
-
-    ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-
-    childNode.variantProperty("width") = 100;
-    childNode.variantProperty("height") = 100;
-
-    childNode.variantProperty("x") = 10;
-    childNode.variantProperty("y") = 10;
-
-    NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
-
-    QCOMPARE(childInstance.size().width(), 100.0);
-    QCOMPARE(childInstance.size().height(), 100.0);
-
-    QCOMPARE(childInstance.position().x(), 10.0);
-    QCOMPARE(childInstance.position().y(), 10.0);
-
-    childNode.bindingProperty("width").setExpression("parent.width");
-
-    QCOMPARE(childInstance.size().width(), 200.0);
-
-    rootModelNode.setId("root");
-    QCOMPARE(rootModelNode.id(), QString("root"));
-
-    childNode.setId("child");
-    QCOMPARE(childNode.id(), QString("child"));
-    childNode.variantProperty("width") = 100;
-
-    QCOMPARE(childInstance.size().width(), 100.0);
-
-    childNode.bindingProperty("width").setExpression("child.height");
-    QCOMPARE(childInstance.size().width(), 100.0);
-
-    childNode.bindingProperty("width").setExpression("root.width");
-    QCOMPARE(childInstance.size().width(), 200.0);
-}
-
-void TestCore::testModelDynamicProperties()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    TestView *testView = new TestView(model.data());
-    model->attachView(testView);
-
-    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
-    ModelNode rootModelNode = rootQmlItemNode.modelNode();
-
-    rootModelNode.variantProperty("x") = 10;
-    rootModelNode.variantProperty("myDouble") = qMakePair(QString("real"), QVariant(10));
-    rootModelNode.variantProperty("myColor").setDynamicTypeNameAndValue("color", Qt::red);
-
-    QVERIFY(!rootModelNode.property("x").isDynamic());
-    QVERIFY(rootModelNode.property("myColor").isDynamic());
-    QVERIFY(rootModelNode.property("myDouble").isDynamic());
-
-    QCOMPARE(rootModelNode.property("myColor").dynamicTypeName(), QString("color"));
-    QCOMPARE(rootModelNode.variantProperty("myColor").value(), QVariant(Qt::red));
-    //QCOMPARE(rootQmlItemNode.instanceValue("myColor"), QVariant(Qt::red)); //not working yet
-    QCOMPARE(rootModelNode.property("myDouble").dynamicTypeName(), QString("real"));
-    QCOMPARE(rootModelNode.variantProperty("myDouble").value(), QVariant(10));
-    //QCOMPARE(rootQmlItemNode.instanceValue("myDouble"), QVariant(10)); //not working yet
-
-    QCOMPARE(rootModelNode.property("x").dynamicTypeName(), QString());
-
-    rootModelNode.variantProperty("myDouble") = QVariant(10);
-    QVERIFY(!rootModelNode.property("myDouble").isDynamic());
-
-    rootModelNode.bindingProperty("myBindingDouble") = qMakePair(QString("real"), QString("myDouble"));
-    rootModelNode.bindingProperty("myBindingColor").setDynamicTypeNameAndExpression("color", "myColor");
-
-    QCOMPARE(rootModelNode.property("myBindingColor").dynamicTypeName(), QString("color"));
-    QCOMPARE(rootModelNode.property("myBindingDouble").dynamicTypeName(), QString("real"));
-
-    QVERIFY(rootModelNode.property("myBindingDouble").isDynamic());
-    QVERIFY(rootModelNode.property("myBindingColor").isDynamic());
-
-    QCOMPARE(rootModelNode.bindingProperty("myBindingDouble").expression(), QString("myDouble"));
-    QCOMPARE(rootModelNode.bindingProperty("myBindingColor").expression(), QString("myColor"));
-}
-
-void TestCore::testModelSliding()
-{
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-
-    ModelNode rect00(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
-    ModelNode rect01(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
-    ModelNode rect02(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
-    ModelNode rect03(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
-
-    QVERIFY(rect00.isValid());
-    QVERIFY(rect01.isValid());
-    QVERIFY(rect02.isValid());
-    QVERIFY(rect03.isValid());
-
-    NodeListProperty listProperty(rootModelNode.nodeListProperty("data"));
-    QVERIFY(!listProperty.isEmpty());
-
-    QList<ModelNode> nodeList(listProperty.toModelNodeList());
-
-    QCOMPARE(rect00, nodeList.at(0));
-    QCOMPARE(rect01, nodeList.at(1));
-    QCOMPARE(rect02, nodeList.at(2));
-    QCOMPARE(rect03, nodeList.at(3));
-
-    listProperty.slide(3,0);
-
-    nodeList = listProperty.toModelNodeList();
-
-    QCOMPARE(rect03, nodeList.at(0));
-    QCOMPARE(rect00, nodeList.at(1));
-    QCOMPARE(rect01, nodeList.at(2));
-    QCOMPARE(rect02, nodeList.at(3));
-
-    NodeListProperty childrenProperty(rootModelNode.nodeListProperty("children"));
-
-    childrenProperty.reparentHere(rect00);
-    childrenProperty.reparentHere(rect01);
-    childrenProperty.reparentHere(rect02);
-    childrenProperty.reparentHere(rect03);
-
-    QVERIFY(listProperty.isEmpty());
-
-    QVERIFY(!childrenProperty.isEmpty());
-
-    nodeList = childrenProperty.toModelNodeList();
-
-    QCOMPARE(rect00, nodeList.at(0));
-    QCOMPARE(rect01, nodeList.at(1));
-    QCOMPARE(rect02, nodeList.at(2));
-    QCOMPARE(rect03, nodeList.at(3));
-
-    childrenProperty.slide(0,3);
-
-    nodeList = childrenProperty.toModelNodeList();
-
-    QCOMPARE(rect01, nodeList.at(0));
-    QCOMPARE(rect02, nodeList.at(1));
-    QCOMPARE(rect03, nodeList.at(2));
-    QCOMPARE(rect00, nodeList.at(3));
-}
-
-void TestCore::testRewriterChangeId()
-{
-    const char* qmlString = "import Qt 4.7\nRectangle { }";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.id(), QString());
-
-    rootModelNode.setId("rectId");
-
-    QCOMPARE(rootModelNode.id(), QString("rectId"));
-
-    QString expected = "import Qt 4.7\n"
-                       "Rectangle { id: rectId }";
-
-    QCOMPARE(textEdit.toPlainText(), expected);
-
-    // change id for node outside of hierarchy
-    ModelNode node = view->createModelNode("Qt/Item", 4, 7);
-    node.setId("myId");
-}
-
-void TestCore::testRewriterRemoveId()
-{
-    const char* qmlString = "import Qt 4.7\nRectangle { id: rect }";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView(0, TestRewriterView::Amend));
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.id(), QString("rect"));
-
-    //
-    // remove id in text
-    //
-    const char* qmlString2 = "import Qt 4.7\nRectangle { }";
-    textEdit.setPlainText(qmlString2);
-
-    QCOMPARE(rootModelNode.id(), QString());
-}
-
-void TestCore::testRewriterChangeValueProperty()
-{
-    const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-
-    QCOMPARE(rootModelNode.property("x").toVariantProperty().value().toInt(), 10);
-
-    rootModelNode.property("x").toVariantProperty().setValue(2);
-
-    QCOMPARE(textEdit.toPlainText(), QString(QLatin1String(qmlString)).replace("x: 10;", "x: 2;"));
-
-    // change property for node outside of hierarchy
-    PropertyListType properties;
-    properties.append(QPair<QString,QVariant>("x", 10));
-    ModelNode node = view->createModelNode("Qt/Item", 4, 7, properties);
-    node.variantProperty("x").setValue(20);
-}
-
-void TestCore::testRewriterRemoveValueProperty()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "Rectangle {\n"
-                                  "  x: 10\n"
-                                  "  y: 10;\n"
-                                  "}\n");
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-
-    QCOMPARE(rootModelNode.property("x").toVariantProperty().value().toInt(), 10);
-
-    rootModelNode.property("x").toVariantProperty().setValue(2);
-
-    rootModelNode.removeProperty("x");
-
-    const QLatin1String expected("\n"
-                                 "import Qt 4.7\n"
-                                 "Rectangle {\n"
-                                 "  y: 10;\n"
-                                 "}\n");
-    QCOMPARE(textEdit.toPlainText(), expected);
-
-    // remove property for node outside of hierarchy
-    PropertyListType properties;
-    properties.append(QPair<QString,QVariant>("x", 10));
-    ModelNode node = view->createModelNode("Qt/Item", 4, 7, properties);
-    node.removeProperty("x");
-}
-
-void TestCore::testRewriterSignalProperty()
-{
-    const char* qmlString = "import Qt 4.7\nRectangle { onColorChanged: {} }";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-
-    // Signal properties are ignored for the time being
-    QCOMPARE(rootModelNode.properties().size(), 0);
-}
-
-void TestCore::testRewriterObjectTypeProperty()
-{
-    const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
-
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    QVERIFY(view.data());
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-
-    QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
-
-    view->changeRootNodeType(QLatin1String("Qt/Text"), 4, 7);
-
-    QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Text"));
-}
-
-void TestCore::testRewriterPropertyChanges()
-{
-    try {
-        // PropertyChanges uses a custom parser
-
-        // Use a slightly more complicated example so that target properties are not resolved in default scope
-        const char* qmlString
-                = "import Qt 4.7\n"
-                  "Rectangle {\n"
-                  "  Text {\n"
-                  "    id: targetObj\n"
-                  "    text: \"base State\"\n"
-                  "  }\n"
-                  "  states: [\n"
-                  "    State {\n"
-                  "      PropertyChanges {\n"
-                  "        target: targetObj\n"
-                  "        text: \"State 1\"\n"
-                  "      }\n"
-                  "    }\n"
-                  "  ]\n"
-                  "}\n";
-
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(qmlString);
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestView> view(new TestView);
-        model->attachView(view.data());
-
-        // read in
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-        ModelNode rootNode = view->rootModelNode();
-        QVERIFY(rootNode.isValid());
-        QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-        QVERIFY(rootNode.propertyNames().contains(QLatin1String("data")));
-        QVERIFY(rootNode.propertyNames().contains(QLatin1String("states")));
-        QCOMPARE(rootNode.propertyNames().count(), 2);
-
-        NodeListProperty statesProperty = rootNode.nodeListProperty("states");
-        QVERIFY(statesProperty.isValid());
-        QCOMPARE(statesProperty.toModelNodeList().size(), 1);
-
-        ModelNode stateNode = statesProperty.toModelNodeList().first();
-        QVERIFY(stateNode.isValid());
-        QCOMPARE(stateNode.type(), QString("Qt/State"));
-        QCOMPARE(stateNode.propertyNames(), QStringList("changes"));
-
-        NodeListProperty stateChangesProperty = stateNode.property("changes").toNodeListProperty();
-        QVERIFY(stateChangesProperty.isValid());
-
-        ModelNode propertyChangesNode = stateChangesProperty.toModelNodeList().first();
-        QVERIFY(propertyChangesNode.isValid());
-        QCOMPARE(propertyChangesNode.properties().size(), 2);
-
-        BindingProperty targetProperty = propertyChangesNode.bindingProperty("target");
-        QVERIFY(targetProperty.isValid());
-
-        VariantProperty textProperty = propertyChangesNode.variantProperty("text");
-        QVERIFY(textProperty.isValid());
-        QCOMPARE(textProperty.value().toString(), QLatin1String("State 1"));
-    } catch (Exception &e) {
-        QFAIL(e.description().toAscii().data());
-    }
-}
-
-void TestCore::testRewriterListModel()
-{
-    QSKIP("See BAUHAUS-157", SkipAll);
-
-    try {
-        // ListModel uses a custom parser
-        const char* qmlString = "import Qt 4.7; ListModel {\n ListElement {\n age: 12\n} \n}";
-
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(qmlString);
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-        QScopedPointer<TestView> view(new TestView);
-        model->attachView(view.data());
-
-        ModelNode listModelNode = view->rootModelNode();
-        QCOMPARE(listModelNode.propertyNames(), QStringList() << "__elements"); // TODO: what should be the name?
-
-        NodeListProperty elementListProperty = listModelNode.nodeListProperty("__elements");
-        QCOMPARE(elementListProperty.toModelNodeList().size(), 1);
-
-        ModelNode elementNode = elementListProperty.toModelNodeList().at(0);
-        QVERIFY(elementNode.isValid());
-        QCOMPARE(elementNode.properties().size(), 1);
-        QVERIFY(elementNode.variantProperty("age").isValid());
-        QCOMPARE(elementNode.variantProperty("age").value().toInt(), 12);
-    } catch (Exception &e) {
-        QFAIL(qPrintable(e.description()));
-    }
-}
-
-void TestCore::testRewriterAddProperty()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    rootNode.variantProperty(QLatin1String("x")).setValue(123);
-
-    QVERIFY(rootNode.hasProperty(QLatin1String("x")));
-    QVERIFY(rootNode.property(QLatin1String("x")).isVariantProperty());
-    QCOMPARE(rootNode.variantProperty(QLatin1String("x")).value(), QVariant(123));
-
-    const QLatin1String expected("\n"
-                                 "import Qt 4.7\n"
-                                 "\n"
-                                 "Rectangle {\n"
-                                 "x: 123\n"
-                                 "}");
-    QCOMPARE(textEdit.toPlainText(), expected);
-}
-
-void TestCore::testRewriterAddPropertyInNestedObject()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    Rectangle {\n"
-                                  "        id: rectangle1\n"
-                                  "    }\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-
-    ModelNode childNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
-    QVERIFY(childNode.isValid());
-    QCOMPARE(childNode.type(), QLatin1String("Qt/Rectangle"));
-    QCOMPARE(childNode.id(), QLatin1String("rectangle1"));
-
-    childNode.variantProperty(QLatin1String("x")).setValue(10);
-    childNode.variantProperty(QLatin1String("y")).setValue(10);
-
-    const QLatin1String expected("\n"
-                                 "import Qt 4.7\n"
-                                 "\n"
-                                 "Rectangle {\n"
-                                 "    Rectangle {\n"
-                                 "        id: rectangle1\n"
-                                 "        x: 10\n"
-                                 "        y: 10\n"
-                                 "    }\n"
-                                 "}");
-    QCOMPARE(textEdit.toPlainText(), expected);
-}
-
-void TestCore::testRewriterAddObjectDefinition()
-{
-    const QLatin1String qmlString("import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    ModelNode childNode = view->createModelNode("Qt/MouseArea", 4, 7);
-    rootNode.nodeAbstractProperty(QLatin1String("data")).reparentHere(childNode);
-
-    QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
-    childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
-    QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
-}
-
-void TestCore::testRewriterAddStatesArray()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    ModelNode stateNode = view->createModelNode("Qt/State", 4, 7);
-    rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode);
-
-    const QString expected1 = QLatin1String("\n"
-                                           "import Qt 4.7\n"
-                                           "\n"
-                                           "Rectangle {\n"
-                                           "states: [\n"
-                                           "    State {\n"
-                                           "    }\n"
-                                           "]\n"
-                                           "}");
-    QCOMPARE(textEdit.toPlainText(), expected1);
-
-    ModelNode stateNode2 = view->createModelNode("Qt/State", 4, 7);
-    rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode2);
-
-    const QString expected2 = QLatin1String("\n"
-                                           "import Qt 4.7\n"
-                                           "\n"
-                                           "Rectangle {\n"
-                                           "states: [\n"
-                                           "    State {\n"
-                                           "    },\n"
-                                           "    State {\n"
-                                           "    }\n"
-                                           "]\n"
-                                           "}");
-    QCOMPARE(textEdit.toPlainText(), expected2);
-}
-
-void TestCore::testRewriterRemoveStates()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    states: [\n"
-                                  "        State {\n"
-                                  "        },\n"
-                                  "        State {\n"
-                                  "        }\n"
-                                  "    ]\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    NodeListProperty statesProperty = rootNode.nodeListProperty(QLatin1String("states"));
-    QVERIFY(statesProperty.isValid());
-    QCOMPARE(statesProperty.toModelNodeList().size(), 2);
-
-    ModelNode state = statesProperty.toModelNodeList().at(1);
-    state.destroy();
-
-    const QLatin1String expected1("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "    states: [\n"
-                                  "        State {\n"
-                                  "        }\n"
-                                  "    ]\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected1);
-
-    state = statesProperty.toModelNodeList().at(0);
-    state.destroy();
-
-    const QLatin1String expected2("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected2);
-}
-
-void TestCore::testRewriterRemoveObjectDefinition()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  MouseArea {\n"
-                                  "  }\n"
-                                  "  MouseArea {\n"
-                                  "  } // some comment here\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 2);
-    ModelNode childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(1);
-    QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
-
-    childNode.destroy();
-
-    QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
-    childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
-    QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
-
-    childNode.destroy();
-
-    QVERIFY(!rootNode.hasProperty(QLatin1String("data")));
-
-    const QString expected = QLatin1String("\n"
-                                           "import Qt 4.7\n"
-                                           "\n"
-                                           "Rectangle {\n"
-                                           "  // some comment here\n"
-                                           "}");
-    QCOMPARE(textEdit.toPlainText(), expected);
-
-    // don't crash when deleting nodes not in any hierarchy
-    ModelNode node1 = view->createModelNode("Qt/Rectangle", 4, 7);
-    ModelNode node2 = addNodeListChild(node1, "Qt/Item", 4, 7, "data");
-    ModelNode node3 = addNodeListChild(node2, "Qt/Item", 4, 7, "data");
-
-    node3.destroy();
-    node1.destroy();
-}
-
-void TestCore::testRewriterRemoveScriptBinding()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "   x: 10; // some comment\n"
-                                  "  y: 20\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    QCOMPARE(rootNode.properties().size(), 2);
-    QVERIFY(rootNode.hasProperty(QLatin1String("x")));
-    QVERIFY(rootNode.hasProperty(QLatin1String("y")));
-
-    rootNode.removeProperty(QLatin1String("y"));
-
-    QCOMPARE(rootNode.properties().size(), 1);
-    QVERIFY(rootNode.hasProperty(QLatin1String("x")));
-    QVERIFY(!rootNode.hasProperty(QLatin1String("y")));
-
-    rootNode.removeProperty(QLatin1String("x"));
-
-    QCOMPARE(rootNode.properties().size(), 0);
-
-    const QString expected = QLatin1String("\n"
-                                           "import Qt 4.7\n"
-                                           "\n"
-                                           "Rectangle {\n"
-                                           "   // some comment\n"
-                                           "}");
-    QCOMPARE(textEdit.toPlainText(), expected);
-}
-
-void TestCore::testRewriterNodeReparenting()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  Item {\n"
-                                  "    MouseArea {\n"
-                                  "    }\n"
-                                  "  }\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    ModelNode itemNode = rootNode.nodeListProperty("data").toModelNodeList().at(0);
-    QVERIFY(itemNode.isValid());
-    QCOMPARE(itemNode.type(), QLatin1String("Qt/Item"));
-
-    ModelNode mouseArea = itemNode.nodeListProperty("data").toModelNodeList().at(0);
-    QVERIFY(mouseArea.isValid());
-    QCOMPARE(mouseArea.type(), QLatin1String("Qt/MouseArea"));
-
-    rootNode.nodeListProperty("data").reparentHere(mouseArea);
-
-    QVERIFY(mouseArea.isValid());
-    QCOMPARE(rootNode.nodeListProperty("data").toModelNodeList().size(), 2);
-
-    QString expected =  "\n"
-                        "import Qt 4.7\n"
-                        "\n"
-                        "Rectangle {\n"
-                        "  Item {\n"
-                        "  }\n"
-                        "\n"
-                        "MouseArea {\n"
-                        "    }\n"
-                        "}";
-    QCOMPARE(textEdit.toPlainText(), expected);
-
-    // reparenting outside of the hierarchy
-    ModelNode node1 = view->createModelNode("Qt/Rectangle", 4, 7);
-    ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
-    ModelNode node3 = view->createModelNode("Qt/Item", 4, 7);
-    node2.nodeListProperty("data").reparentHere(node3);
-    node1.nodeListProperty("data").reparentHere(node2);
-
-    // reparent into the hierarchy
-    rootNode.nodeListProperty("data").reparentHere(node1);
-
-    expected =  "\n"
-                "import Qt 4.7\n"
-                "\n"
-                "Rectangle {\n"
-                "  Item {\n"
-                "  }\n"
-                "\n"
-                "MouseArea {\n"
-                "    }\n"
-                "\n"
-                "    Rectangle {\n"
-                "        Item {\n"
-                "            Item {\n"
-                "            }\n"
-                "        }\n"
-                "    }\n"
-                "}";
-
-    QCOMPARE(textEdit.toPlainText(), expected);
-
-    // reparent out of the hierarchy
-    ModelNode node4 = view->createModelNode("Qt/Rectangle", 4, 7);
-    node4.nodeListProperty("data").reparentHere(node1);
-
-    expected =  "\n"
-                "import Qt 4.7\n"
-                "\n"
-                "Rectangle {\n"
-                "  Item {\n"
-                "  }\n"
-                "\n"
-                "MouseArea {\n"
-                "    }\n"
-                "}";
-
-    QCOMPARE(textEdit.toPlainText(), expected);
-}
-
-void TestCore::testRewriterNodeReparentingWithTransaction()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  id: rootItem\n"
-                                  "  Item {\n"
-                                  "    id: firstItem\n"
-                                  "    x: 10\n"
-                                  "  }\n"
-                                  "  Item {\n"
-                                  "    id: secondItem\n"
-                                  "    x: 20\n"
-                                  "  }\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
-    QCOMPARE(rootNode.id(), QLatin1String("rootItem"));
-
-    ModelNode item1Node = rootNode.nodeListProperty("data").toModelNodeList().at(0);
-    QVERIFY(item1Node.isValid());
-    QCOMPARE(item1Node.type(), QLatin1String("Qt/Item"));
-    QCOMPARE(item1Node.id(), QLatin1String("firstItem"));
-
-    ModelNode item2Node = rootNode.nodeListProperty("data").toModelNodeList().at(1);
-    QVERIFY(item2Node.isValid());
-    QCOMPARE(item2Node.type(), QLatin1String("Qt/Item"));
-    QCOMPARE(item2Node.id(), QLatin1String("secondItem"));
-
-    RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
-
-    item1Node.nodeListProperty(QLatin1String("data")).reparentHere(item2Node);
-    item2Node.variantProperty(QLatin1String("x")).setValue(0);
-
-    transaction.commit();
-
-    const QLatin1String expected("\n"
-                                 "import Qt 4.7\n"
-                                 "\n"
-                                 "Rectangle {\n"
-                                 "  id: rootItem\n"
-                                 "  Item {\n"
-                                 "    id: firstItem\n"
-                                 "    x: 10\n"
-                                 "\n"
-                                 "Item {\n"
-                                 "    id: secondItem\n"
-                                 "    x: 0\n"
-                                 "  }\n"
-                                 "  }\n"
-                                 "}");
-    QCOMPARE(textEdit.toPlainText(), expected);
-}
-void TestCore::testRewriterMovingInOut()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
-    rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
-
-    const QLatin1String expected1("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "MouseArea {\n"
-                                  "}\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected1);
-
-#define move(node, x, y) {\
-    node.variantProperty(QLatin1String("x")).setValue(x);\
-    node.variantProperty(QLatin1String("y")).setValue(y);\
-}
-    move(newNode, 1, 1);
-    move(newNode, 2, 2);
-    move(newNode, 3, 3);
-#undef move
-    newNode.destroy();
-
-    const QLatin1String expected2("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected2);
-}
-
-void TestCore::testRewriterMovingInOutWithTransaction()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-
-    RewriterTransaction transaction = view->beginRewriterTransaction();
-
-    ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
-    rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
-
-#define move(node, x, y) {\
-    node.variantProperty(QLatin1String("x")).setValue(x);\
-    node.variantProperty(QLatin1String("y")).setValue(y);\
-}
-    move(newNode, 1, 1);
-    move(newNode, 2, 2);
-    move(newNode, 3, 3);
-#undef move
-    newNode.destroy();
-
-    transaction.commit();
-
-    const QLatin1String expected2("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected2);
-}
-
-void TestCore::testRewriterComplexMovingInOut()
-{
-    const QLatin1String qmlString("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  Item {\n"
-                                  "  }\n"
-                                  "}");
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(qmlString);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    // read in
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-    ModelNode rootNode = view->rootModelNode();
-    QVERIFY(rootNode.isValid());
-    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
-    ModelNode itemNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
-
-    ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
-    rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
-
-    const QLatin1String expected1("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  Item {\n"
-                                  "  }\n"
-                                  "\n"
-                                  "  MouseArea {\n"
-                                  "  }\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected1);
-
-#define move(node, x, y) {\
-    node.variantProperty(QLatin1String("x")).setValue(x);\
-    node.variantProperty(QLatin1String("y")).setValue(y);\
-}
-    move(newNode, 1, 1);
-    move(newNode, 2, 2);
-    move(newNode, 3, 3);
-
-    const QLatin1String expected2("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  Item {\n"
-                                  "  }\n"
-                                  "\n"
-                                  "  MouseArea {\n"
-                                  "  x: 3\n"
-                                  "  y: 3\n"
-                                  "  }\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected2);
-
-    itemNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
-
-    const QLatin1String expected3("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  Item {\n"
-                                  "MouseArea {\n"
-                                  "  x: 3\n"
-                                  "  y: 3\n"
-                                  "  }\n"
-                                  "  }\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected3);
-
-    move(newNode, 0, 0);
-    move(newNode, 1, 1);
-    move(newNode, 2, 2);
-    move(newNode, 3, 3);
-#undef move
-    newNode.destroy();
-
-    const QLatin1String expected4("\n"
-                                  "import Qt 4.7\n"
-                                  "\n"
-                                  "Rectangle {\n"
-                                  "  Item {\n"
-                                  "  }\n"
-                                  "}");
-    QCOMPARE(textEdit.toPlainText(), expected4);
-}
-
-void TestCore::removeCenteredInAnchorByDetaching()
-{
-    QPlainTextEdit textEdit1;
-    textEdit1.setPlainText("import Qt 4.7; Item { Rectangle { id: child; anchors.centerIn: parent } }");
-    NotIndentingTextEditModifier modifier1(&textEdit1);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-
-    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
-    testRewriterView1->setTextModifier(&modifier1);
-    model->attachView(testRewriterView1.data());
-
-    TestView *testView = new TestView(model.data());
-    model->attachView(testView);
-
-    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
-
-
-    QmlItemNode firstChild(rootQmlItemNode.children().first());
-    QVERIFY(firstChild.isValid());
-    QCOMPARE(firstChild.id(), QString("child"));
-
-    // Verify the synthesized anchors:
-    QmlAnchors anchors(firstChild);
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Left).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Top).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Right).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Bottom).isValid());
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::HorizontalCenter).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::HorizontalCenter).type(), AnchorLine::HorizontalCenter);
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::VerticalCenter).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::VerticalCenter).type(), AnchorLine::VerticalCenter);
-
-    // Remove horizontal anchor:
-    anchors.removeAnchor(AnchorLine::HorizontalCenter);
-
-    // Verify again:
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Left).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Top).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Right).isValid());
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::Bottom).isValid());
-
-    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
-
-    QVERIFY(anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::VerticalCenter).qmlItemNode(), rootQmlItemNode);
-    QCOMPARE(anchors.instanceAnchor(AnchorLine::VerticalCenter).type(), AnchorLine::VerticalCenter);
-}
-
-
-void TestCore::changePropertyBinding()
-{
-
-    QScopedPointer<Model> model(Model::create("Qt/Item"));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestView> view(new TestView);
-    model->attachView(view.data());
-
-    ModelNode rootModelNode(view->rootModelNode());
-    rootModelNode.variantProperty("width") = 20;
-
-    ModelNode firstChild = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
-    firstChild.bindingProperty("width").setExpression(QString("parent.width"));
-    firstChild.variantProperty("height")=  10;
-    QVERIFY(firstChild.isValid());
-
-    {
-        QVERIFY(firstChild.hasProperty("width"));
-
-        BindingProperty widthBinding = firstChild.bindingProperty("width");
-        QVERIFY(widthBinding.isValid());
-        QCOMPARE(widthBinding.expression(), QString("parent.width"));
-        QVERIFY(firstChild.variantProperty("height").value().toInt() == 10);
-    }
-
-    firstChild.variantProperty("width") =  400;
-    firstChild.bindingProperty("height").setExpression("parent.width / 2");
-
-    {
-        QVERIFY(firstChild.hasProperty("width"));
-        QVariant width = firstChild.variantProperty("width").value();
-        QVERIFY(width.isValid() && !width.isNull());
-        QVERIFY(width == 400);
-        QVERIFY(firstChild.hasProperty("height"));
-        BindingProperty heightBinding = firstChild.bindingProperty("height");
-        QVERIFY(heightBinding.isValid());
-        QCOMPARE(heightBinding.expression(), QString("parent.width / 2"));
-    }
-}
-
-
-void TestCore::loadTestFiles()
-{
-    { //empty.qml
-        QFile file(":/fx/empty.qml");
-        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(QString(file.readAll()));
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-
-        QVERIFY(model.data());
-        ModelNode rootModelNode(testRewriterView->rootModelNode());
-        QVERIFY(rootModelNode.isValid());
-        QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Item"));
-        QVERIFY(rootModelNode.allDirectSubModelNodes().isEmpty());
-    }
-
-    { //helloworld.qml
-        QFile file(":/fx/helloworld.qml");
-        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(QString(file.readAll()));
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-
-        QVERIFY(model.data());
-        ModelNode rootModelNode(testRewriterView->rootModelNode());
-        QVERIFY(rootModelNode.isValid());
-        QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
-        QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 1);
-        QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
-        QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
-
-        ModelNode textNode(rootModelNode.allDirectSubModelNodes().first());
-        QVERIFY(textNode.isValid());
-        QCOMPARE(textNode.type(), QLatin1String("Qt/Text"));
-        QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
-        QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);
-    }
-    { //states.qml
-        QFile file(":/fx/states.qml");
-        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(QString(file.readAll()));
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-
-        QVERIFY(model.data());
-        ModelNode rootModelNode(testRewriterView->rootModelNode());
-        QVERIFY(rootModelNode.isValid());
-        QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
-        QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 4);
-        QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
-        QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
-        QCOMPARE(rootModelNode.id(), QLatin1String("rect"));
-        QVERIFY(rootModelNode.hasProperty("data"));
-        QVERIFY(rootModelNode.property("data").isDefaultProperty());
-
-        ModelNode textNode(rootModelNode.nodeListProperty("data").toModelNodeList().first());
-        QVERIFY(textNode.isValid());
-        QCOMPARE(textNode.id(), QLatin1String("text"));
-        QCOMPARE(textNode.type(), QLatin1String("Qt/Text"));
-        QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
-        QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);
-
-        ModelNode imageNode(rootModelNode.nodeListProperty("data").toModelNodeList().last());
-        QVERIFY(imageNode.isValid());
-        QCOMPARE(imageNode.id(), QLatin1String("image1"));
-        QCOMPARE(imageNode.type(), QLatin1String("Qt/Image"));
-        QCOMPARE(imageNode.variantProperty("x").value().toInt(), 41);
-        QCOMPARE(imageNode.variantProperty("y").value().toInt(), 46);
-        QCOMPARE(imageNode.variantProperty("source").value().toUrl(), QUrl("images/qtcreator.png"));
-
-        QVERIFY(rootModelNode.hasProperty("states"));
-        QVERIFY(!rootModelNode.property("states").isDefaultProperty());
-
-        QCOMPARE(rootModelNode.nodeListProperty("states").toModelNodeList().count(), 2);
-    }
-
-    QSKIP("Fails because the text editor model doesn't know about components", SkipAll);
-    { //usingbutton.qml
-        QFile file(":/fx/usingbutton.qml");
-        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(QString(file.readAll()));
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-        QVERIFY(testRewriterView->errors().isEmpty());
-
-        QVERIFY(model.data());
-        ModelNode rootModelNode(testRewriterView->rootModelNode());
-        QVERIFY(rootModelNode.isValid());
-        QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
-        QVERIFY(!rootModelNode.allDirectSubModelNodes().isEmpty());
-    }
-}
-
-static QString rectWithGradient = "import Qt 4.7\n"
-                                  "Rectangle {\n"
-                                  "    gradient: Gradient {\n"
-                                  "        id: pGradient\n"
-                                  "        GradientStop { id: pOne; position: 0.0; color: \"lightsteelblue\" }\n"
-                                  "        GradientStop { id: pTwo; position: 1.0; color: \"blue\" }\n"
-                                  "    }\n"
-                                  "    Gradient {\n"
-                                  "        id: secondGradient\n"
-                                  "        GradientStop { id: nOne; position: 0.0; color: \"blue\" }\n"
-                                  "        GradientStop { id: nTwo; position: 1.0; color: \"lightsteelblue\" }\n"
-                                  "    }\n"
-                                  "}";
-
-void TestCore::loadGradient()
-{
-    QPlainTextEdit textEdit;
-    textEdit.setPlainText(rectWithGradient);
-    NotIndentingTextEditModifier textModifier(&textEdit);
-
-    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-    QVERIFY(model.data());
-
-    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    testRewriterView->setTextModifier(&textModifier);
-    model->attachView(testRewriterView.data());
-
-
-    QVERIFY(model.data());
-    ModelNode rootModelNode(testRewriterView->rootModelNode());
-    QVERIFY(rootModelNode.isValid());
-    QCOMPARE(rootModelNode.allDirectSubModelNodes().size(), 2);
-
-    {
-        QVERIFY(rootModelNode.hasProperty("gradient"));
-        AbstractProperty gradientProperty = rootModelNode.property("gradient");
-        QVERIFY(gradientProperty.isNodeProperty());
-        ModelNode gradientPropertyModelNode = gradientProperty.toNodeProperty().modelNode();
-        QVERIFY(gradientPropertyModelNode.isValid());
-        QCOMPARE(gradientPropertyModelNode.type(), QString("Qt/Gradient"));
-        QCOMPARE(gradientPropertyModelNode.allDirectSubModelNodes().size(), 2);
-
-        AbstractProperty stopsProperty = gradientPropertyModelNode.property("stops");
-        QVERIFY(stopsProperty.isValid());
-
-        QVERIFY(stopsProperty.isNodeListProperty());
-        QList<ModelNode>  stops = stopsProperty.toNodeListProperty().toModelNodeList();
-        QCOMPARE(stops.size(), 2);
-
-        ModelNode pOne = stops.first();
-        ModelNode pTwo = stops.last();
-
-        QCOMPARE(pOne.type(), QString("Qt/GradientStop"));
-        QCOMPARE(pOne.id(), QString("pOne"));
-        QCOMPARE(pOne.allDirectSubModelNodes().size(), 0);
-        QCOMPARE(pOne.propertyNames().size(), 2);
-        QCOMPARE(pOne.variantProperty("position").value().type(), QVariant::Double);
-        QCOMPARE(pOne.variantProperty("position").value().toDouble(), 0.0);
-        QCOMPARE(pOne.variantProperty("color").value().type(), QVariant::Color);
-        QCOMPARE(pOne.variantProperty("color").value().value<QColor>(), QColor("lightsteelblue"));
-
-        QCOMPARE(pTwo.type(), QString("Qt/GradientStop"));
-        QCOMPARE(pTwo.id(), QString("pTwo"));
-        QCOMPARE(pTwo.allDirectSubModelNodes().size(), 0);
-        QCOMPARE(pTwo.propertyNames().size(), 2);
-        QCOMPARE(pTwo.variantProperty("position").value().type(), QVariant::Double);
-        QCOMPARE(pTwo.variantProperty("position").value().toDouble(), 1.0);
-        QCOMPARE(pTwo.variantProperty("color").value().type(), QVariant::Color);
-        QCOMPARE(pTwo.variantProperty("color").value().value<QColor>(), QColor("blue"));
-    }
-
-    {
-        ModelNode gradientNode = rootModelNode.allDirectSubModelNodes().last();
-        QVERIFY(gradientNode.isValid());
-        QVERIFY(!gradientNode.metaInfo().isSubclassOf("Qt/Item", -1, -1));
-        QCOMPARE(gradientNode.type(), QString("Qt/Gradient"));
-        QCOMPARE(gradientNode.id(), QString("secondGradient"));
-        QCOMPARE(gradientNode.allDirectSubModelNodes().size(), 2);
-
-        AbstractProperty stopsProperty = gradientNode.property("stops");
-        QVERIFY(stopsProperty.isValid());
-
-        QVERIFY(stopsProperty.isNodeListProperty());
-        QList<ModelNode>  stops = stopsProperty.toNodeListProperty().toModelNodeList();
-        QCOMPARE(stops.size(), 2);
-
-        ModelNode nOne = stops.first();
-        ModelNode nTwo = stops.last();
-
-        QCOMPARE(nOne.type(), QString("Qt/GradientStop"));
-        QCOMPARE(nOne.id(), QString("nOne"));
-        QCOMPARE(nOne.allDirectSubModelNodes().size(), 0);
-        QCOMPARE(nOne.propertyNames().size(), 2);
-        QCOMPARE(nOne.variantProperty("position").value().type(), QVariant::Double);
-        QCOMPARE(nOne.variantProperty("position").value().toDouble(), 0.0);
-        QCOMPARE(nOne.variantProperty("color").value().type(), QVariant::Color);
-        QCOMPARE(nOne.variantProperty("color").value().value<QColor>(), QColor("blue"));
-
-        QCOMPARE(nTwo.type(), QString("Qt/GradientStop"));
-        QCOMPARE(nTwo.id(), QString("nTwo"));
-        QCOMPARE(nTwo.allDirectSubModelNodes().size(), 0);
-        QCOMPARE(nTwo.propertyNames().size(), 2);
-        QCOMPARE(nTwo.variantProperty("position").value().type(), QVariant::Double);
-        QCOMPARE(nTwo.variantProperty("position").value().toDouble(), 1.0);
-        QCOMPARE(nTwo.variantProperty("color").value().type(), QVariant::Color);
-        QCOMPARE(nTwo.variantProperty("color").value().value<QColor>(), QColor("lightsteelblue"));
-    }
-}
-
-void TestCore::changeGradientId()
-{
-    try {
-        QPlainTextEdit textEdit;
-        textEdit.setPlainText(rectWithGradient);
-        NotIndentingTextEditModifier textModifier(&textEdit);
-
-        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
-        QVERIFY(model.data());
-
-        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-        testRewriterView->setTextModifier(&textModifier);
-        model->attachView(testRewriterView.data());
-
-        QVERIFY(model.data());
-        ModelNode rootModelNode(testRewriterView->rootModelNode());
-        QVERIFY(rootModelNode.isValid());
-        QCOMPARE(rootModelNode.allDirectSubModelNodes().size(), 2);
-
-        AbstractProperty gradientProperty = rootModelNode.property("gradient");
-        QVERIFY(gradientProperty.isNodeProperty());
-        ModelNode gradientNode = gradientProperty.toNodeProperty().modelNode();
-        QVERIFY(gradientNode.isValid());
-        QCOMPARE(gradientNode.id(), QString("pGradient"));
-
-        gradientNode.setId("firstGradient");
-        QCOMPARE(gradientNode.id(), QString("firstGradient"));
-
-        AbstractProperty stopsProperty = gradientNode.property("stops");
-        QVERIFY(stopsProperty.isValid());
-
-        QVERIFY(stopsProperty.isNodeListProperty());
-        QList<ModelNode>  stops = stopsProperty.toNodeListProperty().toModelNodeList();
-        QCOMPARE(stops.size(), 2);
-
-        ModelNode firstStop = stops.at(0);
-        QVERIFY(firstStop.isValid());
-        firstStop.destroy();
-        QVERIFY(!firstStop.isValid());
-
-        ModelNode gradientStop  = addNodeListChild(gradientNode, "Qt/GradientStop", 4, 7, "stops");
-        gradientStop.variantProperty("position") = 0.5;
-        gradientStop.variantProperty("color") = QColor("yellow");
-
-        gradientStop.setId("newGradientStop");
-
-        QCOMPARE(gradientNode.allDirectSubModelNodes().size(), 2);
-        QCOMPARE(gradientNode.nodeListProperty("stops").toModelNodeList().size(), 2);
-        QCOMPARE(gradientStop.id(), QString("newGradientStop"));
-        QCOMPARE(gradientStop.variantProperty("position").value().toDouble(), 0.5);
-        QCOMPARE(gradientStop.variantProperty("color").value().value<QColor>(), QColor("yellow"));
-
-    } catch (Exception &e) {
-        qDebug() << e;
-        QFAIL(e.description().toLatin1().data());
-    }
-}
-
-
-QTEST_MAIN(TestCore);
diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.h b/tests/auto/qml/qmldesigner/coretests/testcore.h
deleted file mode 100644
index 3f29d22be1..0000000000
--- a/tests/auto/qml/qmldesigner/coretests/testcore.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#ifndef TESTCORE_H
-#define TESTCORE_H
-
-#include <QObject>
-
-#include <QtTest>
-
-
-class TestCore : public QObject
-{
-    Q_OBJECT
-public:
-    TestCore();
-
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-
-    //
-    // unit tests MetaInfo, NodeMetaInfo, PropertyMetaInfo
-    //
-    void testMetaInfo();
-    void testMetaInfoSimpleType();
-    void testMetaInfoUncreatableType();
-    void testMetaInfoExtendedType();
-    void testMetaInfoInterface();
-    void testMetaInfoCustomType();
-    void testMetaInfoEnums();
-    void testMetaInfoProperties();
-    void testMetaInfoDotProperties();
-    void testMetaInfoListProperties();
-
-    //
-    // unit tests Model, ModelNode, NodeProperty, AbstractView
-    //
-    void testModelCreateCoreModel();
-    void testModelCreateRect();
-    void testModelViewNotification();
-    void testModelCreateSubNode();
-    void testModelRemoveNode();
-    void testModelRootNode();
-    void testModelReorderSiblings();
-    void testModelAddAndRemoveProperty();
-    void testModelSliding();
-    void testModelBindings();
-    void testModelDynamicProperties();
-    void testModelDefaultProperties();
-    void testModelBasicOperations();
-    void testModelResolveIds();
-    void testModelNodeListProperty();
-    void testModelPropertyValueTypes();
-    void testModelNodeInHierarchy();
-    void testModelNodeIsAncestorOf();
-
-    //
-    // unit tests Rewriter
-    //
-    void testRewriterView();
-    void testRewriterErrors();
-    void testRewriterChangeId();
-    void testRewriterRemoveId();
-    void testRewriterChangeValueProperty();
-    void testRewriterRemoveValueProperty();
-    void testRewriterSignalProperty();
-    void testRewriterObjectTypeProperty();
-    void testRewriterPropertyChanges();
-    void testRewriterListModel();
-    void testRewriterAddProperty();
-    void testRewriterAddPropertyInNestedObject();
-    void testRewriterAddObjectDefinition();
-    void testRewriterAddStatesArray();
-    void testRewriterRemoveStates();
-    void testRewriterRemoveObjectDefinition();
-    void testRewriterRemoveScriptBinding();
-    void testRewriterNodeReparenting();
-    void testRewriterNodeReparentingWithTransaction();
-    void testRewriterMovingInOut();
-    void testRewriterMovingInOutWithTransaction();
-    void testRewriterComplexMovingInOut();
-    void testRewriterAutomaticSemicolonAfterChangedProperty();
-    void testRewriterTransaction();
-    void testRewriterId();
-    void testRewriterNodeReparentingTransaction1();
-    void testRewriterNodeReparentingTransaction2();
-    void testRewriterNodeReparentingTransaction3();
-    void testRewriterNodeReparentingTransaction4();
-    void testRewriterAddNodeTransaction();
-    void testRewriterComponentId();
-    void testRewriterPropertyDeclarations();
-    void testRewriterPropertyAliases();
-    void testRewriterPositionAndOffset();
-    void testRewriterFirstDefinitionInside();
-    void testRewriterComponentTextModifier();
-    void testRewriterPreserveType();
-    void testRewriterForArrayMagic();
-    void testRewriterWithSignals();
-    void testRewriterNodeSliding();
-    void testRewriterExceptionHandling();
-    void testRewriterDynamicProperties();
-    void testRewriterGroupedProperties();
-    void testRewriterPreserveOrder();
-    void testRewriterActionCompression();
-    void testRewriterImports();
-    void testRewriterChangeImports();
-
-    //
-    // unit tests QmlModelNodeFacade/QmlModelState
-    //
-
-    void testQmlModelStates();
-    void testQmlModelAddMultipleStates();
-    void testQmlModelRemoveStates();
-    void testQmlModelStatesInvalidForRemovedNodes();
-    void testQmlModelStateWithName();
-
-    //
-    // unit tests Instances
-    //
-    void testInstancesAttachToExistingModel();
-    void testInstancesStates();
-    void testInstancesIdResolution();
-    void testInstancesNotInScene();
-
-    //
-    // integration tests
-    //
-    void testBasicStates();
-    void testStates();
-    void testStatesBaseState();
-    void testStatesRewriter();
-    void testGradientsRewriter();
-    void testTypicalRewriterOperations();
-    void testBasicOperationsWithView();
-    void testQmlModelView();
-    void reparentingNode();
-    void reparentingNodeInModificationGroup();
-    void testRewriterTransactionRewriter();
-    void testCopyModelRewriter1();
-    void testCopyModelRewriter2();
-    void testSubComponentManager();
-    void testAnchorsAndRewriting();
-    void testAnchorsAndRewritingCenter();
-
-    //
-    // regression tests
-    //
-
-    void reparentingNodeLikeDragAndDrop();
-    void testRewriterForGradientMagic();
-
-    //
-    // old tests
-    //
-
-    void loadEmptyCoreModel();
-    void saveEmptyCoreModel();
-    void loadAttributesInCoreModel();
-    void saveAttributesInCoreModel();
-    void loadSubItems();
-
-
-    void createInvalidCoreModel();
-
-    void loadQml();
-
-    void defaultPropertyValues();
-
-    // Detailed tests for the rewriting:
-
-    // Anchor tests:
-    void loadAnchors();
-    void changeAnchors();
-    void anchorToSibling();
-    void removeFillAnchorByDetaching();
-    void removeFillAnchorByChanging();
-    void removeCenteredInAnchorByDetaching();
-
-    // Property bindings:
-    void changePropertyBinding();
-
-    // Bigger tests:
-    void loadTestFiles();
-
-    // Object bindings as properties:
-    void loadGradient();
-    void changeGradientId();
-};
-
-#endif // TESTCORE_H
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
new file mode 100644
index 0000000000..e4bfd34f6e
--- /dev/null
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
@@ -0,0 +1,6956 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "tst_testcore.h"
+
+#include <QScopedPointer>
+#include <QLatin1String>
+#include <QGraphicsObject>
+
+#include <metainfo.h>
+#include <model.h>
+#include <modelmerger.h>
+#include <modelnode.h>
+#include <qmlanchors.h>
+#include <invalididexception.h>
+#include <invalidmodelnodeexception.h>
+#include <rewritingexception.h>
+#include <nodeinstanceview.h>
+#include <nodeinstance.h>
+#include <subcomponentmanager.h>
+#include <QDebug>
+
+#include "../testview.h"
+#include <variantproperty.h>
+#include <abstractproperty.h>
+#include <bindingproperty.h>
+#include <nodeproperty.h>
+
+#include <nodelistproperty.h>
+#include <nodeabstractproperty.h>
+#include <componenttextmodifier.h>
+
+#include <bytearraymodifier.h>
+#include "testrewriterview.h"
+
+#include <qmljs/qmljsinterpreter.h>
+
+#include <QPlainTextEdit>
+#include <private/qdeclarativestate_p.h>
+#include <private/qdeclarativemetatype_p.h>
+
+
+using namespace QmlDesigner;
+#include <cstdio>
+#include "../common/statichelpers.cpp"
+
+static void initializeMetaTypeSystem(const QString &resourcePath)
+{
+    const QDir typeFileDir(resourcePath + QLatin1String("/qml-type-descriptions"));
+    const QStringList xmlExtensions = QStringList() << QLatin1String("*.xml");
+    const QFileInfoList xmlFiles = typeFileDir.entryInfoList(xmlExtensions,
+                                                             QDir::Files,
+                                                             QDir::Name);
+
+    const QStringList errors = QmlJS::Interpreter::CppQmlTypesLoader::load(xmlFiles);
+    foreach (const QString &error, errors)
+        qWarning() << qPrintable(error);
+}
+
+tst_TestCore::tst_TestCore()
+    : QObject()
+{
+}
+
+void tst_TestCore::initTestCase()
+{
+#ifndef QDEBUG_IN_TESTS
+    qInstallMsgHandler(testMessageOutput);
+#endif
+    Exception::setShouldAssert(false);
+
+    initializeMetaTypeSystem(QLatin1String(QTCREATORDIR "/share/qtcreator"));
+
+
+   // Load plugins
+
+#ifdef Q_OS_MAC
+    const QString pluginPath = QTCREATORDIR "/bin/Qt Creator.app/Contents/PlugIns/QmlDesigner";
+#else
+    const QString pluginPath = QTCREATORDIR "/lib/qmldesigner";
+#endif
+
+    qDebug() << pluginPath;
+    Q_ASSERT(QFileInfo(pluginPath).exists());
+    MetaInfo::setPluginPaths(QStringList() << pluginPath);
+}
+
+void tst_TestCore::cleanupTestCase()
+{
+    MetaInfo::clearGlobal();
+}
+
+void tst_TestCore::testModelCreateCoreModel()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> testView(new TestView);
+    QVERIFY(testView.data());
+    model->attachView(testView.data());
+
+    QVERIFY(testView->rootModelNode().isValid());
+    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
+    model->attachView(nodeInstanceView);
+    model->detachView(nodeInstanceView);
+}
+
+// TODO: this need to e updated for states
+void tst_TestCore::loadEmptyCoreModel()
+{
+    QFile file(":/fx/empty.qml");
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText(file.readAll());
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+
+    QPlainTextEdit textEdit2;
+    textEdit2.setPlainText("import Qt 4.7; Item{}");
+    NotIndentingTextEditModifier modifier2(&textEdit2);
+
+    QScopedPointer<Model> model2(Model::create("Qt/item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
+    testRewriterView2->setTextModifier(&modifier2);
+    model2->attachView(testRewriterView2.data());
+
+    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
+}
+
+void tst_TestCore::testRewriterView()
+{
+    try {
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item"));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestView> view(new TestView);
+        QVERIFY(view.data());
+        model->attachView(view.data());
+
+        ModelNode rootModelNode(view->rootModelNode());
+        QVERIFY(rootModelNode.isValid());
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+        ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+        QVERIFY(childNode.isValid());
+        childNode.setId("childNode");
+
+        ModelNode childNode2(addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data"));
+        childNode2.setId("childNode2");
+        ModelNode childNode3(addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "data"));
+        childNode3.setId("childNode3");
+        ModelNode childNode4(addNodeListChild(childNode3, "Qt/Rectangle", 4, 7, "data"));
+        childNode4.setId("childNode4");
+
+        QVERIFY(childNode.isValid());
+        QVERIFY(childNode2.isValid());
+        QVERIFY(childNode3.isValid());
+        QVERIFY(childNode4.isValid());
+
+        testRewriterView->setModificationGroupActive(true);
+
+        childNode.destroy();
+
+        QVERIFY(!childNode.isValid());
+        QVERIFY(!childNode2.isValid());
+        QVERIFY(!childNode3.isValid());
+        QVERIFY(!childNode4.isValid());
+
+        QVERIFY(testRewriterView->modelToTextMerger()->isNodeScheduledForRemoval(childNode));
+        QVERIFY(!testRewriterView->modelToTextMerger()->isNodeScheduledForRemoval(childNode2));
+        QVERIFY(!testRewriterView->modelToTextMerger()->isNodeScheduledForRemoval(childNode3));
+        QVERIFY(!testRewriterView->modelToTextMerger()->isNodeScheduledForRemoval(childNode4));
+
+        QVERIFY(!rootModelNode.hasProperty(QLatin1String("data")));
+
+        testRewriterView->modelToTextMerger()->applyChanges();
+
+        childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+        QVERIFY(testRewriterView->modelToTextMerger()->isNodeScheduledForAddition(childNode));
+
+        testRewriterView->modelToTextMerger()->applyChanges();
+
+        childNode.variantProperty("x") = 70;
+        childNode.variantProperty("y") = 90;
+
+        QCOMPARE(testRewriterView->modelToTextMerger()->findAddedVariantProperty(childNode.variantProperty("x")).value(), QVariant(70));
+        QCOMPARE(testRewriterView->modelToTextMerger()->findAddedVariantProperty(childNode.variantProperty("y")).value(), QVariant(90));
+
+        model->detachView(testRewriterView.data());
+    } catch (Exception &e) {
+        QFAIL(qPrintable(e.description()));
+    }
+}
+
+void tst_TestCore::testRewriterErrors()
+{
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+    textEdit.setPlainText("import Qt 4.7;\n\nError {\n}\n");
+    QVERIFY(!testRewriterView->errors().isEmpty());
+
+    textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
+    QVERIFY(testRewriterView->errors().isEmpty());
+}
+
+void tst_TestCore::saveEmptyCoreModel()
+{
+    QList<QDeclarativeError> errors;
+    QFile file(":/fx/empty.qml");
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText(file.readAll());
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+
+
+    QBuffer buffer;
+    buffer.open(QIODevice::ReadWrite | QIODevice::Text);
+    modifier1.save(&buffer);
+
+    QPlainTextEdit textEdit2;
+    textEdit2.setPlainText("import Qt 4.7; Item{}");
+    NotIndentingTextEditModifier modifier2(&textEdit2);
+
+    QScopedPointer<Model> model2(Model::create("Qt/item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
+    testRewriterView2->setTextModifier(&modifier2);
+    model2->attachView(testRewriterView2.data());
+
+    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
+
+}
+
+void tst_TestCore::loadAttributesInCoreModel()
+{
+    QList<QDeclarativeError> errors;
+    QFile file(":/fx/attributes.qml");
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText(file.readAll());
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+
+    QPlainTextEdit textEdit2;
+    textEdit2.setPlainText("import Qt 4.7; Item{}");
+    NotIndentingTextEditModifier modifier2(&textEdit2);
+
+    QScopedPointer<Model> model2(Model::create("Qt/item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
+    testRewriterView2->setTextModifier(&modifier2);
+    model2->attachView(testRewriterView2.data());
+
+    ModelNode rootModelNode = testRewriterView2->rootModelNode();
+
+    rootModelNode.setId("theItem");
+    rootModelNode.variantProperty("x").setValue(QVariant(300));
+    rootModelNode.variantProperty("visible").setValue(true);
+    rootModelNode.variantProperty("scale").setValue(0.5);
+
+    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
+}
+
+void tst_TestCore::saveAttributesInCoreModel()
+{
+    QFile file(":/fx/attributes.qml");
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText(file.readAll());
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+
+    QVERIFY(testRewriterView1->errors().isEmpty());
+
+    QBuffer buffer;
+    buffer.open(QIODevice::ReadWrite | QIODevice::Text);
+    modifier1.save(&buffer);
+
+    QPlainTextEdit textEdit2;
+    textEdit2.setPlainText(buffer.data());
+    NotIndentingTextEditModifier modifier2(&textEdit2);
+
+    QScopedPointer<Model> model2(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
+    testRewriterView2->setTextModifier(&modifier2);
+    model2->attachView(testRewriterView2.data());
+
+    QVERIFY(testRewriterView2->errors().isEmpty());
+
+    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
+}
+
+void tst_TestCore::testModelCreateRect()
+{
+     try {
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QVERIFY(view->rootModelNode().isValid());
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(childNode.isValid());
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
+    QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
+    QCOMPARE(childNode.simplifiedTypeName(), QString("Rectangle"));
+
+    QVERIFY(childNode.id().isEmpty());
+
+    childNode.setId("rect01");
+    QCOMPARE(childNode.id(), QString("rect01"));
+
+    childNode.variantProperty("x") = 100;
+    childNode.variantProperty("y") = 100;
+    childNode.variantProperty("width") = 100;
+    childNode.variantProperty("height") = 100;
+
+    QCOMPARE(childNode.propertyNames().count(), 4);
+    QCOMPARE(childNode.variantProperty("scale").value(), QVariant());
+
+     } catch (Exception &exception) {
+        QFAIL("Exception thrown");
+    }
+
+}
+
+void tst_TestCore::testRewriterDynamicProperties()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  property int i\n"
+                                  "  property int ii: 1\n"
+                                  "  property bool b\n"
+                                  "  property bool bb: true\n"
+                                  "  property double d\n"
+                                  "  property double dd: 1.1\n"
+                                  "  property real r\n"
+                                  "  property real rr: 1.1\n"
+                                  "  property string s\n"
+                                  "  property string ss: \"hello\"\n"
+                                  "  property url u\n"
+                                  "  property url uu: \"www\"\n"
+                                  "  property color c\n"
+                                  "  property color cc: \"#ffffff\"\n"
+                                  "  property date t\n"
+                                  "  property date tt: \"2000-03-20\"\n"
+                                  "  property variant v\n"
+                                  "  property variant vv: \"Hello\"\n"
+                                  "}");
+
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText(qmlString);
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+
+    QVERIFY(testRewriterView1->errors().isEmpty());
+
+    //
+    // text2model
+    //
+    ModelNode rootModelNode = testRewriterView1->rootModelNode();
+    QCOMPARE(rootModelNode.properties().count(), 18);
+    QVERIFY(rootModelNode.hasVariantProperty("i"));
+    QCOMPARE(rootModelNode.variantProperty("i").dynamicTypeName(), QString("int"));
+    QCOMPARE(rootModelNode.variantProperty("i").value().type(), QVariant::Int);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("i").value().toInt(), 0);
+
+    QVERIFY(rootModelNode.hasVariantProperty("ii"));
+    QCOMPARE(rootModelNode.variantProperty("ii").dynamicTypeName(), QString("int"));
+    QCOMPARE(rootModelNode.variantProperty("ii").value().type(), QVariant::Int);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("ii").value().toInt(), 1);
+
+    QVERIFY(rootModelNode.hasVariantProperty("b"));
+    QCOMPARE(rootModelNode.variantProperty("b").dynamicTypeName(), QString("bool"));
+    QCOMPARE(rootModelNode.variantProperty("b").value().type(), QVariant::Bool);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("b").value().toBool(), false);
+
+    QVERIFY(rootModelNode.hasVariantProperty("bb"));
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("bb").value().toBool(), true);
+
+    QVERIFY(rootModelNode.hasVariantProperty("d"));
+    QCOMPARE(rootModelNode.variantProperty("d").dynamicTypeName(), QString("double"));
+    QCOMPARE(rootModelNode.variantProperty("d").value().type(), QVariant::Double);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("d").value().toDouble(), 0.0);
+
+    QVERIFY(rootModelNode.hasVariantProperty("dd"));
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("dd").value().toDouble(), 1.1);
+
+    QVERIFY(rootModelNode.hasVariantProperty("r"));
+    QCOMPARE(rootModelNode.variantProperty("r").dynamicTypeName(), QString("real"));
+    QCOMPARE(rootModelNode.variantProperty("r").value().type(), QVariant::Double);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("r").value().toDouble(), 0.0);
+
+    QVERIFY(rootModelNode.hasVariantProperty("rr"));
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("rr").value().toDouble(), 1.1);
+
+    QVERIFY(rootModelNode.hasVariantProperty("s"));
+    QCOMPARE(rootModelNode.variantProperty("s").dynamicTypeName(), QString("string"));
+    QCOMPARE(rootModelNode.variantProperty("s").value().type(), QVariant::String);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("s").value().toString(), QString());
+
+    QVERIFY(rootModelNode.hasVariantProperty("ss"));
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("ss").value().toString(), QString("hello"));
+
+    QVERIFY(rootModelNode.hasVariantProperty("u"));
+    QCOMPARE(rootModelNode.variantProperty("u").dynamicTypeName(), QString("url"));
+    QCOMPARE(rootModelNode.variantProperty("u").value().type(), QVariant::Url);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("u").value().toUrl(), QUrl());
+
+    QVERIFY(rootModelNode.hasVariantProperty("uu"));
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("uu").value().toUrl(), QUrl("www"));
+
+    QVERIFY(rootModelNode.hasVariantProperty("c"));
+    QCOMPARE(rootModelNode.variantProperty("c").dynamicTypeName(), QString("color"));
+    QCOMPARE(rootModelNode.variantProperty("c").value().type(), QVariant::Color);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("c").value().value<QColor>(), QColor());
+
+    QVERIFY(rootModelNode.hasVariantProperty("cc"));
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("cc").value().value<QColor>(), QColor(255, 255, 255));
+
+    QVERIFY(rootModelNode.hasVariantProperty("t"));
+    QCOMPARE(rootModelNode.variantProperty("t").dynamicTypeName(), QString("date"));
+    QCOMPARE(rootModelNode.variantProperty("t").value().type(), QVariant::Date);
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("t").value().value<QDate>(), QDate());
+
+    QVERIFY(rootModelNode.hasVariantProperty("tt"));
+    QCOMPARE(testRewriterView1->rootModelNode().variantProperty("tt").value().value<QDate>(), QDate(2000, 3, 20));
+
+    QVERIFY(rootModelNode.hasVariantProperty("v"));
+    QCOMPARE(rootModelNode.variantProperty("v").dynamicTypeName(), QString("variant"));
+    const int type = rootModelNode.variantProperty("v").value().type();
+    QCOMPARE(type, QMetaType::type("QVariant"));
+
+    QVERIFY(rootModelNode.hasVariantProperty("vv"));
+    const QString inThere = testRewriterView1->rootModelNode().variantProperty("vv").value().value<QString>();
+    QCOMPARE(inThere, QString("Hello"));
+
+    // test model2text
+//    QPlainTextEdit textEdit2;
+//    textEdit2.setPlainText("import Qt 4.7; Item{}");
+//    NotIndentingTextEditModifier modifier2(&textEdit2);
+//
+//    QScopedPointer<Model> model2(Model::create("Qt/Item"));
+//
+//    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
+//    testRewriterView2->setTextModifier(&modifier2);
+//    model2->attachView(testRewriterView2.data());
+//
+//    testRewriterView2->rootModelNode().variantProperty("pushed").setDynamicTypeNameAndValue("bool", QVariant(false));
+//
+//    QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
+}
+
+void tst_TestCore::testRewriterGroupedProperties()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Text {\n"
+                                  "  font {\n"
+                                  "    pointSize: 10\n"
+                                  "    underline: true\n"
+                                  "  }\n"
+                                  "}\n");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier modifier1(&textEdit);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Text"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+
+    QVERIFY(testRewriterView1->errors().isEmpty());
+
+    //
+    // text2model
+    //
+    ModelNode rootModelNode = testRewriterView1->rootModelNode();
+    QCOMPARE(rootModelNode.property(QLatin1String("font.pointSize")).toVariantProperty().value().toDouble(), 10.0);
+    QCOMPARE(rootModelNode.property(QLatin1String("font.underline")).toVariantProperty().value().toBool(), true);
+
+    rootModelNode.removeProperty(QLatin1String("font.underline"));
+    QCOMPARE(rootModelNode.property(QLatin1String("font.pointSize")).toVariantProperty().value().toDouble(), 10.0);
+    QVERIFY(!rootModelNode.hasProperty(QLatin1String("font.underline")));
+
+    rootModelNode.variantProperty(QLatin1String("font.pointSize")).setValue(20.0);
+    QCOMPARE(rootModelNode.property(QLatin1String("font.pointSize")).toVariantProperty().value().toDouble(), 20.0);
+
+    rootModelNode.removeProperty(QLatin1String("font.pointSize"));
+    const QLatin1String expected("\n"
+                                 "import Qt 4.7\n"
+                                 "\n"
+                                 "Text {\n"
+                                 "}\n");
+
+    QCOMPARE(textEdit.toPlainText(), expected);
+}
+
+void tst_TestCore::testRewriterPreserveOrder()
+{
+    const QLatin1String qmlString1("\n"
+        "import Qt 4.7\n"
+        "\n"
+        "Rectangle {\n"
+            "width: 640\n"
+            "height: 480\n"
+            "\n"
+            "states: [\n"
+                "State {\n"
+                    "name: \"State1\"\n"
+                "}\n"
+            "]\n"
+            "\n"
+            "Rectangle {\n"
+                "id: rectangle1\n"
+                "x: 18\n"
+                "y: 19\n"
+                "width: 100\n"
+                "height: 100\n"
+            "}\n"
+        "}\n");
+    const QLatin1String qmlString2("\n"
+        "import Qt 4.7\n"
+        "\n"
+        "Rectangle {\n"
+            "width: 640\n"
+            "height: 480\n"
+            "\n"
+            "Rectangle {\n"
+                "id: rectangle1\n"
+                "x: 18\n"
+                "y: 19\n"
+                "width: 100\n"
+                "height: 100\n"
+            "}\n"
+            "states: [\n"
+                "State {\n"
+                    "name: \"State1\"\n"
+                "}\n"
+            "]\n"
+            "\n"
+        "}\n");
+
+        {
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(qmlString2);
+        NotIndentingTextEditModifier modifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Text"));
+
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&modifier);
+        model->attachView(testRewriterView.data());
+
+        QVERIFY(testRewriterView->errors().isEmpty());
+
+        ModelNode rootModelNode = testRewriterView->rootModelNode();
+        QVERIFY(rootModelNode.isValid());
+
+        RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
+
+        ModelNode newModelNode = testRewriterView->createModelNode("Qt/Rectangle", 4, 7);
+
+        newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
+
+        newModelNode.setId("rectangle2");
+        QCOMPARE(newModelNode.id(), QString("rectangle2"));
+
+        newModelNode.variantProperty("x") = 10;
+        newModelNode.variantProperty("y") = 10;
+        newModelNode.variantProperty("width") = 100;
+        newModelNode.variantProperty("height") = 100;
+
+        transaction.commit();
+
+        QCOMPARE(newModelNode.id(), QString("rectangle2"));
+    }
+
+    {
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(qmlString1);
+        NotIndentingTextEditModifier modifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Text"));
+
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&modifier);
+        model->attachView(testRewriterView.data());
+
+        QVERIFY(testRewriterView->errors().isEmpty());
+
+        ModelNode rootModelNode = testRewriterView->rootModelNode();
+        QVERIFY(rootModelNode.isValid());
+
+        RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
+
+        ModelNode newModelNode = testRewriterView->createModelNode("Qt/Rectangle", 4, 7);
+
+        newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
+
+        newModelNode.setId("rectangle2");
+        QCOMPARE(newModelNode.id(), QString("rectangle2"));
+
+        newModelNode.variantProperty("x") = 10;
+        newModelNode.variantProperty("y") = 10;
+        newModelNode.variantProperty("width") = 100;
+        newModelNode.variantProperty("height") = 100;
+
+        transaction.commit();
+
+        QCOMPARE(newModelNode.id(), QString("rectangle2"));
+    }
+}
+
+void tst_TestCore::testRewriterActionCompression()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  id: root\n"
+                                  "  Rectangle {\n"
+                                  "    id: rect1\n"
+                                  "    x: 10\n"
+                                  "    y: 10\n"
+                                  "  }\n"
+                                  "  Rectangle {\n"
+                                  "    id: rect2\n"
+                                  "    x: 10\n"
+                                  "    y: 10\n"
+                                  "  }\n"
+                                  "}\n");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier modifier1(&textEdit);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Rectangle"));
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView.data());
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+
+    ModelNode rootModelNode = testRewriterView->rootModelNode();
+    ModelNode rect1 = rootModelNode.property(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
+    ModelNode rect2 = rootModelNode.property(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(1);
+
+    QVERIFY(rect1.isValid());
+    QVERIFY(rect2.isValid());
+
+    RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
+    rect1.nodeListProperty(QLatin1String("data")).reparentHere(rect2);
+    rect2.variantProperty(QLatin1String("x")).setValue(1.0);
+    rect2.variantProperty(QLatin1String("y")).setValue(1.0);
+
+    rootModelNode.nodeListProperty(QLatin1String("data")).reparentHere(rect2);
+    rect2.variantProperty(QLatin1String("x")).setValue(9.0);
+    rect2.variantProperty(QLatin1String("y")).setValue(9.0);
+    transaction.commit();
+
+    const QLatin1String expected("\n"
+                                 "import Qt 4.7\n"
+                                 "\n"
+                                 "Rectangle {\n"
+                                 "  id: root\n"
+                                 "  Rectangle {\n"
+                                 "    id: rect1\n"
+                                 "    x: 10\n"
+                                 "    y: 10\n"
+                                 "  }\n"
+                                 "  Rectangle {\n"
+                                 "    id: rect2\n"
+                                 "    x: 9\n"
+                                 "    y: 9\n"
+                                 "  }\n"
+                                 "}\n");
+    QCOMPARE(textEdit.toPlainText(), expected);
+}
+
+void tst_TestCore::testRewriterImports()
+{
+    QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/imports.qml";
+    QFile file(fileName);
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(file.readAll());
+    NotIndentingTextEditModifier modifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    model->setFileUrl(QUrl::fromLocalFile(fileName));
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&modifier);
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+
+    QVERIFY(model->imports().size() == 3);
+
+    // import Qt 4.7
+    Import import = model->imports().at(0);
+    QVERIFY(import.isLibraryImport());
+    QCOMPARE(import.url(), QString("Qt"));
+    QVERIFY(import.hasVersion());
+    QCOMPARE(import.version(), QString("4.7"));
+    QVERIFY(!import.hasAlias());
+
+    // import "subitems"
+    import = model->imports().at(1);
+    QVERIFY(import.isFileImport());
+    QCOMPARE(import.file(), QString("subitems"));
+    QVERIFY(!import.hasVersion());
+    QVERIFY(!import.hasAlias());
+
+    // import QtWebKit 1.0 as Web
+    import = model->imports().at(2);
+    QVERIFY(import.isLibraryImport());
+    QCOMPARE(import.url(), QString("QtWebKit"));
+    QVERIFY(import.hasVersion());
+    QCOMPARE(import.version(), QString("1.0"));
+    QVERIFY(import.hasAlias());
+    QCOMPARE(import.alias(), QString("Web"));
+}
+
+void tst_TestCore::testRewriterChangeImports()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {}\n");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier modifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView(0, RewriterView::Amend));
+    testRewriterView->setTextModifier(&modifier);
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+
+    //
+    // Add / Remove an import in the model
+    //
+    Import webkitImport = Import::createLibraryImport("QtWebKit", "1.0");
+    model->addImport(webkitImport);
+
+    const QLatin1String qmlWithImport("\n"
+                                 "import Qt 4.7\n"
+                                 "import QtWebKit 1.0\n"
+                                 "\n"
+                                 "Rectangle {}\n");
+    QCOMPARE(textEdit.toPlainText(), qmlWithImport);
+
+    model->removeImport(webkitImport);
+
+    QCOMPARE(model->imports().size(), 1);
+    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
+
+    QCOMPARE(textEdit.toPlainText(), qmlString);
+
+
+    //
+    // Add / Remove an import in the model (with alias)
+    //
+    webkitImport = Import::createLibraryImport("QtWebKit", "1.0", "Web");
+    model->addImport(webkitImport);
+
+    const QLatin1String qmlWithAliasImport("\n"
+                                 "import Qt 4.7\n"
+                                 "import QtWebKit 1.0 as Web\n"
+                                 "\n"
+                                 "Rectangle {}\n");
+    QCOMPARE(textEdit.toPlainText(), qmlWithAliasImport);
+
+    model->removeImport(webkitImport);
+
+    QCOMPARE(model->imports().size(), 1);
+    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
+
+    QCOMPARE(textEdit.toPlainText(), qmlString);
+
+
+    //
+    // Add / Remove an import in text
+    //
+    textEdit.setPlainText(qmlWithImport);
+    QCOMPARE(model->imports().size(), 2);
+    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
+    QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0"));
+
+    textEdit.setPlainText(qmlWithAliasImport);
+    QCOMPARE(model->imports().size(), 2);
+    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
+    QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0", "Web"));
+
+    textEdit.setPlainText(qmlString);
+    QCOMPARE(model->imports().size(), 1);
+    QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
+}
+
+void tst_TestCore::testRewriterForGradientMagic()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    id: root\n"
+                                  "    x: 10;\n"
+                                  "    y: 10;\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle1\n"
+                                  "        x: 10;\n"
+                                  "        y: 10;\n"
+                                  "    }\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle2\n"
+                                  "        x: 100;\n"
+                                  "        y: 100;\n"
+                                  "        anchors.fill: root\n"
+                                  "    }\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle3\n"
+                                  "        x: 140;\n"
+                                  "        y: 180;\n"
+                                  "        gradient: Gradient {\n"
+                                  "             GradientStop {\n"
+                                  "                 position: 0\n"
+                                  "                 color: \"white\"\n"
+                                  "             }\n"
+                                  "             GradientStop {\n"
+                                  "                  position: 1\n"
+                                  "                  color: \"black\"\n"
+                                  "             }\n"
+                                  "        }\n"
+                                  "    }\n"
+                                  "}");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier modifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Text"));
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&modifier);
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+
+    ModelNode rootModelNode = testRewriterView->rootModelNode();
+    QVERIFY(rootModelNode.isValid());
+
+    ModelNode myRect = testRewriterView->modelNodeForId(QLatin1String("rectangle3"));
+    QVERIFY(myRect.isValid());
+    myRect.variantProperty("rotation") = QVariant(45);
+    QVERIFY(myRect.isValid());
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model1.data());
+
+    QScopedPointer<TestView> view1(new TestView);
+    model1->attachView(view1.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Item {}");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+
+    QVERIFY(testRewriterView1->errors().isEmpty());
+
+    RewriterTransaction transaction(view1->beginRewriterTransaction());
+
+    ModelMerger merger(view1.data());
+
+    QVERIFY(myRect.isValid());
+    merger.replaceModel(myRect);
+    transaction.commit();
+}
+
+void tst_TestCore::loadSubItems()
+{
+    QFile file(QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/topitem.qml");
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText(file.readAll());
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+}
+
+void tst_TestCore::createInvalidCoreModel()
+{
+    QScopedPointer<Model> invalidModel(Model::create("ItemSUX"));
+    //QVERIFY(!invalidModel.data()); //#no direct ype checking in model atm
+
+    QScopedPointer<Model> invalidModel2(Model::create("InvalidNode"));
+    //QVERIFY(!invalidModel2.data());
+}
+
+void tst_TestCore::testModelCreateSubNode()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QList<TestView::MethodCall> expectedCalls;
+    expectedCalls << TestView::MethodCall("modelAttached", QStringList() << QString::number(reinterpret_cast<long>(model.data())));
+    QCOMPARE(view->methodCalls(), expectedCalls);
+
+    QVERIFY(view->rootModelNode().isValid());
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(childNode.isValid());
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
+    QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
+    QCOMPARE(childNode.simplifiedTypeName(), QString("Rectangle"));
+
+    expectedCalls << TestView::MethodCall("nodeCreated", QStringList() << "");
+    expectedCalls << TestView::MethodCall("nodeReparented", QStringList() << "" << "data" << "" << "PropertiesAdded");
+    QCOMPARE(view->methodCalls(), expectedCalls);
+
+    QVERIFY(childNode.id().isEmpty());
+    childNode.setId("blah");
+    QCOMPARE(childNode.id(), QString("blah"));
+
+    expectedCalls << TestView::MethodCall("nodeIdChanged", QStringList() << "blah" << "blah" << "");
+    QCOMPARE(view->methodCalls(), expectedCalls);
+
+    try {
+        childNode.setId("invalid id");
+        QFAIL("Setting an invalid id does not throw an excxeption");
+    } catch (Exception &exception) {
+        QCOMPARE(exception.type(), QString("InvalidIdException"));
+    }
+
+    QCOMPARE(childNode.id(), QString("blah"));
+    QCOMPARE(view->methodCalls(), expectedCalls);
+
+    childNode.setId(QString());
+    QVERIFY(childNode.id().isEmpty());
+}
+
+
+void tst_TestCore::testTypicalRewriterOperations()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode = view->rootModelNode();
+    QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 0);
+
+    QVERIFY(rootModelNode.property("test").isValid());
+    QVERIFY(!rootModelNode.property("test").isVariantProperty());
+    QVERIFY(!rootModelNode.property("test").isBindingProperty());
+
+    QVERIFY(rootModelNode.variantProperty("test").isValid());
+    QVERIFY(!rootModelNode.hasProperty("test"));
+
+    rootModelNode.variantProperty("test") = 70;
+
+    QVERIFY(rootModelNode.hasProperty("test"));
+    QVERIFY(rootModelNode.property("test").isVariantProperty());
+    QCOMPARE(rootModelNode.variantProperty("test").value(), QVariant(70));
+
+    rootModelNode.bindingProperty("test") = "parent.x";
+    QVERIFY(!rootModelNode.property("test").isVariantProperty());
+    QVERIFY(rootModelNode.property("test").isBindingProperty());
+
+    QCOMPARE(rootModelNode.bindingProperty("test").expression(), QString("parent.x"));
+
+    ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4 ,6, "data"));
+    rootModelNode.nodeListProperty("test").reparentHere(childNode);
+    QCOMPARE(childNode.parentProperty(), rootModelNode.nodeAbstractProperty("test"));
+    QVERIFY(rootModelNode.property("test").isNodeAbstractProperty());
+    QVERIFY(rootModelNode.property("test").isNodeListProperty());
+    QVERIFY(!rootModelNode.property("test").isBindingProperty());
+    QVERIFY(childNode.parentProperty().isNodeListProperty());
+    QCOMPARE(childNode, childNode.parentProperty().toNodeListProperty().toModelNodeList().first());
+    QCOMPARE(rootModelNode, childNode.parentProperty().parentModelNode());
+    QCOMPARE(childNode.parentProperty().name(), QString("test"));
+
+    QVERIFY(!rootModelNode.property("test").isVariantProperty());
+    rootModelNode.variantProperty("test") = 90;
+    QVERIFY(rootModelNode.property("test").isVariantProperty());
+    QCOMPARE(rootModelNode.variantProperty("test").value(), QVariant(90));
+
+}
+
+void tst_TestCore::testBasicStates()
+{
+    char qmlString[] = "import Qt 4.7\n"
+                       "Rectangle {\n"
+                       "id: root;\n"
+                            "Rectangle {\n"
+                                "id: rect1;\n"
+                            "}\n"
+                            "Rectangle {\n"
+                                "id: rect2;\n"
+                            "}\n"
+                            "states: [\n"
+                                "State {\n"
+                                    "name: \"state1\"\n"
+                                    "PropertyChanges {\n"
+                                        "target: rect1\n"
+                                    "}\n"
+                                    "PropertyChanges {\n"
+                                        "target: rect2\n"
+                                    "}\n"
+                                "}\n"
+                                ","
+                                "State {\n"
+                                    "name: \"state2\"\n"
+                                    "PropertyChanges {\n"
+                                        "target: rect1\n"
+                                    "}\n"
+                                    "PropertyChanges {\n"
+                                        "target: rect2;\n"
+                                        "x: 10;\n"
+                                    "}\n"
+                                "}\n"
+                            "]\n"
+                       "}\n";
+
+    Exception::setShouldAssert(true);
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+
+    model->attachView(testRewriterView.data());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
+
+    QVERIFY(rootModelNode.hasProperty("data"));
+
+    QVERIFY(rootModelNode.property("data").isNodeListProperty());
+
+    QCOMPARE(rootModelNode.nodeListProperty("data").toModelNodeList().count(), 2);
+
+    ModelNode rect1 = rootModelNode.nodeListProperty("data").toModelNodeList().first();
+    ModelNode rect2 = rootModelNode.nodeListProperty("data").toModelNodeList().last();
+
+    QVERIFY(QmlItemNode(rect1).isValid());
+    QVERIFY(QmlItemNode(rect2).isValid());
+
+    QVERIFY(QmlItemNode(rootModelNode).isValid());
+
+    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 2);
+    QCOMPARE(QmlItemNode(rootModelNode).states().names().count(), 2);
+    QCOMPARE(QmlItemNode(rootModelNode).states().names().first(), QString("state1"));
+    QCOMPARE(QmlItemNode(rootModelNode).states().names().last(), QString("state2"));
+
+    //
+    // QmlModelState API tests
+    //
+    QmlModelState state1 = QmlItemNode(rootModelNode).states().state("state1");
+    QmlModelState state2 = QmlItemNode(rootModelNode).states().state("state2");
+
+    QVERIFY(state1.isValid());
+    QVERIFY(state2.isValid());
+
+    QCOMPARE(state1.propertyChanges().count(), 2);
+    QCOMPARE(state2.propertyChanges().count(), 2);
+
+    QVERIFY(!state1.hasPropertyChanges(rootModelNode));
+
+    QVERIFY(state1.propertyChanges(rect1).isValid());
+    QVERIFY(state1.propertyChanges(rect2).isValid());
+
+    state1.propertyChanges(rect2).modelNode().hasProperty("x");
+
+    QCOMPARE(QmlItemNode(rect1).allAffectingStates().count(), 2);
+    QCOMPARE(QmlItemNode(rect2).allAffectingStates().count(), 2);
+    QCOMPARE(QmlItemNode(rootModelNode).allAffectingStates().count(), 0);
+    QCOMPARE(QmlItemNode(rect1).allAffectingStatesOperations().count(), 2);
+    QCOMPARE(QmlItemNode(rect2).allAffectingStatesOperations().count(), 2);
+
+    //
+    // check real state2 object
+    //
+
+    NodeInstance state2Instance = view->instanceForModelNode(state2.modelNode());
+    QVERIFY(state2Instance.isValid());
+    QDeclarativeState *stateObject = qobject_cast<QDeclarativeState*>(const_cast<QObject*>(state2Instance.testHandle()));
+    QDeclarativeListProperty<QDeclarativeStateOperation> changesList = stateObject->changes();
+    QCOMPARE(changesList.count(&changesList), 2);
+    QCOMPARE(changesList.at(&changesList, 0)->actions().size(), 0);
+    QCOMPARE(changesList.at(&changesList, 1)->actions().size(), 1);
+
+
+    //
+    // actual state switching
+    //
+
+    // base state
+    QCOMPARE(view->currentState(), view->baseState());
+    NodeInstance rect2Instance = view->instanceForModelNode(rect2);
+    QVERIFY(rect2Instance.isValid());
+    QCOMPARE(rect2Instance.property("x").toInt(), 0);
+
+    int expectedViewMethodCount = view->methodCalls().count();
+
+    // base state-> state2
+    view->setCurrentState(state2);
+    QCOMPARE(view->currentState(), state2);
+    QCOMPARE(view->methodCalls().size(), ++expectedViewMethodCount);
+    QCOMPARE(view->methodCalls().last(), TestView::MethodCall("stateChanged", QStringList() << "state2" << QString()));
+    QCOMPARE(rect2Instance.property("x").toInt(), 10);
+
+    // state2 -> state1
+    view->setCurrentState(state1);
+    QCOMPARE(view->currentState(), state1);
+    expectedViewMethodCount += 2; // Since commit fa640f66db we're always going through the base state
+    QCOMPARE(view->methodCalls().size(), expectedViewMethodCount);
+    QCOMPARE(view->methodCalls().at(view->methodCalls().size()-2), TestView::MethodCall("stateChanged", QStringList() << QString() << "state2"));
+    QCOMPARE(view->methodCalls().at(view->methodCalls().size()-1), TestView::MethodCall("stateChanged", QStringList() << "state1" << QString()));
+    QCOMPARE(rect2Instance.property("x").toInt(), 0);
+
+    // state1 -> baseState
+    view->setCurrentState(view->baseState());
+    QCOMPARE(view->currentState(), view->baseState());
+    QCOMPARE(view->methodCalls().size(), ++expectedViewMethodCount);
+    QCOMPARE(view->methodCalls().last(), TestView::MethodCall("stateChanged", QStringList() << QString() << "state1"));
+    QCOMPARE(rect2Instance.property("x").toInt(), 0);
+}
+
+void tst_TestCore::testModelBasicOperations()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode = view->rootModelNode();
+    QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 0);
+
+    rootModelNode.variantProperty("width").setValue(10);
+    rootModelNode.variantProperty("height").setValue(10);
+
+    QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 10);
+    QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 10);
+
+    QVERIFY(rootModelNode.hasProperty("width"));
+    rootModelNode.removeProperty("width");
+    QVERIFY(!rootModelNode.hasProperty("width"));
+
+    QVERIFY(!rootModelNode.hasProperty("children"));
+    ModelNode childNode1(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "children"));
+    ModelNode childNode2(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+
+    QVERIFY(childNode1.isValid());
+    QVERIFY(childNode2.isValid());
+
+    QVERIFY(childNode1.parentProperty().parentModelNode().isValid());
+    QVERIFY(childNode2.parentProperty().parentModelNode().isValid());
+
+    QVERIFY(rootModelNode.hasProperty("children"));
+    childNode2.setParentProperty(rootModelNode, "children");
+    QVERIFY(!rootModelNode.hasProperty("data"));
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
+    QVERIFY(rootModelNode.hasProperty("children"));
+    childNode2.setParentProperty(rootModelNode, "data");
+    childNode1.setParentProperty(rootModelNode, "data");
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
+    QVERIFY(!rootModelNode.hasProperty("children"));
+    QVERIFY(rootModelNode.hasProperty("data"));
+
+    QVERIFY(childNode2.isValid());
+    QVERIFY(childNode2.parentProperty().parentModelNode().isValid());
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
+
+    childNode1.setParentProperty(rootModelNode, "children");
+    rootModelNode.removeProperty("data");
+    QVERIFY(!childNode2.isValid());
+    QVERIFY(!rootModelNode.hasProperty("data"));
+
+    QVERIFY(childNode1.isValid());
+    rootModelNode.nodeProperty("front").setModelNode(childNode1);
+    QVERIFY(rootModelNode.hasProperty("front"));
+    QCOMPARE(childNode1.parentProperty().parentModelNode(), rootModelNode);
+    rootModelNode.removeProperty("front");
+    QVERIFY(!childNode1.isValid());
+}
+
+void tst_TestCore::testModelResolveIds()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    rootNode.setId("rootNode");
+
+    ModelNode childNode1(addNodeListChild(rootNode, "Qt/Rectangle", 4, 7, "children"));
+
+    ModelNode childNode2(addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "children"));
+    childNode2.setId("childNode2");
+    childNode2.bindingProperty("test").setExpression("parent.parent");
+
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
+    childNode1.setId("childNode1");
+    childNode2.bindingProperty("test").setExpression("childNode1.parent");
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
+    childNode2.bindingProperty("test").setExpression("rootNode");
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
+
+    ModelNode childNode3(addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "children"));
+    childNode3.setId("childNode3");
+    childNode2.nodeProperty("front").setModelNode(childNode3);
+    childNode2.bindingProperty("test").setExpression("childNode3.parent");
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode2);
+    childNode2.bindingProperty("test").setExpression("childNode3.parent.parent");
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode1);
+    childNode2.bindingProperty("test").setExpression("childNode3.parent.parent.parent");
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
+    childNode2.bindingProperty("test").setExpression("childNode3");
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode3);
+    childNode2.bindingProperty("test").setExpression("front");
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode3);
+    childNode2.bindingProperty("test").setExpression("back");
+    QVERIFY(!childNode2.bindingProperty("test").resolveToModelNode().isValid());
+    childNode2.bindingProperty("test").setExpression("childNode3.parent.front");
+    QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), childNode3);
+
+    childNode2.variantProperty("x") = 10;
+    QCOMPARE(childNode2.variantProperty("x").value().toInt(), 10);
+
+    childNode2.bindingProperty("test").setExpression("childNode3.parent.x");
+    QVERIFY(childNode2.bindingProperty("test").resolveToProperty().isVariantProperty());
+    QCOMPARE(childNode2.bindingProperty("test").resolveToProperty().toVariantProperty().value().toInt(), 10);
+
+    childNode2.bindingProperty("test").setExpression("childNode3.parent.test");
+    QVERIFY(childNode2.bindingProperty("test").resolveToProperty().isBindingProperty());
+    QCOMPARE(childNode2.bindingProperty("test").resolveToProperty().toBindingProperty().expression(), QString("childNode3.parent.test"));
+}
+
+void tst_TestCore::testModelNodeListProperty()
+{
+    //
+    // Test NodeListProperty API
+    //
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootNode = view->rootModelNode();
+
+    //
+    // Item {}
+    //
+    NodeListProperty rootChildren = rootNode.nodeListProperty("children");
+    QVERIFY(!rootNode.hasProperty("children"));
+    QVERIFY(rootChildren.isValid());
+    QVERIFY(!rootChildren.isNodeListProperty());
+    QVERIFY(rootChildren.isEmpty());
+
+    ModelNode rectNode = view->createModelNode("Qt/Rectangle", 4, 7);
+    rootChildren.reparentHere(rectNode);
+
+    //
+    // Item { children: [ Rectangle {} ] }
+    //
+    QVERIFY(rootNode.hasProperty("children"));
+    QVERIFY(rootChildren.isValid());
+    QVERIFY(rootChildren.isNodeListProperty());
+    QVERIFY(!rootChildren.isEmpty());
+
+    ModelNode mouseAreaNode = view->createModelNode("Qt/Item", 4, 7);
+    NodeListProperty rectChildren = rectNode.nodeListProperty("children");
+    rectChildren.reparentHere(mouseAreaNode);
+
+    //
+    // Item { children: [ Rectangle { children : [ MouseArea {} ] } ] }
+    //
+    QVERIFY(rectNode.hasProperty("children"));
+    QVERIFY(rectChildren.isValid());
+    QVERIFY(rectChildren.isNodeListProperty());
+    QVERIFY(!rectChildren.isEmpty());
+
+    rectNode.destroy();
+
+    //
+    // Item { }
+    //
+    QVERIFY(!rectNode.isValid());
+    QVERIFY(!mouseAreaNode.isValid());
+    QVERIFY(!rootNode.hasProperty("children"));
+    QVERIFY(rootChildren.isValid());
+    QVERIFY(!rootChildren.isNodeListProperty());
+    QVERIFY(rootChildren.isEmpty());
+    QVERIFY(!rectChildren.isValid());
+}
+
+void tst_TestCore::testBasicOperationsWithView()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
+    model->attachView(nodeInstanceView);
+
+    ModelNode rootModelNode = view->rootModelNode();
+    QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 0);
+    NodeInstance rootInstance = nodeInstanceView->instanceForNode(rootModelNode);
+
+    // no width, height specified implicitly is set to 100x100
+    QCOMPARE(rootInstance.size().width(), 100.0);
+    QCOMPARE(rootInstance.size().height(), 100.0);
+
+    QVERIFY(rootInstance.isValid());
+    QVERIFY(rootInstance.isQmlGraphicsItem());
+
+    QVERIFY(rootModelNode.isValid());
+
+    rootModelNode.variantProperty("width").setValue(10);
+    rootModelNode.variantProperty("height").setValue(10);
+
+    QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 10);
+    QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 10);
+
+    QCOMPARE(rootInstance.size().width(), 10.0);
+    QCOMPARE(rootInstance.size().height(), 10.0);
+
+    ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+    ModelNode childNode2(addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data"));
+    QVERIFY(childNode2.parentProperty().parentModelNode() == childNode);
+
+    QVERIFY(childNode.isValid());
+
+    {
+        NodeInstance childInstance2 = nodeInstanceView->instanceForNode(childNode2);
+        NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
+
+        QVERIFY(childInstance.isValid());
+        QVERIFY(childInstance.isQmlGraphicsItem());
+        QVERIFY(qobject_cast<QGraphicsObject*>(childInstance2.testHandle())->parentItem()->toGraphicsObject() == childInstance.testHandle());
+        QVERIFY(qobject_cast<QGraphicsObject*>(childInstance.testHandle())->parentItem()->toGraphicsObject() == rootInstance.testHandle());
+        QCOMPARE(childInstance.size().width(), 0.0);
+        QCOMPARE(childInstance.size().height(), 0.0);
+
+
+        childNode.variantProperty("width").setValue(100);
+        childNode.variantProperty("height").setValue(100);
+
+        QCOMPARE(childNode.variantProperty("width").value().toInt(), 100);
+        QCOMPARE(childNode.variantProperty("height").value().toInt(), 100);
+
+        QCOMPARE(childInstance.size().width(), 100.0);
+        QCOMPARE(childInstance.size().height(), 100.0);
+
+        childNode.destroy();
+        QVERIFY(!childNode.isValid());
+        QVERIFY(!childNode2.isValid());
+        QVERIFY(childInstance.testHandle() == 0);
+        QVERIFY(childInstance2.testHandle() == 0);
+        QVERIFY(!childInstance.isValid());
+        QVERIFY(!childInstance2.isValid());
+    }
+
+    childNode = addNodeListChild(rootModelNode, "Qt/Image", 4, 7, "data");
+    QVERIFY(childNode.isValid());
+    QCOMPARE(childNode.type(), QString("Qt/Image"));
+    childNode2 = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(childNode2.isValid());
+    childNode2.setParentProperty(rootModelNode, "data");
+    QVERIFY(childNode2.isValid());
+
+    {
+        NodeInstance childInstance2 = nodeInstanceView->instanceForNode(childNode2);
+        NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
+
+        QVERIFY(childInstance.isValid());
+        QVERIFY(childInstance.isQmlGraphicsItem());
+        QVERIFY(qobject_cast<QGraphicsObject*>(childInstance2.testHandle())->parentItem()->toGraphicsObject() == rootInstance.testHandle());
+        QVERIFY(qobject_cast<QGraphicsObject*>(childInstance.testHandle())->parentItem()->toGraphicsObject() == rootInstance.testHandle());
+        QCOMPARE(childInstance.size().width(), 0.0);
+        QCOMPARE(childInstance.size().height(), 0.0);
+
+        QCOMPARE(rootModelNode, childNode2.parentProperty().parentModelNode());
+
+        childNode.variantProperty("width").setValue(20);
+        QCOMPARE(childInstance.property("width").toInt(), 20);
+
+        QCOMPARE(childNode.variantProperty("width").value().toInt(), 20);
+        childNode.removeProperty("width");
+        QVERIFY(!childNode.hasProperty("width"));
+
+        rootModelNode.removeProperty("data");
+        QVERIFY(!childNode.isValid());
+        QVERIFY(!childNode2.isValid());
+        QVERIFY(childInstance.testHandle() == 0);
+        QVERIFY(childInstance2.testHandle() == 0);
+        QVERIFY(!childInstance.isValid());
+        QVERIFY(!childInstance2.isValid());
+    }
+
+    model->detachView(nodeInstanceView);
+}
+
+void tst_TestCore::testQmlModelView()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QmlModelView *view = new TestView(model.data());
+    QVERIFY(view);
+    model->attachView(view);
+    QVERIFY(view->model());
+    QVERIFY(view->rootQmlObjectNode().isValid());
+    QVERIFY(!view->rootQmlObjectNode().hasNodeParent());
+    QVERIFY(!view->rootQmlObjectNode().hasInstanceParent());
+    QVERIFY(view->rootQmlObjectNode().isRootModelNode());
+
+    PropertyListType propertyList;
+    propertyList.append(qMakePair(QString("x"), QVariant(20)));
+    propertyList.append(qMakePair(QString("y"), QVariant(20)));
+    propertyList.append(qMakePair(QString("width"), QVariant(20)));
+    propertyList.append(qMakePair(QString("height"), QVariant(20)));
+
+    QmlObjectNode node1 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+
+    QVERIFY(node1.isValid());
+    QVERIFY(!node1.hasNodeParent());
+    QVERIFY(!node1.hasInstanceParent());
+
+    QCOMPARE(node1.instanceValue("x").toInt(), 20);
+    QCOMPARE(node1.instanceValue("y").toInt(), 20);
+
+    node1.setParentProperty(view->rootQmlObjectNode().nodeAbstractProperty("children"));
+
+    QVERIFY(node1.hasNodeParent());
+    QVERIFY(node1.hasInstanceParent());
+    QVERIFY(node1.instanceParent() == view->rootQmlObjectNode());
+
+
+    QmlObjectNode node2 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+
+    QVERIFY(node2.isValid());
+    QVERIFY(!node2.hasNodeParent());
+    QVERIFY(!node2.hasInstanceParent());
+
+    node2.setParentProperty(view->rootQmlObjectNode().nodeAbstractProperty("children"));
+
+    QVERIFY(node2.hasNodeParent());
+    QVERIFY(node2.hasInstanceParent());
+    QVERIFY(node2.instanceParent() == view->rootQmlObjectNode());
+
+
+    node2.setParentProperty(node1.nodeAbstractProperty("children"));
+
+    QVERIFY(node2.hasNodeParent());
+    QVERIFY(node2.hasInstanceParent());
+    QVERIFY(node2.instanceParent() == node1);
+
+        node2.setParentProperty(view->rootQmlObjectNode().nodeAbstractProperty("children"));
+
+    QCOMPARE(node1.instanceValue("x").toInt(), 20);
+
+    node1.setVariantProperty("x", 2);
+
+    QCOMPARE(node1.instanceValue("x").toInt(), 2);
+
+
+    QmlObjectNode node3 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+    QmlObjectNode node4 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+    QmlObjectNode node5 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+    QmlObjectNode node6 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+    QmlObjectNode node7 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+    QmlObjectNode node8 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+
+    node3.setParentProperty(node2.nodeAbstractProperty("children"));
+    node4.setParentProperty(node3.nodeAbstractProperty("children"));
+    node5.setParentProperty(node4.nodeAbstractProperty("children"));
+    node6.setParentProperty(node5.nodeAbstractProperty("children"));
+    node7.setParentProperty(node6.nodeAbstractProperty("children"));
+    node8.setParentProperty(node7.nodeAbstractProperty("children"));
+
+    QCOMPARE(node2.nodeAbstractProperty("children").allSubNodes().count(), 6);
+    QVERIFY(node8.isValid());
+    node3.destroy();
+    QVERIFY(!node8.isValid());
+    QCOMPARE(node2.nodeAbstractProperty("children").allSubNodes().count(), 0);
+
+    node1.setId("node1");
+
+    node2.setVariantProperty("x", 20);
+    node2.setBindingProperty("x", "node1.x");
+    QCOMPARE(node2.instanceValue("x").toInt(), 2);
+    node1.setVariantProperty("x", 10);
+    QCOMPARE(node2.instanceValue("x").toInt(), 10);
+
+    node1.destroy();
+    QVERIFY(!node1.isValid());
+
+    QCOMPARE(node2.instanceValue("x").toInt(), 10); // is this right? or should it be a invalid qvariant?
+
+    node1 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+    node1.setId("node1");
+
+    QCOMPARE(node2.instanceValue("x").toInt(), 20);
+
+    node3 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+    node3.setParentProperty(node2.nodeAbstractProperty("children"));
+    QCOMPARE(node3.instanceValue("width").toInt(), 20);
+    node3.setVariantProperty("width", 0);
+    QCOMPARE(node3.instanceValue("width").toInt(), 0);
+
+    QCOMPARE(node3.instanceValue("x").toInt(), 20);
+    QVERIFY(!QDeclarativeMetaType::toQObject(node3.instanceValue("anchors.fill")));
+    node3.setBindingProperty("anchors.fill", "parent");
+    QVERIFY(QDeclarativeMetaType::toQObject(node3.instanceValue("anchors.fill")));
+    QCOMPARE(node3.instanceValue("x").toInt(), 0);
+    QCOMPARE(node3.instanceValue("width").toInt(), 20);
+
+    node3.setParentProperty(node1.nodeAbstractProperty("children"));
+    node1.setVariantProperty("width", 50);
+    node2.setVariantProperty("width", 100);
+    QCOMPARE(node3.instanceValue("width").toInt(), 50);
+
+}
+
+void tst_TestCore::testModelRemoveNode()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
+    model->attachView(nodeInstanceView);
+
+    QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 0);
+
+
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(childNode.isValid());
+    QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 1);
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
+    QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
+
+    {
+        NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
+        QVERIFY(childInstance.isValid());
+        QVERIFY(childInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
+    }
+
+    ModelNode subChildNode = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(subChildNode.isValid());
+    QCOMPARE(childNode.allDirectSubModelNodes().count(), 1);
+    QVERIFY(childNode.allDirectSubModelNodes().contains(subChildNode));
+    QVERIFY(subChildNode.parentProperty().parentModelNode() == childNode);
+
+    {
+        NodeInstance subChildInstance = nodeInstanceView->instanceForNode(subChildNode);
+        QVERIFY(subChildInstance.isValid());
+        QVERIFY(subChildInstance.parent() == nodeInstanceView->instanceForNode(childNode));
+    }
+
+    childNode.destroy();
+
+    QVERIFY(!nodeInstanceView->hasInstanceForNode(childNode));
+
+    QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 0);
+    QVERIFY(!view->rootModelNode().allDirectSubModelNodes().contains(childNode));
+    QVERIFY(!childNode.isValid());
+    QVERIFY(!subChildNode.isValid());
+
+    try {
+        view->rootModelNode().destroy();
+        QFAIL("remove the rootModelNode should be throw a exception");
+    } catch (Exception &exception) {
+        QCOMPARE(exception.type(), QString("InvalidArgumentException"));
+    }
+
+    QVERIFY(view->rootModelNode().isValid());
+
+    // delete node not in hierarchy
+    childNode = view->createModelNode("Qt/Item", 4, 7);
+    childNode.destroy();
+
+    model->detachView(nodeInstanceView);
+}
+
+void tst_TestCore::reparentingNode()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode = view->rootModelNode();
+    QVERIFY(rootModelNode.isValid());
+    rootModelNode.setId("rootModelNode");
+    QCOMPARE(rootModelNode.id(), QString("rootModelNode"));
+
+
+    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
+    model->attachView(nodeInstanceView);
+
+    ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    QCOMPARE(childNode.parentProperty().parentModelNode(), rootModelNode);
+    QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode));
+
+    {
+        NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
+        QVERIFY(childInstance.isValid());
+        QVERIFY(childInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
+    }
+
+    ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Item", 4, 7, "data");
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
+    QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
+
+    {
+        NodeInstance childIstance2 = nodeInstanceView->instanceForNode(childNode2);
+        QVERIFY(childIstance2.isValid());
+        QVERIFY(childIstance2.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
+    }
+
+    childNode.setParentProperty(childNode2, "data");
+
+    QCOMPARE(childNode.parentProperty().parentModelNode(), childNode2);
+    QVERIFY(childNode2.allDirectSubModelNodes().contains(childNode));
+    QVERIFY(!rootModelNode.allDirectSubModelNodes().contains(childNode));
+    QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
+
+    {
+        NodeInstance childIstance = nodeInstanceView->instanceForNode(childNode);
+        QVERIFY(childIstance.isValid());
+        QVERIFY(childIstance.parent() == nodeInstanceView->instanceForNode(childNode2));
+    }
+
+    childNode2.setParentProperty(rootModelNode, "data");
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
+    QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
+
+    {
+        NodeInstance childIstance2 = nodeInstanceView->instanceForNode(childNode2);
+        QVERIFY(childIstance2.isValid());
+        QVERIFY(childIstance2.parent() == nodeInstanceView->instanceForNode(rootModelNode));
+    }
+
+    QCOMPARE(childNode.parentProperty().parentModelNode(), childNode2);
+
+    model->detachView(nodeInstanceView);
+}
+
+void tst_TestCore::reparentingNodeLikeDragAndDrop()
+{
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
+    model->attachView(nodeInstanceView);
+    view->rootModelNode().setId("rootModelNode");
+    QCOMPARE(view->rootModelNode().id(), QString("rootModelNode"));
+
+    ModelNode rectNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+    rectNode.setId("rect_1");
+    rectNode.variantProperty("x").setValue(20);
+    rectNode.variantProperty("y").setValue(30);
+    rectNode.variantProperty("width").setValue(40);
+    rectNode.variantProperty("height").setValue(50);
+
+    RewriterTransaction transaction(view->beginRewriterTransaction());
+
+    ModelNode textNode = addNodeListChild(view->rootModelNode(), "Qt/Text", 4, 7, "data");
+    QCOMPARE(textNode.parentProperty().parentModelNode(), view->rootModelNode());
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(textNode));
+
+    textNode.setId("rext_1");
+    textNode.variantProperty("x").setValue(10);
+    textNode.variantProperty("y").setValue(10);
+    textNode.variantProperty("width").setValue(50);
+    textNode.variantProperty("height").setValue(20);
+
+    textNode.variantProperty("x").setValue(30);
+    textNode.variantProperty("y").setValue(30);
+
+    {
+        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
+        QVERIFY(textInstance.isValid());
+        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
+        QCOMPARE(textInstance.position().x(), 30.0);
+        QCOMPARE(textInstance.position().y(), 30.0);
+        QCOMPARE(textInstance.size().width(), 50.0);
+        QCOMPARE(textInstance.size().height(), 20.0);
+    }
+
+    textNode.setParentProperty(rectNode, "data");
+    QCOMPARE(textNode.parentProperty().parentModelNode(), rectNode);
+    QVERIFY(rectNode.allDirectSubModelNodes().contains(textNode));
+
+    {
+        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
+        QVERIFY(textInstance.isValid());
+        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(rectNode));
+        QCOMPARE(textInstance.position().x(), 30.0);
+        QCOMPARE(textInstance.position().y(), 30.0);
+        QCOMPARE(textInstance.size().width(), 50.0);
+        QCOMPARE(textInstance.size().height(), 20.0);
+    }
+
+    textNode.setParentProperty(view->rootModelNode(), "data");
+    QCOMPARE(textNode.parentProperty().parentModelNode(), view->rootModelNode());
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(textNode));
+
+    {
+        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
+        QVERIFY(textInstance.isValid());
+        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
+        QCOMPARE(textInstance.position().x(), 30.0);
+        QCOMPARE(textInstance.position().y(), 30.0);
+        QCOMPARE(textInstance.size().width(), 50.0);
+        QCOMPARE(textInstance.size().height(), 20.0);
+    }
+
+    textNode.setParentProperty(rectNode, "data");
+    QCOMPARE(textNode.parentProperty().parentModelNode(), rectNode);
+    QVERIFY(rectNode.allDirectSubModelNodes().contains(textNode));
+
+    {
+        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
+        QVERIFY(textInstance.isValid());
+        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(rectNode));
+        QCOMPARE(textInstance.position().x(), 30.0);
+        QCOMPARE(textInstance.position().y(), 30.0);
+        QCOMPARE(textInstance.size().width(), 50.0);
+        QCOMPARE(textInstance.size().height(), 20.0);
+    }
+
+    {
+        NodeInstance textInstance = nodeInstanceView->instanceForNode(textNode);
+        QVERIFY(textInstance.isValid());
+        QVERIFY(textInstance.parent() == nodeInstanceView->instanceForNode(rectNode));
+        QCOMPARE(textInstance.position().x(), 30.0);
+        QCOMPARE(textInstance.position().y(), 30.0);
+        QCOMPARE(textInstance.size().width(), 50.0);
+        QCOMPARE(textInstance.size().height(), 20.0);
+    }
+
+    transaction.commit();
+
+    if(!textNode.isValid())
+        QFAIL("textnode node is not valid anymore");
+    else
+        QCOMPARE(textNode.parentProperty().parentModelNode(), rectNode);
+    QVERIFY(rectNode.allDirectSubModelNodes().contains(textNode));
+
+    model->detachView(nodeInstanceView);
+}
+
+void tst_TestCore::testModelReorderSiblings()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
+    model->attachView(nodeInstanceView);
+
+    ModelNode rootModelNode = view->rootModelNode();
+    QVERIFY(rootModelNode.isValid());
+
+    ModelNode a = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(a.isValid());
+    ModelNode b = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(b.isValid());
+    ModelNode c = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(c.isValid());
+
+    {
+        QVERIFY(nodeInstanceView->instanceForNode(a).parent() == nodeInstanceView->instanceForNode(rootModelNode));
+        QVERIFY(nodeInstanceView->instanceForNode(b).parent() == nodeInstanceView->instanceForNode(rootModelNode));
+        QVERIFY(nodeInstanceView->instanceForNode(c).parent() == nodeInstanceView->instanceForNode(rootModelNode));
+    }
+
+    NodeListProperty listProperty(rootModelNode.nodeListProperty("data"));
+
+    listProperty.slide(listProperty.toModelNodeList().indexOf(a), 2); //a.slideToIndex(2);
+
+    QVERIFY(a.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(a), 2);
+    QVERIFY(b.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(b), 0);
+    QVERIFY(c.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(c), 1);
+
+    listProperty.slide(listProperty.toModelNodeList().indexOf(c), 0); //c.slideToIndex(0);
+
+    QVERIFY(a.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(a), 2);
+    QVERIFY(b.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(b), 1);
+    QVERIFY(c.isValid()); QCOMPARE(listProperty.toModelNodeList().indexOf(c), 0);
+
+    {
+        QVERIFY(nodeInstanceView->instanceForNode(a).parent() == nodeInstanceView->instanceForNode(rootModelNode));
+        QVERIFY(nodeInstanceView->instanceForNode(b).parent() == nodeInstanceView->instanceForNode(rootModelNode));
+        QVERIFY(nodeInstanceView->instanceForNode(c).parent() == nodeInstanceView->instanceForNode(rootModelNode));
+    }
+
+    model->detachView(nodeInstanceView);
+}
+
+void tst_TestCore::testModelRootNode()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    try {
+        ModelNode rootModelNode = view->rootModelNode();
+        QVERIFY(rootModelNode.isValid());
+        QVERIFY(rootModelNode.isRootNode());
+        ModelNode topChildNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+        QVERIFY(topChildNode.isValid());
+        QVERIFY(rootModelNode.isRootNode());
+        ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+        QVERIFY(childNode.isValid());
+        QVERIFY(rootModelNode.isValid());
+        QVERIFY(rootModelNode.isRootNode());
+        childNode.setParentProperty(topChildNode, "data");
+        QVERIFY(topChildNode.isValid());
+        QVERIFY(childNode.isValid());
+        QVERIFY(rootModelNode.isValid());
+        QVERIFY(rootModelNode.isRootNode());
+    } catch (const QmlDesigner::Exception &exception) {
+        QString errorMsg = tr("Exception: %1 %2 %3:%4").arg(exception.type(), exception.function(), exception.file()).arg(exception.line());
+        QFAIL(errorMsg.toLatin1().constData());
+    }
+}
+
+void tst_TestCore::reparentingNodeInModificationGroup()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+    ModelNode childNode2 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
+    childNode.variantProperty("x").setValue(10);
+    childNode.variantProperty("y").setValue(10);
+
+    QCOMPARE(childNode.parentProperty().parentModelNode(), view->rootModelNode());
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), view->rootModelNode());
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode2));
+
+//    ModificationGroupToken token = model->beginModificationGroup();
+    childNode.variantProperty("x").setValue(20);
+    childNode.variantProperty("y").setValue(20);
+    childNode.setParentProperty(childNode2, "data");
+    childNode.variantProperty("x").setValue(30);
+    childNode.variantProperty("y").setValue(30);
+    childNode.variantProperty("x").setValue(1000000);
+    childNode.variantProperty("y").setValue(1000000);
+//    model->endModificationGroup(token);
+
+    QCOMPARE(childNode.parentProperty().parentModelNode(), childNode2);
+    QVERIFY(childNode2.allDirectSubModelNodes().contains(childNode));
+    QVERIFY(!view->rootModelNode().allDirectSubModelNodes().contains(childNode));
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode2));
+
+    childNode.setParentProperty(view->rootModelNode(), "data");
+    QVERIFY(childNode.isValid());
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), view->rootModelNode());
+
+    childNode2.setParentProperty(childNode, "data");
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), childNode);
+    QVERIFY(childNode2.isValid());
+    QVERIFY(childNode.allDirectSubModelNodes().contains(childNode2));
+
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), childNode);
+    childNode2.setParentProperty(view->rootModelNode(), "data");
+    QCOMPARE(childNode2.parentProperty().parentModelNode(), view->rootModelNode());
+    QVERIFY(childNode2.isValid());
+    QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode2));
+}
+
+void tst_TestCore::testModelAddAndRemoveProperty()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode node = view->rootModelNode();
+    QVERIFY(node.isValid());
+
+    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
+    model->attachView(nodeInstanceView);
+
+    node.variantProperty("blah").setValue(-1);
+    QCOMPARE(node.variantProperty("blah").value().toInt(), -1);
+    QVERIFY(node.hasProperty("blah"));
+    QCOMPARE(node.variantProperty("blah").value().toInt(), -1);
+
+    node.variantProperty("customValue").setValue(42);
+    QCOMPARE(node.variantProperty("customValue").value().toInt(), 42);
+
+    node.variantProperty("x").setValue(42);
+    QCOMPARE(node.variantProperty("x").value().toInt(), 42);
+
+    {
+        NodeInstance nodeInstance = nodeInstanceView->instanceForNode(node);
+        QCOMPARE(nodeInstance.property("x").toInt(), 42);
+    }
+
+    node.removeProperty("customValue");
+    QVERIFY(!node.hasProperty("customValue"));
+
+    node.variantProperty("foo").setValue("bar");
+    QVERIFY(node.hasProperty("foo"));
+    QCOMPARE(node.variantProperty("foo").value().toString(), QString("bar"));
+
+    model->detachView(nodeInstanceView);
+}
+
+void tst_TestCore::testModelViewNotification()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view1(new TestView);
+    QVERIFY(view1.data());
+
+    QScopedPointer<TestView> view2(new TestView);
+    QVERIFY(view2.data());
+
+    model->attachView(view2.data());
+    model->attachView(view1.data());
+
+    QCOMPARE(view1->methodCalls().size(), 1);
+    QCOMPARE(view1->methodCalls().at(0).name,QString("modelAttached"));
+    QCOMPARE(view2->methodCalls().size(), 1);
+    QCOMPARE(view2->methodCalls().at(0).name,QString("modelAttached"));
+
+    QList<TestView::MethodCall> expectedCalls;
+    expectedCalls << TestView::MethodCall("modelAttached", QStringList() << QString::number(reinterpret_cast<long>(model.data())));
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    ModelNode childNode = addNodeListChild(view2->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+    expectedCalls << TestView::MethodCall("nodeCreated", QStringList() << "");
+    expectedCalls << TestView::MethodCall("nodeReparented", QStringList() << "" << "data" << "" << "PropertiesAdded");
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    childNode.setId("supernode");
+    expectedCalls << TestView::MethodCall("nodeIdChanged", QStringList() << "supernode" << "supernode" << "");
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    childNode.variantProperty("visible").setValue(false);
+    expectedCalls << TestView::MethodCall("variantPropertiesChanged", QStringList() << "visible" << "PropertiesAdded");
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    childNode.setId("supernode2");
+    expectedCalls << TestView::MethodCall("nodeIdChanged", QStringList() << "supernode2" << "supernode2" << "supernode");
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    childNode.variantProperty("visible").setValue(false); // its tae some value so no notification should be sent
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    childNode.variantProperty("visible").setValue(true);
+    expectedCalls << TestView::MethodCall("variantPropertiesChanged", QStringList() << "visible" << "");
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    childNode.bindingProperty("visible").setExpression("false");
+    expectedCalls << TestView::MethodCall("propertiesAboutToBeRemoved", QStringList() << "visible");
+    expectedCalls << TestView::MethodCall("bindingPropertiesChanged", QStringList() << "visible" << "PropertiesAdded");
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    childNode.destroy();
+    expectedCalls << TestView::MethodCall("nodeAboutToBeRemoved", QStringList() << "supernode2");
+    expectedCalls << TestView::MethodCall("nodeRemoved", QStringList() << QString() << "data" << "EmptyPropertiesRemoved");
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+    QCOMPARE(view2->methodCalls(), expectedCalls);
+
+    model->detachView(view1.data());
+    expectedCalls << TestView::MethodCall("modelAboutToBeDetached", QStringList() << QString::number(reinterpret_cast<long>(model.data())));
+    QCOMPARE(view1->methodCalls(), expectedCalls);
+}
+
+
+void tst_TestCore::testRewriterTransaction()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    RewriterTransaction transaction = view->beginRewriterTransaction();
+    QVERIFY(transaction.isValid());
+
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(childNode.isValid());
+
+    childNode.destroy();
+    QVERIFY(!childNode.isValid());
+
+    {
+        RewriterTransaction transaction2 = view->beginRewriterTransaction();
+        QVERIFY(transaction2.isValid());
+
+        ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+        QVERIFY(childNode.isValid());
+
+        childNode.destroy();
+        QVERIFY(!childNode.isValid());
+
+        RewriterTransaction transaction3(transaction2);
+        QVERIFY(!transaction2.isValid());
+        QVERIFY(transaction3.isValid());
+
+        transaction2 = transaction3;
+        QVERIFY(transaction2.isValid());
+        QVERIFY(!transaction3.isValid());
+
+        transaction3 = transaction3;
+        transaction2 = transaction2;
+        QVERIFY(transaction2.isValid());
+        QVERIFY(!transaction3.isValid());
+    }
+
+    QVERIFY(transaction.isValid());
+    transaction.commit();
+    QVERIFY(!transaction.isValid());
+}
+
+void tst_TestCore::testRewriterId()
+{
+    char qmlString[] = "import Qt 4.7\n"
+                       "Rectangle {\n"
+                       "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+
+
+    model->attachView(testRewriterView.data());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
+
+    QVERIFY(rootModelNode.isValid());
+
+    ModelNode newNode(view->createModelNode("Qt/Rectangle", 4, 7));
+    newNode.setId("testId");
+
+    rootModelNode.nodeListProperty("data").reparentHere(newNode);
+
+    const QLatin1String expected("import Qt 4.7\n"
+                                  "Rectangle {\n"
+                                  "Rectangle {\n"
+                                  "    id: testId\n"
+                                  "}\n"
+                                  "}\n");
+
+    QCOMPARE(textEdit.toPlainText(), expected);
+}
+
+void tst_TestCore::testRewriterNodeReparentingTransaction1()
+{
+     char qmlString[] = "import Qt 4.7\n"
+                       "Rectangle {\n"
+                       "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(rootModelNode.isValid());
+
+    ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+
+    ModelNode reparentNode = addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "data");
+
+    RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
+
+    childNode2.nodeListProperty("data").reparentHere(reparentNode);
+    childNode3.nodeListProperty("data").reparentHere(reparentNode);
+    childNode4.nodeListProperty("data").reparentHere(reparentNode);
+
+    reparentNode.destroy();
+
+    rewriterTransaction.commit();
+}
+
+void tst_TestCore::testRewriterNodeReparentingTransaction2()
+{
+     char qmlString[] = "import Qt 4.7\n"
+                       "Rectangle {\n"
+                       "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(rootModelNode.isValid());
+
+    ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+
+    childNode2.variantProperty("x") = 200;
+    childNode2.variantProperty("y") = 50;
+    childNode2.variantProperty("color") = QColor(Qt::red);
+    childNode2.setId("childNode2");
+
+    childNode1.variantProperty("x") = 100;
+    childNode1.variantProperty("y") = 10;
+    childNode1.variantProperty("color") = QColor(Qt::blue);
+    childNode1.setId("childNode1");
+
+    RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
+
+    childNode1.nodeListProperty("data").reparentHere(childNode2);
+    childNode2.variantProperty("x") = 300;
+    childNode2.variantProperty("y") = 150;
+
+    rewriterTransaction.commit();
+
+    rewriterTransaction = view->beginRewriterTransaction();
+
+    rootModelNode.nodeListProperty("data").reparentHere(childNode2);
+    childNode2.variantProperty("x") = 100;
+    childNode2.variantProperty("y") = 200;
+
+    rewriterTransaction.commit();
+
+    rewriterTransaction = view->beginRewriterTransaction();
+
+    rootModelNode.nodeListProperty("data").reparentHere(childNode2);
+    childNode2.variantProperty("x") = 150;
+    childNode2.variantProperty("y") = 250;
+    childNode1.nodeListProperty("data").reparentHere(childNode2);
+
+    rewriterTransaction.commit();
+}
+
+void tst_TestCore::testRewriterNodeReparentingTransaction3()
+{
+    char qmlString[] = "import Qt 4.7\n"
+                      "Rectangle {\n"
+                      "}\n";
+
+   QPlainTextEdit textEdit;
+   textEdit.setPlainText(qmlString);
+   NotIndentingTextEditModifier textModifier(&textEdit);
+
+   QScopedPointer<Model> model(Model::create("Qt/Item"));
+   QVERIFY(model.data());
+
+   QScopedPointer<TestView> view(new TestView);
+   QVERIFY(view.data());
+   model->attachView(view.data());
+
+   ModelNode rootModelNode(view->rootModelNode());
+   QVERIFY(rootModelNode.isValid());
+   QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+   QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+   testRewriterView->setTextModifier(&textModifier);
+
+   model->attachView(testRewriterView.data());
+
+   QVERIFY(rootModelNode.isValid());
+
+   ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+   ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+   ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+   ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+
+   RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
+
+   childNode1.nodeListProperty("data").reparentHere(childNode4);
+   childNode4.variantProperty("x") = 151;
+   childNode4.variantProperty("y") = 251;
+   childNode2.nodeListProperty("data").reparentHere(childNode4);
+   childNode4.variantProperty("x") = 152;
+   childNode4.variantProperty("y") = 252;
+   childNode3.nodeListProperty("data").reparentHere(childNode4);
+   childNode4.variantProperty("x") = 153;
+   childNode4.variantProperty("y") = 253;
+   rootModelNode.nodeListProperty("data").reparentHere(childNode4);
+   childNode4.variantProperty("x") = 154;
+   childNode4.variantProperty("y") = 254;
+
+   rewriterTransaction.commit();
+}
+
+void tst_TestCore::testRewriterNodeReparentingTransaction4()
+{
+    char qmlString[] = "import Qt 4.7\n"
+                      "Rectangle {\n"
+                      "}\n";
+
+   QPlainTextEdit textEdit;
+   textEdit.setPlainText(qmlString);
+   NotIndentingTextEditModifier textModifier(&textEdit);
+
+   QScopedPointer<Model> model(Model::create("Qt/Item"));
+   QVERIFY(model.data());
+
+   QScopedPointer<TestView> view(new TestView);
+   QVERIFY(view.data());
+   model->attachView(view.data());
+
+   ModelNode rootModelNode(view->rootModelNode());
+   QVERIFY(rootModelNode.isValid());
+   QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+   QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+   testRewriterView->setTextModifier(&textModifier);
+
+   model->attachView(testRewriterView.data());
+
+   QVERIFY(rootModelNode.isValid());
+
+   ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+   ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+   ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+   ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+   ModelNode childNode5 = addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "data");
+
+   RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
+
+   childNode1.nodeListProperty("data").reparentHere(childNode4);
+   childNode4.variantProperty("x") = 151;
+   childNode4.variantProperty("y") = 251;
+   childNode2.nodeListProperty("data").reparentHere(childNode4);
+   childNode4.variantProperty("x") = 152;
+   childNode4.variantProperty("y") = 252;
+   childNode3.nodeListProperty("data").reparentHere(childNode4);
+   childNode4.variantProperty("x") = 153;
+   childNode4.variantProperty("y") = 253;
+   childNode5.nodeListProperty("data").reparentHere(childNode4);
+   childNode4.variantProperty("x") = 154;
+   childNode4.variantProperty("y") = 254;
+
+   rewriterTransaction.commit();
+}
+
+void tst_TestCore::testRewriterAddNodeTransaction()
+{
+    char qmlString[] = "import Qt 4.7\n"
+                       "Rectangle {\n"
+                       "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(rootModelNode.isValid());
+
+
+    ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+
+    RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
+
+    ModelNode newNode = view->createModelNode("Qt/Rectangle", 4, 7);
+    newNode.variantProperty("x") = 100;
+    newNode.variantProperty("y") = 100;
+
+    rootModelNode.nodeListProperty("data").reparentHere(newNode);
+    childNode.nodeListProperty("data").reparentHere(newNode);
+
+    rewriterTransaction.commit();
+}
+
+void tst_TestCore::testRewriterComponentId()
+{
+    char qmlString[] = "import Qt 4.7\n"
+        "Rectangle {\n"
+        "   Component {\n"
+        "       id: testComponent\n"
+        "       Item {\n"
+        "       }\n"
+        "   }\n"
+        "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
+
+    ModelNode component(rootModelNode.allDirectSubModelNodes().first());
+    QVERIFY(component.isValid());
+    QCOMPARE(component.type(), QString("Qt/Component"));
+    QCOMPARE(component.id(), QString("testComponent"));
+}
+
+void tst_TestCore::testRewriterTransactionRewriter()
+{
+    char qmlString[] = "import Qt 4.7\n"
+                       "Rectangle {\n"
+                       "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(rootModelNode.isValid());
+
+    ModelNode childNode1;
+    ModelNode childNode2;
+
+    {
+        RewriterTransaction transaction = view->beginRewriterTransaction();
+        childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+        childNode1.variantProperty("x") = 10;
+        childNode1.variantProperty("y") = 10;
+    }
+
+    QVERIFY(childNode1.isValid());
+    QCOMPARE(childNode1.variantProperty("x").value(), QVariant(10));
+    QCOMPARE(childNode1.variantProperty("y").value(), QVariant(10));
+
+
+    {
+        RewriterTransaction transaction = view->beginRewriterTransaction();
+        childNode2 = addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "data");
+        childNode2.destroy();
+    }
+
+    QVERIFY(!childNode2.isValid());
+    QVERIFY(childNode1.isValid());
+}
+
+void tst_TestCore::testRewriterPropertyDeclarations()
+{
+    // Work in progress. See task https://qtrequirements.europe.nokia.com/browse/BAUHAUS-170"
+
+    //
+    // test properties defined in qml
+    //
+    // [default] property <type> <name>[: defaultValue]
+    //
+    // where type is (int | bool | double | real | string | url | color | date | variant)
+    //
+
+    // Unsupported:
+    //  property variant varProperty2: boolProperty
+    //  property variant myArray: [ Rectangle {} ]
+    //  property variant someGradient: Gradient {}
+
+    char qmlString[] = "import Qt 4.7\n"
+        "Item {\n"
+        "   property int intProperty\n"
+        "   property bool boolProperty: true\n"
+        "   property variant varProperty1\n"
+        "   default property url urlProperty\n"
+        "   intProperty: 2\n"
+        "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+
+    //
+    // parsing
+    //
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+
+    QCOMPARE(rootModelNode.properties().size(), 4);
+
+    VariantProperty intProperty = rootModelNode.property(QLatin1String("intProperty")).toVariantProperty();
+    QVERIFY(intProperty.isValid());
+    QVERIFY(intProperty.isVariantProperty());
+
+    VariantProperty boolProperty = rootModelNode.property(QLatin1String("boolProperty")).toVariantProperty();
+    QVERIFY(boolProperty.isValid());
+    QVERIFY(boolProperty.isVariantProperty());
+    QCOMPARE(boolProperty.value(), QVariant(true));
+
+    VariantProperty varProperty1 = rootModelNode.property(QLatin1String("varProperty1")).toVariantProperty();
+    QVERIFY(varProperty1.isValid());
+    QVERIFY(varProperty1.isVariantProperty());
+
+    VariantProperty urlProperty = rootModelNode.property(QLatin1String("urlProperty")).toVariantProperty();
+    QVERIFY(urlProperty.isValid());
+    QVERIFY(urlProperty.isVariantProperty());
+    QCOMPARE(urlProperty.value(), QVariant(QUrl()));
+}
+
+void tst_TestCore::testRewriterPropertyAliases()
+{
+    //
+    // test property aliases defined in qml, i.e.
+    //
+    // [default] property alias <name>: <alias reference>
+    //
+    // where type is (int | bool | double | real | string | url | color | date | variant)
+    //
+
+    char qmlString[] = "import Qt 4.7\n"
+        "Item {\n"
+        "   property alias theText: t.text\n"
+        "   default alias property yPos: t.y\n"
+        "   Text { id: t; text: \"zoo\"}\n"
+        "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+
+    QList<AbstractProperty> properties  = rootModelNode.properties();
+    QCOMPARE(properties.size(), 0); // TODO: How to represent alias properties? As Bindings?
+}
+
+void tst_TestCore::testRewriterPositionAndOffset()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    id: root\n"
+                                  "    x: 10;\n"
+                                  "    y: 10;\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle1\n"
+                                  "        x: 10;\n"
+                                  "        y: 10;\n"
+                                  "    }\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle2\n"
+                                  "        x: 100;\n"
+                                  "        y: 100;\n"
+                                  "        anchors.fill: root\n"
+                                  "    }\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle3\n"
+                                  "        x: 140;\n"
+                                  "        y: 180;\n"
+                                  "        gradient: Gradient {\n"
+                                  "             GradientStop {\n"
+                                  "                 position: 0\n"
+                                  "                 color: \"white\"\n"
+                                  "             }\n"
+                                  "             GradientStop {\n"
+                                  "                  position: 1\n"
+                                  "                  color: \"black\"\n"
+                                  "             }\n"
+                                  "        }\n"
+                                  "    }\n"
+                                  "}");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+
+    QString string = QString(qmlString).mid(testRewriterView->nodeOffset(rootNode), testRewriterView->nodeLength(rootNode));
+    const QString qmlExpected0("Rectangle {\n"
+                               "    id: root\n"
+                               "    x: 10;\n"
+                               "    y: 10;\n"
+                               "    Rectangle {\n"
+                               "        id: rectangle1\n"
+                               "        x: 10;\n"
+                               "        y: 10;\n"
+                               "    }\n"
+                               "    Rectangle {\n"
+                               "        id: rectangle2\n"
+                               "        x: 100;\n"
+                               "        y: 100;\n"
+                               "        anchors.fill: root\n"
+                               "    }\n"
+                               "    Rectangle {\n"
+                               "        id: rectangle3\n"
+                               "        x: 140;\n"
+                               "        y: 180;\n"
+                               "        gradient: Gradient {\n"
+                               "             GradientStop {\n"
+                               "                 position: 0\n"
+                               "                 color: \"white\"\n"
+                               "             }\n"
+                               "             GradientStop {\n"
+                               "                  position: 1\n"
+                               "                  color: \"black\"\n"
+                               "             }\n"
+                               "        }\n"
+                               "    }\n"
+                               "}");
+    QCOMPARE(string, qmlExpected0);
+
+    ModelNode lastRectNode = rootNode.allDirectSubModelNodes().last();
+    ModelNode gradientNode = lastRectNode.allDirectSubModelNodes().first();
+    ModelNode gradientStop = gradientNode.allDirectSubModelNodes().first();
+
+    int offset = testRewriterView->nodeOffset(gradientNode);
+    int length = testRewriterView->nodeLength(gradientNode);
+    string = QString(qmlString).mid(offset, length);
+    const QString qmlExpected1(     "Gradient {\n"
+                               "             GradientStop {\n"
+                               "                 position: 0\n"
+                               "                 color: \"white\"\n"
+                               "             }\n"
+                               "             GradientStop {\n"
+                               "                  position: 1\n"
+                               "                  color: \"black\"\n"
+                               "             }\n"
+                               "        }");
+    QCOMPARE(string, qmlExpected1);
+
+    string = QString(qmlString).mid(testRewriterView->nodeOffset(gradientStop), testRewriterView->nodeLength(gradientStop));
+    const QString qmlExpected2(             "GradientStop {\n"
+                               "                 position: 0\n"
+                               "                 color: \"white\"\n"
+                               "             }");
+
+    QCOMPARE(string, qmlExpected2);
+}
+
+void tst_TestCore::testRewriterComponentTextModifier()
+{
+    const QString qmlString("import Qt 4.7\n"
+                            "Rectangle {\n"
+                            "    id: root\n"
+                            "    x: 10;\n"
+                            "    y: 10;\n"
+                            "    Rectangle {\n"
+                            "        id: rectangle1\n"
+                            "        x: 10;\n"
+                            "        y: 10;\n"
+                            "    }\n"
+                            "    Component {\n"
+                            "        id: rectangleComponent\n"
+                            "        Rectangle {\n"
+                            "            x: 100;\n"
+                            "            y: 100;\n"
+                            "        }\n"
+                            "    }\n"
+                            "}");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+
+    ModelNode componentNode  = rootNode.allDirectSubModelNodes().last();
+
+    int componentStartOffset = testRewriterView->nodeOffset(componentNode);
+    int componentEndOffset = componentStartOffset + testRewriterView->nodeLength(componentNode);
+
+    int rootStartOffset = testRewriterView->nodeOffset(rootNode);
+
+    ComponentTextModifier componentTextModifier(&textModifier, componentStartOffset, componentEndOffset, rootStartOffset);
+
+     const QString qmlExpected("import Qt 4.7\n"
+                            "            "
+                            "             "
+                            "           "
+                            "           "
+                            "                "
+                            "                       "
+                            "               "
+                            "               "
+                            "      "
+                            "    Component {\n"
+                            "        id: rectangleComponent\n"
+                            "        Rectangle {\n"
+                            "            x: 100;\n"
+                            "            y: 100;\n"
+                            "        }\n"
+                            "    } "
+                            " ");
+
+    QCOMPARE(componentTextModifier.text(), qmlExpected);
+
+    QScopedPointer<Model> componentModel(Model::create("Qt/Item", 4, 7));
+    QScopedPointer<TestRewriterView> testRewriterViewComponent(new TestRewriterView());
+    testRewriterViewComponent->setTextModifier(&componentTextModifier);
+    componentModel->attachView(testRewriterViewComponent.data());
+
+    ModelNode componentrootNode = testRewriterViewComponent->rootModelNode();
+    QVERIFY(componentrootNode.isValid());
+    QCOMPARE(componentrootNode.type(), QLatin1String("Qt/Component"));
+}
+
+void tst_TestCore::testRewriterPreserveType()
+{
+    const QString qmlString("import Qt 4.7\n"
+                            "Rectangle {\n"
+                            "    id: root\n"
+                            "    Text {\n"
+                            "        font.bold: true\n"
+                            "        font.pointSize: 14\n"
+                            "    }\n"
+                            "}");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+
+    ModelNode textNode = rootNode.allDirectSubModelNodes().first();
+    QCOMPARE(QVariant::Bool, textNode.variantProperty("font.bold").value().type());
+    QCOMPARE(QVariant::Double, textNode.variantProperty("font.pointSize").value().type());
+    textNode.variantProperty("font.bold") = QVariant(false);
+    textNode.variantProperty("font.bold") = QVariant(true);
+    textNode.variantProperty("font.pointSize") = QVariant(13.0);
+
+    ModelNode newTextNode = addNodeListChild(rootNode, "Qt/Text", 4, 7, "data");
+
+    newTextNode.variantProperty("font.bold") = QVariant(true);
+    newTextNode.variantProperty("font.pointSize") = QVariant(13.0);
+
+    QCOMPARE(QVariant::Bool, newTextNode.variantProperty("font.bold").value().type());
+    QCOMPARE(QVariant::Double, newTextNode.variantProperty("font.pointSize").value().type());
+}
+
+void tst_TestCore::testRewriterForArrayMagic()
+{
+    try {
+        const QLatin1String qmlString("import Qt 4.7\n"
+                                      "\n"
+                                      "Rectangle {\n"
+                                      "    states: State {\n"
+                                      "        name: \"s1\"\n"
+                                      "    }\n"
+                                      "}\n");
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(qmlString);
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestView> view(new TestView);
+        model->attachView(view.data());
+
+        // read in
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+        ModelNode rootNode = view->rootModelNode();
+        QVERIFY(rootNode.isValid());
+        QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+        QVERIFY(rootNode.property(QLatin1String("states")).isNodeListProperty());
+
+        QmlItemNode rootItem(rootNode);
+        QVERIFY(rootItem.isValid());
+
+        QmlModelState state1(rootItem.states().addState("s2"));
+        QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
+
+        const QLatin1String expected("import Qt 4.7\n"
+                                     "\n"
+                                     "Rectangle {\n"
+                                     "    states: [\n"
+                                     "    State {\n"
+                                     "        name: \"s1\"\n"
+                                     "    },\n"
+                                     "    State {\n"
+                                     "        name: \"s2\"\n"
+                                     "    }\n"
+                                     "    ]\n"
+                                     "}\n");
+        QCOMPARE(textEdit.toPlainText(), expected);
+    } catch (Exception &e) {
+        qDebug() << "Exception:" << e.description() << "at line" << e.line() << "in function" << e.function() << "in file" << e.file();
+        QFAIL(qPrintable(e.description()));
+    }
+}
+
+void tst_TestCore::testRewriterWithSignals()
+{
+    const QLatin1String qmlString("import Qt 4.7\n"
+                                  "\n"
+                                  "TextEdit {\n"
+                                  "    onTextChanged: { print(\"foo\"); }\n"
+                                  "}\n");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/TextEdit"));
+
+    QmlItemNode rootItem(rootNode);
+    QVERIFY(rootItem.isValid());
+
+    QCOMPARE(rootNode.properties().count(), 0);
+}
+
+void tst_TestCore::testRewriterNodeSliding()
+{
+    const QLatin1String qmlString("import Qt 4.7\n"
+                                  "Rectangle {\n"
+                                  "    id: root\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle1\n"
+                                  "        x: 10;\n"
+                                  "        y: 10;\n"
+                                  "    }\n"
+                                  "\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle2\n"
+                                  "        x: 100;\n"
+                                  "        y: 100;\n"
+                                  "    }\n"
+                                  "}");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+    QCOMPARE(rootNode.id(), QLatin1String("root"));
+
+    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0).id(), QLatin1String("rectangle1"));
+    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(1).id(), QLatin1String("rectangle2"));
+
+    rootNode.nodeListProperty(QLatin1String("data")).slide(0, 1);
+
+    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0).id(), QLatin1String("rectangle2"));
+    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(1).id(), QLatin1String("rectangle1"));
+
+    rootNode.nodeListProperty(QLatin1String("data")).slide(1, 0);
+
+    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0).id(), QLatin1String("rectangle1"));
+    QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(1).id(), QLatin1String("rectangle2"));
+}
+
+void tst_TestCore::testRewriterExceptionHandling()
+{
+    const QLatin1String qmlString("import Qt 4.7\n"
+                                  "Text {\n"
+                                  "}");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Text", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
+
+    try
+    {
+        RewriterTransaction transaction = view->beginRewriterTransaction();
+        rootNode.variantProperty("text") = QVariant("text");
+        rootNode.variantProperty("bla") = QVariant("blah");
+        transaction.commit();
+        QFAIL("RewritingException should be thrown");
+    } catch (RewritingException &e) {
+        QVERIFY(rootNode.isValid());
+        QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
+        QVERIFY(!rootNode.hasProperty("bla"));
+        QVERIFY(!rootNode.hasProperty("text"));
+    }
+}
+
+void tst_TestCore::testRewriterFirstDefinitionInside()
+{
+    const QString qmlString("import Qt 4.7\n"
+                            "Rectangle {\n"
+                            "    id: root\n"
+                            "    x: 10;\n"
+                            "    y: 10;\n"
+                            "    Rectangle {\n"
+                            "        id: rectangle1\n"
+                            "        x: 10;\n"
+                            "        y: 10;\n"
+                            "    }\n"
+                            "    Component {\n"
+                            "        id: rectangleComponent\n"
+                            "        Rectangle {\n"
+                            "            x: 100;\n"
+                            "            y: 100;\n"
+                            "        }\n"
+                            "    }\n"
+                            "}");
+
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+
+    ModelNode componentNode  = rootNode.allDirectSubModelNodes().last();
+
+    QString string = "";
+    for (int i = testRewriterView->firstDefinitionInsideOffset(componentNode); i < testRewriterView->firstDefinitionInsideOffset(componentNode) +  testRewriterView->firstDefinitionInsideLength(componentNode);i++)
+        string +=QString(qmlString)[i];
+
+    const QString qmlExpected("Rectangle {\n"
+                              "            x: 100;\n"
+                              "            y: 100;\n"
+                              "        }");
+    QCOMPARE(string, qmlExpected);
+
+}
+
+void tst_TestCore::testCopyModelRewriter1()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    id: root\n"
+                                  "    x: 10;\n"
+                                  "    y: 10;\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle1\n"
+                                  "        x: 10;\n"
+                                  "        y: 10;\n"
+                                  "    }\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle2\n"
+                                  "        x: 100;\n"
+                                  "        y: 100;\n"
+                                  "        anchors.fill: root\n"
+                                  "    }\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle3\n"
+                                  "        x: 140;\n"
+                                  "        y: 180;\n"
+                                  "        gradient: Gradient {\n"
+                                  "             GradientStop {\n"
+                                  "                 position: 0\n"
+                                  "                 color: \"white\"\n"
+                                  "             }\n"
+                                  "             GradientStop {\n"
+                                  "                  position: 1\n"
+                                  "                  color: \"black\"\n"
+                                  "             }\n"
+                                  "        }\n"
+                                  "    }\n"
+                                  "}");
+
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model1.data());
+
+    QScopedPointer<TestView> view1(new TestView);
+    model1->attachView(view1.data());
+
+    // read in 1
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&textModifier1);
+    model1->attachView(testRewriterView1.data());
+
+    ModelNode rootNode1 = view1->rootModelNode();
+    QVERIFY(rootNode1.isValid());
+    QCOMPARE(rootNode1.type(), QLatin1String("Qt/Rectangle"));
+
+    QPlainTextEdit textEdit2;
+    textEdit2.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier2(&textEdit2);
+
+    QScopedPointer<Model> model2(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model2.data());
+
+    QScopedPointer<TestView> view2(new TestView);
+    model2->attachView(view2.data());
+
+    // read in 2
+    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
+    testRewriterView2->setTextModifier(&textModifier2);
+    model2->attachView(testRewriterView2.data());
+
+    ModelNode rootNode2 = view2->rootModelNode();
+    QVERIFY(rootNode2.isValid());
+    QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
+
+
+    //
+
+    ModelNode childNode(rootNode1.allDirectSubModelNodes().first());
+    QVERIFY(childNode.isValid());
+
+    RewriterTransaction transaction(view1->beginRewriterTransaction());
+
+    ModelMerger merger(view1.data());
+
+    ModelNode insertedNode(merger.insertModel(rootNode2));
+    transaction.commit();
+
+    QCOMPARE(insertedNode.id(), QString("root1"));
+
+    QVERIFY(insertedNode.isValid());
+    childNode.nodeListProperty("data").reparentHere(insertedNode);
+
+
+
+    const QLatin1String expected(
+
+        "\n"
+        "import Qt 4.7\n"
+        "\n"
+        "Rectangle {\n"
+        "    id: root\n"
+        "    x: 10;\n"
+        "    y: 10;\n"
+        "    Rectangle {\n"
+        "        id: rectangle1\n"
+        "        x: 10;\n"
+        "        y: 10;\n"
+        "\n"
+        "        Rectangle {\n"
+        "            id: root1\n"
+        "            x: 10\n"
+        "            y: 10\n"
+        "            Rectangle {\n"
+        "                id: rectangle4\n"
+        "                x: 10\n"
+        "                y: 10\n"
+        "            }\n"
+        "\n"
+        "            Rectangle {\n"
+        "                id: rectangle5\n"
+        "                x: 100\n"
+        "                y: 100\n"
+        "                anchors.fill: root1\n"
+        "            }\n"
+        "\n"
+        "            Rectangle {\n"
+        "                id: rectangle6\n"
+        "                x: 140\n"
+        "                y: 180\n"
+        "                gradient: Gradient {\n"
+        "                    GradientStop {\n"
+        "                        position: 0\n"
+        "                        color: \"#ffffff\"\n"
+        "                    }\n"
+        "\n"
+        "                    GradientStop {\n"
+        "                        position: 1\n"
+        "                        color: \"#000000\"\n"
+        "                    }\n"
+        "                }\n"
+        "            }\n"
+        "        }\n"
+        "    }\n"
+        "    Rectangle {\n"
+        "        id: rectangle2\n"
+        "        x: 100;\n"
+        "        y: 100;\n"
+        "        anchors.fill: root\n"
+        "    }\n"
+        "    Rectangle {\n"
+        "        id: rectangle3\n"
+        "        x: 140;\n"
+        "        y: 180;\n"
+        "        gradient: Gradient {\n"
+        "             GradientStop {\n"
+        "                 position: 0\n"
+        "                 color: \"white\"\n"
+        "             }\n"
+        "             GradientStop {\n"
+        "                  position: 1\n"
+        "                  color: \"black\"\n"
+        "             }\n"
+        "        }\n"
+        "    }\n"
+        "}");
+
+    QCOMPARE(textEdit1.toPlainText(), expected);
+}
+
+void tst_TestCore::testCopyModelRewriter2()
+{
+   const QLatin1String qmlString1("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "id: root\n"
+                                  "x: 10\n"
+                                  "y: 10\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    id: rectangle1\n"
+                                  "    x: 10\n"
+                                  "    y: 10\n"
+                                  "}\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    id: rectangle2\n"
+                                  "    x: 100\n"
+                                  "    y: 100\n"
+                                  "    anchors.fill: rectangle1\n"
+                                  "}\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    id: rectangle3\n"
+                                  "    x: 140\n"
+                                  "    y: 180\n"
+                                  "    gradient: Gradient {\n"
+                                  "        GradientStop {\n"
+                                  "            position: 0\n"
+                                  "            color: \"#ffffff\"\n"
+                                  "        }\n"
+                                  "\n"
+                                  "        GradientStop {\n"
+                                  "            position: 1\n"
+                                  "            color: \"#000000\"\n"
+                                  "        }\n"
+                                  "    }\n"
+                                  "}\n"
+                                  "}");
+
+
+    const QLatin1String qmlString2("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText(qmlString1);
+    NotIndentingTextEditModifier textModifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model1.data());
+
+    QScopedPointer<TestView> view1(new TestView);
+    model1->attachView(view1.data());
+
+    // read in 1
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&textModifier1);
+    model1->attachView(testRewriterView1.data());
+
+    ModelNode rootNode1 = view1->rootModelNode();
+    QVERIFY(rootNode1.isValid());
+    QCOMPARE(rootNode1.type(), QLatin1String("Qt/Rectangle"));
+
+
+        // read in 2
+
+    QPlainTextEdit textEdit2;
+    textEdit2.setPlainText(qmlString2);
+    NotIndentingTextEditModifier textModifier2(&textEdit2);
+
+    QScopedPointer<Model> model2(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model2.data());
+
+    QScopedPointer<TestView> view2(new TestView);
+    model2->attachView(view2.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
+    testRewriterView2->setTextModifier(&textModifier2);
+    model2->attachView(testRewriterView2.data());
+
+    ModelNode rootNode2 = view2->rootModelNode();
+    QVERIFY(rootNode2.isValid());
+    QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
+
+
+    //
+
+    ModelMerger merger(view2.data());
+
+    merger.replaceModel(rootNode1);
+    QVERIFY(rootNode2.isValid());
+    QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
+
+    QCOMPARE(textEdit2.toPlainText(), qmlString1);
+}
+
+void tst_TestCore::testSubComponentManager()
+{
+    QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/usingmybutton.qml";
+    QFile file(fileName);
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(file.readAll());
+    NotIndentingTextEditModifier modifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    model->setFileUrl(QUrl::fromLocalFile(fileName));
+    QScopedPointer<SubComponentManager> subComponentManager(new SubComponentManager(model->metaInfo(), 0));
+    subComponentManager->update(QUrl::fromLocalFile(fileName), modifier.text().toUtf8());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&modifier);
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+
+    QVERIFY(testRewriterView->rootModelNode().isValid());
+
+
+    QVERIFY(model->metaInfo().nodeMetaInfo("Qt/Rectangle").properties(true).keys().contains("border.width"));
+
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Pen"));
+    NodeMetaInfo myButtonMetaInfo = model->metaInfo().nodeMetaInfo("MyButton");
+    QVERIFY(myButtonMetaInfo.isValid());
+    QVERIFY(myButtonMetaInfo.properties(true).keys().contains("border.width"));
+    QVERIFY(myButtonMetaInfo.property("border.width", true).isValid());
+}
+
+void tst_TestCore::testAnchorsAndRewriting()
+{
+        const QString qmlString("import Qt 4.7\n"
+                            "Rectangle {\n"
+                            "    id: root\n"
+                            "    x: 10;\n"
+                            "    y: 10;\n"
+                            "    Rectangle {\n"
+                            "        id: rectangle1\n"
+                            "        x: 10;\n"
+                            "        y: 10;\n"
+                            "    }\n"
+                            "    Component {\n"
+                            "        id: rectangleComponent\n"
+                            "        Rectangle {\n"
+                            "            x: 100;\n"
+                            "            y: 100;\n"
+                            "        }\n"
+                            "    }\n"
+                            "}");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+
+    QmlItemNode rootItemNode = view->rootQmlItemNode();
+    QVERIFY(rootItemNode.isValid());
+
+    QmlItemNode childNode = rootItemNode.allDirectSubModelNodes().first();
+    QVERIFY(childNode.isValid());
+
+    childNode.anchors().setMargin(AnchorLine::Left, 280);
+    childNode.anchors().setAnchor(AnchorLine::Left, rootItemNode, AnchorLine::Left);
+    childNode.anchors().setMargin(AnchorLine::Right, 200);
+    childNode.anchors().setAnchor(AnchorLine::Right, rootItemNode, AnchorLine::Right);
+    childNode.anchors().setMargin(AnchorLine::Bottom, 50);
+    childNode.anchors().setAnchor(AnchorLine::Bottom, rootItemNode, AnchorLine::Bottom);
+
+    {
+        RewriterTransaction transaction = view->beginRewriterTransaction();
+        
+        childNode.anchors().setMargin(AnchorLine::Top, 100);
+        childNode.anchors().setAnchor(AnchorLine::Top, rootItemNode, AnchorLine::Top);
+    }
+}
+
+void tst_TestCore::testAnchorsAndRewritingCenter()
+{
+      const QString qmlString("import Qt 4.7\n"
+                            "Rectangle {\n"
+                            "    id: root\n"
+                            "    x: 10;\n"
+                            "    y: 10;\n"
+                            "    Rectangle {\n"
+                            "        id: rectangle1\n"
+                            "        x: 10;\n"
+                            "        y: 10;\n"
+                            "    }\n"
+                            "    Component {\n"
+                            "        id: rectangleComponent\n"
+                            "        Rectangle {\n"
+                            "            x: 100;\n"
+                            "            y: 100;\n"
+                            "        }\n"
+                            "    }\n"
+                            "}");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+
+    QmlItemNode rootItemNode = view->rootQmlItemNode();
+    QVERIFY(rootItemNode.isValid());
+
+    QmlItemNode childNode = rootItemNode.allDirectSubModelNodes().first();
+    QVERIFY(childNode.isValid());
+
+    childNode.anchors().setAnchor(AnchorLine::VerticalCenter, rootItemNode, AnchorLine::VerticalCenter);
+    childNode.anchors().setAnchor(AnchorLine::HorizontalCenter, rootItemNode, AnchorLine::HorizontalCenter);
+}
+
+void tst_TestCore::loadQml()
+{
+char qmlString[] = "import Qt 4.7\n"
+                       "Rectangle {\n"
+                            "id: root;\n"
+                            "width: 200;\n"
+                            "height: 200;\n"
+                            "color: \"white\";\n"
+                            "Text {\n"
+                                "id: text1\n"
+                                "text: \"Hello World\"\n"
+                                "anchors.centerIn: parent\n"
+                                "Item {\n"
+                                    "id: item\n"
+                                 "}\n"
+                            "}\n"
+                            "Rectangle {\n"
+                                "id: rectangle;\n"
+                                "gradient: Gradient {\n"
+                                    "GradientStop {\n"
+                                        "position: 0\n"
+                                        "color: \"white\"\n"
+                                     "}\n"
+                                     "GradientStop {\n"
+                                        "position: 1\n"
+                                        "color: \"black\"\n"
+                                     "}\n"
+                                "}\n"
+                            "}\n"
+                             "Text {\n"
+                                "text: \"text\"\n"
+                                "x: 66\n"
+                                "y: 43\n"
+                                "width: 80\n"
+                                "height: 20\n"
+                                "id: text2\n"
+                            "}\n"
+                       "}\n";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+
+    model->attachView(testRewriterView.data());
+
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
+    QCOMPARE(rootModelNode.id(), QString("root"));
+    QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
+    QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
+    QVERIFY(rootModelNode.hasProperty("data"));
+    QVERIFY(rootModelNode.property("data").isNodeListProperty());
+    QVERIFY(!rootModelNode.nodeListProperty("data").toModelNodeList().isEmpty());
+    QCOMPARE(rootModelNode.nodeListProperty("data").toModelNodeList().count(), 3);
+    ModelNode textNode1 = rootModelNode.nodeListProperty("data").toModelNodeList().first();
+    QVERIFY(textNode1.isValid());
+    QCOMPARE(textNode1.type(), QString("Qt/Text"));
+    QCOMPARE(textNode1.id(), QString("text1"));
+    QCOMPARE(textNode1.variantProperty("text").value().toString(), QString("Hello World"));
+    QVERIFY(textNode1.hasProperty("anchors.centerIn"));
+    QVERIFY(textNode1.property("anchors.centerIn").isBindingProperty());
+    QCOMPARE(textNode1.bindingProperty("anchors.centerIn").expression(), QString("parent"));
+    QVERIFY(textNode1.hasProperty("data"));
+    QVERIFY(textNode1.property("data").isNodeListProperty());
+    QVERIFY(!textNode1.nodeListProperty("data").toModelNodeList().isEmpty());
+    ModelNode itemNode = textNode1.nodeListProperty("data").toModelNodeList().first();
+    QVERIFY(itemNode.isValid());
+    QCOMPARE(itemNode.id(), QString("item"));
+    QVERIFY(!itemNode.hasProperty("data"));
+
+    ModelNode rectNode = rootModelNode.nodeListProperty("data").toModelNodeList().at(1);
+    QVERIFY(rectNode.isValid());
+    QCOMPARE(rectNode.type(), QString("Qt/Rectangle"));
+    QCOMPARE(rectNode.id(), QString("rectangle"));
+    QVERIFY(rectNode.hasProperty("gradient"));
+    QVERIFY(rectNode.property("gradient").isNodeProperty());
+    ModelNode gradientNode = rectNode.nodeProperty("gradient").modelNode();
+    QVERIFY(gradientNode.isValid());
+    QCOMPARE(gradientNode.type(), QString("Qt/Gradient"));
+    QVERIFY(gradientNode.hasProperty("stops"));
+    QVERIFY(gradientNode.property("stops").isNodeListProperty());
+    QCOMPARE(gradientNode.nodeListProperty("stops").toModelNodeList().count(), 2);
+
+    ModelNode stop1 = gradientNode.nodeListProperty("stops").toModelNodeList().first();
+    ModelNode stop2 = gradientNode.nodeListProperty("stops").toModelNodeList().last();
+
+    QVERIFY(stop1.isValid());
+    QVERIFY(stop2.isValid());
+
+    QCOMPARE(stop1.type(), QString("Qt/GradientStop"));
+    QCOMPARE(stop2.type(), QString("Qt/GradientStop"));
+
+    QCOMPARE(stop1.variantProperty("position").value().toInt(), 0);
+    QCOMPARE(stop2.variantProperty("position").value().toInt(), 1);
+
+    ModelNode textNode2 = rootModelNode.nodeListProperty("data").toModelNodeList().last();
+    QVERIFY(textNode2.isValid());
+    QCOMPARE(textNode2.type(), QString("Qt/Text"));
+    QCOMPARE(textNode2.id(), QString("text2"));
+    QCOMPARE(textNode2.variantProperty("width").value().toInt(), 80);
+    QCOMPARE(textNode2.variantProperty("height").value().toInt(), 20);
+    QCOMPARE(textNode2.variantProperty("x").value().toInt(), 66);
+    QCOMPARE(textNode2.variantProperty("y").value().toInt(), 43);
+    QCOMPARE(textNode2.variantProperty("text").value().toString(), QString("text"));
+}
+
+void tst_TestCore::testMetaInfo()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    // test whether default type is registered
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
+
+    // test whether types from plugins are registered
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("QtWebKit/WebView", 1, 0));
+
+    // test whether non-qml type is registered
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 4, 7)); // Qt 4.7 namespace
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // webkit 1.0 namespace
+}
+
+void tst_TestCore::testMetaInfoSimpleType()
+{
+    //
+    // Test type registered with qmlRegisterType:
+    //
+    // qmlRegisterType<QDeclarativeItem>("Qt",4,7,"Item")
+    //
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
+
+    NodeMetaInfo itemMetaInfo = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
+    NodeMetaInfo itemMetaInfo2 = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
+    QCOMPARE(itemMetaInfo, itemMetaInfo2);
+
+    QVERIFY(itemMetaInfo.isValid());
+    QCOMPARE(itemMetaInfo.typeName(), QLatin1String("Qt/Item"));
+    QCOMPARE(itemMetaInfo.majorVersion(), 4);
+    QCOMPARE(itemMetaInfo.minorVersion(), 7);
+
+    // super classes
+    NodeMetaInfo graphicsObjectInfo = itemMetaInfo.directSuperClass();
+    QVERIFY(graphicsObjectInfo.isValid());
+    QCOMPARE(graphicsObjectInfo.typeName(), QLatin1String("QGraphicsObject"));
+    QCOMPARE(graphicsObjectInfo.majorVersion(), -1);
+    QCOMPARE(graphicsObjectInfo.minorVersion(), -1);
+
+    QCOMPARE(itemMetaInfo.superClasses().size(), 2); // QGraphicsObject, Qt/QtObject
+    QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 4, 7));
+    QVERIFY(itemMetaInfo.isSubclassOf("Qt/QtObject", 4, 7));
+
+    // availableInVersion
+    QVERIFY(itemMetaInfo.availableInVersion(4, 7));
+    QVERIFY(itemMetaInfo.availableInVersion(4, 8));
+    QVERIFY(itemMetaInfo.availableInVersion(5, 0));
+    QVERIFY(itemMetaInfo.availableInVersion(-1, -1));
+    QVERIFY(!itemMetaInfo.availableInVersion(4, 6));
+    QVERIFY(!itemMetaInfo.availableInVersion(3, 7));
+}
+
+void tst_TestCore::testMetaInfoUncreatableType()
+{
+    // Test type registered with qmlRegisterUncreatableType or qmlRegisterTypeNotAvailable:
+    //
+    // qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
+    //
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Animation"));
+    NodeMetaInfo animationTypeInfo = model->metaInfo().nodeMetaInfo("Qt/Animation", 4, 7);
+    QVERIFY(animationTypeInfo.isValid());
+
+    QVERIFY(animationTypeInfo.isValid());
+    QCOMPARE(animationTypeInfo.typeName(), QLatin1String("Qt/Animation"));
+    QCOMPARE(animationTypeInfo.majorVersion(), 4);
+    QCOMPARE(animationTypeInfo.minorVersion(), 7);
+
+    NodeMetaInfo qObjectTypeInfo = animationTypeInfo.directSuperClass();
+    QVERIFY(qObjectTypeInfo.isValid());
+    QCOMPARE(qObjectTypeInfo.typeName(), QLatin1String("Qt/QtObject"));
+    QCOMPARE(qObjectTypeInfo.majorVersion(), 4);
+    QCOMPARE(qObjectTypeInfo.minorVersion(), 7);
+    QCOMPARE(animationTypeInfo.superClasses().size(), 1);
+}
+
+void tst_TestCore::testMetaInfoExtendedType()
+{
+    // Test type registered with qmlRegisterExtendedType
+    //
+    // qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
+    //
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/QGraphicsWidget"));
+    NodeMetaInfo graphicsWidgetTypeInfo = model->metaInfo().nodeMetaInfo("Qt/QGraphicsWidget", 4, 7);
+    QVERIFY(graphicsWidgetTypeInfo.isValid());
+    QVERIFY(graphicsWidgetTypeInfo.hasProperty("layout")); // from QGraphicsWidgetDeclarativeUI
+    QVERIFY(graphicsWidgetTypeInfo.hasProperty("font")); // from QGraphicsWidget
+    QVERIFY(graphicsWidgetTypeInfo.hasProperty("enabled")); // from QGraphicsItem
+
+    NodeMetaInfo graphicsObjectTypeInfo = graphicsWidgetTypeInfo.directSuperClass();
+    QVERIFY(graphicsObjectTypeInfo.isValid());
+    QCOMPARE(graphicsObjectTypeInfo.typeName(), QLatin1String("QGraphicsObject"));
+    QCOMPARE(graphicsObjectTypeInfo.majorVersion(), -1);
+    QCOMPARE(graphicsObjectTypeInfo.minorVersion(), -1);
+    QCOMPARE(graphicsWidgetTypeInfo.superClasses().size(), 2);
+}
+
+void tst_TestCore::testMetaInfoInterface()
+{
+    // Test type registered with qmlRegisterInterface
+    //
+
+    QSKIP("TODO: Test not implemented yet", SkipAll);
+}
+
+void tst_TestCore::testMetaInfoCustomType()
+{
+    // Test type registered with qmlRegisterCustomType:
+    //
+    // qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/PropertyChanges"));
+    NodeMetaInfo propertyChangesInfo = model->metaInfo().nodeMetaInfo("Qt/PropertyChanges", 4, 7);
+    QVERIFY(propertyChangesInfo.isValid());
+    QVERIFY(propertyChangesInfo.hasProperty("target")); // from QDeclarativePropertyChanges
+    QVERIFY(propertyChangesInfo.hasProperty("restoreEntryValues")); // from QDeclarativePropertyChanges
+    QVERIFY(propertyChangesInfo.hasProperty("explicit")); // from QDeclarativePropertyChanges
+
+    NodeMetaInfo stateOperationInfo = propertyChangesInfo.directSuperClass();
+    QVERIFY(stateOperationInfo.isValid());
+    QCOMPARE(stateOperationInfo.typeName(), QLatin1String("QDeclarativeStateOperation"));
+    QCOMPARE(stateOperationInfo.majorVersion(), -1);
+    QCOMPARE(stateOperationInfo.minorVersion(), -1);
+    QCOMPARE(propertyChangesInfo.superClasses().size(), 2);
+
+    // DeclarativePropertyChanges just has 3 properties
+    QCOMPARE(propertyChangesInfo.properties().size() - stateOperationInfo.properties().size(), 3);
+}
+
+void tst_TestCore::testMetaInfoEnums()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Text"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Text"));
+
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("transformOrigin"));
+
+    QVERIFY(view->rootModelNode().metaInfo().property("transformOrigin").isEnumType());
+    QCOMPARE(view->rootModelNode().metaInfo().property("transformOrigin").type(), QLatin1String("TransformOrigin"));
+    QVERIFY(view->rootModelNode().metaInfo().property("transformOrigin").enumerator().elementNames().contains(QLatin1String("Bottom")));
+    QVERIFY(view->rootModelNode().metaInfo().property("transformOrigin").enumerator().elementNames().contains(QLatin1String("Top")));
+
+    QVERIFY(view->rootModelNode().metaInfo().property("horizontalAlignment").isEnumType());
+    QCOMPARE(view->rootModelNode().metaInfo().property("horizontalAlignment").type(), QLatin1String("HAlignment"));
+    QVERIFY(view->rootModelNode().metaInfo().property("horizontalAlignment").enumerator().elementNames().contains(QLatin1String("AlignLeft")));
+    QVERIFY(view->rootModelNode().metaInfo().property("horizontalAlignment").enumerator().elementNames().contains(QLatin1String("AlignRight")));
+}
+
+void tst_TestCore::testMetaInfoProperties()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Text"));
+    QVERIFY(model.data());
+
+    NodeMetaInfo textNodeMetaInfo = model->metaInfo().nodeMetaInfo("Qt/TextEdit", 4, 7);
+    QVERIFY(textNodeMetaInfo.hasProperty("text"));   // QDeclarativeTextEdit
+    QVERIFY(textNodeMetaInfo.hasProperty("parent"));     // QDeclarativeItem
+    QVERIFY(textNodeMetaInfo.hasProperty("x"));          // QGraphicsObject
+    QVERIFY(textNodeMetaInfo.hasProperty("objectName")); // Qt/QObject
+    QVERIFY(!textNodeMetaInfo.hasProperty("bla"));
+
+    QVERIFY(textNodeMetaInfo.property("text").isValid());
+    QVERIFY(textNodeMetaInfo.property("text").isReadable());
+    QVERIFY(textNodeMetaInfo.property("text").isWriteable());
+    QVERIFY(textNodeMetaInfo.property("x").isValid());
+    QVERIFY(textNodeMetaInfo.property("x").isReadable());
+    QVERIFY(textNodeMetaInfo.property("x").isWriteable());
+}
+
+void tst_TestCore::testMetaInfoDotProperties()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Text"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Text"));
+
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Pen"));
+
+    QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Text"));
+    QVERIFY(!view->rootModelNode().metaInfo().property("text").isValueType());
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("font"));
+    QVERIFY(view->rootModelNode().metaInfo().property("font").isValueType());
+
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("font.bold", true));
+    QVERIFY(view->rootModelNode().metaInfo().properties(true).keys().contains("font.bold"));
+    QVERIFY(!view->rootModelNode().metaInfo().properties().keys().contains("font.bold"));
+    QVERIFY(view->rootModelNode().metaInfo().properties(true).keys().contains("font.pointSize"));
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("font.pointSize", true));
+    QVERIFY(view->rootModelNode().metaInfo().property("font.pointSize", true).isValid());
+
+    ModelNode rectNode(addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data"));
+
+
+    QVERIFY(rectNode.metaInfo().properties(true).keys().contains("pos.x"));
+    QVERIFY(!rectNode.metaInfo().properties().keys().contains("pos.x"));
+    QVERIFY(rectNode.metaInfo().properties(true).keys().contains("pos.y"));
+    QVERIFY(!rectNode.metaInfo().properties().keys().contains("pos.y"));
+    QVERIFY(!rectNode.metaInfo().properties().keys().contains("anchors.topMargin"));
+    QVERIFY(rectNode.metaInfo().properties(true).keys().contains("border.width"));
+    QVERIFY(rectNode.metaInfo().hasProperty("border"));
+    QVERIFY(!rectNode.metaInfo().property("border").isValueType());
+    QVERIFY(rectNode.metaInfo().hasProperty("border.width", true));
+    QVERIFY(rectNode.metaInfo().property("border.width", true).isValid());
+    QVERIFY(rectNode.metaInfo().property("border.width", true).isValid());
+    QVERIFY(rectNode.metaInfo().property("anchors.topMargin", true).isValid());
+}
+
+void tst_TestCore::testMetaInfoListProperties()
+{
+     QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item"));
+    QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Item"));
+
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("states"));
+    QVERIFY(view->rootModelNode().metaInfo().property("states").isListProperty());
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("children"));
+    QVERIFY(view->rootModelNode().metaInfo().property("children").isListProperty());
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("data"));
+    QVERIFY(view->rootModelNode().metaInfo().property("data").isListProperty());
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("resources"));
+    QVERIFY(view->rootModelNode().metaInfo().property("resources").isListProperty());
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("transitions"));
+    QVERIFY(view->rootModelNode().metaInfo().property("transitions").isListProperty());
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("transform"));
+    QVERIFY(view->rootModelNode().metaInfo().property("transform").isListProperty());
+
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("effect"));
+    QVERIFY(!view->rootModelNode().metaInfo().property("effect").isListProperty());
+    QVERIFY(view->rootModelNode().metaInfo().hasProperty("parent"));
+    QVERIFY(!view->rootModelNode().metaInfo().property("parent").isListProperty());
+}
+
+void tst_TestCore::testStatesRewriter()
+{
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText("import Qt 4.7; Item {}\n");
+    NotIndentingTextEditModifier modifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    TestRewriterView *testRewriterView = new TestRewriterView(model.data());
+    testRewriterView->setTextModifier(&modifier);
+    model->attachView(testRewriterView);
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+
+    ModelNode rootModelNode(view->rootModelNode());
+
+    QVERIFY(rootModelNode.isValid());
+
+    QVERIFY(QmlItemNode(rootModelNode).isValid());
+
+    QVERIFY(QmlItemNode(rootModelNode).states().allStates().isEmpty());
+
+    QmlModelState state1 = QmlItemNode(rootModelNode).states().addState("state 1");
+    QVERIFY(state1.isValid());
+    QVERIFY(!QmlItemNode(rootModelNode).states().allStates().isEmpty());
+    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 1);
+
+    QmlModelState state2 = QmlItemNode(rootModelNode).states().addState("state 2");
+    QVERIFY(state2.isValid());
+
+    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 2);
+
+    QmlItemNode(rootModelNode).states().removeState("state 1");
+    QVERIFY(!state1.isValid());
+
+    QmlItemNode(rootModelNode).states().removeState("state 2");
+    QVERIFY(!state2.isValid());
+
+    QVERIFY(QmlItemNode(rootModelNode).states().allStates().isEmpty());
+
+}
+
+
+void tst_TestCore::testGradientsRewriter()
+{
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText("\nimport Qt 4.7\n\nItem {\n}\n");
+    NotIndentingTextEditModifier modifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    TestRewriterView *testRewriterView = new TestRewriterView(model.data());
+    testRewriterView->setTextModifier(&modifier);
+    model->attachView(testRewriterView);
+
+    QVERIFY(testRewriterView->errors().isEmpty());
+
+    ModelNode rootModelNode(view->rootModelNode());
+
+    QVERIFY(rootModelNode.isValid());
+
+    ModelNode rectNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+
+    const QLatin1String expected1("\nimport Qt 4.7\n"
+                                  "\n"
+                                  "Item {\n"
+                                  "Rectangle {\n"
+                                  "}\n"
+                                  "}\n");
+    QCOMPARE(textEdit.toPlainText(), expected1);
+
+    ModelNode gradientNode(addNodeChild(rectNode, "Qt/Gradient", 4, 7, "gradient"));
+
+    QVERIFY(rectNode.hasNodeProperty("gradient"));
+
+    const QLatin1String expected2("\nimport Qt 4.7\n"
+                                  "\n"
+                                  "Item {\n"
+                                  "Rectangle {\n"
+                                  "gradient: Gradient {\n"
+                                  "}\n"
+                                  "}\n"
+                                  "}\n");
+    QCOMPARE(textEdit.toPlainText(), expected2);
+
+    NodeListProperty stops(gradientNode.nodeListProperty("stops"));
+
+    QList<QPair<QString, QVariant> > propertyList;
+
+    propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
+    propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::red))));
+
+    ModelNode gradientStop1(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
+    QVERIFY(gradientStop1.isValid());
+    stops.reparentHere(gradientStop1);
+
+    const QLatin1String expected3("\nimport Qt 4.7\n"
+                                  "\n"
+                                  "Item {\n"
+                                  "Rectangle {\n"
+                                  "gradient: Gradient {\n"
+                                  "GradientStop {\n"
+                                  "    position: 0\n"
+                                  "    color: \"#ff0000\"\n"
+                                  "}\n"
+                                  "}\n"
+                                  "}\n"
+                                  "}\n");
+
+    QCOMPARE(textEdit.toPlainText(), expected3);
+
+    propertyList.clear();
+    propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.5)));
+    propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
+
+    ModelNode gradientStop2(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
+    QVERIFY(gradientStop2.isValid());
+    stops.reparentHere(gradientStop2);
+
+    const QLatin1String expected4("\nimport Qt 4.7\n"
+                                  "\n"
+                                  "Item {\n"
+                                  "Rectangle {\n"
+                                  "gradient: Gradient {\n"
+                                  "GradientStop {\n"
+                                  "    position: 0\n"
+                                  "    color: \"#ff0000\"\n"
+                                  "}\n"
+                                  "\n"
+                                  "GradientStop {\n"
+                                  "    position: 0.5\n"
+                                  "    color: \"#0000ff\"\n"
+                                  "}\n"
+                                  "}\n"
+                                  "}\n"
+                                  "}\n");
+
+    QCOMPARE(textEdit.toPlainText(), expected4);
+
+    propertyList.clear();
+    propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.8)));
+    propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::yellow))));
+
+    ModelNode gradientStop3(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
+    QVERIFY(gradientStop3.isValid());
+    stops.reparentHere(gradientStop3);
+
+    const QLatin1String expected5("\nimport Qt 4.7\n"
+                                  "\n"
+                                  "Item {\n"
+                                  "Rectangle {\n"
+                                  "gradient: Gradient {\n"
+                                  "GradientStop {\n"
+                                  "    position: 0\n"
+                                  "    color: \"#ff0000\"\n"
+                                  "}\n"
+                                  "\n"
+                                  "GradientStop {\n"
+                                  "    position: 0.5\n"
+                                  "    color: \"#0000ff\"\n"
+                                  "}\n"
+                                  "\n"
+                                  "GradientStop {\n"
+                                  "    position: 0.8\n"
+                                  "    color: \"#ffff00\"\n"
+                                  "}\n"
+                                  "}\n"
+                                  "}\n"
+                                  "}\n");
+
+    QCOMPARE(textEdit.toPlainText(), expected5);
+
+    gradientNode.removeProperty("stops");
+
+    const QLatin1String expected6("\nimport Qt 4.7\n"
+                                  "\n"
+                                  "Item {\n"
+                                  "Rectangle {\n"
+                                  "gradient: Gradient {\n"
+                                  "}\n"
+                                  "}\n"
+                                  "}\n");
+
+    QCOMPARE(textEdit.toPlainText(), expected6);
+
+    QVERIFY(!gradientNode.hasProperty(QLatin1String("stops")));
+
+    propertyList.clear();
+    propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
+    propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
+
+    gradientStop1 = gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList);
+    QVERIFY(gradientStop1.isValid());
+
+    stops.reparentHere(gradientStop1);
+}
+
+void tst_TestCore::testQmlModelStates()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+
+
+    ModelNode rootModelNode(view->rootModelNode());
+
+    QVERIFY(rootModelNode.isValid());
+
+    QVERIFY(QmlItemNode(rootModelNode).isValid());
+
+    QVERIFY(QmlItemNode(rootModelNode).states().allStates().isEmpty());
+
+    QmlModelState newState = QmlItemNode(rootModelNode).states().addState("testState");
+    QVERIFY(newState.isValid());
+    QVERIFY(!QmlItemNode(rootModelNode).states().allStates().isEmpty());
+    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 1);
+
+    QCOMPARE(newState.name(), QString("testState"));
+    QCOMPARE(newState, QmlItemNode(rootModelNode).states().state("testState"));
+
+    QmlItemNode(rootModelNode).states().removeState("testState");
+    QVERIFY(!newState.isValid());
+    QVERIFY(QmlItemNode(rootModelNode).states().allStates().isEmpty());
+
+}
+
+void tst_TestCore::testInstancesStates()
+{
+//
+//    import Qt 4.7
+//
+//    Rectangle {
+//      Text {
+//        id: targetObject
+//        text: "base state"
+//      }
+//
+//      states: [
+//        State {
+//          name: "state1"
+//          PropertyChanges {
+//            target: targetObj
+//            x: 10
+//            text: "state1"
+//          }
+//        }
+//        State {
+//          name: "state2"
+//          PropertyChanges {
+//            target: targetObj
+//            text: "state2"
+//          }
+//        }
+//      ]
+//    }
+//
+
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
+    QVERIFY(model.data());
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    //
+    // build up model
+    //
+    ModelNode rootNode = view->rootModelNode();
+
+    ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
+    textNode.setId("targetObject");
+    textNode.variantProperty("text").setValue("base state");
+
+    rootNode.nodeListProperty("data").reparentHere(textNode);
+
+    ModelNode propertyChanges1Node = view->createModelNode("Qt/PropertyChanges", 4, 7);
+    propertyChanges1Node.bindingProperty("target").setExpression("targetObject");
+    propertyChanges1Node.variantProperty("x").setValue(10);
+    propertyChanges1Node.variantProperty("text").setValue("state1");
+
+    ModelNode state1Node = view->createModelNode("Qt/State", 4, 7);
+    state1Node.variantProperty("name").setValue("state1");
+    state1Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
+
+    rootNode.nodeListProperty("states").reparentHere(state1Node);
+
+    ModelNode propertyChanges2Node = view->createModelNode("Qt/PropertyChanges", 4, 7);
+    propertyChanges2Node.bindingProperty("target").setExpression("targetObject");
+    propertyChanges2Node.variantProperty("text").setValue("state2");
+
+    ModelNode state2Node = view->createModelNode("Qt/State", 4, 7);
+    state2Node.variantProperty("name").setValue("state2");
+    state2Node.nodeListProperty("changes").reparentHere(propertyChanges2Node);
+
+    rootNode.nodeListProperty("states").reparentHere(state2Node);
+
+    //
+    // load into instance view
+    //
+    QScopedPointer<NodeInstanceView> instanceView(new NodeInstanceView);
+
+    model->attachView(instanceView.data());
+
+    //
+    // check that list of actions is not empty (otherwise the CustomParser has not been run properly)
+    //
+    NodeInstance state1Instance = instanceView->instanceForNode(state1Node);
+    QVERIFY(state1Instance.isValid());
+    QDeclarativeState *state1 = const_cast<QDeclarativeState*>(qobject_cast<const QDeclarativeState*>(state1Instance.testHandle()));
+    QVERIFY(state1);
+    QDeclarativeListProperty<QDeclarativeStateOperation> state1Changes = state1->changes();
+    QCOMPARE(state1Changes.count(&state1Changes), 1);
+    QCOMPARE(state1Changes.at(&state1Changes, 0)->actions().size(), 2);
+
+    NodeInstance state2Instance = instanceView->instanceForNode(state2Node);
+    QVERIFY(state2Instance.isValid());
+    QDeclarativeState *state2 = const_cast<QDeclarativeState*>(qobject_cast<const QDeclarativeState*>(state1Instance.testHandle()));
+    QVERIFY(state2);
+    QDeclarativeListProperty<QDeclarativeStateOperation> state2Changes = state2->changes();
+    QCOMPARE(state2Changes.count(&state2Changes), 1);
+    QCOMPARE(state2Changes.at(&state2Changes, 0)->actions().size(), 2);
+
+    NodeInstance textInstance = instanceView->instanceForNode(textNode);
+
+    //
+    // State switching
+    //
+
+    // base state
+    QVERIFY(textInstance.isValid());
+    QCOMPARE(state1Instance == instanceView->activeStateInstance(), false);
+    QCOMPARE(state2Instance == instanceView->activeStateInstance(), false);
+    QCOMPARE(textInstance.property("x").toInt(), 0);
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+
+    // base state -> state
+    instanceView->activateState(state1Instance);
+    QCOMPARE(state1Instance == instanceView->activeStateInstance(), true);
+    QCOMPARE(state2Instance == instanceView->activeStateInstance(), false);
+    QCOMPARE(textInstance.property("x").toInt(), 10);
+    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
+
+    // state 1 -> state 2
+    instanceView->activateState(state2Instance);
+    QCOMPARE(state1Instance == instanceView->activeStateInstance(), false);
+    QCOMPARE(state2Instance == instanceView->activeStateInstance(), true);
+    QCOMPARE(textInstance.property("x").toInt(), 0);
+    QCOMPARE(textInstance.property("text").toString(), QString("state2"));
+
+    // state 1 -> base state
+    instanceView->activateBaseState();
+    QCOMPARE(state1Instance == instanceView->activeStateInstance(), false);
+    QCOMPARE(state2Instance == instanceView->activeStateInstance(), false);
+    QCOMPARE(textInstance.property("x").toInt(), 0);
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+
+    //
+    // Add/Change/Remove properties in current state
+    //
+    instanceView->activateState(state1Instance);
+
+    propertyChanges1Node.variantProperty("x").setValue(20);
+    QCOMPARE(textInstance.property("x").toInt(), 20);
+    propertyChanges1Node.variantProperty("x").setValue(10);  // undo
+    QCOMPARE(textInstance.property("x").toInt(), 10);
+
+    QCOMPARE(textInstance.property("y").toInt(), 0);
+    propertyChanges1Node.variantProperty("y").setValue(50);
+    QCOMPARE(textInstance.property("y").toInt(), 50);
+    propertyChanges1Node.removeProperty("y");
+    QCOMPARE(textInstance.property("y").toInt(), 0);
+
+    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
+    propertyChanges1Node.removeProperty("text");
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+    propertyChanges1Node.variantProperty("text").setValue("state1");   // undo
+    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
+
+////    Following is not supported. We work around this
+////    by _always_ changing to the base state before doing any changes to the
+////    state structure.
+
+    //
+    // Reparenting state actions (while state is active)
+    //
+
+    // move property changes of current state out of state
+    ModelNode state3Node = view->createModelNode("Qt/State", 4, 7);
+    QDeclarativeListReference changes(state1, "changes");
+    QCOMPARE(changes.count(), 1);
+    state3Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
+
+    QCOMPARE(changes.count(), 0);
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+
+    // undo
+    state1Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
+    QCOMPARE(changes.count(), 1);
+    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
+
+
+    // change base state if in state1
+
+    textNode.variantProperty("text").setValue("state1 and base state");
+    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
+    instanceView->activateBaseState();
+    QCOMPARE(textInstance.property("text").toString(), QString("state1 and base state"));
+    textNode.variantProperty("text").setValue("base state");
+
+    // expressions
+    ModelNode textNode2 = view->createModelNode("Qt/Text", 4, 7);
+    textNode2.setId("targetObject2");
+    textNode2.variantProperty("text").setValue("textNode2");
+
+
+    rootNode.nodeListProperty("data").reparentHere(textNode2);
+
+    propertyChanges1Node.bindingProperty("text").setExpression("targetObject2.text");
+
+    instanceView->activateState(state1Instance);
+
+    QCOMPARE(textInstance.property("text").toString(), QString("textNode2"));
+    propertyChanges1Node.removeProperty("text");
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+    propertyChanges1Node.variantProperty("text").setValue("state1");
+    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
+
+    propertyChanges1Node.bindingProperty("text").setExpression("targetObject2.text");
+    QCOMPARE(textInstance.property("text").toString(), QString("textNode2"));
+
+    instanceView->activateBaseState();
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+
+    propertyChanges1Node.variantProperty("text").setValue("state1");
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+    textNode.bindingProperty("text").setExpression("targetObject2.text");
+    QCOMPARE(textInstance.property("text").toString(), QString("textNode2"));
+
+    instanceView->activateState(state1Instance);
+    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
+
+    instanceView->activateBaseState();
+    QCOMPARE(textInstance.property("text").toString(), QString("textNode2"));
+    textNode.variantProperty("text").setValue("base state");
+
+    instanceView->activateState(state1Instance);
+    //
+    // Removing state actions (while state is active)
+    //
+
+    QCOMPARE(textInstance.property("text").toString(), QString("state1"));
+    propertyChanges1Node.destroy();
+    QCOMPARE(changes.count(), 0);
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+
+    //
+    // Removing state (while active)
+    //
+
+    instanceView->activateState(state2Instance);
+    QCOMPARE(textInstance.property("text").toString(), QString("state2"));
+    state2Node.destroy();
+
+    QCOMPARE(textInstance.property("text").toString(), QString("base state"));
+
+}
+
+void tst_TestCore::testStates()
+{
+//
+//    import Qt 4.7
+//
+//    Rectangle {
+//      Text {
+//        id: targetObject
+//        text: "base state"
+//      }
+//      states: [
+//        State {
+//          name: "state 1"
+//          PropertyChanges {
+//            target: targetObj
+//            text: "state 1"
+//          }
+//        }
+//      ]
+//    }
+//
+
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
+    QVERIFY(model.data());
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    // build up model
+    ModelNode rootNode = view->rootModelNode();
+
+    ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
+    textNode.setId("targetObject");
+    textNode.variantProperty("text").setValue("base state");
+
+    rootNode.nodeListProperty("data").reparentHere(textNode);
+
+    QVERIFY(rootNode.isValid());
+    QVERIFY(textNode.isValid());
+
+    QmlItemNode rootItem(rootNode);
+    QmlItemNode textItem(textNode);
+
+    QVERIFY(rootItem.isValid());
+    QVERIFY(textItem.isValid());
+
+    QmlModelState state1(rootItem.states().addState("state 1")); //add state "state 1"
+    QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
+
+    QVERIFY(view->currentState().isBaseState());
+
+    NodeInstance textInstance = view->nodeInstanceView()->instanceForNode(textNode);
+    QVERIFY(textInstance.isValid());
+
+    NodeInstance state1Instance = view->nodeInstanceView()->instanceForNode(state1);
+    QVERIFY(state1Instance.isValid());
+    QCOMPARE(state1Instance == view->nodeInstanceView()->activeStateInstance(), false);
+    QCOMPARE(state1Instance.property("name").toString(), QString("state 1"));
+
+    view->setCurrentState(state1); //set currentState "state 1"
+
+    QCOMPARE(view->currentState(), state1);
+
+    QCOMPARE(state1Instance == view->nodeInstanceView()->activeStateInstance(), true);
+
+    QVERIFY(!textItem.propertyAffectedByCurrentState("text"));
+
+    textItem.setVariantProperty("text", QVariant("state 1")); //set text in state !
+
+    QDeclarativeState *qmlState1 = const_cast<QDeclarativeState*>(qobject_cast<const QDeclarativeState*>(state1Instance.testHandle()));
+    QVERIFY(qmlState1);
+    QDeclarativeListProperty<QDeclarativeStateOperation> state1Changes = qmlState1->changes();
+    QCOMPARE(state1Changes.count(&state1Changes), 1);
+    QCOMPARE(state1Changes.at(&state1Changes, 0)->actions().size(), 1);
+
+    QmlPropertyChanges changes(state1.propertyChanges(textNode));
+    QVERIFY(changes.modelNode().hasProperty("text"));
+    QCOMPARE(changes.modelNode().variantProperty("text").value(), QVariant("state 1"));
+    QCOMPARE(changes.modelNode().bindingProperty("target").expression(), QString("targetObject"));
+    QCOMPARE(changes.target(), textNode);
+    QCOMPARE(changes.modelNode().type(), QString("Qt/PropertyChanges"));
+
+    QCOMPARE(changes.modelNode().parentProperty().name(), QString("changes"));
+    QCOMPARE(changes.modelNode().parentProperty().parentModelNode(), state1.modelNode());
+
+    QCOMPARE(state1Instance == view->nodeInstanceView()->activeStateInstance(), true);
+
+    QVERIFY(textItem.propertyAffectedByCurrentState("text"));
+
+    QCOMPARE(textInstance.property("text").toString(), QString("state 1"));
+    QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
+
+    QVERIFY(textNode.hasProperty("text"));
+    QCOMPARE(textNode.variantProperty("text").value(), QVariant("base state"));
+}
+
+void tst_TestCore::testStatesBaseState()
+{
+//
+//    import Qt 4.7
+//
+//    Rectangle {
+//      Text {
+//        id: targetObject
+//        text: "base state"
+//      }
+//      states: [
+//        State {
+//          name: "state 1"
+//          PropertyChanges {
+//            target: targetObj
+//            text: "state 1"
+//          }
+//        }
+//      ]
+//    }
+//
+
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
+    QVERIFY(model.data());
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    // build up model
+    ModelNode rootNode = view->rootModelNode();
+
+    ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
+    textNode.setId("targetObject");
+    textNode.variantProperty("text").setValue("base state");
+
+    rootNode.nodeListProperty("data").reparentHere(textNode);
+
+    QVERIFY(rootNode.isValid());
+    QVERIFY(textNode.isValid());
+
+    QmlItemNode rootItem(rootNode);
+    QmlItemNode textItem(textNode);
+
+    QVERIFY(rootItem.isValid());
+    QVERIFY(textItem.isValid());
+
+    QmlModelState state1(rootItem.states().addState("state 1")); //add state "state 1"
+    QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
+
+    QVERIFY(view->currentState().isBaseState());
+
+    view->setCurrentState(state1); //set currentState "state 1"
+    QCOMPARE(view->currentState(), state1);
+    textItem.setVariantProperty("text", QVariant("state 1")); //set text in state !
+    QVERIFY(textItem.propertyAffectedByCurrentState("text"));
+    QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
+
+    ModelNode newNode = view->createModelNode("Qt/Rectangle", 4, 7);
+    QVERIFY(!QmlObjectNode(newNode).currentState().isBaseState());
+
+    view->setCurrentState(view->baseState()); //set currentState base state
+    QVERIFY(view->currentState().isBaseState());
+
+    textNode.variantProperty("text").setValue("base state changed");
+
+    view->setCurrentState(state1); //set currentState "state 1"
+    QCOMPARE(view->currentState(), state1);
+    QVERIFY(!view->currentState().isBaseState());
+    QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
+
+    view->setCurrentState(view->baseState()); //set currentState base state
+    QVERIFY(view->currentState().isBaseState());
+
+    QCOMPARE(textItem.instanceValue("text"), QVariant("base state changed"));
+}
+
+
+void tst_TestCore::testInstancesIdResolution()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
+    QVERIFY(model.data());
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    //    import Qt 4.7
+    //
+    //    Rectangle {
+    //      id: root
+    //      width: 100
+    //      height: 100
+    //      Rectangle {
+    //        id: item1
+    //        width: root.width
+    //        height: item2.height
+    //      }
+    //    }
+
+    ModelNode rootNode = view->rootModelNode();
+    rootNode.setId("root");
+    rootNode.variantProperty("width").setValue(100);
+    rootNode.variantProperty("height").setValue(100);
+
+    ModelNode item1Node = view->createModelNode("Qt/Rectangle", 4, 7);
+    item1Node.setId("item1");
+    item1Node.bindingProperty("width").setExpression("root.width");
+    item1Node.bindingProperty("height").setExpression("item2.height");
+
+    rootNode.nodeListProperty("data").reparentHere(item1Node);
+
+    NodeInstance item1Instance = view->instanceForModelNode(item1Node);
+    QVERIFY(item1Instance.isValid());
+
+    QCOMPARE(item1Instance.property("width").toInt(), 100);
+    QCOMPARE(item1Instance.property("height").toInt(), 0); // item2 is still unknown
+
+    // Add item2:
+    //      Rectangle {
+    //        id: item2
+    //        width: root.width / 2
+    //        height: root.height
+    //      }
+
+    ModelNode item2Node = view->createModelNode("Qt/Rectangle", 4, 7);
+    item2Node.setId("item2");
+    item2Node.bindingProperty("width").setExpression("root.width / 2");
+    item2Node.bindingProperty("height").setExpression("root.height");
+
+    rootNode.nodeListProperty("data").reparentHere(item2Node);
+
+    NodeInstance item2Instance = view->instanceForModelNode(item2Node);
+    QVERIFY(item2Instance.isValid());
+
+    QCOMPARE(item2Instance.property("width").toInt(), 50);
+    QCOMPARE(item2Instance.property("height").toInt(), 100);
+    QCOMPARE(item1Instance.property("height").toInt(), 100);
+
+    // Remove item2 again
+    item2Node.destroy();
+    QVERIFY(!item2Instance.isValid());
+    QVERIFY(!item2Instance.testHandle());
+
+    // Add item3:
+    //      Rectangle {
+    //        id: item3
+    //        height: 80
+    //      }
+
+    ModelNode item3Node = view->createModelNode("Qt/Rectangle", 4, 7);
+    item3Node.setId("item3");
+    item3Node.variantProperty("height").setValue(80);
+    rootNode.nodeListProperty("data").reparentHere(item3Node);
+
+    // Change item1.height: item3.height
+
+    item1Node.bindingProperty("height").setExpression("item3.height");
+    QCOMPARE(item1Instance.property("height").toInt(), 80);
+}
+
+
+void tst_TestCore::testInstancesNotInScene()
+{
+    //
+    // test whether deleting an instance which is not in the scene crashes
+    //
+
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
+    QVERIFY(model.data());
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
+    node1.setId("node1");
+
+    ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
+    node2.setId("node2");
+
+    node1.nodeListProperty("children").reparentHere(node2);
+
+    node1.destroy();
+}
+
+void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QVERIFY(QmlItemNode(rootModelNode).isValid());
+
+    rootModelNode.setId("rootModelNode");
+
+    QmlModelState state1 = QmlItemNode(rootModelNode).states().addState("state1");
+    QVERIFY(state1.isValid());
+    QCOMPARE(state1.name(), QString("state1"));
+
+    ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(childNode.isValid());
+    childNode.setId("childNode");
+
+    ModelNode subChildNode = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
+    QVERIFY(subChildNode.isValid());
+    subChildNode.setId("subChildNode");
+
+    QVERIFY(!state1.hasPropertyChanges(subChildNode));
+    QmlPropertyChanges changeSet = state1.propertyChanges(subChildNode);
+    QVERIFY(changeSet.isValid());
+
+    QmlItemNode(childNode).destroy();
+    QVERIFY(!childNode.isValid());
+    QVERIFY(!subChildNode.isValid());
+    QVERIFY(!changeSet.isValid());
+}
+
+void tst_TestCore::testInstancesAttachToExistingModel()
+{
+    //
+    // Test attaching nodeinstanceview to an existing model
+    //
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    ModelNode rectangleNode = addNodeListChild(rootNode, "Qt/Rectangle", 4, 7, "data");
+
+    rectangleNode.variantProperty("width").setValue(100);
+
+    QVERIFY(rectangleNode.isValid());
+    QVERIFY(rectangleNode.hasProperty("width"));
+
+    // Attach NodeInstanceView
+
+    QScopedPointer<NodeInstanceView> instanceView(new NodeInstanceView);
+    QVERIFY(instanceView.data());
+    model->attachView(instanceView.data());
+
+    NodeInstance rootInstance = instanceView->instanceForNode(rootNode);
+    NodeInstance rectangleInstance = instanceView->instanceForNode(rectangleNode);
+    QVERIFY(rootInstance.isValid());
+    QVERIFY(rectangleInstance.isValid());
+    QCOMPARE(QVariant(100), rectangleInstance.property("width"));
+    QVERIFY(rootInstance.testHandle());
+    QVERIFY(rectangleInstance.testHandle());
+    QCOMPARE(rootInstance.testHandle(), qobject_cast<QGraphicsObject*>(rectangleInstance.testHandle())->parentItem()->toGraphicsObject());
+}
+
+void tst_TestCore::testQmlModelAddMultipleStates()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QVERIFY(QmlItemNode(rootModelNode).isValid());
+
+    QmlModelState state1 = QmlItemNode(rootModelNode).states().addState("state1");
+    QVERIFY(state1.isValid());
+    QCOMPARE(state1.name(), QString("state1"));
+
+    QmlModelState state2 = QmlItemNode(rootModelNode).states().addState("state2");
+    QVERIFY(state2.isValid());
+    QCOMPARE(state1.name(), QString("state1"));
+    QCOMPARE(state2.name(), QString("state2"));
+
+    QmlModelState state3 = QmlItemNode(rootModelNode).states().addState("state3");
+    QVERIFY(state3.isValid());
+    QCOMPARE(state1.name(), QString("state1"));
+    QCOMPARE(state2.name(), QString("state2"));
+    QCOMPARE(state3.name(), QString("state3"));
+
+    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 3);
+}
+
+void tst_TestCore::testQmlModelRemoveStates()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QVERIFY(QmlItemNode(rootModelNode).isValid());
+
+    QmlModelState state1 = QmlItemNode(rootModelNode).states().addState("state1");
+    QmlModelState state2 = QmlItemNode(rootModelNode).states().addState("state2");
+    QmlModelState state3 = QmlItemNode(rootModelNode).states().addState("state3");
+
+    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 3);
+
+    QmlItemNode(rootModelNode).states().removeState("state2");
+    QVERIFY(!state2.isValid());
+    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 2);
+
+    QmlItemNode(rootModelNode).states().removeState("state3");
+    QVERIFY(!state3.isValid());
+    state1.modelNode().destroy();
+    QVERIFY(!state1.isValid());
+    QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 0);
+}
+
+void tst_TestCore::testQmlModelStateWithName()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 200; } } ] }\n");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    TestRewriterView *testRewriterView1 = new TestRewriterView(model1.data());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1);
+
+    QVERIFY(testRewriterView1->errors().isEmpty());
+
+    TestView *view = new TestView(model1.data());
+    model1->attachView(view);
+    QmlItemNode rootNode = view->rootModelNode();
+    QCOMPARE(rootNode.states().allStates().size(), 1);
+
+    QmlModelState modelState = rootNode.states().allStates().at(0);
+    QVERIFY(!modelState.isBaseState());
+    QCOMPARE(rootNode.instanceValue("width").toInt(), 100);
+
+    QVERIFY(rootNode.isInBaseState());
+    QVERIFY(rootNode.propertyAffectedByCurrentState("width"));
+    view->setCurrentState(rootNode.states().allStates().at(0));
+    rootNode.setVariantProperty("width", 112);
+
+    const QLatin1String expected1("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 112 } } ] }\n");
+    QCOMPARE(textEdit1.toPlainText(), expected1);
+
+    QVERIFY(!rootNode.isInBaseState());
+    QCOMPARE(rootNode.instanceValue("width").toInt(), 112);
+
+    view->setCurrentState(view->baseState());
+    QCOMPARE(rootNode.instanceValue("width").toInt(), 100);
+
+    view->setCurrentState(rootNode.states().allStates().at(0));
+    QCOMPARE(rootNode.instanceValue("width").toInt(), 112);
+
+
+    modelState.destroy();
+    QCOMPARE(rootNode.states().allStates().size(), 0);
+}
+
+void tst_TestCore::testRewriterAutomaticSemicolonAfterChangedProperty()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Rectangle {\n    width: 640\n    height: 480\n}\n");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    TestRewriterView *testRewriterView1 = new TestRewriterView(model1.data());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1);
+
+    QVERIFY(testRewriterView1->errors().isEmpty());
+
+    ModelNode rootModelNode = testRewriterView1->rootModelNode();
+    rootModelNode.variantProperty("height").setValue(1480);
+    QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 1480);
+
+    QVERIFY(testRewriterView1->errors().isEmpty());
+}
+
+void tst_TestCore::defaultPropertyValues()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QCOMPARE(view->rootModelNode().variantProperty("x").value().toDouble(), 0.0);
+    QCOMPARE(view->rootModelNode().variantProperty("width").value().toDouble(), 0.0);
+
+    ModelNode rectNode(addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data"));
+
+    QCOMPARE(rectNode.variantProperty("y").value().toDouble(), 0.0);
+    QCOMPARE(rectNode.variantProperty("width").value().toDouble(), 0.0);
+
+    ModelNode imageNode(addNodeListChild(view->rootModelNode(), "Qt/Image", 4, 7, "data"));
+
+    QCOMPARE(imageNode.variantProperty("y").value().toDouble(), 0.0);
+    QCOMPARE(imageNode.variantProperty("width").value().toDouble(), 0.0);
+}
+
+void tst_TestCore::testModelPropertyValueTypes()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Rectangle { width: 100; radius: 1.5; color: \"red\"; }");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model1(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model1->attachView(testRewriterView1.data());
+
+    QVERIFY(testRewriterView1->errors().isEmpty());
+
+    ModelNode rootModelNode(testRewriterView1->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+
+    QCOMPARE(rootModelNode.variantProperty("width").value().type(), QVariant::Double);
+    QCOMPARE(rootModelNode.variantProperty("radius").value().type(), QVariant::Double);
+    QCOMPARE(rootModelNode.variantProperty("color").value().type(), QVariant::Color);
+}
+
+void tst_TestCore::testModelNodeInHierarchy()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QVERIFY(view->rootModelNode().isInHierarchy());
+    ModelNode node1 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
+    QVERIFY(node1.isInHierarchy());
+    ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
+    QVERIFY(!node2.isInHierarchy());
+    node2.nodeListProperty("data").reparentHere(node1);
+    QVERIFY(!node2.isInHierarchy());
+    view->rootModelNode().nodeListProperty("data").reparentHere(node2);
+    QVERIFY(node1.isInHierarchy());
+    QVERIFY(node2.isInHierarchy());
+}
+
+void tst_TestCore::testModelNodeIsAncestorOf()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    //
+    //  import Qt 4.7
+    //  Item {
+    //    Item {
+    //      id: item2
+    //    }
+    //    Item {
+    //      id: item3
+    //      Item {
+    //        id: item4
+    //      }
+    //    }
+    //  }
+    //
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    view->rootModelNode().setId("item1");
+    ModelNode item2 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
+    item2.setId("item2");
+    ModelNode item3 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
+    item3.setId("item3");
+    ModelNode item4 = addNodeListChild(item3, "Qt/Item", 4, 7, "data");
+    item4.setId("item4");
+
+    QVERIFY(view->rootModelNode().isAncestorOf(item2));
+    QVERIFY(view->rootModelNode().isAncestorOf(item3));
+    QVERIFY(view->rootModelNode().isAncestorOf(item4));
+    QVERIFY(!item2.isAncestorOf(view->rootModelNode()));
+    QVERIFY(!item2.isAncestorOf(item4));
+    QVERIFY(item3.isAncestorOf(item4));
+}
+
+void tst_TestCore::testModelDefaultProperties()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+
+    QCOMPARE(rootModelNode.metaInfo().defaultProperty(), QString("data"));
+}
+
+void tst_TestCore::loadAnchors()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model->attachView(testRewriterView1.data());
+
+    TestView *testView = new TestView(model.data());
+    model->attachView(testView);
+
+    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
+    QmlItemNode anchoredNode(rootQmlItemNode.children().first());
+    QVERIFY(anchoredNode.isValid());
+
+    QmlAnchors anchors(anchoredNode.anchors());
+    QVERIFY(anchors.instanceHasAnchor(AnchorLine::Left));
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Top));
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Right));
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Bottom));
+    QVERIFY(anchors.instanceHasAnchor(AnchorLine::HorizontalCenter));
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::VerticalCenter));
+
+    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 20.0);
+
+
+    QCOMPARE(anchoredNode.instancePosition().x(), 0.0);
+    QCOMPARE(anchoredNode.instancePosition().y(), 0.0);
+    QCOMPARE(anchoredNode.instanceBoundingRect().width(), 100.0);
+    QCOMPARE(anchoredNode.instanceBoundingRect().height(), 0.0);
+
+
+    model->detachView(testView);
+}
+
+void tst_TestCore::changeAnchors()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model->attachView(testRewriterView1.data());
+
+    TestView *testView = new TestView(model.data());
+    model->attachView(testView);
+
+    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
+    QmlItemNode anchoredNode(rootQmlItemNode.children().first());
+    QVERIFY(anchoredNode.isValid());
+
+    QmlAnchors anchors(anchoredNode.anchors());
+    QVERIFY(anchors.instanceHasAnchor(AnchorLine::Left));
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Top));
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Right));
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Bottom));
+    QVERIFY(anchors.instanceHasAnchor(AnchorLine::HorizontalCenter));
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::VerticalCenter));
+    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 20.0);
+
+
+    QCOMPARE(anchoredNode.instancePosition().x(), 0.0);
+    QCOMPARE(anchoredNode.instancePosition().y(), 0.0);
+    QCOMPARE(anchoredNode.instanceBoundingRect().width(), 100.0);
+    QCOMPARE(anchoredNode.instanceBoundingRect().height(), 0.0);
+
+
+    anchors.removeAnchor(AnchorLine::Top);
+
+    anchoredNode.setBindingProperty("anchors.bottom", "parent.bottom");
+    QVERIFY(anchors.instanceHasAnchor(AnchorLine::Bottom));
+    anchors.setAnchor(AnchorLine::Right, rootQmlItemNode, AnchorLine::Right);
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Right));
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Invalid);
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Right).qmlItemNode().isValid());
+
+    anchors.setMargin(AnchorLine::Right, 10.0);
+    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 10.0);
+
+    anchors.setMargin(AnchorLine::Right, 0.0);
+    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 0.0);
+
+    anchors.setMargin(AnchorLine::Right, 20.0);
+    QCOMPARE(anchors.instanceMargin(AnchorLine::Right), 20.0);
+
+    QCOMPARE(anchoredNode.instancePosition().x(), 0.0);
+    QCOMPARE(anchoredNode.instancePosition().y(), 100.0);
+    QCOMPARE(anchoredNode.instanceBoundingRect().width(), 100.0);
+    QCOMPARE(anchoredNode.instanceBoundingRect().height(), 0.0);
+
+    model->detachView(testView);
+}
+
+void tst_TestCore::anchorToSibling()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Item { Rectangle {} Rectangle { id: secondChild } }");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model->attachView(testRewriterView1.data());
+
+    TestView *testView = new TestView(model.data());
+    model->attachView(testView);
+
+    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
+    QmlItemNode anchoredNode(rootQmlItemNode.children().first());
+    QVERIFY(anchoredNode.isValid());
+
+    QmlAnchors anchors(anchoredNode.anchors());
+
+    QmlItemNode firstChild(rootQmlItemNode.children().first());
+    QVERIFY(firstChild.isValid());
+    QCOMPARE(firstChild.validId(), QString("rectangle1"));
+
+    QmlItemNode secondChild(rootQmlItemNode.children().at(1));
+    QVERIFY(secondChild.isValid());
+    QCOMPARE(secondChild.validId(), QString("secondChild"));
+
+    secondChild.anchors().setAnchor(AnchorLine::Top, firstChild, AnchorLine::Bottom);
+
+    QmlItemNode secondChildTopAnchoredNode = secondChild.anchors().instanceAnchor(AnchorLine::Top).qmlItemNode();
+    QVERIFY(secondChildTopAnchoredNode.isValid());
+    QVERIFY2(secondChildTopAnchoredNode == firstChild, QString("expected %1 got %2").arg(firstChild.id(), secondChildTopAnchoredNode.id()).toLatin1().data());
+
+    secondChild.anchors().setMargin(AnchorLine::Top, 10.0);
+    QCOMPARE(secondChild.anchors().instanceMargin(AnchorLine::Top), 10.0);
+
+    QVERIFY(firstChild.anchors().possibleAnchorLines(AnchorLine::Bottom, secondChild) == AnchorLine::Invalid);
+    QVERIFY(firstChild.anchors().possibleAnchorLines(AnchorLine::Left, secondChild) == AnchorLine::HorizontalMask);
+    QVERIFY(secondChild.anchors().possibleAnchorLines(AnchorLine::Top, firstChild) == AnchorLine::VerticalMask);
+    QVERIFY(secondChild.anchors().possibleAnchorLines(AnchorLine::Left, firstChild) == AnchorLine::HorizontalMask);
+}
+
+void tst_TestCore::removeFillAnchorByDetaching()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model->attachView(testRewriterView1.data());
+
+    TestView *testView = new TestView(model.data());
+    model->attachView(testView);
+
+    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
+
+    QmlItemNode firstChild(rootQmlItemNode.children().first());
+    QVERIFY(firstChild.isValid());
+    QCOMPARE(firstChild.id(), QString("child"));
+
+    // Verify the synthesized anchors:
+    QmlAnchors anchors(firstChild);
+    QVERIFY(anchors.instanceHasAnchor(AnchorLine::Left));
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Left).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).type(), AnchorLine::Left);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Top).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).type(), AnchorLine::Top);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Right).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Right);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Bottom).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).type(), AnchorLine::Bottom);
+
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
+
+    QCOMPARE(firstChild.instancePosition().x(), 0.0);
+    QCOMPARE(firstChild.instancePosition().y(), 0.0);
+    QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0);
+    QCOMPARE(firstChild.instanceBoundingRect().height(), 100.0);
+
+    // Remove 2 anchors:
+    RewriterTransaction transaction = testView->beginRewriterTransaction();
+    anchors.removeAnchor(AnchorLine::Bottom);
+    anchors.removeAnchor(AnchorLine::Top);
+    transaction.commit();
+
+    // Verify again:
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Left).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).type(), AnchorLine::Left);
+
+    QVERIFY(!anchors.instanceHasAnchor(AnchorLine::Top));
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Top).isValid());
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Right).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Right);
+
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Bottom).isValid());
+
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
+
+    QCOMPARE(firstChild.instancePosition().x(), 0.0);
+    QCOMPARE(firstChild.instancePosition().y(), 0.0);
+    QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0);
+    QCOMPARE(firstChild.instanceBoundingRect().height(), 0.0);
+
+
+    model->detachView(testView);
+}
+
+void tst_TestCore::removeFillAnchorByChanging()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model->attachView(testRewriterView1.data());
+
+    TestView *testView = new TestView(model.data());
+    model->attachView(testView);
+
+    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
+
+    QmlItemNode firstChild(rootQmlItemNode.children().first());
+    QVERIFY(firstChild.isValid());
+    QCOMPARE(firstChild.id(), QString("child"));
+
+    // Verify the synthesized anchors:
+    QmlAnchors anchors(firstChild);
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Left).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).type(), AnchorLine::Left);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Top).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).type(), AnchorLine::Top);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Right).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Right);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Bottom).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).type(), AnchorLine::Bottom);
+
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
+
+    QCOMPARE(firstChild.instancePosition().x(), 0.0);
+    QCOMPARE(firstChild.instancePosition().y(), 0.0);
+    QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0);
+    QCOMPARE(firstChild.instanceBoundingRect().height(), 100.0);
+
+    // Change 2 anchors:
+    anchors.setAnchor(AnchorLine::Bottom, rootQmlItemNode, AnchorLine::Top);
+    anchors.setAnchor(AnchorLine::Top, rootQmlItemNode, AnchorLine::Bottom);
+
+    // Verify again:
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Left).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Left).type(), AnchorLine::Left);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Top).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Top).type(), AnchorLine::Bottom);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Right).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Right).type(), AnchorLine::Right);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::Bottom).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::Bottom).type(), AnchorLine::Top);
+
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
+
+
+    QCOMPARE(firstChild.instancePosition().x(), 0.0);
+    QCOMPARE(firstChild.instancePosition().y(), 100.0);
+    QCOMPARE(firstChild.instanceBoundingRect().width(), 100.0);
+    QCOMPARE(firstChild.instanceBoundingRect().height(), -100.0);
+
+
+    model->detachView(testView);
+}
+
+void tst_TestCore::testModelBindings()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
+    model->attachView(nodeInstanceView);
+
+    ModelNode rootModelNode = nodeInstanceView->rootModelNode();
+    QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 0);
+    NodeInstance rootInstance = nodeInstanceView->instanceForNode(rootModelNode);
+
+    // default width/height is forced to 100
+    QCOMPARE(rootInstance.size().width(), 100.0);
+    QCOMPARE(rootInstance.size().height(), 100.0);
+
+    rootModelNode.variantProperty("width") = 200;
+    rootModelNode.variantProperty("height") = 100;
+
+    QCOMPARE(rootInstance.size().width(), 200.0);
+    QCOMPARE(rootInstance.size().height(), 100.0);
+
+    ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+
+    childNode.variantProperty("width") = 100;
+    childNode.variantProperty("height") = 100;
+
+    childNode.variantProperty("x") = 10;
+    childNode.variantProperty("y") = 10;
+
+    NodeInstance childInstance = nodeInstanceView->instanceForNode(childNode);
+
+    QCOMPARE(childInstance.size().width(), 100.0);
+    QCOMPARE(childInstance.size().height(), 100.0);
+
+    QCOMPARE(childInstance.position().x(), 10.0);
+    QCOMPARE(childInstance.position().y(), 10.0);
+
+    childNode.bindingProperty("width").setExpression("parent.width");
+
+    QCOMPARE(childInstance.size().width(), 200.0);
+
+    rootModelNode.setId("root");
+    QCOMPARE(rootModelNode.id(), QString("root"));
+
+    childNode.setId("child");
+    QCOMPARE(childNode.id(), QString("child"));
+    childNode.variantProperty("width") = 100;
+
+    QCOMPARE(childInstance.size().width(), 100.0);
+
+    childNode.bindingProperty("width").setExpression("child.height");
+    QCOMPARE(childInstance.size().width(), 100.0);
+
+    childNode.bindingProperty("width").setExpression("root.width");
+    QCOMPARE(childInstance.size().width(), 200.0);
+}
+
+void tst_TestCore::testModelDynamicProperties()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    TestView *testView = new TestView(model.data());
+    model->attachView(testView);
+
+    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
+    ModelNode rootModelNode = rootQmlItemNode.modelNode();
+
+    rootModelNode.variantProperty("x") = 10;
+    rootModelNode.variantProperty("myDouble") = qMakePair(QString("real"), QVariant(10));
+    rootModelNode.variantProperty("myColor").setDynamicTypeNameAndValue("color", Qt::red);
+
+    QVERIFY(!rootModelNode.property("x").isDynamic());
+    QVERIFY(rootModelNode.property("myColor").isDynamic());
+    QVERIFY(rootModelNode.property("myDouble").isDynamic());
+
+    QCOMPARE(rootModelNode.property("myColor").dynamicTypeName(), QString("color"));
+    QCOMPARE(rootModelNode.variantProperty("myColor").value(), QVariant(Qt::red));
+    //QCOMPARE(rootQmlItemNode.instanceValue("myColor"), QVariant(Qt::red)); //not working yet
+    QCOMPARE(rootModelNode.property("myDouble").dynamicTypeName(), QString("real"));
+    QCOMPARE(rootModelNode.variantProperty("myDouble").value(), QVariant(10));
+    //QCOMPARE(rootQmlItemNode.instanceValue("myDouble"), QVariant(10)); //not working yet
+
+    QCOMPARE(rootModelNode.property("x").dynamicTypeName(), QString());
+
+    rootModelNode.variantProperty("myDouble") = QVariant(10);
+    QVERIFY(!rootModelNode.property("myDouble").isDynamic());
+
+    rootModelNode.bindingProperty("myBindingDouble") = qMakePair(QString("real"), QString("myDouble"));
+    rootModelNode.bindingProperty("myBindingColor").setDynamicTypeNameAndExpression("color", "myColor");
+
+    QCOMPARE(rootModelNode.property("myBindingColor").dynamicTypeName(), QString("color"));
+    QCOMPARE(rootModelNode.property("myBindingDouble").dynamicTypeName(), QString("real"));
+
+    QVERIFY(rootModelNode.property("myBindingDouble").isDynamic());
+    QVERIFY(rootModelNode.property("myBindingColor").isDynamic());
+
+    QCOMPARE(rootModelNode.bindingProperty("myBindingDouble").expression(), QString("myDouble"));
+    QCOMPARE(rootModelNode.bindingProperty("myBindingColor").expression(), QString("myColor"));
+}
+
+void tst_TestCore::testModelSliding()
+{
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+
+    ModelNode rect00(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+    ModelNode rect01(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+    ModelNode rect02(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+    ModelNode rect03(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+
+    QVERIFY(rect00.isValid());
+    QVERIFY(rect01.isValid());
+    QVERIFY(rect02.isValid());
+    QVERIFY(rect03.isValid());
+
+    NodeListProperty listProperty(rootModelNode.nodeListProperty("data"));
+    QVERIFY(!listProperty.isEmpty());
+
+    QList<ModelNode> nodeList(listProperty.toModelNodeList());
+
+    QCOMPARE(rect00, nodeList.at(0));
+    QCOMPARE(rect01, nodeList.at(1));
+    QCOMPARE(rect02, nodeList.at(2));
+    QCOMPARE(rect03, nodeList.at(3));
+
+    listProperty.slide(3,0);
+
+    nodeList = listProperty.toModelNodeList();
+
+    QCOMPARE(rect03, nodeList.at(0));
+    QCOMPARE(rect00, nodeList.at(1));
+    QCOMPARE(rect01, nodeList.at(2));
+    QCOMPARE(rect02, nodeList.at(3));
+
+    NodeListProperty childrenProperty(rootModelNode.nodeListProperty("children"));
+
+    childrenProperty.reparentHere(rect00);
+    childrenProperty.reparentHere(rect01);
+    childrenProperty.reparentHere(rect02);
+    childrenProperty.reparentHere(rect03);
+
+    QVERIFY(listProperty.isEmpty());
+
+    QVERIFY(!childrenProperty.isEmpty());
+
+    nodeList = childrenProperty.toModelNodeList();
+
+    QCOMPARE(rect00, nodeList.at(0));
+    QCOMPARE(rect01, nodeList.at(1));
+    QCOMPARE(rect02, nodeList.at(2));
+    QCOMPARE(rect03, nodeList.at(3));
+
+    childrenProperty.slide(0,3);
+
+    nodeList = childrenProperty.toModelNodeList();
+
+    QCOMPARE(rect01, nodeList.at(0));
+    QCOMPARE(rect02, nodeList.at(1));
+    QCOMPARE(rect03, nodeList.at(2));
+    QCOMPARE(rect00, nodeList.at(3));
+}
+
+void tst_TestCore::testRewriterChangeId()
+{
+    const char* qmlString = "import Qt 4.7\nRectangle { }";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.id(), QString());
+
+    rootModelNode.setId("rectId");
+
+    QCOMPARE(rootModelNode.id(), QString("rectId"));
+
+    QString expected = "import Qt 4.7\n"
+                       "Rectangle { id: rectId }";
+
+    QCOMPARE(textEdit.toPlainText(), expected);
+
+    // change id for node outside of hierarchy
+    ModelNode node = view->createModelNode("Qt/Item", 4, 7);
+    node.setId("myId");
+}
+
+void tst_TestCore::testRewriterRemoveId()
+{
+    const char* qmlString = "import Qt 4.7\nRectangle { id: rect }";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView(0, TestRewriterView::Amend));
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.id(), QString("rect"));
+
+    //
+    // remove id in text
+    //
+    const char* qmlString2 = "import Qt 4.7\nRectangle { }";
+    textEdit.setPlainText(qmlString2);
+
+    QCOMPARE(rootModelNode.id(), QString());
+}
+
+void tst_TestCore::testRewriterChangeValueProperty()
+{
+    const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+
+    QCOMPARE(rootModelNode.property("x").toVariantProperty().value().toInt(), 10);
+
+    rootModelNode.property("x").toVariantProperty().setValue(2);
+
+    QCOMPARE(textEdit.toPlainText(), QString(QLatin1String(qmlString)).replace("x: 10;", "x: 2;"));
+
+    // change property for node outside of hierarchy
+    PropertyListType properties;
+    properties.append(QPair<QString,QVariant>("x", 10));
+    ModelNode node = view->createModelNode("Qt/Item", 4, 7, properties);
+    node.variantProperty("x").setValue(20);
+}
+
+void tst_TestCore::testRewriterRemoveValueProperty()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "Rectangle {\n"
+                                  "  x: 10\n"
+                                  "  y: 10;\n"
+                                  "}\n");
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+
+    QCOMPARE(rootModelNode.property("x").toVariantProperty().value().toInt(), 10);
+
+    rootModelNode.property("x").toVariantProperty().setValue(2);
+
+    rootModelNode.removeProperty("x");
+
+    const QLatin1String expected("\n"
+                                 "import Qt 4.7\n"
+                                 "Rectangle {\n"
+                                 "  y: 10;\n"
+                                 "}\n");
+    QCOMPARE(textEdit.toPlainText(), expected);
+
+    // remove property for node outside of hierarchy
+    PropertyListType properties;
+    properties.append(QPair<QString,QVariant>("x", 10));
+    ModelNode node = view->createModelNode("Qt/Item", 4, 7, properties);
+    node.removeProperty("x");
+}
+
+void tst_TestCore::testRewriterSignalProperty()
+{
+    const char* qmlString = "import Qt 4.7\nRectangle { onColorChanged: {} }";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+
+    // Signal properties are ignored for the time being
+    QCOMPARE(rootModelNode.properties().size(), 0);
+}
+
+void tst_TestCore::testRewriterObjectTypeProperty()
+{
+    const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
+
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    QVERIFY(view.data());
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+
+    QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
+
+    view->changeRootNodeType(QLatin1String("Qt/Text"), 4, 7);
+
+    QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Text"));
+}
+
+void tst_TestCore::testRewriterPropertyChanges()
+{
+    try {
+        // PropertyChanges uses a custom parser
+
+        // Use a slightly more complicated example so that target properties are not resolved in default scope
+        const char* qmlString
+                = "import Qt 4.7\n"
+                  "Rectangle {\n"
+                  "  Text {\n"
+                  "    id: targetObj\n"
+                  "    text: \"base State\"\n"
+                  "  }\n"
+                  "  states: [\n"
+                  "    State {\n"
+                  "      PropertyChanges {\n"
+                  "        target: targetObj\n"
+                  "        text: \"State 1\"\n"
+                  "      }\n"
+                  "    }\n"
+                  "  ]\n"
+                  "}\n";
+
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(qmlString);
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestView> view(new TestView);
+        model->attachView(view.data());
+
+        // read in
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+        ModelNode rootNode = view->rootModelNode();
+        QVERIFY(rootNode.isValid());
+        QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+        QVERIFY(rootNode.propertyNames().contains(QLatin1String("data")));
+        QVERIFY(rootNode.propertyNames().contains(QLatin1String("states")));
+        QCOMPARE(rootNode.propertyNames().count(), 2);
+
+        NodeListProperty statesProperty = rootNode.nodeListProperty("states");
+        QVERIFY(statesProperty.isValid());
+        QCOMPARE(statesProperty.toModelNodeList().size(), 1);
+
+        ModelNode stateNode = statesProperty.toModelNodeList().first();
+        QVERIFY(stateNode.isValid());
+        QCOMPARE(stateNode.type(), QString("Qt/State"));
+        QCOMPARE(stateNode.propertyNames(), QStringList("changes"));
+
+        NodeListProperty stateChangesProperty = stateNode.property("changes").toNodeListProperty();
+        QVERIFY(stateChangesProperty.isValid());
+
+        ModelNode propertyChangesNode = stateChangesProperty.toModelNodeList().first();
+        QVERIFY(propertyChangesNode.isValid());
+        QCOMPARE(propertyChangesNode.properties().size(), 2);
+
+        BindingProperty targetProperty = propertyChangesNode.bindingProperty("target");
+        QVERIFY(targetProperty.isValid());
+
+        VariantProperty textProperty = propertyChangesNode.variantProperty("text");
+        QVERIFY(textProperty.isValid());
+        QCOMPARE(textProperty.value().toString(), QLatin1String("State 1"));
+    } catch (Exception &e) {
+        QFAIL(e.description().toAscii().data());
+    }
+}
+
+void tst_TestCore::testRewriterListModel()
+{
+    QSKIP("See BAUHAUS-157", SkipAll);
+
+    try {
+        // ListModel uses a custom parser
+        const char* qmlString = "import Qt 4.7; ListModel {\n ListElement {\n age: 12\n} \n}";
+
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(qmlString);
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+        QScopedPointer<TestView> view(new TestView);
+        model->attachView(view.data());
+
+        ModelNode listModelNode = view->rootModelNode();
+        QCOMPARE(listModelNode.propertyNames(), QStringList() << "__elements"); // TODO: what should be the name?
+
+        NodeListProperty elementListProperty = listModelNode.nodeListProperty("__elements");
+        QCOMPARE(elementListProperty.toModelNodeList().size(), 1);
+
+        ModelNode elementNode = elementListProperty.toModelNodeList().at(0);
+        QVERIFY(elementNode.isValid());
+        QCOMPARE(elementNode.properties().size(), 1);
+        QVERIFY(elementNode.variantProperty("age").isValid());
+        QCOMPARE(elementNode.variantProperty("age").value().toInt(), 12);
+    } catch (Exception &e) {
+        QFAIL(qPrintable(e.description()));
+    }
+}
+
+void tst_TestCore::testRewriterAddProperty()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    rootNode.variantProperty(QLatin1String("x")).setValue(123);
+
+    QVERIFY(rootNode.hasProperty(QLatin1String("x")));
+    QVERIFY(rootNode.property(QLatin1String("x")).isVariantProperty());
+    QCOMPARE(rootNode.variantProperty(QLatin1String("x")).value(), QVariant(123));
+
+    const QLatin1String expected("\n"
+                                 "import Qt 4.7\n"
+                                 "\n"
+                                 "Rectangle {\n"
+                                 "x: 123\n"
+                                 "}");
+    QCOMPARE(textEdit.toPlainText(), expected);
+}
+
+void tst_TestCore::testRewriterAddPropertyInNestedObject()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    Rectangle {\n"
+                                  "        id: rectangle1\n"
+                                  "    }\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+
+    ModelNode childNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
+    QVERIFY(childNode.isValid());
+    QCOMPARE(childNode.type(), QLatin1String("Qt/Rectangle"));
+    QCOMPARE(childNode.id(), QLatin1String("rectangle1"));
+
+    childNode.variantProperty(QLatin1String("x")).setValue(10);
+    childNode.variantProperty(QLatin1String("y")).setValue(10);
+
+    const QLatin1String expected("\n"
+                                 "import Qt 4.7\n"
+                                 "\n"
+                                 "Rectangle {\n"
+                                 "    Rectangle {\n"
+                                 "        id: rectangle1\n"
+                                 "        x: 10\n"
+                                 "        y: 10\n"
+                                 "    }\n"
+                                 "}");
+    QCOMPARE(textEdit.toPlainText(), expected);
+}
+
+void tst_TestCore::testRewriterAddObjectDefinition()
+{
+    const QLatin1String qmlString("import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    ModelNode childNode = view->createModelNode("Qt/MouseArea", 4, 7);
+    rootNode.nodeAbstractProperty(QLatin1String("data")).reparentHere(childNode);
+
+    QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
+    childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
+    QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
+}
+
+void tst_TestCore::testRewriterAddStatesArray()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    ModelNode stateNode = view->createModelNode("Qt/State", 4, 7);
+    rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode);
+
+    const QString expected1 = QLatin1String("\n"
+                                           "import Qt 4.7\n"
+                                           "\n"
+                                           "Rectangle {\n"
+                                           "states: [\n"
+                                           "    State {\n"
+                                           "    }\n"
+                                           "]\n"
+                                           "}");
+    QCOMPARE(textEdit.toPlainText(), expected1);
+
+    ModelNode stateNode2 = view->createModelNode("Qt/State", 4, 7);
+    rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode2);
+
+    const QString expected2 = QLatin1String("\n"
+                                           "import Qt 4.7\n"
+                                           "\n"
+                                           "Rectangle {\n"
+                                           "states: [\n"
+                                           "    State {\n"
+                                           "    },\n"
+                                           "    State {\n"
+                                           "    }\n"
+                                           "]\n"
+                                           "}");
+    QCOMPARE(textEdit.toPlainText(), expected2);
+}
+
+void tst_TestCore::testRewriterRemoveStates()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    states: [\n"
+                                  "        State {\n"
+                                  "        },\n"
+                                  "        State {\n"
+                                  "        }\n"
+                                  "    ]\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    NodeListProperty statesProperty = rootNode.nodeListProperty(QLatin1String("states"));
+    QVERIFY(statesProperty.isValid());
+    QCOMPARE(statesProperty.toModelNodeList().size(), 2);
+
+    ModelNode state = statesProperty.toModelNodeList().at(1);
+    state.destroy();
+
+    const QLatin1String expected1("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "    states: [\n"
+                                  "        State {\n"
+                                  "        }\n"
+                                  "    ]\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected1);
+
+    state = statesProperty.toModelNodeList().at(0);
+    state.destroy();
+
+    const QLatin1String expected2("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected2);
+}
+
+void tst_TestCore::testRewriterRemoveObjectDefinition()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  MouseArea {\n"
+                                  "  }\n"
+                                  "  MouseArea {\n"
+                                  "  } // some comment here\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 2);
+    ModelNode childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(1);
+    QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
+
+    childNode.destroy();
+
+    QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
+    childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
+    QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
+
+    childNode.destroy();
+
+    QVERIFY(!rootNode.hasProperty(QLatin1String("data")));
+
+    const QString expected = QLatin1String("\n"
+                                           "import Qt 4.7\n"
+                                           "\n"
+                                           "Rectangle {\n"
+                                           "  // some comment here\n"
+                                           "}");
+    QCOMPARE(textEdit.toPlainText(), expected);
+
+    // don't crash when deleting nodes not in any hierarchy
+    ModelNode node1 = view->createModelNode("Qt/Rectangle", 4, 7);
+    ModelNode node2 = addNodeListChild(node1, "Qt/Item", 4, 7, "data");
+    ModelNode node3 = addNodeListChild(node2, "Qt/Item", 4, 7, "data");
+
+    node3.destroy();
+    node1.destroy();
+}
+
+void tst_TestCore::testRewriterRemoveScriptBinding()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "   x: 10; // some comment\n"
+                                  "  y: 20\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    QCOMPARE(rootNode.properties().size(), 2);
+    QVERIFY(rootNode.hasProperty(QLatin1String("x")));
+    QVERIFY(rootNode.hasProperty(QLatin1String("y")));
+
+    rootNode.removeProperty(QLatin1String("y"));
+
+    QCOMPARE(rootNode.properties().size(), 1);
+    QVERIFY(rootNode.hasProperty(QLatin1String("x")));
+    QVERIFY(!rootNode.hasProperty(QLatin1String("y")));
+
+    rootNode.removeProperty(QLatin1String("x"));
+
+    QCOMPARE(rootNode.properties().size(), 0);
+
+    const QString expected = QLatin1String("\n"
+                                           "import Qt 4.7\n"
+                                           "\n"
+                                           "Rectangle {\n"
+                                           "   // some comment\n"
+                                           "}");
+    QCOMPARE(textEdit.toPlainText(), expected);
+}
+
+void tst_TestCore::testRewriterNodeReparenting()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  Item {\n"
+                                  "    MouseArea {\n"
+                                  "    }\n"
+                                  "  }\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    ModelNode itemNode = rootNode.nodeListProperty("data").toModelNodeList().at(0);
+    QVERIFY(itemNode.isValid());
+    QCOMPARE(itemNode.type(), QLatin1String("Qt/Item"));
+
+    ModelNode mouseArea = itemNode.nodeListProperty("data").toModelNodeList().at(0);
+    QVERIFY(mouseArea.isValid());
+    QCOMPARE(mouseArea.type(), QLatin1String("Qt/MouseArea"));
+
+    rootNode.nodeListProperty("data").reparentHere(mouseArea);
+
+    QVERIFY(mouseArea.isValid());
+    QCOMPARE(rootNode.nodeListProperty("data").toModelNodeList().size(), 2);
+
+    QString expected =  "\n"
+                        "import Qt 4.7\n"
+                        "\n"
+                        "Rectangle {\n"
+                        "  Item {\n"
+                        "  }\n"
+                        "\n"
+                        "MouseArea {\n"
+                        "    }\n"
+                        "}";
+    QCOMPARE(textEdit.toPlainText(), expected);
+
+    // reparenting outside of the hierarchy
+    ModelNode node1 = view->createModelNode("Qt/Rectangle", 4, 7);
+    ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
+    ModelNode node3 = view->createModelNode("Qt/Item", 4, 7);
+    node2.nodeListProperty("data").reparentHere(node3);
+    node1.nodeListProperty("data").reparentHere(node2);
+
+    // reparent into the hierarchy
+    rootNode.nodeListProperty("data").reparentHere(node1);
+
+    expected =  "\n"
+                "import Qt 4.7\n"
+                "\n"
+                "Rectangle {\n"
+                "  Item {\n"
+                "  }\n"
+                "\n"
+                "MouseArea {\n"
+                "    }\n"
+                "\n"
+                "    Rectangle {\n"
+                "        Item {\n"
+                "            Item {\n"
+                "            }\n"
+                "        }\n"
+                "    }\n"
+                "}";
+
+    QCOMPARE(textEdit.toPlainText(), expected);
+
+    // reparent out of the hierarchy
+    ModelNode node4 = view->createModelNode("Qt/Rectangle", 4, 7);
+    node4.nodeListProperty("data").reparentHere(node1);
+
+    expected =  "\n"
+                "import Qt 4.7\n"
+                "\n"
+                "Rectangle {\n"
+                "  Item {\n"
+                "  }\n"
+                "\n"
+                "MouseArea {\n"
+                "    }\n"
+                "}";
+
+    QCOMPARE(textEdit.toPlainText(), expected);
+}
+
+void tst_TestCore::testRewriterNodeReparentingWithTransaction()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  id: rootItem\n"
+                                  "  Item {\n"
+                                  "    id: firstItem\n"
+                                  "    x: 10\n"
+                                  "  }\n"
+                                  "  Item {\n"
+                                  "    id: secondItem\n"
+                                  "    x: 20\n"
+                                  "  }\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
+    QCOMPARE(rootNode.id(), QLatin1String("rootItem"));
+
+    ModelNode item1Node = rootNode.nodeListProperty("data").toModelNodeList().at(0);
+    QVERIFY(item1Node.isValid());
+    QCOMPARE(item1Node.type(), QLatin1String("Qt/Item"));
+    QCOMPARE(item1Node.id(), QLatin1String("firstItem"));
+
+    ModelNode item2Node = rootNode.nodeListProperty("data").toModelNodeList().at(1);
+    QVERIFY(item2Node.isValid());
+    QCOMPARE(item2Node.type(), QLatin1String("Qt/Item"));
+    QCOMPARE(item2Node.id(), QLatin1String("secondItem"));
+
+    RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
+
+    item1Node.nodeListProperty(QLatin1String("data")).reparentHere(item2Node);
+    item2Node.variantProperty(QLatin1String("x")).setValue(0);
+
+    transaction.commit();
+
+    const QLatin1String expected("\n"
+                                 "import Qt 4.7\n"
+                                 "\n"
+                                 "Rectangle {\n"
+                                 "  id: rootItem\n"
+                                 "  Item {\n"
+                                 "    id: firstItem\n"
+                                 "    x: 10\n"
+                                 "\n"
+                                 "Item {\n"
+                                 "    id: secondItem\n"
+                                 "    x: 0\n"
+                                 "  }\n"
+                                 "  }\n"
+                                 "}");
+    QCOMPARE(textEdit.toPlainText(), expected);
+}
+void tst_TestCore::testRewriterMovingInOut()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
+    rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
+
+    const QLatin1String expected1("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "MouseArea {\n"
+                                  "}\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected1);
+
+#define move(node, x, y) {\
+    node.variantProperty(QLatin1String("x")).setValue(x);\
+    node.variantProperty(QLatin1String("y")).setValue(y);\
+}
+    move(newNode, 1, 1);
+    move(newNode, 2, 2);
+    move(newNode, 3, 3);
+#undef move
+    newNode.destroy();
+
+    const QLatin1String expected2("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected2);
+}
+
+void tst_TestCore::testRewriterMovingInOutWithTransaction()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+
+    RewriterTransaction transaction = view->beginRewriterTransaction();
+
+    ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
+    rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
+
+#define move(node, x, y) {\
+    node.variantProperty(QLatin1String("x")).setValue(x);\
+    node.variantProperty(QLatin1String("y")).setValue(y);\
+}
+    move(newNode, 1, 1);
+    move(newNode, 2, 2);
+    move(newNode, 3, 3);
+#undef move
+    newNode.destroy();
+
+    transaction.commit();
+
+    const QLatin1String expected2("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected2);
+}
+
+void tst_TestCore::testRewriterComplexMovingInOut()
+{
+    const QLatin1String qmlString("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  Item {\n"
+                                  "  }\n"
+                                  "}");
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(qmlString);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    // read in
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+    ModelNode rootNode = view->rootModelNode();
+    QVERIFY(rootNode.isValid());
+    QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
+    ModelNode itemNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
+
+    ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
+    rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
+
+    const QLatin1String expected1("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  Item {\n"
+                                  "  }\n"
+                                  "\n"
+                                  "  MouseArea {\n"
+                                  "  }\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected1);
+
+#define move(node, x, y) {\
+    node.variantProperty(QLatin1String("x")).setValue(x);\
+    node.variantProperty(QLatin1String("y")).setValue(y);\
+}
+    move(newNode, 1, 1);
+    move(newNode, 2, 2);
+    move(newNode, 3, 3);
+
+    const QLatin1String expected2("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  Item {\n"
+                                  "  }\n"
+                                  "\n"
+                                  "  MouseArea {\n"
+                                  "  x: 3\n"
+                                  "  y: 3\n"
+                                  "  }\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected2);
+
+    itemNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
+
+    const QLatin1String expected3("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  Item {\n"
+                                  "MouseArea {\n"
+                                  "  x: 3\n"
+                                  "  y: 3\n"
+                                  "  }\n"
+                                  "  }\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected3);
+
+    move(newNode, 0, 0);
+    move(newNode, 1, 1);
+    move(newNode, 2, 2);
+    move(newNode, 3, 3);
+#undef move
+    newNode.destroy();
+
+    const QLatin1String expected4("\n"
+                                  "import Qt 4.7\n"
+                                  "\n"
+                                  "Rectangle {\n"
+                                  "  Item {\n"
+                                  "  }\n"
+                                  "}");
+    QCOMPARE(textEdit.toPlainText(), expected4);
+}
+
+void tst_TestCore::removeCenteredInAnchorByDetaching()
+{
+    QPlainTextEdit textEdit1;
+    textEdit1.setPlainText("import Qt 4.7; Item { Rectangle { id: child; anchors.centerIn: parent } }");
+    NotIndentingTextEditModifier modifier1(&textEdit1);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+
+    QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
+    testRewriterView1->setTextModifier(&modifier1);
+    model->attachView(testRewriterView1.data());
+
+    TestView *testView = new TestView(model.data());
+    model->attachView(testView);
+
+    QmlItemNode rootQmlItemNode(testView->rootQmlItemNode());
+
+
+    QmlItemNode firstChild(rootQmlItemNode.children().first());
+    QVERIFY(firstChild.isValid());
+    QCOMPARE(firstChild.id(), QString("child"));
+
+    // Verify the synthesized anchors:
+    QmlAnchors anchors(firstChild);
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Left).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Top).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Right).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Bottom).isValid());
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::HorizontalCenter).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::HorizontalCenter).type(), AnchorLine::HorizontalCenter);
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::VerticalCenter).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::VerticalCenter).type(), AnchorLine::VerticalCenter);
+
+    // Remove horizontal anchor:
+    anchors.removeAnchor(AnchorLine::HorizontalCenter);
+
+    // Verify again:
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Left).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Top).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Right).isValid());
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::Bottom).isValid());
+
+    QVERIFY(!anchors.instanceAnchor(AnchorLine::HorizontalCenter).isValid());
+
+    QVERIFY(anchors.instanceAnchor(AnchorLine::VerticalCenter).isValid());
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::VerticalCenter).qmlItemNode(), rootQmlItemNode);
+    QCOMPARE(anchors.instanceAnchor(AnchorLine::VerticalCenter).type(), AnchorLine::VerticalCenter);
+}
+
+
+void tst_TestCore::changePropertyBinding()
+{
+
+    QScopedPointer<Model> model(Model::create("Qt/Item"));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestView> view(new TestView);
+    model->attachView(view.data());
+
+    ModelNode rootModelNode(view->rootModelNode());
+    rootModelNode.variantProperty("width") = 20;
+
+    ModelNode firstChild = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+    firstChild.bindingProperty("width").setExpression(QString("parent.width"));
+    firstChild.variantProperty("height")=  10;
+    QVERIFY(firstChild.isValid());
+
+    {
+        QVERIFY(firstChild.hasProperty("width"));
+
+        BindingProperty widthBinding = firstChild.bindingProperty("width");
+        QVERIFY(widthBinding.isValid());
+        QCOMPARE(widthBinding.expression(), QString("parent.width"));
+        QVERIFY(firstChild.variantProperty("height").value().toInt() == 10);
+    }
+
+    firstChild.variantProperty("width") =  400;
+    firstChild.bindingProperty("height").setExpression("parent.width / 2");
+
+    {
+        QVERIFY(firstChild.hasProperty("width"));
+        QVariant width = firstChild.variantProperty("width").value();
+        QVERIFY(width.isValid() && !width.isNull());
+        QVERIFY(width == 400);
+        QVERIFY(firstChild.hasProperty("height"));
+        BindingProperty heightBinding = firstChild.bindingProperty("height");
+        QVERIFY(heightBinding.isValid());
+        QCOMPARE(heightBinding.expression(), QString("parent.width / 2"));
+    }
+}
+
+
+void tst_TestCore::loadTestFiles()
+{
+    { //empty.qml
+        QFile file(":/fx/empty.qml");
+        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(QString(file.readAll()));
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+
+        QVERIFY(model.data());
+        ModelNode rootModelNode(testRewriterView->rootModelNode());
+        QVERIFY(rootModelNode.isValid());
+        QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Item"));
+        QVERIFY(rootModelNode.allDirectSubModelNodes().isEmpty());
+    }
+
+    { //helloworld.qml
+        QFile file(":/fx/helloworld.qml");
+        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(QString(file.readAll()));
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+
+        QVERIFY(model.data());
+        ModelNode rootModelNode(testRewriterView->rootModelNode());
+        QVERIFY(rootModelNode.isValid());
+        QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
+        QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 1);
+        QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
+        QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
+
+        ModelNode textNode(rootModelNode.allDirectSubModelNodes().first());
+        QVERIFY(textNode.isValid());
+        QCOMPARE(textNode.type(), QLatin1String("Qt/Text"));
+        QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
+        QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);
+    }
+    { //states.qml
+        QFile file(":/fx/states.qml");
+        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(QString(file.readAll()));
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+
+        QVERIFY(model.data());
+        ModelNode rootModelNode(testRewriterView->rootModelNode());
+        QVERIFY(rootModelNode.isValid());
+        QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
+        QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 4);
+        QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
+        QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
+        QCOMPARE(rootModelNode.id(), QLatin1String("rect"));
+        QVERIFY(rootModelNode.hasProperty("data"));
+        QVERIFY(rootModelNode.property("data").isDefaultProperty());
+
+        ModelNode textNode(rootModelNode.nodeListProperty("data").toModelNodeList().first());
+        QVERIFY(textNode.isValid());
+        QCOMPARE(textNode.id(), QLatin1String("text"));
+        QCOMPARE(textNode.type(), QLatin1String("Qt/Text"));
+        QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
+        QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);
+
+        ModelNode imageNode(rootModelNode.nodeListProperty("data").toModelNodeList().last());
+        QVERIFY(imageNode.isValid());
+        QCOMPARE(imageNode.id(), QLatin1String("image1"));
+        QCOMPARE(imageNode.type(), QLatin1String("Qt/Image"));
+        QCOMPARE(imageNode.variantProperty("x").value().toInt(), 41);
+        QCOMPARE(imageNode.variantProperty("y").value().toInt(), 46);
+        QCOMPARE(imageNode.variantProperty("source").value().toUrl(), QUrl("images/qtcreator.png"));
+
+        QVERIFY(rootModelNode.hasProperty("states"));
+        QVERIFY(!rootModelNode.property("states").isDefaultProperty());
+
+        QCOMPARE(rootModelNode.nodeListProperty("states").toModelNodeList().count(), 2);
+    }
+
+    QSKIP("Fails because the text editor model doesn't know about components", SkipAll);
+    { //usingbutton.qml
+        QFile file(":/fx/usingbutton.qml");
+        QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(QString(file.readAll()));
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+        QVERIFY(testRewriterView->errors().isEmpty());
+
+        QVERIFY(model.data());
+        ModelNode rootModelNode(testRewriterView->rootModelNode());
+        QVERIFY(rootModelNode.isValid());
+        QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
+        QVERIFY(!rootModelNode.allDirectSubModelNodes().isEmpty());
+    }
+}
+
+static QString rectWithGradient = "import Qt 4.7\n"
+                                  "Rectangle {\n"
+                                  "    gradient: Gradient {\n"
+                                  "        id: pGradient\n"
+                                  "        GradientStop { id: pOne; position: 0.0; color: \"lightsteelblue\" }\n"
+                                  "        GradientStop { id: pTwo; position: 1.0; color: \"blue\" }\n"
+                                  "    }\n"
+                                  "    Gradient {\n"
+                                  "        id: secondGradient\n"
+                                  "        GradientStop { id: nOne; position: 0.0; color: \"blue\" }\n"
+                                  "        GradientStop { id: nTwo; position: 1.0; color: \"lightsteelblue\" }\n"
+                                  "    }\n"
+                                  "}";
+
+void tst_TestCore::loadGradient()
+{
+    QPlainTextEdit textEdit;
+    textEdit.setPlainText(rectWithGradient);
+    NotIndentingTextEditModifier textModifier(&textEdit);
+
+    QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+    QVERIFY(model.data());
+
+    QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+    testRewriterView->setTextModifier(&textModifier);
+    model->attachView(testRewriterView.data());
+
+
+    QVERIFY(model.data());
+    ModelNode rootModelNode(testRewriterView->rootModelNode());
+    QVERIFY(rootModelNode.isValid());
+    QCOMPARE(rootModelNode.allDirectSubModelNodes().size(), 2);
+
+    {
+        QVERIFY(rootModelNode.hasProperty("gradient"));
+        AbstractProperty gradientProperty = rootModelNode.property("gradient");
+        QVERIFY(gradientProperty.isNodeProperty());
+        ModelNode gradientPropertyModelNode = gradientProperty.toNodeProperty().modelNode();
+        QVERIFY(gradientPropertyModelNode.isValid());
+        QCOMPARE(gradientPropertyModelNode.type(), QString("Qt/Gradient"));
+        QCOMPARE(gradientPropertyModelNode.allDirectSubModelNodes().size(), 2);
+
+        AbstractProperty stopsProperty = gradientPropertyModelNode.property("stops");
+        QVERIFY(stopsProperty.isValid());
+
+        QVERIFY(stopsProperty.isNodeListProperty());
+        QList<ModelNode>  stops = stopsProperty.toNodeListProperty().toModelNodeList();
+        QCOMPARE(stops.size(), 2);
+
+        ModelNode pOne = stops.first();
+        ModelNode pTwo = stops.last();
+
+        QCOMPARE(pOne.type(), QString("Qt/GradientStop"));
+        QCOMPARE(pOne.id(), QString("pOne"));
+        QCOMPARE(pOne.allDirectSubModelNodes().size(), 0);
+        QCOMPARE(pOne.propertyNames().size(), 2);
+        QCOMPARE(pOne.variantProperty("position").value().type(), QVariant::Double);
+        QCOMPARE(pOne.variantProperty("position").value().toDouble(), 0.0);
+        QCOMPARE(pOne.variantProperty("color").value().type(), QVariant::Color);
+        QCOMPARE(pOne.variantProperty("color").value().value<QColor>(), QColor("lightsteelblue"));
+
+        QCOMPARE(pTwo.type(), QString("Qt/GradientStop"));
+        QCOMPARE(pTwo.id(), QString("pTwo"));
+        QCOMPARE(pTwo.allDirectSubModelNodes().size(), 0);
+        QCOMPARE(pTwo.propertyNames().size(), 2);
+        QCOMPARE(pTwo.variantProperty("position").value().type(), QVariant::Double);
+        QCOMPARE(pTwo.variantProperty("position").value().toDouble(), 1.0);
+        QCOMPARE(pTwo.variantProperty("color").value().type(), QVariant::Color);
+        QCOMPARE(pTwo.variantProperty("color").value().value<QColor>(), QColor("blue"));
+    }
+
+    {
+        ModelNode gradientNode = rootModelNode.allDirectSubModelNodes().last();
+        QVERIFY(gradientNode.isValid());
+        QVERIFY(!gradientNode.metaInfo().isSubclassOf("Qt/Item", -1, -1));
+        QCOMPARE(gradientNode.type(), QString("Qt/Gradient"));
+        QCOMPARE(gradientNode.id(), QString("secondGradient"));
+        QCOMPARE(gradientNode.allDirectSubModelNodes().size(), 2);
+
+        AbstractProperty stopsProperty = gradientNode.property("stops");
+        QVERIFY(stopsProperty.isValid());
+
+        QVERIFY(stopsProperty.isNodeListProperty());
+        QList<ModelNode>  stops = stopsProperty.toNodeListProperty().toModelNodeList();
+        QCOMPARE(stops.size(), 2);
+
+        ModelNode nOne = stops.first();
+        ModelNode nTwo = stops.last();
+
+        QCOMPARE(nOne.type(), QString("Qt/GradientStop"));
+        QCOMPARE(nOne.id(), QString("nOne"));
+        QCOMPARE(nOne.allDirectSubModelNodes().size(), 0);
+        QCOMPARE(nOne.propertyNames().size(), 2);
+        QCOMPARE(nOne.variantProperty("position").value().type(), QVariant::Double);
+        QCOMPARE(nOne.variantProperty("position").value().toDouble(), 0.0);
+        QCOMPARE(nOne.variantProperty("color").value().type(), QVariant::Color);
+        QCOMPARE(nOne.variantProperty("color").value().value<QColor>(), QColor("blue"));
+
+        QCOMPARE(nTwo.type(), QString("Qt/GradientStop"));
+        QCOMPARE(nTwo.id(), QString("nTwo"));
+        QCOMPARE(nTwo.allDirectSubModelNodes().size(), 0);
+        QCOMPARE(nTwo.propertyNames().size(), 2);
+        QCOMPARE(nTwo.variantProperty("position").value().type(), QVariant::Double);
+        QCOMPARE(nTwo.variantProperty("position").value().toDouble(), 1.0);
+        QCOMPARE(nTwo.variantProperty("color").value().type(), QVariant::Color);
+        QCOMPARE(nTwo.variantProperty("color").value().value<QColor>(), QColor("lightsteelblue"));
+    }
+}
+
+void tst_TestCore::changeGradientId()
+{
+    try {
+        QPlainTextEdit textEdit;
+        textEdit.setPlainText(rectWithGradient);
+        NotIndentingTextEditModifier textModifier(&textEdit);
+
+        QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
+        QVERIFY(model.data());
+
+        QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
+        testRewriterView->setTextModifier(&textModifier);
+        model->attachView(testRewriterView.data());
+
+        QVERIFY(model.data());
+        ModelNode rootModelNode(testRewriterView->rootModelNode());
+        QVERIFY(rootModelNode.isValid());
+        QCOMPARE(rootModelNode.allDirectSubModelNodes().size(), 2);
+
+        AbstractProperty gradientProperty = rootModelNode.property("gradient");
+        QVERIFY(gradientProperty.isNodeProperty());
+        ModelNode gradientNode = gradientProperty.toNodeProperty().modelNode();
+        QVERIFY(gradientNode.isValid());
+        QCOMPARE(gradientNode.id(), QString("pGradient"));
+
+        gradientNode.setId("firstGradient");
+        QCOMPARE(gradientNode.id(), QString("firstGradient"));
+
+        AbstractProperty stopsProperty = gradientNode.property("stops");
+        QVERIFY(stopsProperty.isValid());
+
+        QVERIFY(stopsProperty.isNodeListProperty());
+        QList<ModelNode>  stops = stopsProperty.toNodeListProperty().toModelNodeList();
+        QCOMPARE(stops.size(), 2);
+
+        ModelNode firstStop = stops.at(0);
+        QVERIFY(firstStop.isValid());
+        firstStop.destroy();
+        QVERIFY(!firstStop.isValid());
+
+        ModelNode gradientStop  = addNodeListChild(gradientNode, "Qt/GradientStop", 4, 7, "stops");
+        gradientStop.variantProperty("position") = 0.5;
+        gradientStop.variantProperty("color") = QColor("yellow");
+
+        gradientStop.setId("newGradientStop");
+
+        QCOMPARE(gradientNode.allDirectSubModelNodes().size(), 2);
+        QCOMPARE(gradientNode.nodeListProperty("stops").toModelNodeList().size(), 2);
+        QCOMPARE(gradientStop.id(), QString("newGradientStop"));
+        QCOMPARE(gradientStop.variantProperty("position").value().toDouble(), 0.5);
+        QCOMPARE(gradientStop.variantProperty("color").value().value<QColor>(), QColor("yellow"));
+
+    } catch (Exception &e) {
+        qDebug() << e;
+        QFAIL(e.description().toLatin1().data());
+    }
+}
+
+
+QTEST_MAIN(tst_TestCore);
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.h b/tests/auto/qml/qmldesigner/coretests/tst_testcore.h
new file mode 100644
index 0000000000..1ee76cd497
--- /dev/null
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.h
@@ -0,0 +1,218 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef TESTCORE_H
+#define TESTCORE_H
+
+#include <QObject>
+
+#include <QtTest>
+
+
+class tst_TestCore : public QObject
+{
+    Q_OBJECT
+public:
+    tst_TestCore();
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+    //
+    // unit tests MetaInfo, NodeMetaInfo, PropertyMetaInfo
+    //
+    void testMetaInfo();
+    void testMetaInfoSimpleType();
+    void testMetaInfoUncreatableType();
+    void testMetaInfoExtendedType();
+    void testMetaInfoInterface();
+    void testMetaInfoCustomType();
+    void testMetaInfoEnums();
+    void testMetaInfoProperties();
+    void testMetaInfoDotProperties();
+    void testMetaInfoListProperties();
+
+    //
+    // unit tests Model, ModelNode, NodeProperty, AbstractView
+    //
+    void testModelCreateCoreModel();
+    void testModelCreateRect();
+    void testModelViewNotification();
+    void testModelCreateSubNode();
+    void testModelRemoveNode();
+    void testModelRootNode();
+    void testModelReorderSiblings();
+    void testModelAddAndRemoveProperty();
+    void testModelSliding();
+    void testModelBindings();
+    void testModelDynamicProperties();
+    void testModelDefaultProperties();
+    void testModelBasicOperations();
+    void testModelResolveIds();
+    void testModelNodeListProperty();
+    void testModelPropertyValueTypes();
+    void testModelNodeInHierarchy();
+    void testModelNodeIsAncestorOf();
+
+    //
+    // unit tests Rewriter
+    //
+    void testRewriterView();
+    void testRewriterErrors();
+    void testRewriterChangeId();
+    void testRewriterRemoveId();
+    void testRewriterChangeValueProperty();
+    void testRewriterRemoveValueProperty();
+    void testRewriterSignalProperty();
+    void testRewriterObjectTypeProperty();
+    void testRewriterPropertyChanges();
+    void testRewriterListModel();
+    void testRewriterAddProperty();
+    void testRewriterAddPropertyInNestedObject();
+    void testRewriterAddObjectDefinition();
+    void testRewriterAddStatesArray();
+    void testRewriterRemoveStates();
+    void testRewriterRemoveObjectDefinition();
+    void testRewriterRemoveScriptBinding();
+    void testRewriterNodeReparenting();
+    void testRewriterNodeReparentingWithTransaction();
+    void testRewriterMovingInOut();
+    void testRewriterMovingInOutWithTransaction();
+    void testRewriterComplexMovingInOut();
+    void testRewriterAutomaticSemicolonAfterChangedProperty();
+    void testRewriterTransaction();
+    void testRewriterId();
+    void testRewriterNodeReparentingTransaction1();
+    void testRewriterNodeReparentingTransaction2();
+    void testRewriterNodeReparentingTransaction3();
+    void testRewriterNodeReparentingTransaction4();
+    void testRewriterAddNodeTransaction();
+    void testRewriterComponentId();
+    void testRewriterPropertyDeclarations();
+    void testRewriterPropertyAliases();
+    void testRewriterPositionAndOffset();
+    void testRewriterFirstDefinitionInside();
+    void testRewriterComponentTextModifier();
+    void testRewriterPreserveType();
+    void testRewriterForArrayMagic();
+    void testRewriterWithSignals();
+    void testRewriterNodeSliding();
+    void testRewriterExceptionHandling();
+    void testRewriterDynamicProperties();
+    void testRewriterGroupedProperties();
+    void testRewriterPreserveOrder();
+    void testRewriterActionCompression();
+    void testRewriterImports();
+    void testRewriterChangeImports();
+
+    //
+    // unit tests QmlModelNodeFacade/QmlModelState
+    //
+
+    void testQmlModelStates();
+    void testQmlModelAddMultipleStates();
+    void testQmlModelRemoveStates();
+    void testQmlModelStatesInvalidForRemovedNodes();
+    void testQmlModelStateWithName();
+
+    //
+    // unit tests Instances
+    //
+    void testInstancesAttachToExistingModel();
+    void testInstancesStates();
+    void testInstancesIdResolution();
+    void testInstancesNotInScene();
+
+    //
+    // integration tests
+    //
+    void testBasicStates();
+    void testStates();
+    void testStatesBaseState();
+    void testStatesRewriter();
+    void testGradientsRewriter();
+    void testTypicalRewriterOperations();
+    void testBasicOperationsWithView();
+    void testQmlModelView();
+    void reparentingNode();
+    void reparentingNodeInModificationGroup();
+    void testRewriterTransactionRewriter();
+    void testCopyModelRewriter1();
+    void testCopyModelRewriter2();
+    void testSubComponentManager();
+    void testAnchorsAndRewriting();
+    void testAnchorsAndRewritingCenter();
+
+    //
+    // regression tests
+    //
+
+    void reparentingNodeLikeDragAndDrop();
+    void testRewriterForGradientMagic();
+
+    //
+    // old tests
+    //
+
+    void loadEmptyCoreModel();
+    void saveEmptyCoreModel();
+    void loadAttributesInCoreModel();
+    void saveAttributesInCoreModel();
+    void loadSubItems();
+
+
+    void createInvalidCoreModel();
+
+    void loadQml();
+
+    void defaultPropertyValues();
+
+    // Detailed tests for the rewriting:
+
+    // Anchor tests:
+    void loadAnchors();
+    void changeAnchors();
+    void anchorToSibling();
+    void removeFillAnchorByDetaching();
+    void removeFillAnchorByChanging();
+    void removeCenteredInAnchorByDetaching();
+
+    // Property bindings:
+    void changePropertyBinding();
+
+    // Bigger tests:
+    void loadTestFiles();
+
+    // Object bindings as properties:
+    void loadGradient();
+    void changeGradientId();
+};
+
+#endif // TESTCORE_H
diff --git a/tests/manual/gdbdebugger/gui/gui.pro b/tests/manual/gdbdebugger/gui/gui.pro
index 8a7194387e..21480760ed 100644
--- a/tests/manual/gdbdebugger/gui/gui.pro
+++ b/tests/manual/gdbdebugger/gui/gui.pro
@@ -5,7 +5,9 @@
 TARGET = gui
 CONFIG+=console
 TEMPLATE = app
-SOURCES += main.cpp \
-    mainwindow.cpp
+SOURCES += \
+    mainwindow.cpp \
+    tst_gui.cpp
+
 HEADERS += mainwindow.h
 FORMS += mainwindow.ui
diff --git a/tests/manual/gdbdebugger/gui/main.cpp b/tests/manual/gdbdebugger/gui/main.cpp
deleted file mode 100644
index bee2fea8c0..0000000000
--- a/tests/manual/gdbdebugger/gui/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include <QtGui/QApplication>
-#include <QtDebug>
-#include "mainwindow.h"
-
-int main(int argc, char *argv[])
-{    
-    QApplication a(argc, argv);
-    qDebug() << "pid=" <<  QApplication::applicationPid();
-    Foo::MainWindow w;
-    w.show();
-    return a.exec();
-}
diff --git a/tests/manual/gdbdebugger/gui/tst_gui.cpp b/tests/manual/gdbdebugger/gui/tst_gui.cpp
new file mode 100644
index 0000000000..bee2fea8c0
--- /dev/null
+++ b/tests/manual/gdbdebugger/gui/tst_gui.cpp
@@ -0,0 +1,41 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDebug>
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{    
+    QApplication a(argc, argv);
+    qDebug() << "pid=" <<  QApplication::applicationPid();
+    Foo::MainWindow w;
+    w.show();
+    return a.exec();
+}
diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp
deleted file mode 100644
index 829a36d2c4..0000000000
--- a/tests/manual/gdbdebugger/simple/app.cpp
+++ /dev/null
@@ -1,2048 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-//#include <complex>
-
-//template <typename T> class B;  B foo() {}
-
-#include <QtCore/QDebug>
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QHash>
-#include <QtCore/QLibrary>
-#include <QtCore/QLinkedList>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QPointer>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QSettings>
-#include <QtCore/QStack>
-#include <QtCore/QThread>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-#if QT_VERSION >= 0x040500
-#include <QtCore/QSharedPointer>
-#endif
-
-#include <QtGui/QApplication>
-#include <QtGui/QAction>
-#include <QtGui/QColor>
-#include <QtGui/QFont>
-#include <QtGui/QLabel>
-#include <QtGui/QPainter>
-#include <QtGui/QPainterPath>
-#include <QtGui/QRegion>
-#include <QtGui/QStandardItemModel>
-
-#include <QtNetwork/QHostAddress>
-
-#include <deque>
-#include <iostream>
-#include <map>
-#include <list>
-#include <set>
-#include <stack>
-#include <string>
-#include <vector>
-
-#if defined(__GNUC__) && !defined(__llvm__) && !defined(Q_OS_MAC)
-#    define USE_GCC_EXT 1
-#    undef __DEPRECATED
-#    include <hash_set>
-#endif
-
-#ifdef Q_OS_WIN
-#include <windows.h>
-#undef min
-#undef max
-#endif
-
-Q_DECLARE_METATYPE(QHostAddress)
-Q_DECLARE_METATYPE(QList<int>)
-Q_DECLARE_METATYPE(QStringList)
-
-typedef QMap<uint, QStringList> MyType;
-#define COMMA ,
-Q_DECLARE_METATYPE(QMap<uint COMMA QStringList>)
-
-template <typename T> class Vector
-{
-public:
-    explicit Vector(int size) : m_size(size), m_data(new T[size]) {}
-    ~Vector() { delete [] m_data; }
-    //...
-private:
-    int m_size;
-    T *m_data;
-};
-
-
-namespace nsX {
-namespace nsY {
-int z;
-}
-}
-
-namespace nsXY = nsX::nsY;
-
-int qwert()
-{
-    return nsXY::z;
-}
-
-uint qHash(const QMap<int, int> &)
-{
-    return 0;
-}
-
-uint qHash(const double & f)
-{
-    return int(f);
-}
-
-
-class Foo
-{
-public:
-    Foo(int i = 0)
-        : a(i), b(2)
-    {
-        int s = 1;
-        int t = 2;
-        b = 2 + s + t;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-        a += 1;
-    }
-
-    virtual ~Foo()
-    {
-        a = 5;
-    }
-
-    void doit()
-    {
-        static QObject ob;
-        m["1"] = "2";
-        h[&ob] = m.begin();
-
-        a += 1;
-        --b;
-        //s += 'x';
-    }
-
-
-    struct Bar {
-        Bar() : ob(0) {}
-        QObject *ob;
-    };
-
-public:
-    int a, b;
-    char x[6];
-
-private:
-    //QString s;
-    typedef QMap<QString, QString> Map;
-    Map m;
-    QHash<QObject *, Map::iterator> h;
-};
-
-class X : public Foo
-{
-public:
-    X() {
-    }
-};
-
-class XX : virtual public Foo
-{
-public:
-    XX() {
-    }
-};
-
-class Y : virtual public Foo
-{
-public:
-    Y() {
-    }
-};
-
-class D : public X, public Y
-{
-    int diamond;
-};
-
-void testArray()
-{
-#if 1
-    X x;
-    XX xx;
-    D diamond;
-    Q_UNUSED(diamond);
-    Foo *f = &xx;
-    Q_UNUSED(f);
-    Foo ff;
-    Q_UNUSED(ff);
-    double d[3][3];
-    for (int i = 0; i != 3; ++i)
-        for (int j = 0; j != 3; ++j)
-            d[i][j] = i + j;
-    Q_UNUSED(d);
-#endif
-
-#if 1
-    char c[20];
-    c[0] = 'a';
-    c[1] = 'b';
-    c[2] = 'c';
-    c[3] = 'd';
-    Q_UNUSED(c);
-#endif
-
-#if 1
-    QString s[20];
-    s[0] = "a";
-    s[1] = "b";
-    s[2] = "c";
-    s[3] = "d";
-    Q_UNUSED(s);
-#endif
-
-#if 1
-    QByteArray b[20];
-    b[0] = "a";
-    b[1] = "b";
-    b[2] = "c";
-    b[3] = "d";
-    Q_UNUSED(b);
-#endif
-
-#if 1
-    Foo foo[10];
-    //for (int i = 0; i != sizeof(foo)/sizeof(foo[0]); ++i) {
-    for (int i = 0; i < 5; ++i) {
-        foo[i].a = i;
-        foo[i].doit();
-    }
-#endif
-}
-
-#ifndef Q_CC_RVCT
-struct TestAnonymous
-{
-    union {
-        struct { int i; int b; };
-        struct { float f; };
-        double d;
-    };
-};
-#endif
-
-void testPeekAndPoke3()
-{
-    // Anonymous structs
-    {
-#ifndef Q_CC_RVCT
-        union {
-            struct { int i; int b; };
-            struct { float f; };
-            double d;
-        } a = { { 42, 43 } };
-        a.i = 1; // Break here. Expand a. Step.
-        a.i = 2; // Change a.i in Locals view to 0. This changes f, d but expectedly not b. Step.
-        a.i = 3; // Continue.
-        Q_UNUSED(a);
-#endif
-    }
-
-    // Complex watchers
-    {
-        struct S { int a; double b; } s[10];
-        for (int i = 0; i != 10; ++i) {
-            s[i].a = i;  // Break here. Expand s and s[0]. Step.
-            // Watcher Context: "Add New Watcher".
-            // Type    ['s[%d].a' % i for i in range(5)]
-            // Expand it, continue stepping.
-        }
-        Q_UNUSED(s);
-    }
-
-    // QImage display
-    {
-        QImage im(QSize(200, 200), QImage::Format_RGB32);
-        im.fill(QColor(200, 10, 30).rgba());
-        QPainter pain;
-        pain.begin(&im);
-        pain.setPen(QPen(Qt::black, 5.0, Qt::SolidLine, Qt::RoundCap));
-        pain.drawEllipse(20, 20, 160, 160); // Break here. Step.
-        // Toggle between "Normal" and "Displayed" in L&W Context Menu, entry "Display of Type QImage". Step.
-        pain.drawArc(70, 115, 60, 30, 200 * 16, 140 * 16);
-        pain.setBrush(Qt::black);
-        pain.drawEllipse(65, 70, 15, 15); // Step.
-        pain.drawEllipse(120, 70, 15, 15); // Step.
-        pain.end();
-    }
-
-}
-
-
-#ifndef Q_CC_RVCT
-namespace { // anon
-
-struct Something
-{
-    Something() { a = b = 1; }
-
-    void foo()
-    {
-        a = 42;
-        b = 43;
-    }
-
-    int a, b;
-};
-
-} // anon
-#endif
-
-
-void testAnonymous()
-{
-#ifndef Q_CC_RVCT
-    TestAnonymous a;
-    a.i = 1;
-    a.i = 2;
-    a.i = 3;
-    Q_UNUSED(a);
-
-    Something s;
-    s.foo();
-    Q_UNUSED(s);
-#endif
-}
-
-typedef void (*func_t)();
-func_t testFunctionPointer()
-{
-    func_t f1 = testAnonymous;
-    func_t f2 = testPeekAndPoke3;
-    func_t f3 = testPeekAndPoke3;
-    Q_UNUSED(f1);
-    Q_UNUSED(f2);
-    Q_UNUSED(f3);
-    return f1;
-}
-
-QByteArray testQByteArray()
-{
-    QByteArray ba = "Hello";
-    ba += '"';
-    ba += "World";
-
-    const char *str1 = "\356";
-    const char *str2 = "\xee";
-    const char *str3 = "\\ee";
-    QByteArray buf1( str1 );
-    QByteArray buf2( str2 );
-    QByteArray buf3( str3 );
-
-    ba += char(0);
-    ba += 1;
-    ba += 2;
-    return ba;
-}
-
-static void throwit1()
-{
-    throw 14;
-}
-
-static void throwit()
-{
-    throwit1();
-}
-
-int testCatchThrow()
-{
-    int gotit = 0;
-    try {
-        throwit();
-    } catch (int what) {
-        gotit = what;
-    }
-    return gotit;
-}
-
-QDateTime testQDateTime()
-{
-    QDateTime date;
-    date = QDateTime::currentDateTime();
-    date = date.addSecs(5);
-    date = date.addSecs(5);
-    date = date.addSecs(5);
-    date = date.addSecs(5);
-    return date;
-}
-
-QFileInfo testQFileInfo()
-{
-    QFileInfo fi("/tmp/t");
-    QString s = fi.absoluteFilePath();
-    s = fi.bundleName();
-    s = fi.bundleName();
-    s = fi.bundleName();
-    return fi;
-}
-
-QHash<int, float> testQHash()
-{
-#if 1
-    QHash<int, float> hgg0;
-    hgg0[11] = 11.0;
-    hgg0[22] = 22.0;
-    hgg0[22] = 22.0;
-    hgg0[22] = 22.0;
-    hgg0[22] = 22.0;
-    hgg0[22] = 22.0;
-    hgg0[22] = 22.0;
-
-#endif
-
-#if 1
-
-    QHash<QString, int> hgg1;
-    hgg1["22.0"] = 22.0;
-    hgg1["123.0"] = 22.0;
-    hgg1["111111ss111128.0"] = 28.0;
-    hgg1["11124.0"] = 22.0;
-    hgg1["1111125.0"] = 22.0;
-    hgg1["11111126.0"] = 22.0;
-    hgg1["111111127.0"] = 27.0;
-    hgg1["111111111128.0"] = 28.0;
-    hgg1["111111111111111111129.0"] = 29.0;
-
-    QHash<QByteArray, float> hgx1;
-    hgx1["22.0"] = 22.0;
-    hgx1["123.0"] = 22.0;
-    hgx1["111111ss111128.0"] = 28.0;
-    hgx1["11124.0"] = 22.0;
-    hgx1["1111125.0"] = 22.0;
-    hgx1["11111126.0"] = 22.0;
-    hgx1["111111127.0"] = 27.0;
-    hgx1["111111111128.0"] = 28.0;
-    hgx1["111111111111111111129.0"] = 29.0;
-#endif
-#if 1
-    QHash<int, QString> hgg2;
-    hgg2[22] = "22.0";
-
-    QHash<QString, Foo> hgg3;
-    hgg3["22.0"] = Foo(22);
-    hgg3["33.0"] = Foo(33);
-
-    QObject ob;
-    QHash<QString, QPointer<QObject> > hash;
-    hash.insert("Hallo", QPointer<QObject>(&ob));
-    hash.insert("Welt", QPointer<QObject>(&ob));
-    hash.insert(".", QPointer<QObject>(&ob));
-#endif
-    return hgg0;
-}
-
-void testQImage()
-{
-    // only works with Python dumper
-    QImage im(QSize(200, 200), QImage::Format_RGB32);
-    im.fill(QColor(200, 100, 130).rgba());
-    QPainter pain;
-    pain.begin(&im);
-    pain.drawLine(2, 2, 130, 130);
-    pain.drawLine(4, 2, 130, 140);
-    pain.drawRect(30, 30, 80, 80);
-    pain.end();
-}
-
-struct Function
-{
-    Function(QByteArray var, QByteArray f, double min, double max)
-      : var(var), f(f), min(min), max(max) {}
-    QByteArray var;
-    QByteArray f;
-    double min;
-    double max;
-};
-
-void testFunction()
-{
-    // In order to use this, switch on the 'qDump__Function' in gdbmacros.py
-    Function func("x", "sin(x)", 0, 1);
-    func.max = 10;
-    func.f = "cos(x)";
-    func.max = 4;
-    func.max = 5;
-    func.max = 6;
-    func.max = 7;
-    func.max = 8;
-}
-
-void testOutput()
-{
-    qDebug() << "qDebug() 1";
-    qDebug() << "qDebug() 2";
-    qDebug() << "qDebug() 3";
-    qDebug() << "qDebug <foo & bar>";
-
-    std::cout << "std::cout @@ 1" << std::endl;
-    std::cout << "std::cout @@ 2\n";
-    std::cout << "std::cout @@ 3" << std::endl;
-    std::cout << "std::cout <foo & bar>\n";
-
-    std::cerr << "std::cerr 1\n";
-    std::cerr << "std::cerr 2\n";
-    std::cerr << "std::cerr 3\n";
-    std::cerr << "std::cerr <foo & bar>\n";
-}
-
-void testInput()
-{
-#if 0
-    // This works only when "Run in terminal" is selected
-    // in the Run Configuration.
-    int i;
-    std::cin >> i;
-    int j;
-    std::cin >> j;
-#endif
-}
-
-void testQLinkedList()
-{
-#if 1
-    QLinkedList<int> li;
-    QLinkedList<uint> lu;
-
-    for (int i = 0; i != 3; ++i)
-        li.append(i);
-    li.append(102);
-
-
-    lu.append(102);
-    lu.append(102);
-    lu.append(102);
-
-    QLinkedList<Foo *> lpi;
-    lpi.append(new Foo(1));
-    lpi.append(0);
-    lpi.append(new Foo(3));
-
-    QLinkedList<qulonglong> l;
-    l.append(42);
-    l.append(43);
-    l.append(44);
-    l.append(45);
-
-    QLinkedList<Foo> f;
-    f.append(Foo(1));
-    f.append(Foo(2));
-#endif
-    QLinkedList<std::string> v;
-    v.push_back("aa");
-    v.push_back("bb");
-    v.push_back("cc");
-    v.push_back("dd");
- }
-
-void testQLocale()
-{
-    QLocale loc = QLocale::system();
-    //QString s = loc.name();
-    //QVariant v = loc;
-    QLocale::MeasurementSystem m = loc.measurementSystem();
-    Q_UNUSED(m);
-}
-
-void testQList()
-{
-    QList<int> big;
-    for (int i = 0; i < 10000; ++i)
-        big.push_back(i);
-
-    QList<Foo> flist;
-    for (int i = 0; i < 100; ++i)
-        flist.push_back(i + 15);
-    flist.push_back(1000);
-    flist.push_back(1001);
-    flist.push_back(1002);
-#if 1
-    QList<int> li;
-    QList<uint> lu;
-
-    for (int i = 0; i != 30; ++i) {
-        li.append(i);
-    }
-    li.append(101);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-    li.append(102);
-
-    QList<int *> lpi;
-    lpi.append(new int(1));
-    lpi.append(new int(2));
-    lpi.append(new int(3));
-
-
-    for (int i = 0; i != 3; ++i) {
-        lu.append(i);
-    }
-    lu.append(101);
-    lu.append(102);
-    lu.append(102);
-    lu.append(102);
-
-    QList<uint> i;
-    i.append(42);
-    i.append(43);
-    i.append(44);
-    i.append(45);
-
-    QList<ushort> ls;
-    ls.append(42);
-    ls.append(43);
-    ls.append(44);
-    ls.append(45);
-
-    QList<QChar> lc;
-    lc.append(QChar('a'));
-    lc.append(QChar('b'));
-    lc.append(QChar('c'));
-    lc.append(QChar('d'));
-
-    QList<qulonglong> l;
-    l.append(42);
-    l.append(43);
-    l.append(44);
-    l.append(45);
-
-    QList<Foo> f;
-    f.append(Foo(1));
-    f.append(Foo(2));
-
-    QList<std::string> v;
-    v.push_back("aa");
-    v.push_back("bb");
-    v.push_back("cc");
-    v.push_back("dd");
-#endif
- }
-
-void testQMap()
-{
-    QMap<uint, QStringList> ggl;
-    ggl[11] = QStringList() << "11";
-    ggl[22] = QStringList() << "22";
-
-    typedef QMap<uint, QStringList> T;
-    T ggt;
-    ggt[11] = QStringList() << "11";
-    ggt[22] = QStringList() << "22";
-
-#if 1
-    QMap<uint, float> gg0;
-    gg0[11] = 11.0;
-    gg0[22] = 22.0;
-
-
-    QMap<QString, float> gg1;
-    gg1["22.0"] = 22.0;
-
-    QMap<int, QString> gg2;
-    gg2[22] = "22.0";
-
-    QMap<QString, Foo> gg3;
-    gg3["22.0"] = Foo(22);
-    gg3["33.0"] = Foo(33);
-
-    QObject ob;
-    QMap<QString, QPointer<QObject> > map;
-    map.insert("Hallo", QPointer<QObject>(&ob));
-    map.insert("Welt", QPointer<QObject>(&ob));
-    map.insert(".", QPointer<QObject>(&ob));
-#endif
-}
-
-void testQMultiMap()
-{
-    QMultiMap<uint, float> gg0;
-    gg0.insert(11, 11.0);
-    gg0.insert(22, 22.0);
-    gg0.insert(22, 33.0);
-    gg0.insert(22, 34.0);
-    gg0.insert(22, 35.0);
-    gg0.insert(22, 36.0);
-#if 1
-    QMultiMap<QString, float> gg1;
-    gg1.insert("22.0", 22.0);
-
-    QMultiMap<int, QString> gg2;
-    gg2.insert(22, "22.0");
-
-    QMultiMap<QString, Foo> gg3;
-    gg3.insert("22.0", Foo(22));
-    gg3.insert("33.0", Foo(33));
-    gg3.insert("22.0", Foo(22));
-
-    QObject ob;
-    QMultiMap<QString, QPointer<QObject> > map;
-    map.insert("Hallo", QPointer<QObject>(&ob));
-    map.insert("Welt", QPointer<QObject>(&ob));
-    map.insert(".", QPointer<QObject>(&ob));
-    map.insert(".", QPointer<QObject>(&ob));
-#endif
-}
-
-namespace Names {
-namespace Bar {
-
-struct Ui {
-    Ui() { w = 0; }
-    QWidget *w;
-};
-
-class TestObject : public QObject
-{
-    Q_OBJECT
-
-public:
-    TestObject(QObject *parent = 0)
-      : QObject(parent)
-    {
-        m_ui = new Ui;
-        m_ui->w = new QWidget;
-        Q_UNUSED(parent);
-    }
-
-    Q_PROPERTY(QString myProp1 READ myProp1 WRITE setMyProp1)
-    QString myProp1() const { return m_myProp1; }
-    Q_SLOT void setMyProp1(const QString &mt) { m_myProp1 = mt; }
-
-    Q_PROPERTY(QString myProp2 READ myProp2 WRITE setMyProp2)
-    QString myProp2() const { return m_myProp2; }
-    Q_SLOT void setMyProp2(const QString &mt) { m_myProp2 = mt; }
-
-public:
-    Ui *m_ui;
-    QString m_myProp1;
-    QString m_myProp2;
-};
-
-} // namespace Bar
-} // namespace Names
-
-void testQObject(int &argc, char *argv[])
-{
-    QApplication app(argc, argv);
-#if 1
-    Names::Bar::TestObject test;
-    test.setMyProp1("HELLO");
-    test.setMyProp2("WORLD");
-    QString s = test.myProp1();
-    s += test.myProp2();
-    Q_UNUSED(s);
-#endif
-
-#if 0
-    QAction act("xxx", &app);
-    QString t = act.text();
-    t += "y";
-    t += "y";
-    t += "y";
-    t += "y";
-    t += "y";
-#endif
-
-#if 0
-    QWidget ob;
-    ob.setObjectName("An Object");
-    ob.setProperty("USER DEFINED 1", 44);
-    ob.setProperty("USER DEFINED 2", QStringList() << "FOO" << "BAR");
-    QObject ob1;
-    ob1.setObjectName("Another Object");
-
-    QObject::connect(&ob, SIGNAL(destroyed()), &ob1, SLOT(deleteLater()));
-    //QObject::connect(&app, SIGNAL(lastWindowClosed()), &ob, SLOT(deleteLater()));
-#endif
-
-#if 0
-    QList<QObject *> obs;
-    obs.append(&ob);
-    obs.append(&ob1);
-    obs.append(0);
-    obs.append(&app);
-    ob1.setObjectName("A Subobject");
-#endif
-
-#if 0
-    QString str = QString::fromUtf8("XXXXXXXXXXXXXXyyXXX ö");
-    QLabel l(str);
-    l.setObjectName("Some Label");
-    l.show();
-    app.exec();
-#endif
-}
-
-class Sender : public QObject
-{
-    Q_OBJECT
-public:
-    Sender() { setObjectName("Sender"); }
-    void doEmit() { emit aSignal(); }
-signals:
-    void aSignal();
-};
-
-class Receiver : public QObject
-{
-    Q_OBJECT
-public:
-    Receiver() { setObjectName("Receiver"); }
-public slots:
-    void aSlot() {
-        QObject *s = sender();
-        if (s) {
-            qDebug() << "SENDER: " << s;
-        } else {
-            qDebug() << "NO SENDER";
-        }
-    }
-};
-
-void testSignalSlot(int &argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    Sender sender;
-    Receiver receiver;
-    QObject::connect(&sender, SIGNAL(aSignal()), &receiver, SLOT(aSlot()));
-    sender.doEmit();
-};
-
-
-void testQPixmap()
-{
-    QImage im(QSize(200, 200), QImage::Format_RGB32);
-    im.fill(QColor(200, 100, 130).rgba());
-    QPainter pain;
-    pain.begin(&im);
-    pain.drawLine(2, 2, 130, 130);
-    pain.end();
-    QPixmap pm = QPixmap::fromImage(im);
-    int i = 1;
-    Q_UNUSED(i);
-}
-
-void testQRegion()
-{
-    // only works with Python dumper
-    QRegion region;
-    region += QRect(100, 100, 200, 200);
-    region += QRect(300, 300, 400, 500);
-    region += QRect(500, 500, 600, 600);
-    region += QRect(500, 500, 600, 600);
-    region += QRect(500, 500, 600, 600);
-    region += QRect(500, 500, 600, 600);
-}
-
-
-void testPlugin()
-{
-    QString dir = QDir::currentPath();
-#ifdef Q_OS_LINUX
-    QLibrary lib(dir + "/libplugin.so");
-#endif
-#ifdef Q_OS_MAC
-    dir = QFileInfo(dir + "/../..").canonicalPath();
-    QLibrary lib(dir + "/libplugin.dylib");
-#endif
-#ifdef Q_OS_WIN
-    QLibrary lib(dir + "/plugin.dll");
-#endif
-#ifdef Q_OS_SYMBIAN
-    QLibrary lib(dir + "/plugin.dll");
-#endif
-    int (*foo)() = (int(*)()) lib.resolve("pluginTest");
-    qDebug() << "library resolve: " << foo;
-    if (foo) {
-        int res = foo();
-        res += 1;
-    } else {
-        qDebug() << lib.errorString();
-    }
-}
-
-void testQSet()
-{
-    QSet<int> hgg0;
-    hgg0.insert(11);
-    hgg0.insert(22);
-
-    QSet<QString> hgg1;
-    hgg1.insert("22.0");
-
-    QObject ob;
-    QSet<QPointer<QObject> > hash;
-    QPointer<QObject> ptr(&ob);
-    Q_UNUSED(ptr);
-    //hash.insert(ptr);
-    //hash.insert(ptr);
-    //hash.insert(ptr);
-}
-
-#if QT_VERSION >= 0x040500
-class EmployeeData : public QSharedData
-{
-public:
-    EmployeeData() : id(-1) { name.clear(); }
-    EmployeeData(const EmployeeData &other)
-        : QSharedData(other), id(other.id), name(other.name) { }
-    ~EmployeeData() { }
-
-    int id;
-    QString name;
-};
-
-class Employee
-{
-public:
-    Employee() { d = new EmployeeData; }
-    Employee(int id, QString name) {
-        d = new EmployeeData;
-        setId(id);
-        setName(name);
-    }
-    Employee(const Employee &other)
-          : d (other.d)
-    {
-    }
-    void setId(int id) { d->id = id; }
-    void setName(QString name) { d->name = name; }
-
-    int id() const { return d->id; }
-    QString name() const { return d->name; }
-
-   private:
-     QSharedDataPointer<EmployeeData> d;
-};
-
-
-void testQSharedPointer()
-{
-    //Employee e1(1, "Herbert");
-    //Employee e2 = e1;
-#if 0
-    QSharedPointer<int> iptr(new int(43));
-    QSharedPointer<int> iptr2 = iptr;
-    QSharedPointer<int> iptr3 = iptr;
-
-    QSharedPointer<QString> ptr(new QString("hallo"));
-    QSharedPointer<QString> ptr2 = ptr;
-    QSharedPointer<QString> ptr3 = ptr;
-
-    QWeakPointer<int> wiptr(iptr);
-    QWeakPointer<int> wiptr2 = wiptr;
-    QWeakPointer<int> wiptr3 = wiptr;
-
-    QWeakPointer<QString> wptr(ptr);
-    QWeakPointer<QString> wptr2 = wptr;
-    QWeakPointer<QString> wptr3 = wptr;
-#endif
-
-    QSharedPointer<Foo> fptr(new Foo(1));
-    QWeakPointer<Foo> wfptr(fptr);
-    QWeakPointer<Foo> wfptr2 = wfptr;
-    QWeakPointer<Foo> wfptr3 = wfptr;
-}
-#endif
-
-void stringRefTest(const QString &refstring)
-{
-    Q_UNUSED(refstring);
-}
-
-void testStdDeque()
-{
-    std::deque<int *> plist1;
-    plist1.push_back(new int(1));
-    plist1.push_back(0);
-    plist1.push_back(new int(2));
-    plist1.pop_back();
-    plist1.pop_front();
-    plist1.pop_front();
-
-    std::deque<int> flist2;
-    flist2.push_back(1);
-    flist2.push_back(2);
-
-    std::deque<Foo *> plist;
-    plist.push_back(new Foo(1));
-    plist.push_back(new Foo(2));
-
-    std::deque<Foo> flist;
-    flist.push_back(1);
-    flist.push_front(2);
-}
-
-void testStdHashSet()
-{
-#if USE_GCC_EXT
-    using namespace __gnu_cxx;
-    hash_set<int> h;
-    h.insert(1);
-    h.insert(194);
-    h.insert(2);
-    h.insert(3);
-    h.insert(4);
-    h.insert(5);
-#endif
-}
-
-std::list<int> testStdList()
-{
-    std::list<int> big;
-    for (int i = 0; i < 10000; ++i)
-        big.push_back(i);
-
-    std::list<Foo> flist;
-    for (int i = 0; i < 100; ++i)
-        flist.push_back(i + 15);
-
-#if 1
-    std::list<int *> plist1;
-    plist1.push_back(new int(1));
-    plist1.push_back(0);
-    plist1.push_back(new int(2));
-
-    std::list<int> flist2;
-    flist2.push_back(1);
-    flist2.push_back(2);
-    flist2.push_back(3);
-    flist2.push_back(4);
-
-    flist2.push_back(1);
-    flist2.push_back(2);
-    flist2.push_back(3);
-    flist2.push_back(4);
-
-    std::list<Foo *> plist;
-    plist.push_back(new Foo(1));
-    plist.push_back(0);
-    plist.push_back(new Foo(2));
-
-
-    foreach (Foo f, flist)
-    {}
-
-    std::list<bool> vec;
-    vec.push_back(true);
-    vec.push_back(false);
-#endif
-    return big;
-}
-
-void testStdMap()
-{
-#if 0
-    std::map<QString, Foo> gg3;
-    gg3["22.0"] = Foo(22);
-    gg3["33.0"] = Foo(33);
-    gg3["44.0"] = Foo(44);
-
-    std::map<const char *, Foo> m1;
-    m1["22.0"] = Foo(22);
-    m1["33.0"] = Foo(33);
-    m1["44.0"] = Foo(44);
-
-    std::map<uint, uint> gg;
-    gg[11] = 1;
-    gg[22] = 2;
-    gg[33] = 3;
-    gg[44] = 4;
-    gg[55] = 5;
-
-    std::pair<uint, QStringList> p = std::make_pair(3, QStringList() << "11");
-    std::vector< std::pair<uint, QStringList> > v;
-    v.push_back(p);
-    v.push_back(p);
-
-    std::map<uint, QStringList> ggl;
-    ggl[11] = QStringList() << "11";
-    ggl[22] = QStringList() << "22";
-    ggl[33] = QStringList() << "33";
-    ggl[44] = QStringList() << "44";
-    ggl[55] = QStringList() << "55";
-
-    typedef std::map<uint, QStringList> T;
-    T ggt;
-    ggt[11] = QStringList() << "11";
-    ggt[22] = QStringList() << "22";
-
-    std::map<uint, float> gg0;
-    gg0[11] = 11.0;
-    gg0[22] = 22.0;
-
-
-    std::map<QString, float> gg1;
-    gg1["22.0"] = 22.0;
-
-    std::map<int, QString> gg2;
-    gg2[22] = "22.0";
-#endif
-
-#if 1
-    QObject ob;
-    std::map<QString, QPointer<QObject> > map;
-    map["Hallo"] = QPointer<QObject>(&ob);
-    map["Welt"] = QPointer<QObject>(&ob);
-    map["."] = QPointer<QObject>(&ob);
-#endif
-}
-
-std::set<int> testStdSet()
-{
-    std::set<int> hgg0;
-    hgg0.insert(11);
-    hgg0.insert(22);
-    hgg0.insert(33);
-#if 1
-    std::set<QString> hgg1;
-    hgg1.insert("22.0");
-
-    QObject ob;
-    std::set<QPointer<QObject> > hash;
-    QPointer<QObject> ptr(&ob);
-#endif
-    return hgg0;
-}
-
-std::stack<int> testStdStack()
-{
-    // only works with Python dumper
-    std::stack<int *> plist1;
-    plist1.push(new int(1));
-    plist1.push(0);
-    plist1.push(new int(2));
-    plist1.pop();
-    plist1.pop();
-    plist1.pop();
-
-    std::stack<int> flist2;
-    flist2.push(1);
-    flist2.push(2);
-
-    std::stack<Foo *> plist;
-    plist.push(new Foo(1));
-    plist.push(new Foo(2));
-
-    std::stack<Foo> flist;
-    flist.push(1);
-    flist.push(2);
-
-    return flist2;
-}
-
-std::string testStdString()
-{
-    QString foo;
-    std::string str;
-    std::wstring wstr;
-
-    std::vector<std::string> v;
-
-    foo += "a";
-    str += "b";
-    wstr += wchar_t('e');
-    foo += "c";
-    str += "d";
-    foo += "e";
-    wstr += wchar_t('e');
-    str += "e";
-    foo += "a";
-    str += "b";
-    foo += "c";
-    str += "d";
-    str += "e";
-    wstr += wchar_t('e');
-    wstr += wchar_t('e');
-    str += "e";
-
-    QList<std::string> l;
-
-    l.push_back(str);
-    l.push_back(str);
-    l.push_back(str);
-    l.push_back(str);
-
-    v.push_back(str);
-    v.push_back(str);
-    v.push_back(str);
-    v.push_back(str);
-
-    return str;
-}
-
-void testStdVector()
-{
-    std::vector<int *> plist1;
-    plist1.push_back(new int(1));
-    plist1.push_back(0);
-    plist1.push_back(new int(2));
-
-    std::vector<int> flist2;
-    flist2.push_back(1);
-    flist2.push_back(2);
-    flist2.push_back(3);
-    flist2.push_back(4);
-
-    flist2.push_back(1);
-    flist2.push_back(2);
-    flist2.push_back(3);
-    flist2.push_back(4);
-
-    std::vector<Foo *> plist;
-    plist.push_back(new Foo(1));
-    plist.push_back(0);
-    plist.push_back(new Foo(2));
-
-    std::vector<Foo> flist;
-    flist.push_back(1);
-    flist.push_back(2);
-    flist.push_back(3);
-    flist.push_back(4);
-    //flist.takeFirst();
-    //flist.takeFirst();
-
-    std::vector<bool> vec;
-    vec.push_back(true);
-    vec.push_back(false);
-    vec.push_back(false);
-    vec.push_back(true);
-    vec.push_back(false);
-}
-
-void testQStandardItemModel()
-{
-    //char buf[100];
-    //QString *s = static_cast<QString *>(static_cast<void *>(&(v.data_ptr().data.c)));
-    //QString *t = (QString *)&(v.data_ptr());
-
-    QStandardItemModel m;
-    QStandardItem *i1, *i2, *i11;
-    m.appendRow(QList<QStandardItem *>()
-         << (i1 = new QStandardItem("1")) << (new QStandardItem("a")) << (new QStandardItem("a2")));
-    QModelIndex mi = i1->index();
-    m.appendRow(QList<QStandardItem *>()
-         << (i2 = new QStandardItem("2")) << (new QStandardItem("b")));
-    i1->appendRow(QList<QStandardItem *>()
-         << (i11 = new QStandardItem("11")) << (new QStandardItem("aa")));
-    int i = 1;
-    ++i;
-    ++i;
-}
-
-QStack<int> testQStack()
-{
-    QVector<int> bigv;
-    for (int i = 0; i < 10; ++i)
-        bigv.append(i);
-    QStack<int> big;
-    for (int i = 0; i < 10; ++i)
-        big.append(i);
-    QStack<Foo *> plist;
-    plist.append(new Foo(1));
-    plist.append(0);
-    plist.append(new Foo(2));
-    QStack<Foo> flist;
-    flist.append(1);
-    flist.append(2);
-    flist.append(3);
-    flist.append(4);
-    //flist.takeFirst();
-    //flist.takeFirst();
-    QStack<bool> vec;
-    vec.append(true);
-    vec.append(false);
-    return big;
-}
-
-void testQString()
-{
-    QUrl url(QString("http://www.nokia.com"));
-    QImage im;
-
-    // Could be broken due to Return Value Optimzation
-    QString str = "Hello ";
-    str += " big, ";
-    str += " fat ";
-    str += " World ";
-    str += " World ";
-    str += " World ";
-    str += " World ";
-    str += " World ";
-}
-
-void testQString3()
-{
-    QString str = "Hello ";
-    str += " big, ";
-    str += " fat ";
-    str += " World ";
-
-    QString string("String Test");
-    QString *pstring = new QString("Pointer String Test");
-    stringRefTest(QString("Ref String Test"));
-    string = "Hi";
-    string += "Du";
-    qDebug() << string;
-    delete pstring;
-}
-
-QStringList testQStringList()
-{
-    QStringList l;
-    l << "Hello ";
-    l << " big, ";
-    l << " fat ";
-    l.takeFirst();
-    l << " World ";
-    return l;
-}
-
-Foo testStruct()
-{
-    Foo f(2);
-    f.doit();
-    f.doit();
-    f.doit();
-    Foo f1 = f;
-    f1.doit();
-    return f1;
-}
-
-class Thread : public QThread
-{
-public:
-    Thread(int id) : m_id(id) {}
-
-    void run()
-    {
-        int j = 2;
-        ++j;
-        for (int i = 0; i != 100000; ++i) {
-            //sleep(1);
-            std::cerr << m_id;
-        }
-        if (m_id == 2) {
-            ++j;
-        }
-        std::cerr << j;
-    }
-
-private:
-    int m_id;
-};
-
-void testQThread()
-{
-    Thread thread1(1);
-    Thread thread2(2);
-    thread1.start();
-    thread2.start();
-    thread1.wait();
-    thread2.wait();
-}
-
-void testQVariant1()
-{
-    QVariant v;
-    v = 1;
-    v = 1.0;
-    v = "string";
-    v = QRect(100, 200, 300, 400);
-    v = QRectF(100, 200, 300, 400);
-    v = 1;
-    //return v;
-}
-
-QVariant testQVariant2()
-{
-    QVariant value;
-    QVariant::Type t = QVariant::String;
-    value = QVariant(t, (void*)0);
-    *(QString*)value.data() = QString("XXX");
-
-    int i = 1;
-    Q_UNUSED(i);
-#if 1
-    QVariant var;
-    var.setValue(1);
-    var.setValue(2);
-    var.setValue(3);
-    var.setValue(QString("Hello"));
-    var.setValue(QString("World"));
-    var.setValue(QString("Hello"));
-    var.setValue(QStringList() << "World");
-    var.setValue(QStringList() << "World" << "Hello");
-    var.setValue(QStringList() << "Hello" << "Hello");
-    var.setValue(QStringList() << "World" << "Hello" << "Hello");
-#endif
-#if 1
-    QVariant var3;
-    QHostAddress ha("127.0.0.1");
-    var.setValue(ha);
-    var3 = var;
-    var3 = var;
-    var3 = var;
-    var3 = var;
-    QHostAddress ha1 = var.value<QHostAddress>();
-    typedef QMap<uint, QStringList> MyType;
-    MyType my;
-    my[1] = (QStringList() << "Hello");
-    my[3] = (QStringList() << "World");
-    var.setValue(my);
-    // FIXME: Known to break
-    QString type = var.typeName();
-    var.setValue(my);
-    var.setValue(my);
-    var.setValue(my);
-    var.setValue(my);
-#endif
-    return QVariant("sss");
-}
-
-QVariant testQVariant3()
-{
-    QVariantList vl;
-    vl.append(QVariant(1));
-    vl.append(QVariant(2));
-    vl.append(QVariant("Some String"));
-    vl.append(QVariant(21));
-    vl.append(QVariant(22));
-    vl.append(QVariant("2Some String"));
-
-    QList<int> list;
-    list << 1 << 2 << 3;
-    QVariant variant = qVariantFromValue(list);
-    list.clear();
-    list = qVariantValue<QList<int> >(variant);
-    return QVariant("xxx");
-}
-
-void testQVector()
-{
-    QVector<int> big(10000);
-    big[1] = 1;
-    big[2] = 2;
-    big[3] = 3;
-    big[4] = 4;
-    big[5] = 5;
-    big[9] = 9;
-    big.append(1);
-    big.append(1);
-    big.append(1);
-    big.append(1);
-
-    QVector<Foo *> plist;
-    plist.append(new Foo(1));
-    plist.append(0);
-    plist.append(new Foo(2));
-
-    QVector<Foo> flist;
-    flist.append(1);
-    flist.append(2);
-    flist.append(3);
-    flist.append(4);
-    //flist.takeFirst();
-    //flist.takeFirst();
-
-    QVector<bool> vec;
-    vec.append(true);
-    vec.append(false);
-}
-
-void testQVectorOfQList()
-{
-    QVector<QList<int> > v;
-    QVector<QList<int> > *pv = &v;
-    v.append(QList<int>() << 1);
-    v.append(QList<int>() << 2 << 3);
-    Q_UNUSED(pv);
-    //return v;
-}
-
-
-class Goo
-{
-public:
-   Goo(const QString& str, const int n) :
-           str_(str), n_(n)
-   {
-   }
-private:
-   QString str_;
-   int n_;
-};
-
-typedef QList<Goo> GooList;
-
-void testNoArgumentName(int i, int, int k)
-{
-    GooList list;
-    list.append(Goo("Hello", 1));
-    list.append(Goo("World", 2));
-
-    QList<Goo> list2;
-    list2.append(Goo("Hello", 1));
-    list2.append(Goo("World", 2));
-
-    ++i;
-    ++k;
-}
-
-void foo() {}
-void foo(int) {}
-void foo(QList<int>) {}
-void foo(QList<QVector<int> >) {}
-void foo(QList<QVector<int> *>) {}
-void foo(QList<QVector<int *> *>) {}
-
-template <class T>
-void foo(QList<QVector<T> *>) {}
-
-
-namespace somespace {
-
-class MyBase : public QObject
-{
-public:
-    MyBase() {}
-    virtual void doit(int i)
-    {
-       n = i;
-    }
-protected:
-    int n;
-};
-
-namespace nested {
-
-class MyFoo : public MyBase
-{
-public:
-    MyFoo() {}
-    virtual void doit(int i)
-    {
-       n = i;
-    }
-protected:
-    int n;
-};
-
-class MyBar : public MyFoo
-{
-public:
-    virtual void doit(int i)
-    {
-       n = i + 1;
-    }
-};
-
-namespace {
-
-class MyAnon : public MyBar
-{
-public:
-    virtual void doit(int i)
-    {
-       n = i + 3;
-    }
-};
-
-namespace baz {
-
-class MyBaz : public MyAnon
-{
-public:
-    virtual void doit(int i)
-    {
-       n = i + 5;
-    }
-};
-
-} // namespace baz
-
-} // namespace anon
-
-
-} // namespace nested
-} // namespace somespace
-
-void testNamespace()
-{
-    using namespace somespace;
-    using namespace nested;
-    MyFoo foo;
-    MyBar bar;
-    MyAnon anon;
-    baz::MyBaz baz;
-    baz.doit(1);
-    anon.doit(1);
-    foo.doit(1);
-    bar.doit(1);
-    bar.doit(1);
-    bar.doit(1);
-    bar.doit(1);
-    bar.doit(1);
-    bar.doit(1);
-    bar.doit(1);
-}
-
-void testHidden()
-{
-    int  n = 1;
-    n = 2;
-    n = 3;
-    n = 3;
-    n = 3;
-    n = 3;
-    n = 3;
-    n = 3;
-    n = 3;
-    {
-        QString n = "2";
-        n = "3";
-        n = "4";
-        {
-            double n = 3.5;
-            ++n;
-            ++n;
-        }
-        n = "3";
-        n = "4";
-    }
-    ++n;
-    ++n;
-}
-
-void testObject1()
-{
-    QObject parent;
-    parent.setObjectName("A Parent");
-    QObject child(&parent);
-    child.setObjectName("A Child");
-    QObject::connect(&child, SIGNAL(destroyed()), qApp, SLOT(quit()));
-    QObject::disconnect(&child, SIGNAL(destroyed()), qApp, SLOT(quit()));
-    child.setObjectName("A renamed Child");
-}
-
-void testVector1()
-{
-    std::vector<std::list<int> *> vector;
-    std::list<int> list;
-    vector.push_back(new std::list<int>(list));
-    vector.push_back(0);
-    list.push_back(45);
-    vector.push_back(new std::list<int>(list));
-    vector.push_back(0);
-}
-
-void testQHash1()
-{
-    QHash<QString, QList<int> > hash;
-    hash.insert("Hallo", QList<int>());
-    hash.insert("Welt", QList<int>() << 1);
-    hash.insert("!", QList<int>() << 1 << 2);
-    hash.insert("!", QList<int>() << 1 << 2);
-}
-
-void testPointer()
-{
-    Foo *f = new Foo();
-    Q_UNUSED(f);
-    int i = 0;
-    ++i;
-    ++i;
-    ++i;
-}
-
-class Z : public QObject
-{
-public:
-    Z() {
-        f = new Foo();
-        i = 0;
-        i = 1;
-        i = 2;
-        i = 3;
-    }
-    int i;
-    Foo *f;
-};
-
-void testUninitialized()
-{
-    QString s;
-    QStringList sl;
-    QMap<int, int> mii;
-    QMap<QString, QString> mss;
-    QHash<int, int> hii;
-    QHash<QString, QString> hss;
-    QList<int> li;
-    QVector<int> vi;
-    QStack<int> si;
-
-    std::string ss;
-    std::map<int, int> smii;
-    std::map<std::string, std::string> smss;
-    std::list<int> sli;
-    std::list<std::string> ssl;
-    std::vector<int> svi;
-    std::stack<int> ssi;
-}
-
-void testEndlessRecursion()
-{
-    testEndlessRecursion();
-}
-
-int testEndlessLoop()
-{
-    qlonglong a = 1;
-    while (a > 0)
-        ++a;
-    return a;
-}
-
-QString fooxx()
-{
-    return "bababa";
-}
-
-int testReference()
-{
-    QString a = "hello";
-    const QString &b = fooxx();
-    const QString c = "world";
-    return a.size() + b.size() + c.size();
-}
-
-struct Color
-{
-    int r,g,b,a;
-    Color() { r = 1, g = 2, b = 3, a = 4; }
-};
-
-Color testColor()
-{
-    Color c;
-    c.r = 5;
-    return c;
-}
-
-int fooii()
-{
-    return 3;
-}
-
-typedef QVector<Foo> FooVector;
-
-FooVector fooVector()
-{
-    FooVector f;
-    f.append(Foo(2));
-    fprintf(stderr, "xxx\n");
-    f.append(Foo(3));
-    f.append(Foo(4));
-    for (int i = 0; i < 1000; ++i)
-        f.append(Foo(i));
-    return f;
-}
-
-namespace ns {
-    typedef unsigned long long vl;
-    typedef vl verylong;
-}
-
-void testTypedef()
-{
-    typedef quint32 myType1;
-    typedef unsigned int myType2;
-    myType1 t1 = 0;
-    myType2 t2 = 0;
-    ns::vl j = 1000;
-    ns::verylong k = 1000;
-
-    ++j;
-    ++k;
-    ++t1;
-    ++t2;
-};
-
-void testStuff()
-{
-    Foo *f1 = new Foo(1);
-    X *x = new X();
-    Foo *f2 = x;
-    XX *xx = new XX();
-    Foo *f3 = xx;
-    Y *y = new Y();
-    Foo *f4 = y;
-    //Foo *f5 = new D();
-    qDebug() << f1 << f2 << f3 << f4;
-}
-
-void testStuff2()
-{
-    QList<QList<int> > list1;
-    QList<QList<int> > list2;
-    list1.append(QList<int>() << 1);
-    list2.append(QList<int>() << 2);
-    for (int i = 0; i < list1.size(); ++i) {
-        for (int j = 0; j < list1.at(i).size(); ++j) {
-            for (int k = i; k < list1.size(); ++k) {
-                for (int l = j; l < list1.at(k).size(); ++l) {
-                    qDebug() << list1.at(i).at(j)+list2.at(k).at(l);
-                }
-            }
-        }
-    }
-
-    // special char* support only with Python.
-    typedef unsigned short wchar;
-    wchar *str = new wchar[10];
-    str[2] = 0;
-    str[1] = 'B';
-    str[0] = 'A';
-    str[0] = 'A';
-    str[0] = 'A';
-    str[0] = 'A';
-    QString foo = "foo";
-    wchar *f = (wchar*)foo.utf16();
-    Q_UNUSED(f);
-    str[0] = 'A';
-    str[0] = 'A';
-    str[0] = 'A';
-}
-
-void testPassByReferenceHelper(Foo &f)
-{
-    ++f.a;
-}
-
-void testPassByReference()
-{
-    Foo f(12);
-    testPassByReferenceHelper(f);
-}
-
-void testWCout()
-{
-    using namespace std;
-    wstring x = L"xxxxx";
-    wstring::iterator i = x.begin();
-    while (i != x.end()) {
-        wcout << *i;
-        i++;
-    }
-    wcout.flush();
-    string y = "yyyyy";
-    string::iterator j = y.begin();
-    while (j != y.end()) {
-        cout << *j;
-        j++;
-    }
-    cout.flush();
-};
-
-void testWCout0()
-{
-    // Mixing cout and wcout does not work with gcc.
-    // See http://gcc.gnu.org/ml/gcc-bugs/2006-05/msg01193.html
-    // which also says "you can obtain something close to your
-    // expectations by calling std::ios::sync_with_stdio(false);
-    // at the beginning of your program."
-
-    using namespace std;
-    //std::ios::sync_with_stdio(false);
-    wcout << L"WWWWWW" << endl;
-    wcerr << L"YYYYYY" << endl;
-    cout << "CCCCCC" << endl;
-    cerr << "EEEEEE" << endl;
-    wcout << L"WWWWWW" << endl;
-    wcerr << L"YYYYYY" << endl;
-    cout << "CCCCCC" << endl;
-    cerr << "EEEEEE" << endl;
-    wcout << L"WWWWWW" << endl;
-    wcerr << L"YYYYYY" << endl;
-    cout << "CCCCCC" << endl;
-    cerr << "EEEEEE" << endl;
-}
-
-void testQSettings()
-{
-    // Note: Construct a QCoreApplication first.
-    QSettings settings("/tmp/test.ini", QSettings::IniFormat);
-    QVariant value = settings.value("item1","").toString();
-    int x = 1;
-    Q_UNUSED(x);
-}
-
-int main(int argc, char *argv[])
-{
-    //testQSettings();
-    //testWCout0();
-    //testWCout();
-    testQLocale();
-    testColor();
-    testQRegion();
-    testTypedef();
-    testStuff();
-    testPeekAndPoke3();
-    testFunctionPointer();
-    testAnonymous();
-    testReference();
-    //testEndlessLoop();
-    //testEndlessRecursion();
-    testQStack();
-    testUninitialized();
-    testPointer();
-    testQDateTime();
-    testQFileInfo();
-    testObject1();
-    testVector1();
-    testQHash1();
-    testSignalSlot(argc, argv);
-
-    QString hallo = "hallo\nwelt";
-    QStringList list;
-    list << "aaa" << "bbb" << "cc";
-
-    QList<const char *> list2;
-    list2 << "foo";
-    list2 << "bar";
-    list2 << 0;
-    list2 << "baz";
-    list2 << 0;
-
-    testQStandardItemModel();
-    testFunction();
-    testQImage();
-    testNoArgumentName(1, 2, 3);
-    testInput();
-    testOutput();
-    testHidden();
-    testArray();
-    testCatchThrow();
-    testQByteArray();
-
-    testStdDeque();
-    testStdList();
-    testStdHashSet();
-    testStdMap();
-    testStdSet();
-    testStdStack();
-    testStdString();
-    testStdVector();
-
-    testPassByReference();
-    testPlugin();
-    testQList();
-    testQLinkedList();
-    const char *s = "aöa";
-    // wchar_t * support only with Python.
-    const wchar_t *w = L"aöa";
-    testNamespace();
-    //return 0;
-    testQHash();
-    testQImage();
-    testQMap();
-    testQMultiMap();
-    testQString();
-    testQSet();
-#    if QT_VERSION >= 0x040500
-    testQSharedPointer();
-#    endif
-    testQStringList();
-    testStruct();
-    //testQThread();
-    testQVariant1();
-    testQVariant2();
-    testQVariant3();
-    testQVector();
-    testQVectorOfQList();
-
-
-    //*(int *)0 = 0;
-
-    testQObject(argc, argv);
-
-    //QColor color(255,128,10);
-    //QFont font;
-
-    Q_UNUSED(s);
-    Q_UNUSED(w);
-}
-
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
-#include "app.moc"
diff --git a/tests/manual/gdbdebugger/simple/plugin.cpp b/tests/manual/gdbdebugger/simple/plugin.cpp
deleted file mode 100644
index 782645064c..0000000000
--- a/tests/manual/gdbdebugger/simple/plugin.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include <stdio.h>
-#include <qglobal.h>
-
-
-extern "C" Q_DECL_EXPORT int pluginTest()
-{
-    int s = 0;
-    for (int i = 1; i != 2000; ++i)
-        s += i;
-    fprintf(stderr, "in plugin test\n");
-    return s;
-}
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
new file mode 100644
index 0000000000..829a36d2c4
--- /dev/null
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
@@ -0,0 +1,2048 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+//#include <complex>
+
+//template <typename T> class B;  B foo() {}
+
+#include <QtCore/QDebug>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QHash>
+#include <QtCore/QLibrary>
+#include <QtCore/QLinkedList>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QPointer>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QSettings>
+#include <QtCore/QStack>
+#include <QtCore/QThread>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
+#include <QtCore/QUrl>
+#if QT_VERSION >= 0x040500
+#include <QtCore/QSharedPointer>
+#endif
+
+#include <QtGui/QApplication>
+#include <QtGui/QAction>
+#include <QtGui/QColor>
+#include <QtGui/QFont>
+#include <QtGui/QLabel>
+#include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
+#include <QtGui/QRegion>
+#include <QtGui/QStandardItemModel>
+
+#include <QtNetwork/QHostAddress>
+
+#include <deque>
+#include <iostream>
+#include <map>
+#include <list>
+#include <set>
+#include <stack>
+#include <string>
+#include <vector>
+
+#if defined(__GNUC__) && !defined(__llvm__) && !defined(Q_OS_MAC)
+#    define USE_GCC_EXT 1
+#    undef __DEPRECATED
+#    include <hash_set>
+#endif
+
+#ifdef Q_OS_WIN
+#include <windows.h>
+#undef min
+#undef max
+#endif
+
+Q_DECLARE_METATYPE(QHostAddress)
+Q_DECLARE_METATYPE(QList<int>)
+Q_DECLARE_METATYPE(QStringList)
+
+typedef QMap<uint, QStringList> MyType;
+#define COMMA ,
+Q_DECLARE_METATYPE(QMap<uint COMMA QStringList>)
+
+template <typename T> class Vector
+{
+public:
+    explicit Vector(int size) : m_size(size), m_data(new T[size]) {}
+    ~Vector() { delete [] m_data; }
+    //...
+private:
+    int m_size;
+    T *m_data;
+};
+
+
+namespace nsX {
+namespace nsY {
+int z;
+}
+}
+
+namespace nsXY = nsX::nsY;
+
+int qwert()
+{
+    return nsXY::z;
+}
+
+uint qHash(const QMap<int, int> &)
+{
+    return 0;
+}
+
+uint qHash(const double & f)
+{
+    return int(f);
+}
+
+
+class Foo
+{
+public:
+    Foo(int i = 0)
+        : a(i), b(2)
+    {
+        int s = 1;
+        int t = 2;
+        b = 2 + s + t;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+        a += 1;
+    }
+
+    virtual ~Foo()
+    {
+        a = 5;
+    }
+
+    void doit()
+    {
+        static QObject ob;
+        m["1"] = "2";
+        h[&ob] = m.begin();
+
+        a += 1;
+        --b;
+        //s += 'x';
+    }
+
+
+    struct Bar {
+        Bar() : ob(0) {}
+        QObject *ob;
+    };
+
+public:
+    int a, b;
+    char x[6];
+
+private:
+    //QString s;
+    typedef QMap<QString, QString> Map;
+    Map m;
+    QHash<QObject *, Map::iterator> h;
+};
+
+class X : public Foo
+{
+public:
+    X() {
+    }
+};
+
+class XX : virtual public Foo
+{
+public:
+    XX() {
+    }
+};
+
+class Y : virtual public Foo
+{
+public:
+    Y() {
+    }
+};
+
+class D : public X, public Y
+{
+    int diamond;
+};
+
+void testArray()
+{
+#if 1
+    X x;
+    XX xx;
+    D diamond;
+    Q_UNUSED(diamond);
+    Foo *f = &xx;
+    Q_UNUSED(f);
+    Foo ff;
+    Q_UNUSED(ff);
+    double d[3][3];
+    for (int i = 0; i != 3; ++i)
+        for (int j = 0; j != 3; ++j)
+            d[i][j] = i + j;
+    Q_UNUSED(d);
+#endif
+
+#if 1
+    char c[20];
+    c[0] = 'a';
+    c[1] = 'b';
+    c[2] = 'c';
+    c[3] = 'd';
+    Q_UNUSED(c);
+#endif
+
+#if 1
+    QString s[20];
+    s[0] = "a";
+    s[1] = "b";
+    s[2] = "c";
+    s[3] = "d";
+    Q_UNUSED(s);
+#endif
+
+#if 1
+    QByteArray b[20];
+    b[0] = "a";
+    b[1] = "b";
+    b[2] = "c";
+    b[3] = "d";
+    Q_UNUSED(b);
+#endif
+
+#if 1
+    Foo foo[10];
+    //for (int i = 0; i != sizeof(foo)/sizeof(foo[0]); ++i) {
+    for (int i = 0; i < 5; ++i) {
+        foo[i].a = i;
+        foo[i].doit();
+    }
+#endif
+}
+
+#ifndef Q_CC_RVCT
+struct TestAnonymous
+{
+    union {
+        struct { int i; int b; };
+        struct { float f; };
+        double d;
+    };
+};
+#endif
+
+void testPeekAndPoke3()
+{
+    // Anonymous structs
+    {
+#ifndef Q_CC_RVCT
+        union {
+            struct { int i; int b; };
+            struct { float f; };
+            double d;
+        } a = { { 42, 43 } };
+        a.i = 1; // Break here. Expand a. Step.
+        a.i = 2; // Change a.i in Locals view to 0. This changes f, d but expectedly not b. Step.
+        a.i = 3; // Continue.
+        Q_UNUSED(a);
+#endif
+    }
+
+    // Complex watchers
+    {
+        struct S { int a; double b; } s[10];
+        for (int i = 0; i != 10; ++i) {
+            s[i].a = i;  // Break here. Expand s and s[0]. Step.
+            // Watcher Context: "Add New Watcher".
+            // Type    ['s[%d].a' % i for i in range(5)]
+            // Expand it, continue stepping.
+        }
+        Q_UNUSED(s);
+    }
+
+    // QImage display
+    {
+        QImage im(QSize(200, 200), QImage::Format_RGB32);
+        im.fill(QColor(200, 10, 30).rgba());
+        QPainter pain;
+        pain.begin(&im);
+        pain.setPen(QPen(Qt::black, 5.0, Qt::SolidLine, Qt::RoundCap));
+        pain.drawEllipse(20, 20, 160, 160); // Break here. Step.
+        // Toggle between "Normal" and "Displayed" in L&W Context Menu, entry "Display of Type QImage". Step.
+        pain.drawArc(70, 115, 60, 30, 200 * 16, 140 * 16);
+        pain.setBrush(Qt::black);
+        pain.drawEllipse(65, 70, 15, 15); // Step.
+        pain.drawEllipse(120, 70, 15, 15); // Step.
+        pain.end();
+    }
+
+}
+
+
+#ifndef Q_CC_RVCT
+namespace { // anon
+
+struct Something
+{
+    Something() { a = b = 1; }
+
+    void foo()
+    {
+        a = 42;
+        b = 43;
+    }
+
+    int a, b;
+};
+
+} // anon
+#endif
+
+
+void testAnonymous()
+{
+#ifndef Q_CC_RVCT
+    TestAnonymous a;
+    a.i = 1;
+    a.i = 2;
+    a.i = 3;
+    Q_UNUSED(a);
+
+    Something s;
+    s.foo();
+    Q_UNUSED(s);
+#endif
+}
+
+typedef void (*func_t)();
+func_t testFunctionPointer()
+{
+    func_t f1 = testAnonymous;
+    func_t f2 = testPeekAndPoke3;
+    func_t f3 = testPeekAndPoke3;
+    Q_UNUSED(f1);
+    Q_UNUSED(f2);
+    Q_UNUSED(f3);
+    return f1;
+}
+
+QByteArray testQByteArray()
+{
+    QByteArray ba = "Hello";
+    ba += '"';
+    ba += "World";
+
+    const char *str1 = "\356";
+    const char *str2 = "\xee";
+    const char *str3 = "\\ee";
+    QByteArray buf1( str1 );
+    QByteArray buf2( str2 );
+    QByteArray buf3( str3 );
+
+    ba += char(0);
+    ba += 1;
+    ba += 2;
+    return ba;
+}
+
+static void throwit1()
+{
+    throw 14;
+}
+
+static void throwit()
+{
+    throwit1();
+}
+
+int testCatchThrow()
+{
+    int gotit = 0;
+    try {
+        throwit();
+    } catch (int what) {
+        gotit = what;
+    }
+    return gotit;
+}
+
+QDateTime testQDateTime()
+{
+    QDateTime date;
+    date = QDateTime::currentDateTime();
+    date = date.addSecs(5);
+    date = date.addSecs(5);
+    date = date.addSecs(5);
+    date = date.addSecs(5);
+    return date;
+}
+
+QFileInfo testQFileInfo()
+{
+    QFileInfo fi("/tmp/t");
+    QString s = fi.absoluteFilePath();
+    s = fi.bundleName();
+    s = fi.bundleName();
+    s = fi.bundleName();
+    return fi;
+}
+
+QHash<int, float> testQHash()
+{
+#if 1
+    QHash<int, float> hgg0;
+    hgg0[11] = 11.0;
+    hgg0[22] = 22.0;
+    hgg0[22] = 22.0;
+    hgg0[22] = 22.0;
+    hgg0[22] = 22.0;
+    hgg0[22] = 22.0;
+    hgg0[22] = 22.0;
+
+#endif
+
+#if 1
+
+    QHash<QString, int> hgg1;
+    hgg1["22.0"] = 22.0;
+    hgg1["123.0"] = 22.0;
+    hgg1["111111ss111128.0"] = 28.0;
+    hgg1["11124.0"] = 22.0;
+    hgg1["1111125.0"] = 22.0;
+    hgg1["11111126.0"] = 22.0;
+    hgg1["111111127.0"] = 27.0;
+    hgg1["111111111128.0"] = 28.0;
+    hgg1["111111111111111111129.0"] = 29.0;
+
+    QHash<QByteArray, float> hgx1;
+    hgx1["22.0"] = 22.0;
+    hgx1["123.0"] = 22.0;
+    hgx1["111111ss111128.0"] = 28.0;
+    hgx1["11124.0"] = 22.0;
+    hgx1["1111125.0"] = 22.0;
+    hgx1["11111126.0"] = 22.0;
+    hgx1["111111127.0"] = 27.0;
+    hgx1["111111111128.0"] = 28.0;
+    hgx1["111111111111111111129.0"] = 29.0;
+#endif
+#if 1
+    QHash<int, QString> hgg2;
+    hgg2[22] = "22.0";
+
+    QHash<QString, Foo> hgg3;
+    hgg3["22.0"] = Foo(22);
+    hgg3["33.0"] = Foo(33);
+
+    QObject ob;
+    QHash<QString, QPointer<QObject> > hash;
+    hash.insert("Hallo", QPointer<QObject>(&ob));
+    hash.insert("Welt", QPointer<QObject>(&ob));
+    hash.insert(".", QPointer<QObject>(&ob));
+#endif
+    return hgg0;
+}
+
+void testQImage()
+{
+    // only works with Python dumper
+    QImage im(QSize(200, 200), QImage::Format_RGB32);
+    im.fill(QColor(200, 100, 130).rgba());
+    QPainter pain;
+    pain.begin(&im);
+    pain.drawLine(2, 2, 130, 130);
+    pain.drawLine(4, 2, 130, 140);
+    pain.drawRect(30, 30, 80, 80);
+    pain.end();
+}
+
+struct Function
+{
+    Function(QByteArray var, QByteArray f, double min, double max)
+      : var(var), f(f), min(min), max(max) {}
+    QByteArray var;
+    QByteArray f;
+    double min;
+    double max;
+};
+
+void testFunction()
+{
+    // In order to use this, switch on the 'qDump__Function' in gdbmacros.py
+    Function func("x", "sin(x)", 0, 1);
+    func.max = 10;
+    func.f = "cos(x)";
+    func.max = 4;
+    func.max = 5;
+    func.max = 6;
+    func.max = 7;
+    func.max = 8;
+}
+
+void testOutput()
+{
+    qDebug() << "qDebug() 1";
+    qDebug() << "qDebug() 2";
+    qDebug() << "qDebug() 3";
+    qDebug() << "qDebug <foo & bar>";
+
+    std::cout << "std::cout @@ 1" << std::endl;
+    std::cout << "std::cout @@ 2\n";
+    std::cout << "std::cout @@ 3" << std::endl;
+    std::cout << "std::cout <foo & bar>\n";
+
+    std::cerr << "std::cerr 1\n";
+    std::cerr << "std::cerr 2\n";
+    std::cerr << "std::cerr 3\n";
+    std::cerr << "std::cerr <foo & bar>\n";
+}
+
+void testInput()
+{
+#if 0
+    // This works only when "Run in terminal" is selected
+    // in the Run Configuration.
+    int i;
+    std::cin >> i;
+    int j;
+    std::cin >> j;
+#endif
+}
+
+void testQLinkedList()
+{
+#if 1
+    QLinkedList<int> li;
+    QLinkedList<uint> lu;
+
+    for (int i = 0; i != 3; ++i)
+        li.append(i);
+    li.append(102);
+
+
+    lu.append(102);
+    lu.append(102);
+    lu.append(102);
+
+    QLinkedList<Foo *> lpi;
+    lpi.append(new Foo(1));
+    lpi.append(0);
+    lpi.append(new Foo(3));
+
+    QLinkedList<qulonglong> l;
+    l.append(42);
+    l.append(43);
+    l.append(44);
+    l.append(45);
+
+    QLinkedList<Foo> f;
+    f.append(Foo(1));
+    f.append(Foo(2));
+#endif
+    QLinkedList<std::string> v;
+    v.push_back("aa");
+    v.push_back("bb");
+    v.push_back("cc");
+    v.push_back("dd");
+ }
+
+void testQLocale()
+{
+    QLocale loc = QLocale::system();
+    //QString s = loc.name();
+    //QVariant v = loc;
+    QLocale::MeasurementSystem m = loc.measurementSystem();
+    Q_UNUSED(m);
+}
+
+void testQList()
+{
+    QList<int> big;
+    for (int i = 0; i < 10000; ++i)
+        big.push_back(i);
+
+    QList<Foo> flist;
+    for (int i = 0; i < 100; ++i)
+        flist.push_back(i + 15);
+    flist.push_back(1000);
+    flist.push_back(1001);
+    flist.push_back(1002);
+#if 1
+    QList<int> li;
+    QList<uint> lu;
+
+    for (int i = 0; i != 30; ++i) {
+        li.append(i);
+    }
+    li.append(101);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+    li.append(102);
+
+    QList<int *> lpi;
+    lpi.append(new int(1));
+    lpi.append(new int(2));
+    lpi.append(new int(3));
+
+
+    for (int i = 0; i != 3; ++i) {
+        lu.append(i);
+    }
+    lu.append(101);
+    lu.append(102);
+    lu.append(102);
+    lu.append(102);
+
+    QList<uint> i;
+    i.append(42);
+    i.append(43);
+    i.append(44);
+    i.append(45);
+
+    QList<ushort> ls;
+    ls.append(42);
+    ls.append(43);
+    ls.append(44);
+    ls.append(45);
+
+    QList<QChar> lc;
+    lc.append(QChar('a'));
+    lc.append(QChar('b'));
+    lc.append(QChar('c'));
+    lc.append(QChar('d'));
+
+    QList<qulonglong> l;
+    l.append(42);
+    l.append(43);
+    l.append(44);
+    l.append(45);
+
+    QList<Foo> f;
+    f.append(Foo(1));
+    f.append(Foo(2));
+
+    QList<std::string> v;
+    v.push_back("aa");
+    v.push_back("bb");
+    v.push_back("cc");
+    v.push_back("dd");
+#endif
+ }
+
+void testQMap()
+{
+    QMap<uint, QStringList> ggl;
+    ggl[11] = QStringList() << "11";
+    ggl[22] = QStringList() << "22";
+
+    typedef QMap<uint, QStringList> T;
+    T ggt;
+    ggt[11] = QStringList() << "11";
+    ggt[22] = QStringList() << "22";
+
+#if 1
+    QMap<uint, float> gg0;
+    gg0[11] = 11.0;
+    gg0[22] = 22.0;
+
+
+    QMap<QString, float> gg1;
+    gg1["22.0"] = 22.0;
+
+    QMap<int, QString> gg2;
+    gg2[22] = "22.0";
+
+    QMap<QString, Foo> gg3;
+    gg3["22.0"] = Foo(22);
+    gg3["33.0"] = Foo(33);
+
+    QObject ob;
+    QMap<QString, QPointer<QObject> > map;
+    map.insert("Hallo", QPointer<QObject>(&ob));
+    map.insert("Welt", QPointer<QObject>(&ob));
+    map.insert(".", QPointer<QObject>(&ob));
+#endif
+}
+
+void testQMultiMap()
+{
+    QMultiMap<uint, float> gg0;
+    gg0.insert(11, 11.0);
+    gg0.insert(22, 22.0);
+    gg0.insert(22, 33.0);
+    gg0.insert(22, 34.0);
+    gg0.insert(22, 35.0);
+    gg0.insert(22, 36.0);
+#if 1
+    QMultiMap<QString, float> gg1;
+    gg1.insert("22.0", 22.0);
+
+    QMultiMap<int, QString> gg2;
+    gg2.insert(22, "22.0");
+
+    QMultiMap<QString, Foo> gg3;
+    gg3.insert("22.0", Foo(22));
+    gg3.insert("33.0", Foo(33));
+    gg3.insert("22.0", Foo(22));
+
+    QObject ob;
+    QMultiMap<QString, QPointer<QObject> > map;
+    map.insert("Hallo", QPointer<QObject>(&ob));
+    map.insert("Welt", QPointer<QObject>(&ob));
+    map.insert(".", QPointer<QObject>(&ob));
+    map.insert(".", QPointer<QObject>(&ob));
+#endif
+}
+
+namespace Names {
+namespace Bar {
+
+struct Ui {
+    Ui() { w = 0; }
+    QWidget *w;
+};
+
+class TestObject : public QObject
+{
+    Q_OBJECT
+
+public:
+    TestObject(QObject *parent = 0)
+      : QObject(parent)
+    {
+        m_ui = new Ui;
+        m_ui->w = new QWidget;
+        Q_UNUSED(parent);
+    }
+
+    Q_PROPERTY(QString myProp1 READ myProp1 WRITE setMyProp1)
+    QString myProp1() const { return m_myProp1; }
+    Q_SLOT void setMyProp1(const QString &mt) { m_myProp1 = mt; }
+
+    Q_PROPERTY(QString myProp2 READ myProp2 WRITE setMyProp2)
+    QString myProp2() const { return m_myProp2; }
+    Q_SLOT void setMyProp2(const QString &mt) { m_myProp2 = mt; }
+
+public:
+    Ui *m_ui;
+    QString m_myProp1;
+    QString m_myProp2;
+};
+
+} // namespace Bar
+} // namespace Names
+
+void testQObject(int &argc, char *argv[])
+{
+    QApplication app(argc, argv);
+#if 1
+    Names::Bar::TestObject test;
+    test.setMyProp1("HELLO");
+    test.setMyProp2("WORLD");
+    QString s = test.myProp1();
+    s += test.myProp2();
+    Q_UNUSED(s);
+#endif
+
+#if 0
+    QAction act("xxx", &app);
+    QString t = act.text();
+    t += "y";
+    t += "y";
+    t += "y";
+    t += "y";
+    t += "y";
+#endif
+
+#if 0
+    QWidget ob;
+    ob.setObjectName("An Object");
+    ob.setProperty("USER DEFINED 1", 44);
+    ob.setProperty("USER DEFINED 2", QStringList() << "FOO" << "BAR");
+    QObject ob1;
+    ob1.setObjectName("Another Object");
+
+    QObject::connect(&ob, SIGNAL(destroyed()), &ob1, SLOT(deleteLater()));
+    //QObject::connect(&app, SIGNAL(lastWindowClosed()), &ob, SLOT(deleteLater()));
+#endif
+
+#if 0
+    QList<QObject *> obs;
+    obs.append(&ob);
+    obs.append(&ob1);
+    obs.append(0);
+    obs.append(&app);
+    ob1.setObjectName("A Subobject");
+#endif
+
+#if 0
+    QString str = QString::fromUtf8("XXXXXXXXXXXXXXyyXXX ö");
+    QLabel l(str);
+    l.setObjectName("Some Label");
+    l.show();
+    app.exec();
+#endif
+}
+
+class Sender : public QObject
+{
+    Q_OBJECT
+public:
+    Sender() { setObjectName("Sender"); }
+    void doEmit() { emit aSignal(); }
+signals:
+    void aSignal();
+};
+
+class Receiver : public QObject
+{
+    Q_OBJECT
+public:
+    Receiver() { setObjectName("Receiver"); }
+public slots:
+    void aSlot() {
+        QObject *s = sender();
+        if (s) {
+            qDebug() << "SENDER: " << s;
+        } else {
+            qDebug() << "NO SENDER";
+        }
+    }
+};
+
+void testSignalSlot(int &argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    Sender sender;
+    Receiver receiver;
+    QObject::connect(&sender, SIGNAL(aSignal()), &receiver, SLOT(aSlot()));
+    sender.doEmit();
+};
+
+
+void testQPixmap()
+{
+    QImage im(QSize(200, 200), QImage::Format_RGB32);
+    im.fill(QColor(200, 100, 130).rgba());
+    QPainter pain;
+    pain.begin(&im);
+    pain.drawLine(2, 2, 130, 130);
+    pain.end();
+    QPixmap pm = QPixmap::fromImage(im);
+    int i = 1;
+    Q_UNUSED(i);
+}
+
+void testQRegion()
+{
+    // only works with Python dumper
+    QRegion region;
+    region += QRect(100, 100, 200, 200);
+    region += QRect(300, 300, 400, 500);
+    region += QRect(500, 500, 600, 600);
+    region += QRect(500, 500, 600, 600);
+    region += QRect(500, 500, 600, 600);
+    region += QRect(500, 500, 600, 600);
+}
+
+
+void testPlugin()
+{
+    QString dir = QDir::currentPath();
+#ifdef Q_OS_LINUX
+    QLibrary lib(dir + "/libplugin.so");
+#endif
+#ifdef Q_OS_MAC
+    dir = QFileInfo(dir + "/../..").canonicalPath();
+    QLibrary lib(dir + "/libplugin.dylib");
+#endif
+#ifdef Q_OS_WIN
+    QLibrary lib(dir + "/plugin.dll");
+#endif
+#ifdef Q_OS_SYMBIAN
+    QLibrary lib(dir + "/plugin.dll");
+#endif
+    int (*foo)() = (int(*)()) lib.resolve("pluginTest");
+    qDebug() << "library resolve: " << foo;
+    if (foo) {
+        int res = foo();
+        res += 1;
+    } else {
+        qDebug() << lib.errorString();
+    }
+}
+
+void testQSet()
+{
+    QSet<int> hgg0;
+    hgg0.insert(11);
+    hgg0.insert(22);
+
+    QSet<QString> hgg1;
+    hgg1.insert("22.0");
+
+    QObject ob;
+    QSet<QPointer<QObject> > hash;
+    QPointer<QObject> ptr(&ob);
+    Q_UNUSED(ptr);
+    //hash.insert(ptr);
+    //hash.insert(ptr);
+    //hash.insert(ptr);
+}
+
+#if QT_VERSION >= 0x040500
+class EmployeeData : public QSharedData
+{
+public:
+    EmployeeData() : id(-1) { name.clear(); }
+    EmployeeData(const EmployeeData &other)
+        : QSharedData(other), id(other.id), name(other.name) { }
+    ~EmployeeData() { }
+
+    int id;
+    QString name;
+};
+
+class Employee
+{
+public:
+    Employee() { d = new EmployeeData; }
+    Employee(int id, QString name) {
+        d = new EmployeeData;
+        setId(id);
+        setName(name);
+    }
+    Employee(const Employee &other)
+          : d (other.d)
+    {
+    }
+    void setId(int id) { d->id = id; }
+    void setName(QString name) { d->name = name; }
+
+    int id() const { return d->id; }
+    QString name() const { return d->name; }
+
+   private:
+     QSharedDataPointer<EmployeeData> d;
+};
+
+
+void testQSharedPointer()
+{
+    //Employee e1(1, "Herbert");
+    //Employee e2 = e1;
+#if 0
+    QSharedPointer<int> iptr(new int(43));
+    QSharedPointer<int> iptr2 = iptr;
+    QSharedPointer<int> iptr3 = iptr;
+
+    QSharedPointer<QString> ptr(new QString("hallo"));
+    QSharedPointer<QString> ptr2 = ptr;
+    QSharedPointer<QString> ptr3 = ptr;
+
+    QWeakPointer<int> wiptr(iptr);
+    QWeakPointer<int> wiptr2 = wiptr;
+    QWeakPointer<int> wiptr3 = wiptr;
+
+    QWeakPointer<QString> wptr(ptr);
+    QWeakPointer<QString> wptr2 = wptr;
+    QWeakPointer<QString> wptr3 = wptr;
+#endif
+
+    QSharedPointer<Foo> fptr(new Foo(1));
+    QWeakPointer<Foo> wfptr(fptr);
+    QWeakPointer<Foo> wfptr2 = wfptr;
+    QWeakPointer<Foo> wfptr3 = wfptr;
+}
+#endif
+
+void stringRefTest(const QString &refstring)
+{
+    Q_UNUSED(refstring);
+}
+
+void testStdDeque()
+{
+    std::deque<int *> plist1;
+    plist1.push_back(new int(1));
+    plist1.push_back(0);
+    plist1.push_back(new int(2));
+    plist1.pop_back();
+    plist1.pop_front();
+    plist1.pop_front();
+
+    std::deque<int> flist2;
+    flist2.push_back(1);
+    flist2.push_back(2);
+
+    std::deque<Foo *> plist;
+    plist.push_back(new Foo(1));
+    plist.push_back(new Foo(2));
+
+    std::deque<Foo> flist;
+    flist.push_back(1);
+    flist.push_front(2);
+}
+
+void testStdHashSet()
+{
+#if USE_GCC_EXT
+    using namespace __gnu_cxx;
+    hash_set<int> h;
+    h.insert(1);
+    h.insert(194);
+    h.insert(2);
+    h.insert(3);
+    h.insert(4);
+    h.insert(5);
+#endif
+}
+
+std::list<int> testStdList()
+{
+    std::list<int> big;
+    for (int i = 0; i < 10000; ++i)
+        big.push_back(i);
+
+    std::list<Foo> flist;
+    for (int i = 0; i < 100; ++i)
+        flist.push_back(i + 15);
+
+#if 1
+    std::list<int *> plist1;
+    plist1.push_back(new int(1));
+    plist1.push_back(0);
+    plist1.push_back(new int(2));
+
+    std::list<int> flist2;
+    flist2.push_back(1);
+    flist2.push_back(2);
+    flist2.push_back(3);
+    flist2.push_back(4);
+
+    flist2.push_back(1);
+    flist2.push_back(2);
+    flist2.push_back(3);
+    flist2.push_back(4);
+
+    std::list<Foo *> plist;
+    plist.push_back(new Foo(1));
+    plist.push_back(0);
+    plist.push_back(new Foo(2));
+
+
+    foreach (Foo f, flist)
+    {}
+
+    std::list<bool> vec;
+    vec.push_back(true);
+    vec.push_back(false);
+#endif
+    return big;
+}
+
+void testStdMap()
+{
+#if 0
+    std::map<QString, Foo> gg3;
+    gg3["22.0"] = Foo(22);
+    gg3["33.0"] = Foo(33);
+    gg3["44.0"] = Foo(44);
+
+    std::map<const char *, Foo> m1;
+    m1["22.0"] = Foo(22);
+    m1["33.0"] = Foo(33);
+    m1["44.0"] = Foo(44);
+
+    std::map<uint, uint> gg;
+    gg[11] = 1;
+    gg[22] = 2;
+    gg[33] = 3;
+    gg[44] = 4;
+    gg[55] = 5;
+
+    std::pair<uint, QStringList> p = std::make_pair(3, QStringList() << "11");
+    std::vector< std::pair<uint, QStringList> > v;
+    v.push_back(p);
+    v.push_back(p);
+
+    std::map<uint, QStringList> ggl;
+    ggl[11] = QStringList() << "11";
+    ggl[22] = QStringList() << "22";
+    ggl[33] = QStringList() << "33";
+    ggl[44] = QStringList() << "44";
+    ggl[55] = QStringList() << "55";
+
+    typedef std::map<uint, QStringList> T;
+    T ggt;
+    ggt[11] = QStringList() << "11";
+    ggt[22] = QStringList() << "22";
+
+    std::map<uint, float> gg0;
+    gg0[11] = 11.0;
+    gg0[22] = 22.0;
+
+
+    std::map<QString, float> gg1;
+    gg1["22.0"] = 22.0;
+
+    std::map<int, QString> gg2;
+    gg2[22] = "22.0";
+#endif
+
+#if 1
+    QObject ob;
+    std::map<QString, QPointer<QObject> > map;
+    map["Hallo"] = QPointer<QObject>(&ob);
+    map["Welt"] = QPointer<QObject>(&ob);
+    map["."] = QPointer<QObject>(&ob);
+#endif
+}
+
+std::set<int> testStdSet()
+{
+    std::set<int> hgg0;
+    hgg0.insert(11);
+    hgg0.insert(22);
+    hgg0.insert(33);
+#if 1
+    std::set<QString> hgg1;
+    hgg1.insert("22.0");
+
+    QObject ob;
+    std::set<QPointer<QObject> > hash;
+    QPointer<QObject> ptr(&ob);
+#endif
+    return hgg0;
+}
+
+std::stack<int> testStdStack()
+{
+    // only works with Python dumper
+    std::stack<int *> plist1;
+    plist1.push(new int(1));
+    plist1.push(0);
+    plist1.push(new int(2));
+    plist1.pop();
+    plist1.pop();
+    plist1.pop();
+
+    std::stack<int> flist2;
+    flist2.push(1);
+    flist2.push(2);
+
+    std::stack<Foo *> plist;
+    plist.push(new Foo(1));
+    plist.push(new Foo(2));
+
+    std::stack<Foo> flist;
+    flist.push(1);
+    flist.push(2);
+
+    return flist2;
+}
+
+std::string testStdString()
+{
+    QString foo;
+    std::string str;
+    std::wstring wstr;
+
+    std::vector<std::string> v;
+
+    foo += "a";
+    str += "b";
+    wstr += wchar_t('e');
+    foo += "c";
+    str += "d";
+    foo += "e";
+    wstr += wchar_t('e');
+    str += "e";
+    foo += "a";
+    str += "b";
+    foo += "c";
+    str += "d";
+    str += "e";
+    wstr += wchar_t('e');
+    wstr += wchar_t('e');
+    str += "e";
+
+    QList<std::string> l;
+
+    l.push_back(str);
+    l.push_back(str);
+    l.push_back(str);
+    l.push_back(str);
+
+    v.push_back(str);
+    v.push_back(str);
+    v.push_back(str);
+    v.push_back(str);
+
+    return str;
+}
+
+void testStdVector()
+{
+    std::vector<int *> plist1;
+    plist1.push_back(new int(1));
+    plist1.push_back(0);
+    plist1.push_back(new int(2));
+
+    std::vector<int> flist2;
+    flist2.push_back(1);
+    flist2.push_back(2);
+    flist2.push_back(3);
+    flist2.push_back(4);
+
+    flist2.push_back(1);
+    flist2.push_back(2);
+    flist2.push_back(3);
+    flist2.push_back(4);
+
+    std::vector<Foo *> plist;
+    plist.push_back(new Foo(1));
+    plist.push_back(0);
+    plist.push_back(new Foo(2));
+
+    std::vector<Foo> flist;
+    flist.push_back(1);
+    flist.push_back(2);
+    flist.push_back(3);
+    flist.push_back(4);
+    //flist.takeFirst();
+    //flist.takeFirst();
+
+    std::vector<bool> vec;
+    vec.push_back(true);
+    vec.push_back(false);
+    vec.push_back(false);
+    vec.push_back(true);
+    vec.push_back(false);
+}
+
+void testQStandardItemModel()
+{
+    //char buf[100];
+    //QString *s = static_cast<QString *>(static_cast<void *>(&(v.data_ptr().data.c)));
+    //QString *t = (QString *)&(v.data_ptr());
+
+    QStandardItemModel m;
+    QStandardItem *i1, *i2, *i11;
+    m.appendRow(QList<QStandardItem *>()
+         << (i1 = new QStandardItem("1")) << (new QStandardItem("a")) << (new QStandardItem("a2")));
+    QModelIndex mi = i1->index();
+    m.appendRow(QList<QStandardItem *>()
+         << (i2 = new QStandardItem("2")) << (new QStandardItem("b")));
+    i1->appendRow(QList<QStandardItem *>()
+         << (i11 = new QStandardItem("11")) << (new QStandardItem("aa")));
+    int i = 1;
+    ++i;
+    ++i;
+}
+
+QStack<int> testQStack()
+{
+    QVector<int> bigv;
+    for (int i = 0; i < 10; ++i)
+        bigv.append(i);
+    QStack<int> big;
+    for (int i = 0; i < 10; ++i)
+        big.append(i);
+    QStack<Foo *> plist;
+    plist.append(new Foo(1));
+    plist.append(0);
+    plist.append(new Foo(2));
+    QStack<Foo> flist;
+    flist.append(1);
+    flist.append(2);
+    flist.append(3);
+    flist.append(4);
+    //flist.takeFirst();
+    //flist.takeFirst();
+    QStack<bool> vec;
+    vec.append(true);
+    vec.append(false);
+    return big;
+}
+
+void testQString()
+{
+    QUrl url(QString("http://www.nokia.com"));
+    QImage im;
+
+    // Could be broken due to Return Value Optimzation
+    QString str = "Hello ";
+    str += " big, ";
+    str += " fat ";
+    str += " World ";
+    str += " World ";
+    str += " World ";
+    str += " World ";
+    str += " World ";
+}
+
+void testQString3()
+{
+    QString str = "Hello ";
+    str += " big, ";
+    str += " fat ";
+    str += " World ";
+
+    QString string("String Test");
+    QString *pstring = new QString("Pointer String Test");
+    stringRefTest(QString("Ref String Test"));
+    string = "Hi";
+    string += "Du";
+    qDebug() << string;
+    delete pstring;
+}
+
+QStringList testQStringList()
+{
+    QStringList l;
+    l << "Hello ";
+    l << " big, ";
+    l << " fat ";
+    l.takeFirst();
+    l << " World ";
+    return l;
+}
+
+Foo testStruct()
+{
+    Foo f(2);
+    f.doit();
+    f.doit();
+    f.doit();
+    Foo f1 = f;
+    f1.doit();
+    return f1;
+}
+
+class Thread : public QThread
+{
+public:
+    Thread(int id) : m_id(id) {}
+
+    void run()
+    {
+        int j = 2;
+        ++j;
+        for (int i = 0; i != 100000; ++i) {
+            //sleep(1);
+            std::cerr << m_id;
+        }
+        if (m_id == 2) {
+            ++j;
+        }
+        std::cerr << j;
+    }
+
+private:
+    int m_id;
+};
+
+void testQThread()
+{
+    Thread thread1(1);
+    Thread thread2(2);
+    thread1.start();
+    thread2.start();
+    thread1.wait();
+    thread2.wait();
+}
+
+void testQVariant1()
+{
+    QVariant v;
+    v = 1;
+    v = 1.0;
+    v = "string";
+    v = QRect(100, 200, 300, 400);
+    v = QRectF(100, 200, 300, 400);
+    v = 1;
+    //return v;
+}
+
+QVariant testQVariant2()
+{
+    QVariant value;
+    QVariant::Type t = QVariant::String;
+    value = QVariant(t, (void*)0);
+    *(QString*)value.data() = QString("XXX");
+
+    int i = 1;
+    Q_UNUSED(i);
+#if 1
+    QVariant var;
+    var.setValue(1);
+    var.setValue(2);
+    var.setValue(3);
+    var.setValue(QString("Hello"));
+    var.setValue(QString("World"));
+    var.setValue(QString("Hello"));
+    var.setValue(QStringList() << "World");
+    var.setValue(QStringList() << "World" << "Hello");
+    var.setValue(QStringList() << "Hello" << "Hello");
+    var.setValue(QStringList() << "World" << "Hello" << "Hello");
+#endif
+#if 1
+    QVariant var3;
+    QHostAddress ha("127.0.0.1");
+    var.setValue(ha);
+    var3 = var;
+    var3 = var;
+    var3 = var;
+    var3 = var;
+    QHostAddress ha1 = var.value<QHostAddress>();
+    typedef QMap<uint, QStringList> MyType;
+    MyType my;
+    my[1] = (QStringList() << "Hello");
+    my[3] = (QStringList() << "World");
+    var.setValue(my);
+    // FIXME: Known to break
+    QString type = var.typeName();
+    var.setValue(my);
+    var.setValue(my);
+    var.setValue(my);
+    var.setValue(my);
+#endif
+    return QVariant("sss");
+}
+
+QVariant testQVariant3()
+{
+    QVariantList vl;
+    vl.append(QVariant(1));
+    vl.append(QVariant(2));
+    vl.append(QVariant("Some String"));
+    vl.append(QVariant(21));
+    vl.append(QVariant(22));
+    vl.append(QVariant("2Some String"));
+
+    QList<int> list;
+    list << 1 << 2 << 3;
+    QVariant variant = qVariantFromValue(list);
+    list.clear();
+    list = qVariantValue<QList<int> >(variant);
+    return QVariant("xxx");
+}
+
+void testQVector()
+{
+    QVector<int> big(10000);
+    big[1] = 1;
+    big[2] = 2;
+    big[3] = 3;
+    big[4] = 4;
+    big[5] = 5;
+    big[9] = 9;
+    big.append(1);
+    big.append(1);
+    big.append(1);
+    big.append(1);
+
+    QVector<Foo *> plist;
+    plist.append(new Foo(1));
+    plist.append(0);
+    plist.append(new Foo(2));
+
+    QVector<Foo> flist;
+    flist.append(1);
+    flist.append(2);
+    flist.append(3);
+    flist.append(4);
+    //flist.takeFirst();
+    //flist.takeFirst();
+
+    QVector<bool> vec;
+    vec.append(true);
+    vec.append(false);
+}
+
+void testQVectorOfQList()
+{
+    QVector<QList<int> > v;
+    QVector<QList<int> > *pv = &v;
+    v.append(QList<int>() << 1);
+    v.append(QList<int>() << 2 << 3);
+    Q_UNUSED(pv);
+    //return v;
+}
+
+
+class Goo
+{
+public:
+   Goo(const QString& str, const int n) :
+           str_(str), n_(n)
+   {
+   }
+private:
+   QString str_;
+   int n_;
+};
+
+typedef QList<Goo> GooList;
+
+void testNoArgumentName(int i, int, int k)
+{
+    GooList list;
+    list.append(Goo("Hello", 1));
+    list.append(Goo("World", 2));
+
+    QList<Goo> list2;
+    list2.append(Goo("Hello", 1));
+    list2.append(Goo("World", 2));
+
+    ++i;
+    ++k;
+}
+
+void foo() {}
+void foo(int) {}
+void foo(QList<int>) {}
+void foo(QList<QVector<int> >) {}
+void foo(QList<QVector<int> *>) {}
+void foo(QList<QVector<int *> *>) {}
+
+template <class T>
+void foo(QList<QVector<T> *>) {}
+
+
+namespace somespace {
+
+class MyBase : public QObject
+{
+public:
+    MyBase() {}
+    virtual void doit(int i)
+    {
+       n = i;
+    }
+protected:
+    int n;
+};
+
+namespace nested {
+
+class MyFoo : public MyBase
+{
+public:
+    MyFoo() {}
+    virtual void doit(int i)
+    {
+       n = i;
+    }
+protected:
+    int n;
+};
+
+class MyBar : public MyFoo
+{
+public:
+    virtual void doit(int i)
+    {
+       n = i + 1;
+    }
+};
+
+namespace {
+
+class MyAnon : public MyBar
+{
+public:
+    virtual void doit(int i)
+    {
+       n = i + 3;
+    }
+};
+
+namespace baz {
+
+class MyBaz : public MyAnon
+{
+public:
+    virtual void doit(int i)
+    {
+       n = i + 5;
+    }
+};
+
+} // namespace baz
+
+} // namespace anon
+
+
+} // namespace nested
+} // namespace somespace
+
+void testNamespace()
+{
+    using namespace somespace;
+    using namespace nested;
+    MyFoo foo;
+    MyBar bar;
+    MyAnon anon;
+    baz::MyBaz baz;
+    baz.doit(1);
+    anon.doit(1);
+    foo.doit(1);
+    bar.doit(1);
+    bar.doit(1);
+    bar.doit(1);
+    bar.doit(1);
+    bar.doit(1);
+    bar.doit(1);
+    bar.doit(1);
+}
+
+void testHidden()
+{
+    int  n = 1;
+    n = 2;
+    n = 3;
+    n = 3;
+    n = 3;
+    n = 3;
+    n = 3;
+    n = 3;
+    n = 3;
+    {
+        QString n = "2";
+        n = "3";
+        n = "4";
+        {
+            double n = 3.5;
+            ++n;
+            ++n;
+        }
+        n = "3";
+        n = "4";
+    }
+    ++n;
+    ++n;
+}
+
+void testObject1()
+{
+    QObject parent;
+    parent.setObjectName("A Parent");
+    QObject child(&parent);
+    child.setObjectName("A Child");
+    QObject::connect(&child, SIGNAL(destroyed()), qApp, SLOT(quit()));
+    QObject::disconnect(&child, SIGNAL(destroyed()), qApp, SLOT(quit()));
+    child.setObjectName("A renamed Child");
+}
+
+void testVector1()
+{
+    std::vector<std::list<int> *> vector;
+    std::list<int> list;
+    vector.push_back(new std::list<int>(list));
+    vector.push_back(0);
+    list.push_back(45);
+    vector.push_back(new std::list<int>(list));
+    vector.push_back(0);
+}
+
+void testQHash1()
+{
+    QHash<QString, QList<int> > hash;
+    hash.insert("Hallo", QList<int>());
+    hash.insert("Welt", QList<int>() << 1);
+    hash.insert("!", QList<int>() << 1 << 2);
+    hash.insert("!", QList<int>() << 1 << 2);
+}
+
+void testPointer()
+{
+    Foo *f = new Foo();
+    Q_UNUSED(f);
+    int i = 0;
+    ++i;
+    ++i;
+    ++i;
+}
+
+class Z : public QObject
+{
+public:
+    Z() {
+        f = new Foo();
+        i = 0;
+        i = 1;
+        i = 2;
+        i = 3;
+    }
+    int i;
+    Foo *f;
+};
+
+void testUninitialized()
+{
+    QString s;
+    QStringList sl;
+    QMap<int, int> mii;
+    QMap<QString, QString> mss;
+    QHash<int, int> hii;
+    QHash<QString, QString> hss;
+    QList<int> li;
+    QVector<int> vi;
+    QStack<int> si;
+
+    std::string ss;
+    std::map<int, int> smii;
+    std::map<std::string, std::string> smss;
+    std::list<int> sli;
+    std::list<std::string> ssl;
+    std::vector<int> svi;
+    std::stack<int> ssi;
+}
+
+void testEndlessRecursion()
+{
+    testEndlessRecursion();
+}
+
+int testEndlessLoop()
+{
+    qlonglong a = 1;
+    while (a > 0)
+        ++a;
+    return a;
+}
+
+QString fooxx()
+{
+    return "bababa";
+}
+
+int testReference()
+{
+    QString a = "hello";
+    const QString &b = fooxx();
+    const QString c = "world";
+    return a.size() + b.size() + c.size();
+}
+
+struct Color
+{
+    int r,g,b,a;
+    Color() { r = 1, g = 2, b = 3, a = 4; }
+};
+
+Color testColor()
+{
+    Color c;
+    c.r = 5;
+    return c;
+}
+
+int fooii()
+{
+    return 3;
+}
+
+typedef QVector<Foo> FooVector;
+
+FooVector fooVector()
+{
+    FooVector f;
+    f.append(Foo(2));
+    fprintf(stderr, "xxx\n");
+    f.append(Foo(3));
+    f.append(Foo(4));
+    for (int i = 0; i < 1000; ++i)
+        f.append(Foo(i));
+    return f;
+}
+
+namespace ns {
+    typedef unsigned long long vl;
+    typedef vl verylong;
+}
+
+void testTypedef()
+{
+    typedef quint32 myType1;
+    typedef unsigned int myType2;
+    myType1 t1 = 0;
+    myType2 t2 = 0;
+    ns::vl j = 1000;
+    ns::verylong k = 1000;
+
+    ++j;
+    ++k;
+    ++t1;
+    ++t2;
+};
+
+void testStuff()
+{
+    Foo *f1 = new Foo(1);
+    X *x = new X();
+    Foo *f2 = x;
+    XX *xx = new XX();
+    Foo *f3 = xx;
+    Y *y = new Y();
+    Foo *f4 = y;
+    //Foo *f5 = new D();
+    qDebug() << f1 << f2 << f3 << f4;
+}
+
+void testStuff2()
+{
+    QList<QList<int> > list1;
+    QList<QList<int> > list2;
+    list1.append(QList<int>() << 1);
+    list2.append(QList<int>() << 2);
+    for (int i = 0; i < list1.size(); ++i) {
+        for (int j = 0; j < list1.at(i).size(); ++j) {
+            for (int k = i; k < list1.size(); ++k) {
+                for (int l = j; l < list1.at(k).size(); ++l) {
+                    qDebug() << list1.at(i).at(j)+list2.at(k).at(l);
+                }
+            }
+        }
+    }
+
+    // special char* support only with Python.
+    typedef unsigned short wchar;
+    wchar *str = new wchar[10];
+    str[2] = 0;
+    str[1] = 'B';
+    str[0] = 'A';
+    str[0] = 'A';
+    str[0] = 'A';
+    str[0] = 'A';
+    QString foo = "foo";
+    wchar *f = (wchar*)foo.utf16();
+    Q_UNUSED(f);
+    str[0] = 'A';
+    str[0] = 'A';
+    str[0] = 'A';
+}
+
+void testPassByReferenceHelper(Foo &f)
+{
+    ++f.a;
+}
+
+void testPassByReference()
+{
+    Foo f(12);
+    testPassByReferenceHelper(f);
+}
+
+void testWCout()
+{
+    using namespace std;
+    wstring x = L"xxxxx";
+    wstring::iterator i = x.begin();
+    while (i != x.end()) {
+        wcout << *i;
+        i++;
+    }
+    wcout.flush();
+    string y = "yyyyy";
+    string::iterator j = y.begin();
+    while (j != y.end()) {
+        cout << *j;
+        j++;
+    }
+    cout.flush();
+};
+
+void testWCout0()
+{
+    // Mixing cout and wcout does not work with gcc.
+    // See http://gcc.gnu.org/ml/gcc-bugs/2006-05/msg01193.html
+    // which also says "you can obtain something close to your
+    // expectations by calling std::ios::sync_with_stdio(false);
+    // at the beginning of your program."
+
+    using namespace std;
+    //std::ios::sync_with_stdio(false);
+    wcout << L"WWWWWW" << endl;
+    wcerr << L"YYYYYY" << endl;
+    cout << "CCCCCC" << endl;
+    cerr << "EEEEEE" << endl;
+    wcout << L"WWWWWW" << endl;
+    wcerr << L"YYYYYY" << endl;
+    cout << "CCCCCC" << endl;
+    cerr << "EEEEEE" << endl;
+    wcout << L"WWWWWW" << endl;
+    wcerr << L"YYYYYY" << endl;
+    cout << "CCCCCC" << endl;
+    cerr << "EEEEEE" << endl;
+}
+
+void testQSettings()
+{
+    // Note: Construct a QCoreApplication first.
+    QSettings settings("/tmp/test.ini", QSettings::IniFormat);
+    QVariant value = settings.value("item1","").toString();
+    int x = 1;
+    Q_UNUSED(x);
+}
+
+int main(int argc, char *argv[])
+{
+    //testQSettings();
+    //testWCout0();
+    //testWCout();
+    testQLocale();
+    testColor();
+    testQRegion();
+    testTypedef();
+    testStuff();
+    testPeekAndPoke3();
+    testFunctionPointer();
+    testAnonymous();
+    testReference();
+    //testEndlessLoop();
+    //testEndlessRecursion();
+    testQStack();
+    testUninitialized();
+    testPointer();
+    testQDateTime();
+    testQFileInfo();
+    testObject1();
+    testVector1();
+    testQHash1();
+    testSignalSlot(argc, argv);
+
+    QString hallo = "hallo\nwelt";
+    QStringList list;
+    list << "aaa" << "bbb" << "cc";
+
+    QList<const char *> list2;
+    list2 << "foo";
+    list2 << "bar";
+    list2 << 0;
+    list2 << "baz";
+    list2 << 0;
+
+    testQStandardItemModel();
+    testFunction();
+    testQImage();
+    testNoArgumentName(1, 2, 3);
+    testInput();
+    testOutput();
+    testHidden();
+    testArray();
+    testCatchThrow();
+    testQByteArray();
+
+    testStdDeque();
+    testStdList();
+    testStdHashSet();
+    testStdMap();
+    testStdSet();
+    testStdStack();
+    testStdString();
+    testStdVector();
+
+    testPassByReference();
+    testPlugin();
+    testQList();
+    testQLinkedList();
+    const char *s = "aöa";
+    // wchar_t * support only with Python.
+    const wchar_t *w = L"aöa";
+    testNamespace();
+    //return 0;
+    testQHash();
+    testQImage();
+    testQMap();
+    testQMultiMap();
+    testQString();
+    testQSet();
+#    if QT_VERSION >= 0x040500
+    testQSharedPointer();
+#    endif
+    testQStringList();
+    testStruct();
+    //testQThread();
+    testQVariant1();
+    testQVariant2();
+    testQVariant3();
+    testQVector();
+    testQVectorOfQList();
+
+
+    //*(int *)0 = 0;
+
+    testQObject(argc, argv);
+
+    //QColor color(255,128,10);
+    //QFont font;
+
+    Q_UNUSED(s);
+    Q_UNUSED(w);
+}
+
+QT_BEGIN_NAMESPACE
+QT_END_NAMESPACE
+
+#include "app.moc"
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro
index cd157e8cea..2b4389eb34 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro
@@ -1,11 +1,12 @@
 TEMPLATE = app
-TARGET = debuggertest
+TARGET = simple_gdbtest_app
 DEPENDPATH += .
 INCLUDEPATH += .
 DESTDIR = .
 
 # Input
-SOURCES += app.cpp
+SOURCES += \
+    simple_gdbtest_app.cpp
 
 # SOURCES += ../../../share/qtcreator/gdbmacros/gdbmacros.cpp
 QT += network
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp
new file mode 100644
index 0000000000..782645064c
--- /dev/null
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp
@@ -0,0 +1,41 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include <stdio.h>
+#include <qglobal.h>
+
+
+extern "C" Q_DECL_EXPORT int pluginTest()
+{
+    int s = 0;
+    for (int i = 1; i != 2000; ++i)
+        s += i;
+    fprintf(stderr, "in plugin test\n");
+    return s;
+}
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro b/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro
index 5ab176dd3e..235f61d2c6 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro
@@ -1,9 +1,9 @@
 TEMPLATE = lib
-TARGET = plugin
-DESTDIR = .
+TARGET = simple_gdbtest_plugin
 CONFIG += shared
 
-SOURCES += plugin.cpp
+SOURCES += \
+    simple_gdbtest_plugin.cpp
 
 macx {
    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/
@@ -14,5 +14,3 @@ macx {
     QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
     QMAKE_RPATHDIR =
 }
-
-
-- 
cgit v1.2.1