qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve and fix tst_customization 

- Don't collect multiple object names for the same object. It was
  confusing that the "override" tests contained both "label-override"
  and "label-simple", for instance.
- If creation fails, output the error as part of the FAIL message.
- Verify that the QML files actually contain correct types. One of
  the RadioButton tests was accidentally running with a CheckBox.

Change-Id: Ide56eed84b5625652321bfe4ef5e32fcf6f45438
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
J-P Nurmi 2017-12-14 11:16:13 +01:00
parent af0abc24e3
commit 04337fae37
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/customization/data/styles/incomplete/RadioButton.qml
View File

@ -51,7 +51,7 @@
import QtQuick 2.9
import QtQuick.Templates 2.2 as T
T.CheckBox {
T.RadioButton {
id: control
objectName: "radiobutton-incomplete"

54
tests/auto/customization/tst_customization.cpp
View File

@ -64,11 +64,13 @@ private:
void addHooks();
void removeHooks();
QObject* createControl(const QString &type);
QObject* createControl(const QString &type, QString *error);
QQmlEngine *engine = nullptr;
};
typedef QHash<QObject *, QString> QObjectNameHash;
Q_GLOBAL_STATIC(QObjectNameHash, qt_objectNames)
Q_GLOBAL_STATIC(QStringList, qt_createdQObjects)
Q_GLOBAL_STATIC(QStringList, qt_destroyedQObjects)
@ -76,8 +78,13 @@ extern "C" Q_DECL_EXPORT void qt_addQObject(QObject *object)
{
// objectName is not set at construction time
QObject::connect(object, &QObject::objectNameChanged, [object](const QString &objectName) {
if (!objectName.isEmpty())
QString oldObjectName = qt_objectNames()->value(object);
if (!oldObjectName.isEmpty())
qt_createdQObjects()->removeOne(oldObjectName);
if (!objectName.isEmpty()) {
qt_createdQObjects()->append(objectName);
qt_objectNames()->insert(object, objectName);
}
});
}
@ -86,6 +93,7 @@ extern "C" Q_DECL_EXPORT void qt_removeQObject(QObject *object)
QString objectName = object->objectName();
if (!objectName.isEmpty())
qt_destroyedQObjects()->append(objectName);
qt_objectNames()->remove(object);
}
void tst_customization::init()
@ -115,13 +123,13 @@ void tst_customization::reset()
qt_destroyedQObjects()->clear();
}
QObject* tst_customization::createControl(const QString &name)
QObject* tst_customization::createControl(const QString &name, QString *error)
{
QQmlComponent component(engine);
component.setData("import QtQuick.Controls 2.2; " + name.toUtf8() + " { }", QUrl());
QObject *obj = component.create();
if (!obj)
qDebug() << component.errorString();
*error = component.errorString();
return obj;
}
@ -175,21 +183,21 @@ void tst_customization::creation_data()
QTest::newRow("simple:ToolBar") << "simple" << "ToolBar" << (QStringList() << "toolbar-simple" << "toolbar-background-simple");
// the "override" style overrides various delegates in the above styles
QTest::newRow("override:ApplicationWindow") << "override" << "ApplicationWindow" << (QStringList() << "applicationwindow-override" << "applicationwindow-background-override" << "applicationwindow-simple"); // overrides "simple"
QTest::newRow("override:Button") << "override" << "Button" << (QStringList() << "button-override" << "button-background-override" << "button-contentItem-override" << "button-empty"); // overrides "empty"
QTest::newRow("override:CheckBox") << "override" << "CheckBox" << (QStringList() << "checkbox-override" << "checkbox-background-override" << "checkbox-contentItem-incomplete" << "checkbox-incomplete"); // overrides "incomplete"
QTest::newRow("override:ComboBox") << "override" << "ComboBox" << (QStringList() << "combobox-override" << "combobox-background-override" << "combobox-contentItem-simple" << "combobox-indicator-simple" << "combobox-simple"); // overrides "simple"
QTest::newRow("override:Dial") << "override" << "Dial" << (QStringList() << "dial-override" << "dial-background-override" << "dial-handle-override" << "dial-incomplete"); // overrides "incomplete"
QTest::newRow("override:Frame") << "override" << "Frame" << (QStringList() << "frame-override" << "frame-background-override" << "frame-simple"); // overrides "simple"
QTest::newRow("override:GroupBox") << "override" << "GroupBox" << (QStringList() << "groupbox-override" << "groupbox-background-override" << "groupbox-simple"); // overrides "simple"
QTest::newRow("override:Label") << "override" << "Label" << (QStringList() << "label-override" << "label-background-override" << "label-simple"); // overrides "simple"
QTest::newRow("override:Pane") << "override" << "Pane" << (QStringList() << "pane-override" << "pane-background-override" << "pane-simple"); // overrides "simple"
QTest::newRow("override:RadioButton") << "override" << "RadioButton" << (QStringList() << "radiobutton-override" << "radiobutton-background-override" << "radiobutton-contentItem-simple" << "radiobutton-indicator-override" << "radiobutton-simple"); // overrides "simple"
QTest::newRow("override:RangeSlider") << "override" << "RangeSlider" << (QStringList() << "rangeslider-override" << "rangeslider-background-override" << "rangeslider-first-handle-override" << "rangeslider-second-handle-override" << "rangeslider-incomplete"); // overrides "incomplete"
QTest::newRow("override:Slider") << "override" << "Slider" << (QStringList() << "slider-override" << "slider-background-override" << "slider-handle-override" << "slider-incomplete"); // overrides "incomplete"
QTest::newRow("override:TextField") << "override" << "TextField" << (QStringList() << "textfield-override" << "textfield-background-override" << "textfield-simple"); // overrides "simple"
QTest::newRow("override:TextArea") << "override" << "TextArea" << (QStringList() << "textarea-override" << "textarea-background-override" << "textarea-simple"); // overrides "simple"
QTest::newRow("override:ToolBar") << "override" << "ToolBar" << (QStringList() << "toolbar-override" << "toolbar-background-override" << "toolbar-simple"); // overrides "simple"
QTest::newRow("override:ApplicationWindow") << "override" << "ApplicationWindow" << (QStringList() << "applicationwindow-override" << "applicationwindow-background-override");
QTest::newRow("override:Button") << "override" << "Button" << (QStringList() << "button-override" << "button-background-override" << "button-contentItem-override");
QTest::newRow("override:CheckBox") << "override" << "CheckBox" << (QStringList() << "checkbox-override" << "checkbox-background-override" << "checkbox-contentItem-incomplete");
QTest::newRow("override:ComboBox") << "override" << "ComboBox" << (QStringList() << "combobox-override" << "combobox-background-override" << "combobox-contentItem-simple" << "combobox-indicator-simple");
QTest::newRow("override:Dial") << "override" << "Dial" << (QStringList() << "dial-override" << "dial-background-override" << "dial-handle-override");
QTest::newRow("override:Frame") << "override" << "Frame" << (QStringList() << "frame-override" << "frame-background-override");
QTest::newRow("override:GroupBox") << "override" << "GroupBox" << (QStringList() << "groupbox-override" << "groupbox-background-override");
QTest::newRow("override:Label") << "override" << "Label" << (QStringList() << "label-override" << "label-background-override");
QTest::newRow("override:Pane") << "override" << "Pane" << (QStringList() << "pane-override" << "pane-background-override");
QTest::newRow("override:RadioButton") << "override" << "RadioButton" << (QStringList() << "radiobutton-override" << "radiobutton-background-override" << "radiobutton-contentItem-simple" << "radiobutton-indicator-override");
QTest::newRow("override:RangeSlider") << "override" << "RangeSlider" << (QStringList() << "rangeslider-override" << "rangeslider-background-override" << "rangeslider-first-handle-override" << "rangeslider-second-handle-override");
QTest::newRow("override:Slider") << "override" << "Slider" << (QStringList() << "slider-override" << "slider-background-override" << "slider-handle-override");
QTest::newRow("override:TextField") << "override" << "TextField" << (QStringList() << "textfield-override" << "textfield-background-override");
QTest::newRow("override:TextArea") << "override" << "TextArea" << (QStringList() << "textarea-override" << "textarea-background-override");
QTest::newRow("override:ToolBar") << "override" << "ToolBar" << (QStringList() << "toolbar-override" << "toolbar-background-override");
}
void tst_customization::creation()
@ -200,8 +208,12 @@ void tst_customization::creation()
QQuickStyle::setStyle(testFile("styles/" + style));
QScopedPointer<QObject> control(createControl(type));
QVERIFY(control);
QString error;
QScopedPointer<QObject> control(createControl(type, &error));
QVERIFY2(control, qPrintable(error));
QByteArray templateType = "QQuick" + type.toUtf8();
QVERIFY2(control->inherits(templateType), qPrintable(type + " does not inherit " + templateType + " (" + control->metaObject()->className() + ")"));
for (const QString &delegate : delegates)
QVERIFY2(qt_createdQObjects()->removeOne(delegate), qPrintable(delegate + " was not created as expected"));