summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-08-15 08:44:09 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-08-15 13:40:31 (GMT)
commit77b161ad441627958d671877843f33a7fad06ddd (patch)
tree320254facde6db0700460d4df92000def71516bd
parent9622b544ad4186ff0d69a0424ed027a0d960b00f (diff)
downloadQt-77b161ad441627958d671877843f33a7fad06ddd.zip
Qt-77b161ad441627958d671877843f33a7fad06ddd.tar.gz
Qt-77b161ad441627958d671877843f33a7fad06ddd.tar.bz2
test: Re-enable tst_QGraphicsEffect test.
The test has four stable failures. Mark these with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26858 Change-Id: I278baa8179f1be83b6d6f620393fcaea92a5bf2f Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
-rw-r--r--tests/auto/qgraphicseffect/qgraphicseffect.pro2
-rw-r--r--tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp22
2 files changed, 22 insertions, 2 deletions
diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/qgraphicseffect/qgraphicseffect.pro
index f35809c..9e734fb 100644
--- a/tests/auto/qgraphicseffect/qgraphicseffect.pro
+++ b/tests/auto/qgraphicseffect/qgraphicseffect.pro
@@ -4,5 +4,3 @@ TARGET = tst_qgraphicseffect
QT += testlib
SOURCES += tst_qgraphicseffect.cpp
CONFIG += parallel_test
-
-CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index 6f5d471..5ee945e 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -53,6 +53,8 @@
#include <private/qgraphicseffect_p.h>
#include "../platformquirks.h"
+#include <QSysInfo>
+
//TESTED_CLASS=
//TESTED_FILES=
@@ -690,6 +692,11 @@ void tst_QGraphicsEffect::childrenVisibilityShouldInvalidateCache()
view.show();
QApplication::setActiveWindow(&view);
QTest::qWaitForWindowShown(&view);
+#ifdef Q_OS_MAC
+ if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) {
+ QEXPECT_FAIL("", "QTBUG-26858", Abort);
+ }
+#endif
QTRY_COMPARE(parent.nbPaint, 1);
//we set an effect on the parent
parent.setGraphicsEffect(new QGraphicsDropShadowEffect(&parent));
@@ -718,6 +725,11 @@ void tst_QGraphicsEffect::prepareGeometryChangeInvalidateCache()
else
view.show();
QTest::qWaitForWindowShown(&view);
+#ifdef Q_OS_MAC
+ if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) {
+ QEXPECT_FAIL("", "QTBUG-26858", Abort);
+ }
+#endif
QTRY_COMPARE(item->nbPaint, 1);
item->nbPaint = 0;
@@ -802,6 +814,11 @@ void tst_QGraphicsEffect::graphicsEffectUpdateShouldInvalidateParentGraphicsEffe
QTest::qWaitForWindowShown(&view);
//flush the events
QApplication::processEvents();
+#ifdef Q_OS_MAC
+ if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) {
+ QEXPECT_FAIL("", "QTBUG-26858", Abort);
+ }
+#endif
QTRY_COMPARE(parent.nbPaint, 1);
QTRY_COMPARE(child.nbPaint, 1);
@@ -842,6 +859,11 @@ void tst_QGraphicsEffect::itemHasNoContents()
QGraphicsView view(&scene);
view.show();
QTest::qWaitForWindowShown(&view);
+#ifdef Q_OS_MAC
+ if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) {
+ QEXPECT_FAIL("", "QTBUG-26858", Abort);
+ }
+#endif
QTRY_COMPARE(child->nbPaint, 1);
CustomEffect *effect = new CustomEffect;