summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-19 12:53:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-21 01:20:29 +0200
commit27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch)
tree3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/widgets/kernel
parent016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff)
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/widgets/kernel')
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp2
-rw-r--r--tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp4
-rw-r--r--tests/auto/widgets/kernel/qsound/tst_qsound.cpp4
-rw-r--r--tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp2
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp25
5 files changed, 18 insertions, 19 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index c37dfc609e..80c1bdb202 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -339,7 +339,7 @@ void tst_QApplication::nonGui()
{
#ifdef Q_OS_HPUX
// ### This is only to allow us to generate a test report for now.
- QSKIP("This test shuts down the window manager on HP-UX.", SkipAll);
+ QSKIP("This test shuts down the window manager on HP-UX.");
#endif
int argc = 0;
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index 100b7eb892..11f0cfc7fb 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -724,7 +724,7 @@ void tst_QGridLayout::spacingsAndMargins()
QSize minimumsize = vbox.totalMinimumSize();
if (topsize.width() < minimumsize.width() || topsize.height() < minimumsize.height())
- QSKIP("The screen is too small to run this test case", SkipSingle);
+ QSKIP("The screen is too small to run this test case");
// We are relying on the order here...
for (int pi = 0; pi < sizehinters.count(); ++pi) {
@@ -869,7 +869,7 @@ void tst_QGridLayout::minMaxSize()
}else{
style = QStyleFactory::create(stylename);
if (!style) {
- QSKIP( qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename)), SkipSingle);
+ QSKIP( qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename)));
}
}
QApplication::setStyle(style);
diff --git a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp
index 7450549f47..1b8907b1be 100644
--- a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp
+++ b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp
@@ -60,7 +60,7 @@ private slots:
void tst_QSound::checkFinished()
{
#if defined(Q_WS_QPA)
- QSKIP("QSound is not implemented on Lighthouse", SkipAll);
+ QSKIP("QSound is not implemented on Lighthouse");
#else
QSound sound(SRCDIR"4.wav");
sound.setLoops(3);
@@ -76,7 +76,7 @@ void tst_QSound::checkFinished()
void tst_QSound::staticPlay()
{
- QSKIP("Test disabled -- only for manual purposes", SkipAll);
+ QSKIP("Test disabled -- only for manual purposes");
#if !defined(Q_WS_QPA)
// Check that you hear sound with static play also.
QSound::play(SRCDIR"4.wav");
diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
index de734877d7..66a8fe24a8 100644
--- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
@@ -291,7 +291,7 @@ void tst_QStackedLayout::removeWidget()
if (QApplication::focusWidget() == top)
break;
else if (i >= 5)
- QSKIP("Can't get focus", SkipSingle);
+ QSKIP("Can't get focus");
QTest::qWait(100);
++i;
}
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index ded0c5e061..e92389ff62 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -108,7 +108,7 @@ static HWND winHandleOf(const QWidget *w)
# if !defined(Q_OS_WINCE)
#define Q_CHECK_PAINTEVENTS \
if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \
- QSKIP("desktop is not visible, this test would fail", SkipSingle);
+ QSKIP("desktop is not visible, this test would fail");
# else
# define Q_CHECK_PAINTEVENTS
# endif
@@ -2407,7 +2407,7 @@ void tst_QWidget::hideWhenFocusWidgetIsChild()
QString actualFocusWidget, expectedFocusWidget;
#ifdef Q_WS_X11
if (!qApp->focusWidget())
- QSKIP("Your window manager is too broken for this test", SkipAll);
+ QSKIP("Your window manager is too broken for this test");
#endif
QVERIFY(qApp->focusWidget());
actualFocusWidget.sprintf("%p %s %s", qApp->focusWidget(), qApp->focusWidget()->objectName().toLatin1().constData(), qApp->focusWidget()->metaObject()->className());
@@ -2551,7 +2551,7 @@ void tst_QWidget::setGeometry()
tlw.show();
QTest::qWait(50);
if (tlw.frameGeometry() != tlw.geometry())
- QSKIP("Your window manager is too broken for this test", SkipAll);
+ QSKIP("Your window manager is too broken for this test");
QCOMPARE(tlw.geometry(), tr);
}
@@ -2689,7 +2689,7 @@ void tst_QWidget::raise()
#ifdef Q_OS_MAC
if (child1->internalWinId()) {
- QSKIP("Cocoa has no Z-Order for views, we hack it, but it results in paint events.", SkipAll);
+ QSKIP("Cocoa has no Z-Order for views, we hack it, but it results in paint events.");
}
#endif
@@ -2718,7 +2718,7 @@ void tst_QWidget::raise()
int expectedPaintEvents = child == child2 ? 1 : 0;
int expectedZOrderChangeEvents = child == child2 ? 1 : 0;
#ifdef Q_OS_MAC
- QSKIP("Not yet sure why this fails.", SkipSingle);
+ QSKIP("Not yet sure why this fails.");
#endif
QTRY_COMPARE(child->numPaintEvents, expectedPaintEvents);
QCOMPARE(child->numZOrderChangeEvents, expectedZOrderChangeEvents);
@@ -3766,7 +3766,7 @@ void tst_QWidget::optimizedResizeMove()
void tst_QWidget::optimizedResize_topLevel()
{
#if defined(Q_WS_MAC) || defined(Q_WS_QWS)
- QSKIP("We do not yet have static contents support for *top-levels* on this platform", SkipAll);
+ QSKIP("We do not yet have static contents support for *top-levels* on this platform");
#endif
StaticWidget topLevel;
@@ -3835,7 +3835,7 @@ void tst_QWidget::childDeletesItsSibling()
do { \
QSize safeSize(qt_screen->width() - 250, qt_screen->height() - 250); \
if (!safeSize.isValid()) \
- QSKIP("Screen size too small", SkipAll); \
+ QSKIP("Screen size too small"); \
if (defaultSize.width() > safeSize.width() || defaultSize.height() > safeSize.height()) { \
defaultSize = safeSize; \
w.resize(defaultSize); \
@@ -6575,9 +6575,8 @@ void tst_QWidget::render_windowOpacity()
QPixmap expected(child.size());
#ifdef Q_WS_X11
- if (expected.depth() < 24) {
- QSKIP("This test won't give correct results with dithered pixmaps", SkipAll);
- }
+ if (expected.depth() < 24)
+ QSKIP("This test won't give correct results with dithered pixmaps");
#endif
expected.fill(Qt::green);
QPainter painter(&expected);
@@ -7661,7 +7660,7 @@ void tst_QWidget::sendUpdateRequestImmediately()
{
#ifdef Q_WS_MAC
if (!QApplicationPrivate::graphicsSystem())
- QSKIP("We only send update requests on the Mac when passing -graphicssystem", SkipAll);
+ QSKIP("We only send update requests on the Mac when passing -graphicssystem");
#endif
UpdateWidget updateWidget;
@@ -7687,7 +7686,7 @@ void tst_QWidget::doubleRepaint()
{
#if defined(Q_WS_MAC)
if (!macHasAccessToWindowsServer())
- QSKIP("Not having window server access causes the wrong number of repaints to be issues", SkipAll);
+ QSKIP("Not having window server access causes the wrong number of repaints to be issues");
#endif
UpdateWidget widget;
widget.setFocusPolicy(Qt::StrongFocus);
@@ -9035,7 +9034,7 @@ void tst_QWidget::inputFocus_task257832()
QLineEdit *widget = new QLineEdit;
QInputContext *context = widget->inputContext();
if (!context)
- QSKIP("No input context", SkipSingle);
+ QSKIP("No input context");
widget->setFocus();
widget->winId(); // make sure, widget has been created
context->setFocusWidget(widget);