summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-01-17 09:58:50 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-20 08:50:09 +0100
commite6a538a3ed713262a6438c437301721095544360 (patch)
tree8a7602e7425403dab18e85a3bf89ba0e3f0bcab1
parent0d125002406c7cc3b97369f74b0cf5e00e5671d0 (diff)
Expect tooltip related test failures on Mac OS X
Mark test failures related to tool tips with QEXPECT_FAIL(). See QTBUG-23707 for description of the failures. Change-Id: I753256d1db748cef41cf1898620647c4cbacc472 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp3
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp3
-rw-r--r--tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp9
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 28ee69a36c..792f2e5094 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -1069,6 +1069,9 @@ void tst_QGraphicsItem::toolTip()
foundTipLabel = true;
}
QVERIFY(foundView);
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-23707", Continue);
+#endif
QVERIFY(foundTipLabel);
}
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 4cd32a9186..6537c6e9e3 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -2640,6 +2640,9 @@ void tst_QGraphicsProxyWidget::tooltip_basic()
foundTipLabel = true;
}
QVERIFY(foundView);
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-23707", Continue);
+#endif
QVERIFY(foundTipLabel);
}
}
diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
index d8b0666880..dfdff51e6f 100644
--- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
+++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
@@ -116,6 +116,9 @@ void tst_QToolTip::task183679()
widget.showDelayedToolTip(100);
QTest::qWait(300);
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-23707", Continue);
+#endif
QTRY_VERIFY(QToolTip::isVisible());
QTest::keyPress(&widget, key);
@@ -125,6 +128,12 @@ void tst_QToolTip::task183679()
// auto-close timeout (currently 10000 msecs)
QTest::qWait(1500);
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("Shift", "QTBUG-23707", Continue);
+ QEXPECT_FAIL("Control", "QTBUG-23707", Continue);
+ QEXPECT_FAIL("Alt", "QTBUG-23707", Continue);
+ QEXPECT_FAIL("Meta", "QTBUG-23707", Continue);
+#endif
QCOMPARE(QToolTip::isVisible(), visible);
}