1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetic changes to exceptionsafety_objects test

Browse Source 
Sort test data alphabetically and remove excess whitespace.

Change-Id: I0e244efca9e9adbe747a375a28a63f70992ef4f8
Reviewed-by: Trust Me
(cherry picked from commit 10f3f270c8a319205590ae13bdeab063d5216441)
This commit is contained in:
Jason McDonald 2011-04-18 18:21:03 +10:00 committed by Rohan McGovern
parent 22d6cd5cdd
commit 084b7ababd
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
View File

@ -164,12 +164,12 @@ void tst_ExceptionSafety_Objects::objects_data()
NEWROW(QObject); NEWROW(QObject);
NEWROW(QBuffer); NEWROW(QBuffer);
NEWROW(QFile); NEWROW(QFile);
NEWROW(QFSFileEngine);
NEWROW(QProcess); NEWROW(QProcess);
NEWROW(QSettings); NEWROW(QSettings);
NEWROW(QThread); NEWROW(QThread);
NEWROW(QThreadPool); NEWROW(QThreadPool);
NEWROW(QTranslator); NEWROW(QTranslator);
NEWROW(QFSFileEngine);
#define NEWROW2(T, CREATOR) QTest::newRow(#T) << static_cast<AbstractTester *>(new CREATOR) #define NEWROW2(T, CREATOR) QTest::newRow(#T) << static_cast<AbstractTester *>(new CREATOR)
NEWROW2(QBitArray, BitArrayCreator); NEWROW2(QBitArray, BitArrayCreator);
@ -177,7 +177,6 @@ void tst_ExceptionSafety_Objects::objects_data()
NEWROW2(QCryptographicHash, CryptographicHashCreator); NEWROW2(QCryptographicHash, CryptographicHashCreator);
NEWROW2(QDataStream, DataStreamCreator); NEWROW2(QDataStream, DataStreamCreator);
NEWROW2(QDir, DirCreator); NEWROW2(QDir, DirCreator);
} }
// create and destructs an object, and lets each and every allocation // create and destructs an object, and lets each and every allocation
@ -363,7 +362,7 @@ void tst_ExceptionSafety_Objects::objects()
QFETCH(AbstractTester *, objectCreator); QFETCH(AbstractTester *, objectCreator);
doOOMTest(*objectCreator, 0); doOOMTest(*objectCreator, 0);
delete objectCreator; delete objectCreator;
} }
@ -400,9 +399,9 @@ void tst_ExceptionSafety_Objects::widgets_data()
{ {
#ifdef Q_OS_SYMBIAN #ifdef Q_OS_SYMBIAN
// Initialise the S60 rasteriser, which crashes if started while out of memory // Initialise the S60 rasteriser, which crashes if started while out of memory
QImage image(20, 20, QImage::Format_RGB32); QImage image(20, 20, QImage::Format_RGB32);
QPainter p(&image); QPainter p(&image);
p.drawText(0, 15, "foo"); p.drawText(0, 15, "foo");
#endif #endif
QTest::addColumn<AbstractTester *>("widgetCreator"); QTest::addColumn<AbstractTester *>("widgetCreator");
@ -413,23 +412,27 @@ void tst_ExceptionSafety_Objects::widgets_data()
NEWROW(QWidget); NEWROW(QWidget);
NEWROW(QButtonGroup); NEWROW(QButtonGroup);
NEWROW(QDesktopWidget);
NEWROW(QCheckBox); NEWROW(QCheckBox);
NEWROW(QColumnView);
NEWROW(QComboBox); NEWROW(QComboBox);
NEWROW(QCommandLinkButton); NEWROW(QCommandLinkButton);
NEWROW(QDateEdit); NEWROW(QDateEdit);
NEWROW(QDateTimeEdit); NEWROW(QDateTimeEdit);
NEWROW(QDesktopWidget);
NEWROW(QDial); NEWROW(QDial);
NEWROW(QDoubleSpinBox); NEWROW(QDoubleSpinBox);
NEWROW(QFocusFrame); NEWROW(QFocusFrame);
NEWROW(QFontComboBox); NEWROW(QFontComboBox);
NEWROW(QFrame); NEWROW(QFrame);
NEWROW(QGroupBox); NEWROW(QGroupBox);
NEWROW(QLCDNumber);
NEWROW(QLabel); NEWROW(QLabel);
NEWROW(QLCDNumber); NEWROW(QLCDNumber);
NEWROW(QLineEdit); NEWROW(QLineEdit);
NEWROW(QListView);
NEWROW(QListWidget);
NEWROW(QMainWindow);
NEWROW(QMenu); NEWROW(QMenu);
NEWROW(QMenuBar);
NEWROW(QPlainTextEdit); NEWROW(QPlainTextEdit);
NEWROW(QProgressBar); NEWROW(QProgressBar);
NEWROW(QPushButton); NEWROW(QPushButton);
@ -443,24 +446,18 @@ void tst_ExceptionSafety_Objects::widgets_data()
NEWROW(QStackedWidget); NEWROW(QStackedWidget);
NEWROW(QStatusBar); NEWROW(QStatusBar);
NEWROW(QTabBar); NEWROW(QTabBar);
NEWROW(QTableView);
NEWROW(QTableWidget);
NEWROW(QTabWidget); NEWROW(QTabWidget);
NEWROW(QTextBrowser); NEWROW(QTextBrowser);
NEWROW(QTextEdit); NEWROW(QTextEdit);
NEWROW(QTimeEdit); NEWROW(QTimeEdit);
NEWROW(QToolBar);
NEWROW(QToolBox); NEWROW(QToolBox);
NEWROW(QToolButton); NEWROW(QToolButton);
NEWROW(QStatusBar);
NEWROW(QToolBar);
NEWROW(QMenuBar);
NEWROW(QMainWindow);
NEWROW(QWorkspace);
NEWROW(QColumnView);
NEWROW(QListView);
NEWROW(QListWidget);
NEWROW(QTableView);
NEWROW(QTableWidget);
NEWROW(QTreeView); NEWROW(QTreeView);
NEWROW(QTreeWidget); NEWROW(QTreeWidget);
NEWROW(QWorkspace);
} }
void tst_ExceptionSafety_Objects::widgets() void tst_ExceptionSafety_Objects::widgets()