Autotest

Task-number: QTBUG-16026

Change-Id: Iafcd0ae99016ea684c162e54da1090417f781790
Reviewed-on: http://codereview.qt.nokia.com/2089
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

diff --git a/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.errors.txt
new file mode 100644 (file)
index 0000000..07d05d3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.errors.txt
@@ -0,0 +1 @@
+3:1:MyQmlObject is not a type

diff --git a/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.qml b/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.qml
new file mode 100644 (file)
index 0000000..717ca76
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/majorVersionIsolation.qml
@@ -0,0 +1,4 @@
+import Test.Version 2.0
+
+MyQmlObject {
+}

diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
index cd74414..20f0719 100644 (file)
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
@@ -70,6 +70,10 @@ void registerTypes()
     qmlRegisterCustomType<MyCustomParserType>("Test", 1, 0, "MyCustomParserType", new MyCustomParserTypeParser);
 
     qmlRegisterTypeNotAvailable("Test",1,0,"UnavailableType", "UnavailableType is unavailable for testing");
+
+    qmlRegisterType<MyQmlObject>("Test.Version",1,0,"MyQmlObject");
+    qmlRegisterType<MyTypeObject>("Test.Version",1,0,"MyTypeObject");
+    qmlRegisterType<MyTypeObject>("Test.Version",2,0,"MyTypeObject");
 }
 
 QVariant myCustomVariantTypeConverter(const QString &data)

diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index adf7887..b8f1899 100644 (file)
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -433,6 +433,8 @@ void tst_qdeclarativelanguage::errors_data()
     QTest::newRow("metaobjectRevision.1") << "metaobjectRevision.1.qml" << "metaobjectRevision.1.errors.txt" << false;
     QTest::newRow("metaobjectRevision.2") << "metaobjectRevision.2.qml" << "metaobjectRevision.2.errors.txt" << false;
     QTest::newRow("metaobjectRevision.3") << "metaobjectRevision.3.qml" << "metaobjectRevision.3.errors.txt" << false;
+
+    QTest::newRow("Major version isolation") << "majorVersionIsolation.qml" << "majorVersionIsolation.errors.txt" << false;
 }