diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-12-06 12:29:09 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-06 04:17:36 +0100 |
commit | 80ccf0b29624f837c1846c21551498f99726b764 (patch) | |
tree | 48f4d99cba9bbe7429c26fc987c02ad6e8930f7c | |
parent | 73240c8433dcbaac001a0c6148d3aef69ee4ee63 (diff) |
Ignore expected warnings in Item and PathView tests
Change-Id: I05ebebbfe7f6b107068e9feaf66c03fd3ae71237
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp | 16 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp | 7 |
2 files changed, 23 insertions, 0 deletions
diff --git a/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp b/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp index f04b9bac36..959710e0db 100644 --- a/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp @@ -1156,6 +1156,11 @@ void tst_QQuickItem::childrenRect() void tst_QQuickItem::childrenRectBug() { QQuickView *canvas = new QQuickView(0); + + QString warning = QUrl::fromLocalFile(TESTDATA("childrenRectBug.qml")).toString() + ":7:5: QML Item: Binding loop detected for property \"height\""; + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); + canvas->setSource(QUrl::fromLocalFile(TESTDATA("childrenRectBug.qml"))); canvas->show(); @@ -1172,6 +1177,17 @@ void tst_QQuickItem::childrenRectBug() void tst_QQuickItem::childrenRectBug2() { QQuickView *canvas = new QQuickView(0); + + QString warning1 = QUrl::fromLocalFile(TESTDATA("childrenRectBug2.qml")).toString() + ":7:5: QML Item: Binding loop detected for property \"width\""; + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); + + QString warning2 = QUrl::fromLocalFile(TESTDATA("childrenRectBug2.qml")).toString() + ":7:5: QML Item: Binding loop detected for property \"height\""; + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); + canvas->setSource(QUrl::fromLocalFile(TESTDATA("childrenRectBug2.qml"))); canvas->show(); diff --git a/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp index 2f1d836c72..133769fc2a 100644 --- a/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp @@ -1294,6 +1294,13 @@ void tst_QQuickPathView::visualDataModel() void tst_QQuickPathView::undefinedPath() { QDeclarativeEngine engine; + + QString warning1("QPainterPath::moveTo: Adding point where x or y is NaN or Inf, ignoring call"); + QTest::ignoreMessage(QtWarningMsg,qPrintable(warning1)); + + QString warning2("QPainterPath::lineTo: Adding point where x or y is NaN or Inf, ignoring call"); + QTest::ignoreMessage(QtWarningMsg,qPrintable(warning2)); + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("undefinedpath.qml"))); QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create()); |