diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2012-06-07 13:21:56 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 15:40:13 +0200 |
commit | 7e4d6efadf71d6c8ec5d06cdffcee117f01c6160 (patch) | |
tree | d9168983007b7b6619735c0a9d5dda6e40ed947e /tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp | |
parent | e883fa03efad4384f030cec5f13c22346356e3bf (diff) |
Allow setting horizontal and vertical tile modes in sci files
It was still using the old 'tileRule' name.
Also make sci file parser less strict with h/v tile mode values.
Task-number: QTBUG-26022
Change-Id: I41b7571b42a0fb9bd2cfab8ce2e76e57addabefd
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp')
-rw-r--r-- | tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp index 173f230203..c6c3f6cbd6 100644 --- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp @@ -79,6 +79,8 @@ private slots: void sciSource(); void sciSource_data(); void invalidSciFile(); + void validSciFiles_data(); + void validSciFiles(); void pendingRemoteRequest(); void pendingRemoteRequest_data(); @@ -342,6 +344,33 @@ void tst_qquickborderimage::invalidSciFile() delete obj; } +void tst_qquickborderimage::validSciFiles_data() +{ + QTest::addColumn<QString>("source"); + + QTest::newRow("valid1") << testFileUrl("valid1.sci").toString(); + QTest::newRow("valid2") << testFileUrl("valid2.sci").toString(); + QTest::newRow("valid3") << testFileUrl("valid3.sci").toString(); + QTest::newRow("valid4") << testFileUrl("valid4.sci").toString(); +} + +void tst_qquickborderimage::validSciFiles() +{ + QFETCH(QString, source); + + QString componentStr = "import QtQuick 2.0\nBorderImage { source: \"" + source +"\"; width: 300; height: 300 }"; + QQmlComponent component(&engine); + component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); + QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create()); + QVERIFY(obj != 0); + QCOMPARE(obj->width(), 300.); + QCOMPARE(obj->height(), 300.); + QCOMPARE(obj->horizontalTileMode(), QQuickBorderImage::Round); + QCOMPARE(obj->verticalTileMode(), QQuickBorderImage::Repeat); + + delete obj; +} + void tst_qquickborderimage::pendingRemoteRequest() { QFETCH(QString, source); |