From 58ac4658c17ae120856235bd23727564cd4f67e2 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 11 Apr 2012 20:08:29 +0200 Subject: test: Re-enabling tst_QScrollBar::task_209492() on Mac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This test has been XPASS'ing since a long time now. Change-Id: Ibfcd1b5078e0b8efed9ed0740a4238d24ef8ca33 Reviewed-by: Rohan McGovern Reviewed-by: Morten Johan Sørvig Reviewed-by: Bradley T. Hughes --- tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp') diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp index 688daf1f8a..ec48c2b680 100644 --- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp @@ -136,9 +136,6 @@ void tst_QScrollBar::task_209492() QApplication::sendEvent(verticalScrollBar, &mouseReleaseEvent); // Check that the action was triggered once. -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "Fix does does not work on Mac due to paint architechure differences.", Abort); -#endif QCOMPARE(scrollArea.scrollCount, 1); QCOMPARE(spy.count(), 1); } -- cgit v1.2.3 From 87548de2ef2313f628d1ddf10ae0cebea74838b2 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 12 Apr 2012 12:23:46 +0200 Subject: test: Don't mark tst_qscrollbar as insignificant on Mac OS X Just XFAIL the failing test instead of ignoring the whole test. Task-number: QTBUG-25272 Change-Id: Iedca9913032f13c6610b049a0313c9e4336216e0 Reviewed-by: Bradley T. Hughes --- tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp') diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp index ec48c2b680..f568322ab7 100644 --- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp @@ -99,6 +99,9 @@ void tst_QScrollBar::scrollSingleStep() QTest::mouseClick(testWidget, Qt::LeftButton, Qt::NoModifier, QPoint(sr.x(), sr.y())); QTest::qWait(510); // initial delay is 500 for setRepeatAction disconnect(testWidget, SIGNAL(actionTriggered(int)), 0, 0); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "This test fails on Mac OS X, see QTBUG-25272", Abort); +#endif QCOMPARE(testWidget->value(), testWidget->singleStep()); } -- cgit v1.2.3