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

Tests: Remove empty init/cleanup slots, constructors and destructors.

Browse Source 
Move some code (like registrations of meta types) from init() to
initTestCase() in the process.

Change-Id: I57db5156647cfadab554fbed853b2e68b2815f3b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-12-03 16:59:30 +01:00
parent 872b9b231e
commit 1289bc8172
96 changed files with 92 additions and 1811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/corelib/json/tst_qtjson.cpp
View File

@ -46,14 +46,9 @@
class tst_QtJson: public QObject
{
Q_OBJECT
public:
tst_QtJson(QObject *parent = 0);
private Q_SLOTS:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
void testValueSimple();
void testNumbers();
@ -151,10 +146,6 @@ private:
QString testDataDir;
};
tst_QtJson::tst_QtJson(QObject *parent) : QObject(parent)
{
}
void tst_QtJson::initTestCase()
{
testDataDir = QFileInfo(QFINDTESTDATA("test.json")).absolutePath();
@ -162,18 +153,6 @@ void tst_QtJson::initTestCase()
testDataDir = QCoreApplication::applicationDirPath();
}
void tst_QtJson::cleanupTestCase()
{
}
void tst_QtJson::init()
{
}
void tst_QtJson::cleanup()
{
}
void tst_QtJson::testValueSimple()
{
QJsonObject object;

24
tests/auto/corelib/tools/collections/tst_collections.cpp
View File

@ -96,13 +96,6 @@ class tst_Collections : public QObject
{
Q_OBJECT
public:
tst_Collections();
~tst_Collections();
public slots:
void init();
void cleanup();
private slots:
void typeinfo();
void qstring();
@ -174,23 +167,6 @@ struct Pod {
int i1, i2;
};
tst_Collections::tst_Collections()
{
}
tst_Collections::~tst_Collections()
{
}
void tst_Collections::init()
{
}
void tst_Collections::cleanup()
{
}
void tst_Collections::typeinfo()
{
QVERIFY(QTypeInfo<int*>::isPointer);

5
tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp
View File

@ -96,7 +96,6 @@ public Q_SLOTS:
void callbackInAnotherAuxThread_thread();
private Q_SLOTS:
void initTestCase();
void dyingThread();
void lastInstanceInOtherThread();
void concurrentCreation();
@ -236,10 +235,6 @@ void tst_QDBusThreading::cleanup()
QTest::qWait(500);
}
void tst_QDBusThreading::initTestCase()
{
}
void tst_QDBusThreading::dyingThread_thread()
{
QDBusConnection::connectToBus(QDBusConnection::SessionBus, myConnectionName);

36
tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
View File

@ -38,17 +38,8 @@ class tst_QIcoImageFormat : public QObject
{
Q_OBJECT
public:
tst_QIcoImageFormat();
virtual ~tst_QIcoImageFormat();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void format();
void canRead_data();
void canRead();
@ -69,26 +60,6 @@ private:
QString m_IconPath;
};
tst_QIcoImageFormat::tst_QIcoImageFormat()
{
}
tst_QIcoImageFormat::~tst_QIcoImageFormat()
{
}
void tst_QIcoImageFormat::init()
{
}
void tst_QIcoImageFormat::cleanup()
{
}
void tst_QIcoImageFormat::initTestCase()
{
m_IconPath = QFINDTESTDATA("icons");
@ -96,11 +67,6 @@ void tst_QIcoImageFormat::initTestCase()
QFAIL("Cannot find icons directory containing testdata!");
}
void tst_QIcoImageFormat::cleanupTestCase()
{
}
void tst_QIcoImageFormat::format()
{
{

15
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
View File

@ -61,13 +61,10 @@ class tst_QImageWriter : public QObject
Q_OBJECT
public:
tst_QImageWriter();
virtual ~tst_QImageWriter();
public slots:
void init();
void initTestCase();
void cleanup();
private slots:
void getSetCheck();
@ -163,10 +160,6 @@ void tst_QImageWriter::getSetCheck()
QCOMPARE(1.1f, obj1.gamma());
}
tst_QImageWriter::tst_QImageWriter()
{
}
tst_QImageWriter::~tst_QImageWriter()
{
QDir dir(prefix);
@ -177,14 +170,6 @@ tst_QImageWriter::~tst_QImageWriter()
}
void tst_QImageWriter::init()
{
}
void tst_QImageWriter::cleanup()
{
}
void tst_QImageWriter::writeImage_data()
{
QTest::addColumn<QString>("fileName");

16
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
View File

@ -64,12 +64,8 @@ class tst_QPixmap : public QObject
public:
tst_QPixmap();
virtual ~tst_QPixmap();
public slots:
void init();
void cleanup();
void initTestCase();
void cleanupTestCase();
@ -212,18 +208,6 @@ tst_QPixmap::tst_QPixmap()
{
}
tst_QPixmap::~tst_QPixmap()
{
}
void tst_QPixmap::init()
{
}
void tst_QPixmap::cleanup()
{
}
void tst_QPixmap::initTestCase()
{
QVERIFY(!m_prefix.isEmpty());

24
tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
View File

@ -40,14 +40,6 @@ class tst_QStandardItem : public QObject
{
Q_OBJECT
public:
tst_QStandardItem();
virtual ~tst_QStandardItem();
public slots:
void init();
void cleanup();
private slots:
void ctor();
void textCtor();
@ -84,22 +76,6 @@ private slots:
void lessThan();
};
tst_QStandardItem::tst_QStandardItem()
{
}
tst_QStandardItem::~tst_QStandardItem()
{
}
void tst_QStandardItem::init()
{
}
void tst_QStandardItem::cleanup()
{
}
void tst_QStandardItem::ctor()
{
QStandardItem item;

10
tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
View File

@ -44,7 +44,6 @@ class tst_QStandardItemModel : public QObject
public:
tst_QStandardItemModel();
virtual ~tst_QStandardItemModel();
enum ModelChanged {
RowsAboutToBeInserted,
@ -151,10 +150,8 @@ Q_DECLARE_METATYPE(Qt::Orientation)
tst_QStandardItemModel::tst_QStandardItemModel() : m_model(0), rcParent(8), rcFirst(8,0), rcLast(8,0)
{
}
tst_QStandardItemModel::~tst_QStandardItemModel()
{
qRegisterMetaType<QStandardItem*>("QStandardItem*");
qRegisterMetaType<Qt::Orientation>("Qt::Orientation");
}
/*
@ -169,9 +166,6 @@ tst_QStandardItemModel::~tst_QStandardItemModel()
*/
void tst_QStandardItemModel::init()
{
qRegisterMetaType<QStandardItem*>("QStandardItem*");
qRegisterMetaType<Qt::Orientation>("Qt::Orientation");
m_model = new QStandardItemModel(defaultSize, defaultSize);
connect(m_model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int)));

10
tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp
View File

@ -44,20 +44,10 @@ class tst_NoQtEventLoop : public QObject
Q_OBJECT
private slots:
void initTestCase();
void cleanup();
void consumeMouseEvents();
};
void tst_NoQtEventLoop::initTestCase()
{
}
void tst_NoQtEventLoop::cleanup()
{
}
class Window : public QWindow
{
public:

21
tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
View File

@ -75,16 +75,10 @@ class tst_QMouseEvent : public QObject
{
Q_OBJECT
public:
tst_QMouseEvent();
virtual ~tst_QMouseEvent();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void checkMousePressEvent_data();
void checkMousePressEvent();
@ -95,17 +89,6 @@ private:
MouseEventWidget* testMouseWidget;
};
tst_QMouseEvent::tst_QMouseEvent()
{
}
tst_QMouseEvent::~tst_QMouseEvent()
{
}
void tst_QMouseEvent::initTestCase()
{
testMouseWidget = new MouseEventWidget(0);
@ -129,10 +112,6 @@ void tst_QMouseEvent::init()
testMouseWidget->mouseReleaseModifiers = 0;
}
void tst_QMouseEvent::cleanup()
{
}
void tst_QMouseEvent::checkMousePressEvent_data()
{
QTest::addColumn<int>("buttonPressed");

26
tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
View File

@ -51,17 +51,9 @@ class tst_qmouseevent_modal : public QObject
{
Q_OBJECT
public:
tst_qmouseevent_modal();
virtual ~tst_qmouseevent_modal();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void mousePressRelease();
private:
@ -97,14 +89,6 @@ private:
int c;
};
tst_qmouseevent_modal::tst_qmouseevent_modal()
{
}
tst_qmouseevent_modal::~tst_qmouseevent_modal()
{
}
void tst_qmouseevent_modal::initTestCase()
{
w = new TstWidget;
@ -117,14 +101,6 @@ void tst_qmouseevent_modal::cleanupTestCase()
w = 0;
}
void tst_qmouseevent_modal::init()
{
}
void tst_qmouseevent_modal::cleanup()
{
}
/*
Test for task 22500
*/

19
tests/auto/gui/painting/qpainter/tst_qpainter.cpp
View File

@ -81,14 +81,9 @@ Q_OBJECT
public:
tst_QPainter();
virtual ~tst_QPainter();
public slots:
void init();
void cleanup();
void cleanupTestCase();
private slots:
void cleanupTestCase();
void getSetCheck();
#ifndef QT_NO_WIDGETS
void drawPixmap_comp_data();
@ -392,18 +387,6 @@ tst_QPainter::tst_QPainter()
QGuiApplication::setDesktopSettingsAware(true);
}
tst_QPainter::~tst_QPainter()
{
}
void tst_QPainter::init()
{
}
void tst_QPainter::cleanup()
{
}
void tst_QPainter::cleanupTestCase()
{
QFile::remove(QLatin1String("dest.png"));

26
tests/auto/gui/painting/qtransform/tst_qtransform.cpp
View File

@ -43,14 +43,6 @@ class tst_QTransform : public QObject
{
Q_OBJECT
public:
tst_QTransform();
virtual ~tst_QTransform();
public slots:
void init();
void cleanup();
private slots:
void mapRect_data();
void mapToPolygon_data();
@ -80,24 +72,6 @@ private:
Q_DECLARE_METATYPE(QTransform)
tst_QTransform::tst_QTransform()
{
}
tst_QTransform::~tst_QTransform()
{
}
void tst_QTransform::init()
{
// No initialisation is required
}
void tst_QTransform::cleanup()
{
// No cleanup is required.
}
#if defined(Q_OS_WIN) && !defined(M_PI)
#define M_PI 3.14159265897932384626433832795f
#endif

27
tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
View File

@ -42,14 +42,6 @@ class tst_QWMatrix : public QObject
{
Q_OBJECT
public:
tst_QWMatrix();
virtual ~tst_QWMatrix();
public slots:
void init();
void cleanup();
private slots:
void mapRect_data();
void mapToPolygon_data();
@ -65,25 +57,6 @@ private:
void mapping_data();
};
tst_QWMatrix::tst_QWMatrix()
{
}
tst_QWMatrix::~tst_QWMatrix()
{
}
void tst_QWMatrix::init()
{
// No initialisation is required
}
void tst_QWMatrix::cleanup()
{
// No cleanup is required.
}
void tst_QWMatrix::mapRect_data()
{
mapping_data();

28
tests/auto/gui/text/qfont/tst_qfont.cpp
View File

@ -50,13 +50,6 @@ class tst_QFont : public QObject
{
Q_OBJECT
public:
tst_QFont();
virtual ~tst_QFont();
public slots:
void init();
void cleanup();
private slots:
void getSetCheck();
void exactMatch();
@ -115,27 +108,6 @@ void tst_QFont::getSetCheck()
QCOMPARE(QFont::StyleStrategy(QFont::OpenGLCompatible), obj1.styleStrategy());
}
tst_QFont::tst_QFont()
{
}
tst_QFont::~tst_QFont()
{
}
void tst_QFont::init()
{
// TODO: Add initialization code here.
// This will be executed immediately before each test is run.
}
void tst_QFont::cleanup()
{
// TODO: Add cleanup code here.
// This will be executed immediately after each test is run.
}
void tst_QFont::exactMatch()
{
QFont font;

23
tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
View File

@ -46,13 +46,9 @@ Q_OBJECT
public:
tst_QFontDatabase();
virtual ~tst_QFontDatabase();
public slots:
void initTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void styles_data();
void styles();
@ -82,28 +78,11 @@ tst_QFontDatabase::tst_QFontDatabase()
{
}
tst_QFontDatabase::~tst_QFontDatabase()
{
}
void tst_QFontDatabase::initTestCase()
{
QVERIFY(!m_testFont.isEmpty());
}
void tst_QFontDatabase::init()
{
// TODO: Add initialization code here.
// This will be executed immediately before each test is run.
}
void tst_QFontDatabase::cleanup()
{
// TODO: Add cleanup code here.
// This will be executed immediately after each test is run.
}
void tst_QFontDatabase::styles_data()
{
QTest::addColumn<QString>("font");

25
tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
View File

@ -44,13 +44,6 @@ class tst_QFontMetrics : public QObject
{
Q_OBJECT
public:
tst_QFontMetrics();
virtual ~tst_QFontMetrics();
public slots:
void init();
void cleanup();
private slots:
void same();
void metrics();
@ -68,24 +61,6 @@ private slots:
void leadingBelowLine();
};
tst_QFontMetrics::tst_QFontMetrics()
{
}
tst_QFontMetrics::~tst_QFontMetrics()
{
}
void tst_QFontMetrics::init()
{
}
void tst_QFontMetrics::cleanup()
{
}
void tst_QFontMetrics::same()
{
QFont font;

35
tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
View File

@ -43,18 +43,22 @@
// #define DEBUG_SAVE_IMAGE
static inline QImage blankSquare()
{
// a "blank" square; we compare against in our testfunctions to verify
// that we have actually painted something
QPixmap pm(1000, 1000);
pm.fill(Qt::white);
return pm.toImage();
}
class tst_QStaticText: public QObject
{
Q_OBJECT
public:
tst_QStaticText() {}
tst_QStaticText() : m_whiteSquare(blankSquare()) {}
private slots:
void initTestCase();
void init();
void cleanup();
void constructionAndDestruction();
void drawToPoint_data();
void drawToPoint();
@ -96,28 +100,11 @@ private slots:
private:
bool supportsTransformations() const;
QImage const m_whiteSquare;
const QImage m_whiteSquare;
};
Q_DECLARE_METATYPE(QImage::Format);
void tst_QStaticText::initTestCase()
{
// a "blank" square; we compare against in our testfunctions to verify
// that we have actually painted something
QPixmap pm(1000, 1000);
pm.fill(Qt::white);
const_cast<QImage&>(m_whiteSquare) = pm.toImage();
}
void tst_QStaticText::init()
{
}
void tst_QStaticText::cleanup()
{
}
void tst_QStaticText::constructionAndDestruction()
{
QStaticText text("My text");

8
tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
View File

@ -69,14 +69,10 @@ public:
class tst_QSyntaxHighlighter : public QObject
{
Q_OBJECT
public:
inline tst_QSyntaxHighlighter() {}
public slots:
void init();
void cleanup();
private slots:
void init();
void cleanup();
void basic();
void basicTwo();
void removeFormatsOnDelete();

10
tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
View File

@ -48,14 +48,9 @@ class tst_QTextBlock : public QObject
{
Q_OBJECT
public:
tst_QTextBlock();
public slots:
private slots:
void init();
void cleanup();
private slots:
void fragmentOverBlockBoundaries();
void excludeParagraphSeparatorFragment();
void backwardsBlockIterator();
@ -67,9 +62,6 @@ private:
QTextCursor cursor;
};
tst_QTextBlock::tst_QTextBlock()
{}
void tst_QTextBlock::init()
{
doc = new QTextDocument;

11
tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
View File

@ -51,14 +51,9 @@ class tst_QTextCursor : public QObject
{
Q_OBJECT
public:
tst_QTextCursor();
public slots:
private slots:
void init();
void cleanup();
private slots:
void navigation1();
void navigation2_data();
void navigation2();
@ -154,10 +149,6 @@ private:
QTextCursor cursor;
};
tst_QTextCursor::tst_QTextCursor()
{}
void tst_QTextCursor::init()
{
doc = new QTextDocument;

8
tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
View File

@ -64,13 +64,11 @@ class tst_QTextDocument : public QObject
public:
tst_QTextDocument();
virtual ~tst_QTextDocument();
public slots:
private slots:
void init();
void cleanup();
void cleanupTestCase();
private slots:
void getSetCheck();
void isEmpty();
void find_data();
@ -247,10 +245,6 @@ tst_QTextDocument::tst_QTextDocument()
img.save("foo.png");
}
tst_QTextDocument::~tst_QTextDocument()
{
}
void tst_QTextDocument::init()
{
doc = new QTextDocument;

7
tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
View File

@ -47,16 +47,11 @@
class tst_QTextDocumentLayout : public QObject
{
Q_OBJECT
public:
inline tst_QTextDocumentLayout() {}
virtual ~tst_QTextDocumentLayout() {}
public slots:
private slots:
void init();
void cleanup();
void cleanupTestCase();
private slots:
void defaultPageSizeHandling();
void idealWidth();
void lineSeparatorFollowingTable();

9
tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
View File

@ -59,13 +59,10 @@ class tst_QTextLayout : public QObject
public:
tst_QTextLayout();
virtual ~tst_QTextLayout();
public slots:
private slots:
void init();
void cleanup();
private slots:
void getSetCheck();
void lineBreaking();
#ifdef QT_BUILD_INTERNAL
@ -199,10 +196,6 @@ tst_QTextLayout::tst_QTextLayout()
#endif
}
tst_QTextLayout::~tst_QTextLayout()
{
}
void tst_QTextLayout::init()
{
testFont = QFont();

10
tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
View File

@ -45,14 +45,9 @@ class tst_QTextList : public QObject
{
Q_OBJECT
public:
tst_QTextList();
public slots:
private slots:
void init();
void cleanup();
private slots:
void item();
void autoNumbering();
void autoNumberingRTL();
@ -78,9 +73,6 @@ private:
QTestDocumentLayout *layout;
};
tst_QTextList::tst_QTextList()
{}
void tst_QTextList::init()
{
doc = new QTextDocument();

19
tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
View File

@ -44,14 +44,9 @@ class tst_QTextScriptEngine : public QObject
public:
tst_QTextScriptEngine();
virtual ~tst_QTextScriptEngine();
public slots:
void initTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void devanagari_data();
void devanagari();
void bengali_data();
@ -97,10 +92,6 @@ tst_QTextScriptEngine::tst_QTextScriptEngine()
{
}
tst_QTextScriptEngine::~tst_QTextScriptEngine()
{
}
void tst_QTextScriptEngine::initTestCase()
{
if (!haveTestFonts) {
@ -114,14 +105,6 @@ void tst_QTextScriptEngine::initTestCase()
}
}
void tst_QTextScriptEngine::init()
{
}
void tst_QTextScriptEngine::cleanup()
{
}
struct ShapeTable {
unsigned short unicode[16];
unsigned short glyphs[16];

10
tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
View File

@ -58,14 +58,9 @@ class tst_QTextTable : public QObject
{
Q_OBJECT
public:
tst_QTextTable();
public slots:
private slots:
void init();
void cleanup();
private slots:
void cursorPositioning();
void variousTableModifications();
void tableShrinking();
@ -115,9 +110,6 @@ private:
QTextCursor cursor;
};
tst_QTextTable::tst_QTextTable()
{}
void tst_QTextTable::init()
{
doc = new QTextDocument;

22
tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
View File

@ -41,34 +41,12 @@ class tst_qdesktopservices : public QObject
{
Q_OBJECT
public:
tst_qdesktopservices();
virtual ~tst_qdesktopservices();
private slots:
void init();
void cleanup();
void openUrl();
void handlers();
void testDataLocation();
};
tst_qdesktopservices::tst_qdesktopservices()
{
}
tst_qdesktopservices::~tst_qdesktopservices()
{
}
void tst_qdesktopservices::init()
{
}
void tst_qdesktopservices::cleanup()
{
}
void tst_qdesktopservices::openUrl()
{
// At the bare minimum check that they return false for invalid url's

27
tests/auto/gui/util/qregexpvalidator/tst_qregexpvalidator.cpp
View File

@ -42,38 +42,11 @@ class tst_QRegExpValidator : public QObject
{
Q_OBJECT
public:
tst_QRegExpValidator();
virtual ~tst_QRegExpValidator();
// I can think of no other way to do this for the moment
enum State { Invalid=0, Intermediate=1, Acceptable=2 };
public slots:
void init();
void cleanup();
private slots:
void validate_data();
void validate();
};
tst_QRegExpValidator::tst_QRegExpValidator()
{
}
tst_QRegExpValidator::~tst_QRegExpValidator()
{
}
void tst_QRegExpValidator::init()
{
}
void tst_QRegExpValidator::cleanup()
{
}
void tst_QRegExpValidator::validate_data()
{

9
tests/auto/network/access/qftp/tst_qftp.cpp
View File

@ -63,16 +63,13 @@ class tst_QFtp : public QObject
public:
tst_QFtp();
virtual ~tst_QFtp();
public slots:
private slots:
void initTestCase_data();
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void connectToHost_data();
void connectToHost();
void connectToUnresponsiveHost();
@ -187,10 +184,6 @@ tst_QFtp::tst_QFtp() :
{
}
tst_QFtp::~tst_QFtp()
{
}
void tst_QFtp::initTestCase_data()
{
QTest::addColumn<bool>("setProxy");

23
tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
View File

@ -44,9 +44,6 @@ class tst_QHttpNetworkConnection: public QObject
{
Q_OBJECT
public:
tst_QHttpNetworkConnection();
public Q_SLOTS:
void finishedReply();
void finishedWithError(QNetworkReply::NetworkError errorCode, const QString &detail);
@ -60,11 +57,7 @@ private:
QNetworkReply::NetworkError netErrorCode;
private Q_SLOTS:
void init();
void cleanup();
void initTestCase();
void cleanupTestCase();
void options_data();
void options();
void get_data();
@ -111,27 +104,11 @@ private Q_SLOTS:
void overlappingCloseAndWrite();
};
tst_QHttpNetworkConnection::tst_QHttpNetworkConnection()
{
}
void tst_QHttpNetworkConnection::initTestCase()
{
QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
}
void tst_QHttpNetworkConnection::cleanupTestCase()
{
}
void tst_QHttpNetworkConnection::init()
{
}
void tst_QHttpNetworkConnection::cleanup()
{
}
void tst_QHttpNetworkConnection::options_data()
{
// not tested yet

22
tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
View File

@ -39,32 +39,10 @@ class tst_QHttpNetworkReply: public QObject
{
Q_OBJECT
private Q_SLOTS:
void init();
void cleanup();
void initTestCase();
void cleanupTestCase();
void parseHeader_data();
void parseHeader();
};
void tst_QHttpNetworkReply::initTestCase()
{
}
void tst_QHttpNetworkReply::cleanupTestCase()
{
}
void tst_QHttpNetworkReply::init()
{
}
void tst_QHttpNetworkReply::cleanup()
{
}
void tst_QHttpNetworkReply::parseHeader_data()
{
QTest::addColumn<QByteArray>("headers");

28
tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
View File

@ -41,12 +41,6 @@ class tst_QNetworkCacheMetaData : public QObject
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void qnetworkcachemetadata_data();
void qnetworkcachemetadata();
@ -76,28 +70,6 @@ class SubQNetworkCacheMetaData : public QNetworkCacheMetaData
{
public:};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QNetworkCacheMetaData::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QNetworkCacheMetaData::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QNetworkCacheMetaData::init()
{
}
// This will be called after every test function.
void tst_QNetworkCacheMetaData::cleanup()
{
}
void tst_QNetworkCacheMetaData::qnetworkcachemetadata_data()
{
}

16
tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
View File

@ -50,14 +50,12 @@ public:
tst_QNetworkDiskCache();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
void accessAfterRemoveReadyReadSlot();
void setCookieHeaderMetaDataChangedSlot();
private slots:
void initTestCase();
void cleanupTestCase();
void qnetworkdiskcache_data();
void qnetworkdiskcache();
@ -202,16 +200,6 @@ void tst_QNetworkDiskCache::cleanupTestCase()
workingDir.removeRecursively();
}
// This will be called before each test function is executed.
void tst_QNetworkDiskCache::init()
{
}
// This will be called after every test function.
void tst_QNetworkDiskCache::cleanup()
{
}
void tst_QNetworkDiskCache::qnetworkdiskcache_data()
{
}

20
tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
View File

@ -57,12 +57,7 @@ class tst_QHostAddress : public QObject
public:
tst_QHostAddress();
virtual ~tst_QHostAddress();
public slots:
void init();
void cleanup();
private slots:
void constructor_QString_data();
void constructor_QString();
@ -89,26 +84,13 @@ private slots:
void convertv4v6();
};
tst_QHostAddress::tst_QHostAddress()
{
}
tst_QHostAddress::~tst_QHostAddress()
{
}
Q_DECLARE_METATYPE(QHostAddress)
void tst_QHostAddress::init()
tst_QHostAddress::tst_QHostAddress()
{
qRegisterMetaType<QHostAddress>("QHostAddress");
}
void tst_QHostAddress::cleanup()
{
// No cleanup is required.
}
void tst_QHostAddress::constructor_QString_data()
{
setAddress_QString_data();

24
tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
View File

@ -92,17 +92,9 @@ class tst_QHostInfo : public QObject
{
Q_OBJECT
public:
tst_QHostInfo();
virtual ~tst_QHostInfo();
public slots:
void init();
void cleanup();
void initTestCase();
private slots:
void init();
void initTestCase();
void getSetCheck();
void staticInformation();
void lookupIPv4_data();
@ -169,14 +161,6 @@ void tst_QHostInfo::staticInformation()
qDebug() << "Domain name:" << QHostInfo::localDomainName();
}
tst_QHostInfo::tst_QHostInfo()
{
}
tst_QHostInfo::~tst_QHostInfo()
{
}
void tst_QHostInfo::initTestCase()
{
QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
@ -237,10 +221,6 @@ void tst_QHostInfo::init()
qt_qhostinfo_enable_cache(cache);
}
void tst_QHostInfo::cleanup()
{
}
void tst_QHostInfo::lookupIPv4_data()
{
QTest::addColumn<QString>("hostname");

26
tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
View File

@ -70,16 +70,8 @@ class tst_PlatformSocketEngine : public QObject
{
Q_OBJECT
public:
tst_PlatformSocketEngine();
virtual ~tst_PlatformSocketEngine();
public slots:
void initTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void construction();
void simpleConnectToIMAP();
void udpLoopbackTest();
@ -99,27 +91,11 @@ private slots:
void tooManySockets();
};
tst_PlatformSocketEngine::tst_PlatformSocketEngine()
{
}
tst_PlatformSocketEngine::~tst_PlatformSocketEngine()
{
}
void tst_PlatformSocketEngine::initTestCase()
{
QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
}
void tst_PlatformSocketEngine::init()
{
}
void tst_PlatformSocketEngine::cleanup()
{
}
//---------------------------------------------------------------------------
void tst_PlatformSocketEngine::construction()
{

21
tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
View File

@ -51,16 +51,9 @@ class tst_QHttpSocketEngine : public QObject
{
Q_OBJECT
public:
tst_QHttpSocketEngine();
virtual ~tst_QHttpSocketEngine();
public slots:
private slots:
void initTestCase();
void init();
void cleanup();
private slots:
void construction();
void errorTest_data();
void errorTest();
@ -131,14 +124,6 @@ public slots:
}
};
tst_QHttpSocketEngine::tst_QHttpSocketEngine()
{
}
tst_QHttpSocketEngine::~tst_QHttpSocketEngine()
{
}
void tst_QHttpSocketEngine::initTestCase()
{
QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
@ -150,10 +135,6 @@ void tst_QHttpSocketEngine::init()
bytesAvailable = 0;
}
void tst_QHttpSocketEngine::cleanup()
{
}
//---------------------------------------------------------------------------
void tst_QHttpSocketEngine::construction()
{

11
tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
View File

@ -54,9 +54,8 @@ class tst_QLocalSocket : public QObject
{
Q_OBJECT
public Q_SLOTS:
void init();
void cleanup();
public:
tst_QLocalSocket();
private slots:
// basics
@ -116,7 +115,7 @@ private slots:
};
void tst_QLocalSocket::init()
tst_QLocalSocket::tst_QLocalSocket()
{
qRegisterMetaType<QLocalSocket::LocalSocketState>("QLocalSocket::LocalSocketState");
qRegisterMetaType<QLocalSocket::LocalSocketError>("QLocalSocket::LocalSocketError");
@ -124,10 +123,6 @@ void tst_QLocalSocket::init()
qRegisterMetaType<QFile::Permissions>("QFile::Permissions");
}
void tst_QLocalSocket::cleanup()
{
}
class LocalServer : public QLocalServer
{
Q_OBJECT

21
tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
View File

@ -57,16 +57,9 @@ class tst_QSocks5SocketEngine : public QObject, public QAbstractSocketEngineRece
{
Q_OBJECT
public:
tst_QSocks5SocketEngine();
virtual ~tst_QSocks5SocketEngine();
public slots:
private slots:
void initTestCase();
void init();
void cleanup();
private slots:
void construction();
void errorTest_data();
void errorTest();
@ -160,14 +153,6 @@ private slots:
}
};
tst_QSocks5SocketEngine::tst_QSocks5SocketEngine()
{
}
tst_QSocks5SocketEngine::~tst_QSocks5SocketEngine()
{
}
void tst_QSocks5SocketEngine::initTestCase()
{
QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
@ -179,10 +164,6 @@ void tst_QSocks5SocketEngine::init()
bytesAvailable = 0;
}
void tst_QSocks5SocketEngine::cleanup()
{
}
//---------------------------------------------------------------------------
void tst_QSocks5SocketEngine::construction()
{

16
tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
View File

@ -70,17 +70,11 @@ class tst_QTcpServer : public QObject
{
Q_OBJECT
public:
tst_QTcpServer();
virtual ~tst_QTcpServer();
public slots:
private slots:
void initTestCase_data();
void initTestCase();
void init();
void cleanup();
private slots:
void getSetCheck();
void constructing();
void clientServerLoop();
@ -138,14 +132,6 @@ void tst_QTcpServer::getSetCheck()
QCOMPARE(INT_MAX, obj1.maxPendingConnections());
}
tst_QTcpServer::tst_QTcpServer()
{
}
tst_QTcpServer::~tst_QTcpServer()
{
}
void tst_QTcpServer::initTestCase_data()
{
QTest::addColumn<bool>("setProxy");

6
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
View File

@ -94,7 +94,6 @@ class tst_QTcpSocket : public QObject
public:
tst_QTcpSocket();
virtual ~tst_QTcpSocket();
static void enterLoop(int secs)
{
@ -322,11 +321,6 @@ tst_QTcpSocket::tst_QTcpSocket()
firstFailInfo.setAddresses(QList<QHostAddress>() << QHostAddress("224.0.0.0") << QtNetworkSettings::serverIP());
}
tst_QTcpSocket::~tst_QTcpSocket()
{
}
void tst_QTcpSocket::initTestCase_data()
{
QTest::addColumn<bool>("setProxy");

16
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
View File

@ -63,17 +63,11 @@ class tst_QUdpSocket : public QObject
{
Q_OBJECT
public:
tst_QUdpSocket();
virtual ~tst_QUdpSocket();
public slots:
private slots:
void initTestCase_data();
void initTestCase();
void init();
void cleanup();
private slots:
void constructing();
void unconnectedServerAndClientTest();
void broadcasting();
@ -144,14 +138,6 @@ static QHostAddress makeNonAny(const QHostAddress &address, QHostAddress::Specia
return address;
}
tst_QUdpSocket::tst_QUdpSocket()
{
}
tst_QUdpSocket::~tst_QUdpSocket()
{
}
void tst_QUdpSocket::initTestCase_data()
{
// hack: we only enable the Socks5 over UDP tests on the old

32
tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp
View File

@ -42,44 +42,14 @@ class tst_QSslCipher : public QObject
{
Q_OBJECT
public:
tst_QSslCipher();
virtual ~tst_QSslCipher();
public slots:
void initTestCase_data();
void init();
void cleanup();
#ifndef QT_NO_SSL
private slots:
void constructing();
#endif
#endif // QT_NO_SSL
};
tst_QSslCipher::tst_QSslCipher()
{
}
tst_QSslCipher::~tst_QSslCipher()
{
}
void tst_QSslCipher::initTestCase_data()
{
}
void tst_QSslCipher::init()
{
}
void tst_QSslCipher::cleanup()
{
}
#ifndef QT_NO_SSL
void tst_QSslCipher::constructing()

5
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -102,7 +102,6 @@ class tst_QSslSocket : public QObject
public:
tst_QSslSocket();
virtual ~tst_QSslSocket();
static void enterLoop(int secs)
{
@ -290,10 +289,6 @@ tst_QSslSocket::tst_QSslSocket()
#endif
}
tst_QSslSocket::~tst_QSslSocket()
{
}
enum ProxyTests {
NoProxy = 0x00,
Socks5Proxy = 0x01,

10
tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
View File

@ -57,8 +57,6 @@ class tst_QSslSocket_onDemandCertificates_member : public QObject
int proxyAuthCalled;
public:
tst_QSslSocket_onDemandCertificates_member();
virtual ~tst_QSslSocket_onDemandCertificates_member();
#ifndef QT_NO_OPENSSL
QSslSocketPtr newSocket();
@ -80,14 +78,6 @@ private:
#endif // QT_NO_OPENSSL
};
tst_QSslSocket_onDemandCertificates_member::tst_QSslSocket_onDemandCertificates_member()
{
}
tst_QSslSocket_onDemandCertificates_member::~tst_QSslSocket_onDemandCertificates_member()
{
}
enum ProxyTests {
NoProxy = 0x00,
Socks5Proxy = 0x01,

10
tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
View File

@ -53,8 +53,6 @@ class tst_QSslSocket_onDemandCertificates_static : public QObject
int proxyAuthCalled;
public:
tst_QSslSocket_onDemandCertificates_static();
virtual ~tst_QSslSocket_onDemandCertificates_static();
#ifndef QT_NO_OPENSSL
QSslSocketPtr newSocket();
@ -76,14 +74,6 @@ private:
#endif // QT_NO_OPENSSL
};
tst_QSslSocket_onDemandCertificates_static::tst_QSslSocket_onDemandCertificates_static()
{
}
tst_QSslSocket_onDemandCertificates_static::~tst_QSslSocket_onDemandCertificates_static()
{
}
enum ProxyTests {
NoProxy = 0x00,
Socks5Proxy = 0x01,

26
tests/auto/other/gestures/tst_gestures.cpp
View File

@ -309,17 +309,9 @@ class tst_Gestures : public QObject
{
Q_OBJECT
public:
tst_Gestures();
virtual ~tst_Gestures();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void customGesture();
void autoCancelingGestures();
void gestureOverChild();
@ -355,14 +347,6 @@ private slots:
void bug_13501_gesture_not_accepted();
};
tst_Gestures::tst_Gestures()
{
}
tst_Gestures::~tst_Gestures()
{
}
void tst_Gestures::initTestCase()
{
CustomGesture::GestureType = QGestureRecognizer::registerRecognizer(new CustomGestureRecognizer);
@ -375,14 +359,6 @@ void tst_Gestures::cleanupTestCase()
QGestureRecognizer::unregisterRecognizer(CustomGesture::GestureType);
}
void tst_Gestures::init()
{
}
void tst_Gestures::cleanup()
{
}
void tst_Gestures::customGesture()
{
GestureWidget widget;

28
tests/auto/other/modeltest/tst_modeltest.cpp
View File

@ -44,16 +44,6 @@ class tst_ModelTest : public QObject
{
Q_OBJECT
public:
tst_ModelTest() {}
virtual ~tst_ModelTest() {}
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void stringListModel();
void treeWidgetModel();
@ -63,24 +53,6 @@ private slots:
void testResetThroughProxy();
};
void tst_ModelTest::initTestCase()
{
}
void tst_ModelTest::cleanupTestCase()
{
}
void tst_ModelTest::init()
{
}
void tst_ModelTest::cleanup()
{
}
/*
tests
*/

5
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -205,7 +205,6 @@ class tst_QAccessibility : public QObject
Q_OBJECT
public:
tst_QAccessibility();
virtual ~tst_QAccessibility();
public slots:
void initTestCase();
@ -286,10 +285,6 @@ tst_QAccessibility::tst_QAccessibility()
click_count = 0;
}
tst_QAccessibility::~tst_QAccessibility()
{
}
void tst_QAccessibility::onClicked()
{
click_count++;

29
tests/auto/other/qcomplextext/tst_qcomplextext.cpp
View File

@ -41,14 +41,6 @@ class tst_QComplexText : public QObject
{
Q_OBJECT
public:
tst_QComplexText();
virtual ~tst_QComplexText();
public slots:
void init();
void cleanup();
private slots:
void bidiReorderString_data();
void bidiReorderString();
@ -62,27 +54,6 @@ private slots:
void bidiInvalidCursorNoMovement();
};
tst_QComplexText::tst_QComplexText()
{
}
tst_QComplexText::~tst_QComplexText()
{
}
void tst_QComplexText::init()
{
// This will be executed immediately before each test is run.
// TODO: Add initialization code here.
}
void tst_QComplexText::cleanup()
{
// This will be executed immediately after each test is run.
// TODO: Add cleanup code here.
}
void tst_QComplexText::bidiReorderString_data()
{
QTest::addColumn<QString>("logical");

21
tests/auto/other/qfocusevent/tst_qfocusevent.cpp
View File

@ -81,18 +81,12 @@ class tst_QFocusEvent : public QObject
Q_OBJECT
public:
tst_QFocusEvent();
virtual ~tst_QFocusEvent();
void initWidget();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void checkReason_Tab();
void checkReason_ShiftTab();
void checkReason_BackTab();
@ -107,15 +101,6 @@ private:
FocusLineEdit* childFocusWidgetTwo;
};
tst_QFocusEvent::tst_QFocusEvent()
{
}
tst_QFocusEvent::~tst_QFocusEvent()
{
}
void tst_QFocusEvent::initTestCase()
{
testFocusWidget = new QWidget( 0 );
@ -139,10 +124,6 @@ void tst_QFocusEvent::cleanupTestCase()
delete testFocusWidget;
}
void tst_QFocusEvent::init()
{
}
void tst_QFocusEvent::cleanup()
{
childFocusWidgetTwo->setGeometry( 10, 50, 180, 20 );

24
tests/auto/tools/qmake/tst_qmake.cpp
View File

@ -51,16 +51,9 @@ class tst_qmake : public QObject
{
Q_OBJECT
public:
tst_qmake();
virtual ~tst_qmake();
public slots:
void initTestCase();
void cleanupTestCase();
void cleanup();
private slots:
void initTestCase();
void cleanup();
void simple_app();
void simple_app_shadowbuild();
void simple_app_shadowbuild2();
@ -92,15 +85,6 @@ private:
QString base_path;
};
tst_qmake::tst_qmake()
{
}
tst_qmake::~tst_qmake()
{
}
void tst_qmake::initTestCase()
{
QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
@ -128,10 +112,6 @@ void tst_qmake::initTestCase()
base_path = QCoreApplication::applicationDirPath();
}
void tst_qmake::cleanupTestCase()
{
}
void tst_qmake::cleanup()
{
test_compiler.resetArguments();

22
tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
View File

@ -50,12 +50,6 @@ public slots:
void testGetRgba();
void testNativeActiveModalWidget();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void defaultOkButton();
void native_activeModalWidget();
@ -108,22 +102,6 @@ void tst_QColorDialog::native_activeModalWidget()
qApp->exec();
}
void tst_QColorDialog::initTestCase()
{
}
void tst_QColorDialog::cleanupTestCase()
{
}
void tst_QColorDialog::init()
{
}
void tst_QColorDialog::cleanup()
{
}
void tst_QColorDialog::postKeyReturn() {
QWidgetList list = QApplication::topLevelWidgets();
for (int i=0; i<list.count(); ++i) {

16
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
View File

@ -101,16 +101,10 @@ class tst_QFiledialog : public QObject
{
Q_OBJECT
public:
tst_QFiledialog();
virtual ~tst_QFiledialog();
public slots:
private slots:
void initTestCase();
void init();
void cleanup();
private slots:
void currentChangedSignal();
#ifdef QT_BUILD_INTERNAL
void directoryEnteredSignal();
@ -171,14 +165,6 @@ private:
void cleanupSettingsFile();
};
tst_QFiledialog::tst_QFiledialog()
{
}
tst_QFiledialog::~tst_QFiledialog()
{
}
void tst_QFiledialog::cleanupSettingsFile()
{
// clean up the sidebar between each test

8
tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
View File

@ -93,14 +93,12 @@ Q_OBJECT
public:
tst_QFileDialog2();
virtual ~tst_QFileDialog2();
public slots:
private slots:
void initTestCase();
void init();
void cleanup();
private slots:
#ifdef QT_BUILD_INTERNAL
void deleteDirAndFiles();
void listRoot();
@ -159,10 +157,6 @@ tst_QFileDialog2::tst_QFileDialog2()
#endif
}
tst_QFileDialog2::~tst_QFileDialog2()
{
}
void tst_QFileDialog2::cleanupSettingsFile()
{
// clean up the sidebar between each test

24
tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
View File

@ -39,14 +39,6 @@
class tst_QSidebar : public QObject {
Q_OBJECT
public:
tst_QSidebar();
virtual ~tst_QSidebar();
public Q_SLOTS:
void init();
void cleanup();
private slots:
void setUrls();
void selectUrls();
@ -55,22 +47,6 @@ private slots:
void goToUrl();
};
tst_QSidebar::tst_QSidebar()
{
}
tst_QSidebar::~tst_QSidebar()
{
}
void tst_QSidebar::init()
{
}
void tst_QSidebar::cleanup()
{
}
void tst_QSidebar::setUrls()
{
QList<QUrl> urls;

9
tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
View File

@ -59,11 +59,8 @@ class tst_QWizard : public QObject
public:
tst_QWizard();
public slots:
void init();
void cleanup();
private slots:
void cleanup();
void buttonText();
void setButtonLayout();
void setButton();
@ -138,10 +135,6 @@ private slots:
tst_QWizard::tst_QWizard()
{
}
void tst_QWizard::init()
{
#ifdef Q_OS_WINCE //disable magic for WindowsCE
qApp->setAutoMaximizeThreshold(-1);
#endif

25
tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
View File

@ -41,15 +41,6 @@ class tst_QPixmapFilter : public QObject
{
Q_OBJECT
public:
tst_QPixmapFilter();
virtual ~tst_QPixmapFilter();
public slots:
void init();
void cleanup();
private slots:
void colorizeSetColor();
void colorizeSetStrength();
@ -78,22 +69,6 @@ public:
}
};
tst_QPixmapFilter::tst_QPixmapFilter()
{
}
tst_QPixmapFilter::~tst_QPixmapFilter()
{
}
void tst_QPixmapFilter::init()
{
}
void tst_QPixmapFilter::cleanup()
{
}
void tst_QPixmapFilter::testDefaultImplementations()
{
CustomFilter filter;

23
tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
View File

@ -42,13 +42,8 @@ class tst_QGraphicsGridLayout : public QObject
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void qgraphicsgridlayout_data();
void qgraphicsgridlayout();
void addItem_data();
@ -309,27 +304,11 @@ typedef QList<QSizeF> SizeList;
// It is only called once.
void tst_QGraphicsGridLayout::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsGridLayout::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsGridLayout::init()
{
#ifdef Q_OS_WINCE //disable magic for WindowsCE
qApp->setAutoMaximizeThreshold(-1);
#endif
}
// This will be called after every test function.
void tst_QGraphicsGridLayout::cleanup()
{
}
void tst_QGraphicsGridLayout::qgraphicsgridlayout_data()
{
}

28
tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
View File

@ -40,12 +40,6 @@
class tst_QGraphicsLayoutItem : public QObject {
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void qgraphicslayoutitem();
@ -96,28 +90,6 @@ public:
};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QGraphicsLayoutItem::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsLayoutItem::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsLayoutItem::init()
{
}
// This will be called after every test function.
void tst_QGraphicsLayoutItem::cleanup()
{
}
void tst_QGraphicsLayoutItem::qgraphicslayoutitem()
{
SubQGraphicsLayoutItem layoutItem;

23
tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
View File

@ -46,13 +46,8 @@
class tst_QGraphicsLinearLayout : public QObject {
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void qgraphicslinearlayout_data();
void qgraphicslinearlayout();
@ -151,22 +146,6 @@ void tst_QGraphicsLinearLayout::initTestCase()
QApplication::setStyle("windows");
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsLinearLayout::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsLinearLayout::init()
{
}
// This will be called after every test function.
void tst_QGraphicsLinearLayout::cleanup()
{
}
class RectWidget : public QGraphicsWidget
{
public:

30
tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
View File

@ -43,12 +43,6 @@
class tst_QGraphicsObject : public QObject {
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void pos();
void x();
@ -60,30 +54,6 @@ private slots:
void deleted();
};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QGraphicsObject::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsObject::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsObject::init()
{
}
// This will be called after every test function.
void tst_QGraphicsObject::cleanup()
{
}
class MyGraphicsObject : public QGraphicsObject
{
public:

28
tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
View File

@ -40,12 +40,6 @@ class tst_QGraphicsPixmapItem : public QObject
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void qgraphicspixmapitem_data();
void qgraphicspixmapitem();
@ -102,28 +96,6 @@ public:
{ return SubQGraphicsPixmapItem::supportsExtension((QGraphicsItem::Extension)extension); }
};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QGraphicsPixmapItem::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsPixmapItem::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsPixmapItem::init()
{
}
// This will be called after every test function.
void tst_QGraphicsPixmapItem::cleanup()
{
}
void tst_QGraphicsPixmapItem::qgraphicspixmapitem_data()
{
}

28
tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
View File

@ -41,12 +41,6 @@ class tst_QGraphicsPolygonItem : public QObject
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void qgraphicspolygonitem_data();
void qgraphicspolygonitem();
@ -98,28 +92,6 @@ public:
{ return SubQGraphicsPolygonItem::supportsExtension((QGraphicsItem::Extension)extension); }
};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QGraphicsPolygonItem::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsPolygonItem::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsPolygonItem::init()
{
}
// This will be called after every test function.
void tst_QGraphicsPolygonItem::cleanup()
{
}
void tst_QGraphicsPolygonItem::qgraphicspolygonitem_data()
{
}

19
tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
View File

@ -84,13 +84,9 @@ class tst_QGraphicsProxyWidget : public QObject
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void cleanup();
void qgraphicsproxywidget_data();
void qgraphicsproxywidget();
void paint();
@ -291,17 +287,6 @@ void tst_QGraphicsProxyWidget::initTestCase()
QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false);
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsProxyWidget::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsProxyWidget::init()
{
}
// This will be called after every test function.
void tst_QGraphicsProxyWidget::cleanup()
{

29
tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp
View File

@ -39,12 +39,6 @@
class tst_QGraphicsTransform : public QObject {
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void scale();
void rotation();
@ -57,29 +51,6 @@ private:
QString toString(QTransform const&);
};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QGraphicsTransform::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsTransform::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsTransform::init()
{
}
// This will be called after every test function.
void tst_QGraphicsTransform::cleanup()
{
}
static QTransform transform2D(const QGraphicsTransform& t)
{
QMatrix4x4 m;

28
tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
View File

@ -77,12 +77,6 @@ protected:
class tst_QGraphicsWidget : public QObject {
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void qgraphicswidget();
@ -262,28 +256,6 @@ protected:
}
};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QGraphicsWidget::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QGraphicsWidget::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QGraphicsWidget::init()
{
}
// This will be called after every test function.
void tst_QGraphicsWidget::cleanup()
{
}
class SizeHinter : public QGraphicsWidget
{
public:

16
tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
View File

@ -51,14 +51,10 @@ class tst_QColumnView : public QObject {
public:
tst_QColumnView();
virtual ~tst_QColumnView();
public Q_SLOTS:
void initTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void init();
void rootIndex();
void grips();
void isIndexHidden();
@ -183,10 +179,6 @@ tst_QColumnView::tst_QColumnView()
m_fakeDirHomeIndex = m_fakeDirModel.indexFromItem(homeItem);
}
tst_QColumnView::~tst_QColumnView()
{
}
void tst_QColumnView::initTestCase()
{
QVERIFY(m_fakeDirHomeIndex.isValid());
@ -201,10 +193,6 @@ void tst_QColumnView::init()
#endif
}
void tst_QColumnView::cleanup()
{
}
void tst_QColumnView::rootIndex()
{
ColumnView view;

29
tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
View File

@ -40,12 +40,6 @@ class tst_QFileIconProvider : public QObject
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void qfileiconprovider_data();
void qfileiconprovider();
@ -69,29 +63,6 @@ public:
};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QFileIconProvider::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QFileIconProvider::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QFileIconProvider::init()
{
}
// This will be called after every test function.
void tst_QFileIconProvider::cleanup()
{
}
void tst_QFileIconProvider::qfileiconprovider_data()
{
}

9
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
View File

@ -106,15 +106,12 @@ class tst_QHeaderView : public QObject
public:
tst_QHeaderView();
virtual ~tst_QHeaderView();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void getSetCheck();
void visualIndex();
@ -383,10 +380,6 @@ tst_QHeaderView::tst_QHeaderView()
qRegisterMetaType<int>("Qt::SortOrder");
}
tst_QHeaderView::~tst_QHeaderView()
{
}
void tst_QHeaderView::initTestCase()
{
#ifdef Q_OS_WINCE //disable magic for WindowsCE

32
tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
View File

@ -189,15 +189,7 @@ class tst_QItemDelegate : public QObject
{
Q_OBJECT
public:
tst_QItemDelegate();
virtual ~tst_QItemDelegate();
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
void getSetCheck();
void textRectangle_data();
void textRectangle();
@ -255,30 +247,6 @@ void tst_QItemDelegate::getSetCheck()
QCOMPARE(obj1.hasClipping(), true);
}
tst_QItemDelegate::tst_QItemDelegate()
{
}
tst_QItemDelegate::~tst_QItemDelegate()
{
}
void tst_QItemDelegate::initTestCase()
{
}
void tst_QItemDelegate::cleanupTestCase()
{
}
void tst_QItemDelegate::init()
{
}
void tst_QItemDelegate::cleanup()
{
}
void tst_QItemDelegate::textRectangle_data()
{
QFont font;

7
tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
View File

@ -90,15 +90,10 @@ class tst_QItemView : public QObject
{
Q_OBJECT
public:
tst_QItemView() {};
virtual ~tst_QItemView() {};
public slots:
private slots:
void init();
void cleanup();
private slots:
void nonDestructiveBasicTest_data();
void nonDestructiveBasicTest();

29
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
View File

@ -87,17 +87,9 @@ class tst_QListView : public QObject
{
Q_OBJECT
public:
tst_QListView();
virtual ~tst_QListView();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void cleanup();
void getSetCheck();
void noDelegate();
void noModel();
@ -292,24 +284,8 @@ public:
mutable bool wrongIndex;
};
tst_QListView::tst_QListView()
{
}
tst_QListView::~tst_QListView()
{
}
void tst_QListView::initTestCase()
{
}
void tst_QListView::cleanupTestCase()
{
}
void tst_QListView::init()
{
#ifdef Q_OS_WINCE //disable magic for WindowsCE
qApp->setAutoMaximizeThreshold(-1);
#endif
@ -320,7 +296,6 @@ void tst_QListView::cleanup()
QVERIFY(QApplication::topLevelWidgets().isEmpty());
}
void tst_QListView::noDelegate()
{
QtTestModel model(0);

14
tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
View File

@ -46,7 +46,6 @@ class tst_QListWidget : public QObject
public:
tst_QListWidget();
~tst_QListWidget();
enum ModelChanged {
RowsAboutToBeInserted,
@ -59,13 +58,10 @@ public:
ColumnsRemoved
};
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void addItem();
void addItem2();
void addItems();
@ -162,10 +158,6 @@ tst_QListWidget::tst_QListWidget(): testWidget(0), rcParent(8), rcFirst(8,0), rc
{
}
tst_QListWidget::~tst_QListWidget()
{
}
void tst_QListWidget::initTestCase()
{
testWidget = new QListWidget();
@ -210,10 +202,6 @@ void tst_QListWidget::checkDefaultValues()
QCOMPARE(testWidget->count(), 0);
}
void tst_QListWidget::cleanup()
{
}
void tst_QListWidget::populate()
{
addItem();

32
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
View File

@ -65,17 +65,9 @@ class tst_QTableView : public QObject
{
Q_OBJECT
public:
tst_QTableView();
virtual ~tst_QTableView();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void getSetCheck();
void noDelegate();
@ -532,14 +524,6 @@ public:
QSize hint;
};
tst_QTableView::tst_QTableView()
{
}
tst_QTableView::~tst_QTableView()
{
}
void tst_QTableView::initTestCase()
{
#ifdef Q_OS_WINCE //disable magic for WindowsCE
@ -547,18 +531,6 @@ void tst_QTableView::initTestCase()
#endif
}
void tst_QTableView::cleanupTestCase()
{
}
void tst_QTableView::init()
{
}
void tst_QTableView::cleanup()
{
}
void tst_QTableView::noDelegate()
{
QtTestTableModel model(3, 3);

14
tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
View File

@ -51,14 +51,11 @@ class tst_QTableWidget : public QObject
public:
tst_QTableWidget();
~tst_QTableWidget();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void getSetCheck();
void clear();
void clearContents();
@ -161,10 +158,6 @@ tst_QTableWidget::tst_QTableWidget(): testWidget(0)
{
}
tst_QTableWidget::~tst_QTableWidget()
{
}
void tst_QTableWidget::initTestCase()
{
testWidget = new QTableWidget();
@ -188,11 +181,6 @@ void tst_QTableWidget::init()
testWidget->showColumn(column);
}
void tst_QTableWidget::cleanup()
{
}
void tst_QTableWidget::clearContents()
{
QTableWidgetItem *item = new QTableWidgetItem("test");

32
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
View File

@ -119,20 +119,12 @@ class tst_QTreeView : public QObject
{
Q_OBJECT
public:
tst_QTreeView();
virtual ~tst_QTreeView();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
void selectionOrderTest();
private slots:
void initTestCase();
void getSetCheck();
// one test per QTreeView property
@ -402,14 +394,6 @@ public:
mutable QMap<QModelIndex,QModelIndex> parentHash;
};
tst_QTreeView::tst_QTreeView()
{
}
tst_QTreeView::~tst_QTreeView()
{
}
void tst_QTreeView::initTestCase()
{
#ifdef Q_OS_WINCE //disable magic for WindowsCE
@ -417,18 +401,6 @@ void tst_QTreeView::initTestCase()
#endif
}
void tst_QTreeView::cleanupTestCase()
{
}
void tst_QTreeView::init()
{
}
void tst_QTreeView::cleanup()
{
}
// Testing get/set functions
void tst_QTreeView::getSetCheck()
{

22
tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
View File

@ -46,15 +46,11 @@ class tst_QTreeWidgetItemIterator : public QObject
public:
tst_QTreeWidgetItemIterator();
~tst_QTreeWidgetItemIterator();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void cleanupTestCase();
void postincrement();
void preincrement();
void postdecrement();
@ -81,10 +77,6 @@ tst_QTreeWidgetItemIterator::tst_QTreeWidgetItemIterator(): testWidget(0)
{
}
tst_QTreeWidgetItemIterator::~tst_QTreeWidgetItemIterator()
{
}
void tst_QTreeWidgetItemIterator::initTestCase()
{
testWidget = new QTreeWidget();
@ -175,14 +167,6 @@ void tst_QTreeWidgetItemIterator::cleanupTestCase()
delete testWidget;
}
void tst_QTreeWidgetItemIterator::init()
{
}
void tst_QTreeWidgetItemIterator::cleanup()
{
}
void tst_QTreeWidgetItemIterator::iteratorflags_data()
{
/*

18
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -103,13 +103,10 @@ Q_OBJECT
public:
tst_QApplication();
virtual ~tst_QApplication();
public slots:
void initTestCase();
void init();
void cleanup();
private slots:
void initTestCase();
void cleanup();
void sendEventsOnProcessEvents(); // this must be the first test
void staticSetup();
@ -249,17 +246,6 @@ tst_QApplication::tst_QApplication()
#endif
}
tst_QApplication::~tst_QApplication()
{
}
void tst_QApplication::init()
{
// TODO: Add initialization code here.
// This will be executed immediately before each test is run.
}
void tst_QApplication::cleanup()
{
// TODO: Add cleanup code here.

20
tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
View File

@ -41,15 +41,9 @@ class tst_QDesktopWidget : public QObject
{
Q_OBJECT
public:
tst_QDesktopWidget();
virtual ~tst_QDesktopWidget();
public slots:
void init();
private slots:
void cleanup();
private slots:
void numScreens();
void primaryScreen();
void screenNumberForQWidget();
@ -59,18 +53,6 @@ private slots:
void topLevels();
};
tst_QDesktopWidget::tst_QDesktopWidget()
{
}
tst_QDesktopWidget::~tst_QDesktopWidget()
{
}
void tst_QDesktopWidget::init()
{
}
void tst_QDesktopWidget::cleanup()
{
QVERIFY(QApplication::topLevelWidgets().isEmpty());

20
tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
View File

@ -46,16 +46,11 @@ class tst_QStackedLayout : public QObject
public:
tst_QStackedLayout();
virtual ~tst_QStackedLayout();
public slots:
void initTestCase();
void cleanupTestCase();
private slots:
void init();
void cleanup();
private slots:
void getSetCheck();
void testCase();
void deleteCurrent();
@ -100,18 +95,6 @@ tst_QStackedLayout::tst_QStackedLayout()
{
}
tst_QStackedLayout::~tst_QStackedLayout()
{
}
void tst_QStackedLayout::initTestCase()
{
}
void tst_QStackedLayout::cleanupTestCase()
{
}
void tst_QStackedLayout::init()
{
if (testWidget) {
@ -134,7 +117,6 @@ void tst_QStackedLayout::cleanup()
testWidget = 0;
}
void tst_QStackedLayout::testCase()
{
QStackedLayout onStack(testWidget);

18
tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
View File

@ -92,17 +92,15 @@ class tst_QStyle : public QObject
Q_OBJECT
public:
tst_QStyle();
virtual ~tst_QStyle();
private:
bool testAllFunctions(QStyle *);
bool testScrollBarSubControls(QStyle *);
void testPainting(QStyle *style, const QString &platform);
private slots:
void drawItemPixmap();
void initTestCase();
void cleanup();
void cleanupTestCase();
void init();
void cleanup();
#ifndef QT_NO_STYLE_FUSION
void testFusionStyle();
#endif
@ -142,10 +140,6 @@ tst_QStyle::tst_QStyle()
testWidget = 0;
}
tst_QStyle::~tst_QStyle()
{
}
class MyWidget : public QWidget
{
public:
@ -165,14 +159,6 @@ void tst_QStyle::cleanup()
testWidget = 0;
}
void tst_QStyle::initTestCase()
{
}
void tst_QStyle::cleanupTestCase()
{
}
void tst_QStyle::testStyleFactory()
{
QStringList keys = QStyleFactory::keys();

22
tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
View File

@ -48,17 +48,11 @@ class tst_QAbstractButton : public QObject
{
Q_OBJECT
public:
tst_QAbstractButton();
virtual ~tst_QAbstractButton();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void setAutoRepeat_data();
void setAutoRepeat();
@ -147,14 +141,6 @@ private:
}
};
tst_QAbstractButton::tst_QAbstractButton()
{
}
tst_QAbstractButton::~tst_QAbstractButton()
{
}
void tst_QAbstractButton::initTestCase()
{
testWidget = new MyButton(0);
@ -188,10 +174,6 @@ void tst_QAbstractButton::init()
click_count = 0;
}
void tst_QAbstractButton::cleanup()
{
}
void tst_QAbstractButton::resetValues()
{
toggle_count = 0;

28
tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
View File

@ -68,14 +68,7 @@ protected:
class tst_QButtonGroup : public QObject
{
Q_OBJECT
public:
tst_QButtonGroup();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void arrowKeyNavigation();
void exclusive();
@ -91,27 +84,6 @@ private slots:
void task209485_removeFromGroupInEventHandler();
};
tst_QButtonGroup::tst_QButtonGroup()
{
}
void tst_QButtonGroup::initTestCase()
{
}
void tst_QButtonGroup::cleanupTestCase()
{
}
void tst_QButtonGroup::init()
{
}
void tst_QButtonGroup::cleanup()
{
}
QT_BEGIN_NAMESPACE
extern bool Q_GUI_EXPORT qt_tab_all_widgets();
QT_END_NAMESPACE

34
tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
View File

@ -46,15 +46,6 @@ class tst_QCalendarWidget : public QObject
{
Q_OBJECT
public:
tst_QCalendarWidget();
virtual ~tst_QCalendarWidget();
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void getSetCheck();
void buttonClickCheck();
@ -265,31 +256,6 @@ void tst_QCalendarWidget::setWeekdayFormat()
}
}
tst_QCalendarWidget::tst_QCalendarWidget()
{
}
tst_QCalendarWidget::~tst_QCalendarWidget()
{
}
void tst_QCalendarWidget::initTestCase()
{
}
void tst_QCalendarWidget::cleanupTestCase()
{
}
void tst_QCalendarWidget::init()
{
}
void tst_QCalendarWidget::cleanup()
{
}
typedef void (QCalendarWidget::*ShowFunc)();
Q_DECLARE_METATYPE(ShowFunc)

15
tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
View File

@ -45,17 +45,12 @@ class tst_QCheckBox : public QObject
{
Q_OBJECT
public:
tst_QCheckBox();
virtual ~tst_QCheckBox();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void setChecked();
void setTriState();
void setText_data();
@ -86,14 +81,6 @@ private:
QCheckBox *testWidget;
};
tst_QCheckBox::tst_QCheckBox()
{
}
tst_QCheckBox::~tst_QCheckBox()
{
}
void tst_QCheckBox::initTestCase()
{
// Create the test class

20
tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
View File

@ -48,16 +48,12 @@
class tst_QCommandLinkButton : public QObject
{
Q_OBJECT
public:
tst_QCommandLinkButton();
virtual ~tst_QCommandLinkButton();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void getSetCheck();
void pressed();
void setAccel();
@ -112,14 +108,6 @@ void tst_QCommandLinkButton::getSetCheck()
delete var1;
}
tst_QCommandLinkButton::tst_QCommandLinkButton()
{
}
tst_QCommandLinkButton::~tst_QCommandLinkButton()
{
}
void tst_QCommandLinkButton::initTestCase()
{
// Create the test class
@ -153,10 +141,6 @@ void tst_QCommandLinkButton::init()
resetCounters();
}
void tst_QCommandLinkButton::cleanup()
{
}
void tst_QCommandLinkButton::resetCounters()
{
toggle_count = 0;

16
tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
View File

@ -125,15 +125,13 @@ public:
class tst_QDateTimeEdit : public QObject
{
Q_OBJECT
public:
tst_QDateTimeEdit();
virtual ~tst_QDateTimeEdit();
public slots:
private slots:
void initTestCase();
void init();
void cleanup();
void cleanupTestCase();
private slots:
void cachedDayTest();
void getSetCheck();
void constructor_qwidget();
@ -314,14 +312,6 @@ void tst_QDateTimeEdit::getSetCheck()
QCOMPARE(timeEdit.inputMethodQuery(Qt::ImHints), QVariant(int(Qt::ImhPreferNumbers)));
}
tst_QDateTimeEdit::tst_QDateTimeEdit()
{
}
tst_QDateTimeEdit::~tst_QDateTimeEdit()
{
}
void tst_QDateTimeEdit::initTestCase()
{
QLocale system = QLocale::system();

28
tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
View File

@ -39,12 +39,6 @@ class tst_QFontComboBox : public QObject
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void qfontcombobox_data();
void qfontcombobox();
@ -69,28 +63,6 @@ public:
{ return SubQFontComboBox::event(e); }
};
// This will be called before the first test function is executed.
// It is only called once.
void tst_QFontComboBox::initTestCase()
{
}
// This will be called after the last test function is executed.
// It is only called once.
void tst_QFontComboBox::cleanupTestCase()
{
}
// This will be called before each test function is executed.
void tst_QFontComboBox::init()
{
}
// This will be called after every test function.
void tst_QFontComboBox::cleanup()
{
}
void tst_QFontComboBox::qfontcombobox_data()
{
}

9
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
View File

@ -132,14 +132,13 @@ public:
enum EventStates { Press, Release, Click };
tst_QLineEdit();
virtual ~tst_QLineEdit();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void getSetCheck();
void experimental();
@ -380,10 +379,6 @@ tst_QLineEdit::tst_QLineEdit() : validInput(false), m_testWidget(0), m_keyboardS
}
}
tst_QLineEdit::~tst_QLineEdit()
{
}
QLineEdit *tst_QLineEdit::ensureTestWidget()
{
if (!m_testWidget) {

22
tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
View File

@ -49,17 +49,12 @@
class tst_QPushButton : public QObject
{
Q_OBJECT
public:
tst_QPushButton();
virtual ~tst_QPushButton();
public slots:
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void getSetCheck();
void autoRepeat();
void pressed();
@ -109,14 +104,6 @@ void tst_QPushButton::getSetCheck()
delete var1;
}
tst_QPushButton::tst_QPushButton()
{
}
tst_QPushButton::~tst_QPushButton()
{
}
void tst_QPushButton::initTestCase()
{
// Create the test class
@ -149,11 +136,6 @@ void tst_QPushButton::init()
resetCounters();
}
void tst_QPushButton::cleanup()
{
}
void tst_QPushButton::resetCounters()
{
toggle_count = 0;

26
tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
View File

@ -44,21 +44,13 @@ class tst_QStatusBar: public QObject
{
Q_OBJECT
public:
tst_QStatusBar();
virtual ~tst_QStatusBar();
protected slots:
void messageChanged(const QString&);
public slots:
void initTestCase();
void cleanupTestCase();
private slots:
void init();
void cleanup();
private slots:
void tempMessage();
void insertWidget();
void insertPermanentWidget();
@ -73,14 +65,6 @@ private:
QString currentMessage;
};
tst_QStatusBar::tst_QStatusBar()
{
}
tst_QStatusBar::~tst_QStatusBar()
{
}
void tst_QStatusBar::init()
{
testWidget = new QStatusBar;
@ -97,14 +81,6 @@ void tst_QStatusBar::cleanup()
delete testWidget;
}
void tst_QStatusBar::initTestCase()
{
}
void tst_QStatusBar::cleanupTestCase()
{
}
void tst_QStatusBar::messageChanged(const QString &m)
{
currentMessage = m;

10
tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
View File

@ -76,13 +76,11 @@ class QTabWidgetChild:public QTabWidget {
class tst_QTabWidget:public QObject {
Q_OBJECT
public:
tst_QTabWidget();
public slots:
private slots:
void init();
void cleanup();
private slots:
void getSetCheck();
void testChild();
void addRemoveTab();
@ -156,10 +154,6 @@ void tst_QTabWidget::getSetCheck()
QCOMPARE(w5, obj1.currentWidget()); // current not changed
}
tst_QTabWidget::tst_QTabWidget()
{
}
void tst_QTabWidget::init()
{
tw = new QTabWidget(0);

14
tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
View File

@ -72,15 +72,11 @@ QVariant TestBrowser::loadResource(int type, const QUrl &name)
class tst_QTextBrowser : public QObject
{
Q_OBJECT
public:
tst_QTextBrowser();
virtual ~tst_QTextBrowser();
public slots:
private slots:
void init();
void cleanup();
private slots:
void noReloadOnAnchorJump();
void bgColorOnSourceChange();
void forwardButton();
@ -104,14 +100,6 @@ private:
TestBrowser *browser;
};
tst_QTextBrowser::tst_QTextBrowser()
{
}
tst_QTextBrowser::~tst_QTextBrowser()
{
}
void tst_QTextBrowser::init()
{
QString prefix = QFileInfo(QFINDTESTDATA("subdir")).absolutePath();

26
tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp
View File

@ -44,19 +44,13 @@ class tst_QToolBox : public QObject
{
Q_OBJECT
public:
tst_QToolBox();
virtual ~tst_QToolBox();
protected slots:
void currentChanged(int);
public slots:
void initTestCase();
void cleanupTestCase();
private slots:
void init();
void cleanup();
private slots:
void getSetCheck();
void populate();
void change();
@ -106,14 +100,6 @@ void tst_QToolBox::getSetCheck()
QCOMPARE(w3, obj1.currentWidget());
}
tst_QToolBox::tst_QToolBox()
{
}
tst_QToolBox::~tst_QToolBox()
{
}
class tst_QToolBoxPrivate
{
public:
@ -183,14 +169,6 @@ void tst_QToolBox::cleanup()
delete d;
}
void tst_QToolBox::initTestCase()
{
}
void tst_QToolBox::cleanupTestCase()
{
}
void tst_QToolBox::currentChanged(int index)
{
currentIndex = index;