From 930a04cd66e40addd42e3ade195400c959fd3292 Mon Sep 17 00:00:00 2001 From: mread Date: Wed, 9 Sep 2009 09:51:42 +0100 Subject: Getting text widget OOM tests working in Symbian There is one actual bug fix, checking for null pointer return. The exception safety test code now initialises the fonts system. The S60 fonts system does not survive OOM testing without this. Otherwise some duplicate tests are removed and code tidied up. Reviewed-by: Liang Qi Reviewed-by: Harald Fernengel Reviewed-by: Alessandro Portale --- .../exceptionsafety_objects/tst_exceptionsafety_objects.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index 1bd9aacfa8..e3a70e9920 100644 --- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -347,6 +347,13 @@ template <> struct WidgetCreator : public AbstractTester }; void tst_ExceptionSafetyObjects::widgets_data() { +#ifdef Q_OS_SYMBIAN + // Initialise the S60 rasteriser, which crashes if started while out of memory + QImage image(20, 20, QImage::Format_RGB32); + QPainter p(&image); + p.drawText(0, 15, "foo"); +#endif + QTest::addColumn("widgetCreator"); #undef NEWROW @@ -392,9 +399,6 @@ void tst_ExceptionSafetyObjects::widgets_data() NEWROW(QToolBox); NEWROW(QToolButton); NEWROW(QStatusBar); - NEWROW(QSplitter); - NEWROW(QTextEdit); - NEWROW(QTextBrowser); NEWROW(QToolBar); NEWROW(QMenuBar); NEWROW(QMainWindow); @@ -502,7 +506,7 @@ struct IntegerMoveable int IntegerMoveable::instanceCount = 0; Q_DECLARE_TYPEINFO(IntegerMoveable, Q_MOVABLE_TYPE); -template class Container > +template class Container> void containerInsertTest(QObject*) { Container container; -- cgit v1.2.3