From 700910d938c75c978f765ec8438f81e70676999a Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 23 Jan 2013 14:08:58 -0800 Subject: Add QtQml.Models module The moved Model classes can now be exposed in a QtQml import. To keep the QtQml import resticted to more core functionality, they are being exposed in a plugin module. Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29 Reviewed-by: Alan Alpert Reviewed-by: Lars Knoll --- tests/auto/qml/qml.pro | 1 + tests/auto/qml/qtqmlmodules/data/base.qml | 14 +++ tests/auto/qml/qtqmlmodules/data/models.qml | 15 +++ tests/auto/qml/qtqmlmodules/data/unavailable.qml | 35 +++++++ tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 12 +++ tests/auto/qml/qtqmlmodules/tst_qtqmlmodules.cpp | 95 +++++++++++++++++++ .../tst_qquickvisualdatamodel.cpp | 104 ++++++++++----------- 7 files changed, 224 insertions(+), 52 deletions(-) create mode 100644 tests/auto/qml/qtqmlmodules/data/base.qml create mode 100644 tests/auto/qml/qtqmlmodules/data/models.qml create mode 100644 tests/auto/qml/qtqmlmodules/data/unavailable.qml create mode 100644 tests/auto/qml/qtqmlmodules/qtqmlmodules.pro create mode 100644 tests/auto/qml/qtqmlmodules/tst_qtqmlmodules.cpp (limited to 'tests/auto') diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index da705cefdb..e278d29162 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -24,6 +24,7 @@ PUBLICTESTS += \ qqmltranslation \ qqmlxmlhttprequest \ qqmlparser \ + qtqmlmodules \ qquickfolderlistmodel PRIVATETESTS += \ diff --git a/tests/auto/qml/qtqmlmodules/data/base.qml b/tests/auto/qml/qtqmlmodules/data/base.qml new file mode 100644 index 0000000000..942b270572 --- /dev/null +++ b/tests/auto/qml/qtqmlmodules/data/base.qml @@ -0,0 +1,14 @@ +import QtQml 2.0 + +QtObject { + property bool success: { + prop1 != undefined && + prop2 != undefined && + prop3 != undefined && + prop4 != undefined + } + property Component prop1: Component { QtObject {}} + property Timer prop2: Timer {} + property Connections prop3: Connections{} + property Binding prop4: Binding{} +} diff --git a/tests/auto/qml/qtqmlmodules/data/models.qml b/tests/auto/qml/qtqmlmodules/data/models.qml new file mode 100644 index 0000000000..d253565932 --- /dev/null +++ b/tests/auto/qml/qtqmlmodules/data/models.qml @@ -0,0 +1,15 @@ +import QtQml 2.0 +import QtQml.Models 2.1 + +QtObject { + property bool success: { + prop1 != undefined && + prop2 != undefined && + prop3 != undefined && + prop4 != undefined + } + property DelegateModelGroup prop1: DelegateModelGroup{} + property DelegateModel prop2: DelegateModel{} + property ObjectModel prop3: ObjectModel{} + property ListModel prop4: ListModel{ListElement{dummy: true}} +} diff --git a/tests/auto/qml/qtqmlmodules/data/unavailable.qml b/tests/auto/qml/qtqmlmodules/data/unavailable.qml new file mode 100644 index 0000000000..5841e3f677 --- /dev/null +++ b/tests/auto/qml/qtqmlmodules/data/unavailable.qml @@ -0,0 +1,35 @@ +import QtQml 2.0 + +QtObject { + id: root + property bool success: false; + Component.onCompleted: { + var strings = [ + "QtObject{}", + "Binding{}", + "Connections{}", + "Timer{}", + "Component{QtObject{}}", + "ListModel{ListElement{}}", + "ObjectModel{QtObject{}}", + "import QtQml 2.0 Item{}", + "import QtQml 2.0 ListModel{}", + "import QtQml 2.0 ObjectModel{}" + ]; + var idx; + for (idx in strings) { + var errored = false; + var item; + try { + item = Qt.createQmlObject(strings[idx], root); + } catch (err) { + errored = true; + } + if (!errored) { + console.log("It worked? ", item); + return; + } + } + root.success = true; + } +} diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro new file mode 100644 index 0000000000..36ece8d7e0 --- /dev/null +++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro @@ -0,0 +1,12 @@ +CONFIG += testcase +TARGET = tst_qtqmlmodules +SOURCES += tst_qtqmlmodules.cpp + +include (../../shared/util.pri) + +macx:CONFIG -= app_bundle + +TESTDATA = data/* + +QT += core-private v8-private qml-private testlib gui gui-private +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qtqmlmodules/tst_qtqmlmodules.cpp b/tests/auto/qml/qtqmlmodules/tst_qtqmlmodules.cpp new file mode 100644 index 0000000000..1e98c53694 --- /dev/null +++ b/tests/auto/qml/qtqmlmodules/tst_qtqmlmodules.cpp @@ -0,0 +1,95 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Research in Motion. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include +#include "../../shared/util.h" + +class tst_qtqmlmodules : public QQmlDataTest +{ + Q_OBJECT +public: + tst_qtqmlmodules() {} + +private slots: + void baseTypes(); + void modelsTypes(); + void unavailableTypes(); +}; + +void tst_qtqmlmodules::baseTypes() +{ + QQmlEngine engine; + QQmlComponent component(&engine, testFileUrl("base.qml")); + QObject *object = component.create(); + QVERIFY(object != 0); + QVERIFY(object->property("success").toBool()); + + delete object; +} + +void tst_qtqmlmodules::modelsTypes() +{ + QQmlEngine engine; + QQmlComponent component(&engine, testFileUrl("models.qml")); + QObject *object = component.create(); + QVERIFY(object != 0); + QVERIFY(object->property("success").toBool()); + + delete object; +} + +void tst_qtqmlmodules::unavailableTypes() +{ + QQmlEngine engine; + QQmlComponent component(&engine, testFileUrl("unavailable.qml")); + QObject *object = component.create(); + QVERIFY(object != 0); + QVERIFY(object->property("success").toBool()); + + delete object; +} + +QTEST_MAIN(tst_qtqmlmodules) + +#include "tst_qtqmlmodules.moc" diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index f97b0f35a6..d16bf81d88 100644 --- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -453,8 +453,8 @@ private: template void get_verify( const SingleRoleModel &model, QQmlDelegateModel *visualModel, - QQmlDataGroup *visibleItems, - QQmlDataGroup *selectedItems, + QQmlDelegateModelGroup *visibleItems, + QQmlDelegateModelGroup *selectedItems, const int (&mIndex)[N], const int (&iIndex)[N], const int (&vIndex)[N], @@ -1713,10 +1713,10 @@ void tst_qquickvisualdatamodel::groups() QQmlDelegateModel *visualModel = listview->findChild("visualModel"); QVERIFY(visualModel); - QQmlDataGroup *visibleItems = listview->findChild("visibleItems"); + QQmlDelegateModelGroup *visibleItems = listview->findChild("visibleItems"); QVERIFY(visibleItems); - QQmlDataGroup *selectedItems = listview->findChild("selectedItems"); + QQmlDelegateModelGroup *selectedItems = listview->findChild("selectedItems"); QVERIFY(selectedItems); const bool f = false; @@ -1940,8 +1940,8 @@ void tst_qquickvisualdatamodel::groups() template void tst_qquickvisualdatamodel::get_verify( const SingleRoleModel &model, QQmlDelegateModel *visualModel, - QQmlDataGroup *visibleItems, - QQmlDataGroup *selectedItems, + QQmlDelegateModelGroup *visibleItems, + QQmlDelegateModelGroup *selectedItems, const int (&mIndex)[N], const int (&iIndex)[N], const int (&vIndex)[N], @@ -2033,10 +2033,10 @@ void tst_qquickvisualdatamodel::get() QQmlDelegateModel *visualModel = qobject_cast(qvariant_cast(listview->model())); QVERIFY(visualModel); - QQmlDataGroup *visibleItems = visualModel->findChild("visibleItems"); + QQmlDelegateModelGroup *visibleItems = visualModel->findChild("visibleItems"); QVERIFY(visibleItems); - QQmlDataGroup *selectedItems = visualModel->findChild("selectedItems"); + QQmlDelegateModelGroup *selectedItems = visualModel->findChild("selectedItems"); QVERIFY(selectedItems); QV8Engine *v8Engine = QQmlEnginePrivate::getV8Engine(ctxt->engine()); @@ -2154,7 +2154,7 @@ void tst_qquickvisualdatamodel::get() void tst_qquickvisualdatamodel::invalidGroups() { QUrl source = testFileUrl("groups-invalid.qml"); - QTest::ignoreMessage(QtWarningMsg, (source.toString() + ":12:9: QML VisualDataGroup: " + QQmlDataGroup::tr("Group names must start with a lower case letter")).toUtf8()); + QTest::ignoreMessage(QtWarningMsg, (source.toString() + ":12:9: QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("Group names must start with a lower case letter")).toUtf8()); QQmlComponent component(&engine, source); QScopedPointer object(component.create()); @@ -3665,67 +3665,67 @@ void tst_qquickvisualdatamodel::warnings_data() QTest::newRow("insert < 0") << testFileUrl("listmodelproperties.qml") << QString("items.insert(-2, {\"number\": \"eight\"})") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("insert: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("insert: index out of range")) << 4; QTest::newRow("insert > length") << testFileUrl("listmodelproperties.qml") << QString("items.insert(8, {\"number\": \"eight\"})") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("insert: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("insert: index out of range")) << 4; QTest::newRow("create < 0") << testFileUrl("listmodelproperties.qml") << QString("items.create(-2, {\"number\": \"eight\"})") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("create: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("create: index out of range")) << 4; QTest::newRow("create > length") << testFileUrl("listmodelproperties.qml") << QString("items.create(8, {\"number\": \"eight\"})") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("create: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("create: index out of range")) << 4; QTest::newRow("resolve from < 0") << testFileUrl("listmodelproperties.qml") << QString("items.resolve(-2, 3)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: from index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("resolve: from index out of range")) << 4; QTest::newRow("resolve from > length") << testFileUrl("listmodelproperties.qml") << QString("items.resolve(8, 3)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: from index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("resolve: from index out of range")) << 4; QTest::newRow("resolve to < 0") << testFileUrl("listmodelproperties.qml") << QString("items.resolve(3, -2)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: to index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("resolve: to index out of range")) << 4; QTest::newRow("resolve to > length") << testFileUrl("listmodelproperties.qml") << QString("items.resolve(3, 8)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: to index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("resolve: to index out of range")) << 4; QTest::newRow("resolve from invalid index") << testFileUrl("listmodelproperties.qml") << QString("items.resolve(\"two\", 3)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: from index invalid")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("resolve: from index invalid")) << 4; QTest::newRow("resolve to invalid index") << testFileUrl("listmodelproperties.qml") << QString("items.resolve(3, \"two\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: to index invalid")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("resolve: to index invalid")) << 4; QTest::newRow("resolve already resolved item") << testFileUrl("listmodelproperties.qml") << QString("items.resolve(3, 2)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: from is not an unresolved item")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("resolve: from is not an unresolved item")) << 4; QTest::newRow("resolve already resolved item") @@ -3733,193 +3733,193 @@ void tst_qquickvisualdatamodel::warnings_data() << QString("{ items.insert(0, {\"number\": \"eight\"});" "items.insert(1, {\"number\": \"seven\"});" "items.resolve(0, 1)}") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: to is not a model item")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("resolve: to is not a model item")) << 6; QTest::newRow("remove index < 0") << testFileUrl("listmodelproperties.qml") << QString("items.remove(-2, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("remove: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("remove: index out of range")) << 4; QTest::newRow("remove index == length") << testFileUrl("listmodelproperties.qml") << QString("items.remove(4, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("remove: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("remove: index out of range")) << 4; QTest::newRow("remove index > length") << testFileUrl("listmodelproperties.qml") << QString("items.remove(9, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("remove: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("remove: index out of range")) << 4; QTest::newRow("remove invalid index") << testFileUrl("listmodelproperties.qml") << QString("items.remove(\"nine\", 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("remove: invalid index")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("remove: invalid index")) << 4; QTest::newRow("remove count < 0") << testFileUrl("listmodelproperties.qml") << QString("items.remove(1, -2)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("remove: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("remove: invalid count")) << 4; QTest::newRow("remove index + count > length") << testFileUrl("listmodelproperties.qml") << QString("items.remove(2, 4, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("remove: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("remove: invalid count")) << 4; QTest::newRow("addGroups index < 0") << testFileUrl("listmodelproperties.qml") << QString("items.addGroups(-2, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("addGroups: index out of range")) << 4; QTest::newRow("addGroups index == length") << testFileUrl("listmodelproperties.qml") << QString("items.addGroups(4, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("addGroups: index out of range")) << 4; QTest::newRow("addGroups index > length") << testFileUrl("listmodelproperties.qml") << QString("items.addGroups(9, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("addGroups: index out of range")) << 4; QTest::newRow("addGroups count < 0") << testFileUrl("listmodelproperties.qml") << QString("items.addGroups(1, -2, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("addGroups: invalid count")) << 4; QTest::newRow("addGroups index + count > length") << testFileUrl("listmodelproperties.qml") << QString("items.addGroups(2, 4, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("addGroups: invalid count")) << 4; QTest::newRow("removeGroups index < 0") << testFileUrl("listmodelproperties.qml") << QString("items.removeGroups(-2, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("removeGroups: index out of range")) << 4; QTest::newRow("removeGroups index == length") << testFileUrl("listmodelproperties.qml") << QString("items.removeGroups(4, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("removeGroups: index out of range")) << 4; QTest::newRow("removeGroups index > length") << testFileUrl("listmodelproperties.qml") << QString("items.removeGroups(9, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("removeGroups: index out of range")) << 4; QTest::newRow("removeGroups count < 0") << testFileUrl("listmodelproperties.qml") << QString("items.removeGroups(1, -2, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("removeGroups: invalid count")) << 4; QTest::newRow("removeGroups index + count > length") << testFileUrl("listmodelproperties.qml") << QString("items.removeGroups(2, 4, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("removeGroups: invalid count")) << 4; QTest::newRow("setGroups index < 0") << testFileUrl("listmodelproperties.qml") << QString("items.setGroups(-2, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("setGroups: index out of range")) << 4; QTest::newRow("setGroups index == length") << testFileUrl("listmodelproperties.qml") << QString("items.setGroups(4, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("setGroups: index out of range")) << 4; QTest::newRow("setGroups index > length") << testFileUrl("listmodelproperties.qml") << QString("items.setGroups(9, 1, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("setGroups: index out of range")) << 4; QTest::newRow("setGroups count < 0") << testFileUrl("listmodelproperties.qml") << QString("items.setGroups(1, -2, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("setGroups: invalid count")) << 4; QTest::newRow("setGroups index + count > length") << testFileUrl("listmodelproperties.qml") << QString("items.setGroups(2, 4, \"selected\")") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("setGroups: invalid count")) << 4; QTest::newRow("move from < 0") << testFileUrl("listmodelproperties.qml") << QString("items.move(-2, 1, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: from index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: from index out of range")) << 4; QTest::newRow("move from == length") << testFileUrl("listmodelproperties.qml") << QString("items.move(4, 1, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: from index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: from index out of range")) << 4; QTest::newRow("move from > length") << testFileUrl("listmodelproperties.qml") << QString("items.move(9, 1, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: from index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: from index out of range")) << 4; QTest::newRow("move invalid from") << testFileUrl("listmodelproperties.qml") << QString("items.move(\"nine\", 1, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: invalid from index")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: invalid from index")) << 4; QTest::newRow("move to < 0") << testFileUrl("listmodelproperties.qml") << QString("items.move(1, -2, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: to index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: to index out of range")) << 4; QTest::newRow("move to == length") << testFileUrl("listmodelproperties.qml") << QString("items.move(1, 4, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: to index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: to index out of range")) << 4; QTest::newRow("move to > length") << testFileUrl("listmodelproperties.qml") << QString("items.move(1, 9, 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: to index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: to index out of range")) << 4; QTest::newRow("move invalid to") << testFileUrl("listmodelproperties.qml") << QString("items.move(1, \"nine\", 1)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: invalid to index")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: invalid to index")) << 4; QTest::newRow("move count < 0") << testFileUrl("listmodelproperties.qml") << QString("items.move(1, 1, -2)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: invalid count")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: invalid count")) << 4; QTest::newRow("move from + count > length") << testFileUrl("listmodelproperties.qml") << QString("items.move(2, 1, 4)") - << (": QML VisualDataGroup: " + QQmlDataGroup::tr("move: from index out of range")) + << (": QML VisualDataGroup: " + QQmlDelegateModelGroup::tr("move: from index out of range")) << 4; } -- cgit v1.2.3