AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer QSKIP to QTEST_NOOP_MAIN.

Browse Source 
Use QSKIP instead of QTEST_NOOP_MAIN so that the user receives a clear
indication that this test won't be testing anything until it gets fixed
for Qt5.

Change-Id: I4fa73883f58d8d4a533a7c21ecd4dd5b3c55b174
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-10-17 16:39:59 +10:00 committed by Qt by Nokia
parent cd7623c19f
commit 604619fc38
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/auto/qwindowsurface/tst_qwindowsurface.cpp
View File

@ -44,30 +44,37 @@
#include <QPainter>
#include <QPalette>
#include <QWindowsStyle>
#if QT_VERSION < 0x050000 // Fixme Qt 5
#include <private/qwindowsurface_p.h>
#include <QDesktopWidget>
#include <QX11Info>
#include "../../shared/util.h"
#if QT_VERSION < 0x050000
#include <private/qwindowsurface_p.h>
#endif
class tst_QWindowSurface : public QObject
{
Q_OBJECT
public:
tst_QWindowSurface() {}
~tst_QWindowSurface() {}
#if QT_VERSION >= 0x050000
public slots:
void initTestCase();
#else
private slots:
void getSetWindowSurface();
void flushOutsidePaintEvent();
void grabWidget();
#endif
};
#if QT_VERSION >= 0x050000
void tst_QWindowSurface::initTestCase()
{
QSKIP("This test is temporarily skipped until it is fixed for Qt5", SkipAll);
}
#else
class MyWindowSurface : public QWindowSurface
{
public:
@ -281,13 +288,7 @@ void tst_QWindowSurface::grabWidget()
QVERIFY(QColor(childInvalidSubImage.pixel(0, 0)) == QColor(Qt::white));
}
QTEST_MAIN(tst_QWindowSurface)
#else
// Temporarily skip the entire test until it is fixed for Qt5
QTEST_NOOP_MAIN
#endif
QTEST_MAIN(tst_QWindowSurface)
#include "tst_qwindowsurface.moc"