Commit Graph

270 Commits

Author SHA1 Message Date
Jason McDonald
b8efa50fda Remove Qt3Support code from QMenuBar test, part 2.
Follow-up to previous commit: remove the "_noQt3" suffixes on test
function names and the "_Qt4" suffixes on variable names.

Change-Id: I000e87357b025930b0065efc1d0de05c2cd07bba
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-20 10:30:06 +10:00
Qt Continuous Integration System
f60b3e90e6 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Don't crash if windowmanager is not initialized
  Compile fix for 64bit Linux.
2011-05-20 00:58:20 +10:00
Friedemann Kleint
ac0eef5d64 Compile fix for 64bit Linux.
Reviewed-by: Thiago <thiago.macieira@nokia.com>
2011-05-19 16:28:30 +02:00
Qt Continuous Integration System
348f5f40d8 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Tests: Fix some compile warnings.
2011-05-20 00:23:38 +10:00
Friedemann Kleint
49995ee35f Tests: Fix some compile warnings.
As they are now compiled by default.
2011-05-19 16:20:08 +02:00
Qt Continuous Integration System
c1031d334f Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove warning from QColor::setNamedColor().
2011-05-19 21:55:04 +10:00
Samuel Rødal
0377b7f96d Remove warning from QColor::setNamedColor().
This warning is pointless as the user can anyway check if the color is
valid after making the call by calling isValid(). Using isValidColor()
could be used but it has a big performance overhead as validation then
needs to be done twice.

Task-number: QTBUG-19098
Reviewed-by: Erik Verbruggen
(cherry picked from commit a423ff5474b89028eeca95b254f5184311c8223b)
2011-05-19 13:17:53 +02:00
Qt Continuous Integration System
77cd5455b2 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile IPC tests.
  Always call XInitThreads.
  Remove redundant #ifdef's from benchmarks
  Improve coding style of qdatastream test
  Don't use Qt3Support in arthur test suite.
  Remove Qt3Support code from QMenuBar autotest
  Remove Qt3Support code from QSplitter autotest
  Remove Qt3Support code from QSharedPointer autotest
  Remove Qt3Support code from QComboBox autotest
  Remove Qt3Support test code from accessibility autotest
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test
2011-05-19 20:04:29 +10:00
Friedemann Kleint
1b92bb9bb2 Compile IPC tests. 2011-05-19 09:42:17 +02:00
Jason McDonald
c5303517c3 Remove redundant #ifdef's from benchmarks
Preprocessor directives that refer to QT_VERSION's less than Qt 5 are
redundant in the qt5 modules.

Change-Id: Id3a9c5f0ba07b72d1c99e51c12a240570bf0d58e
Reviewed-by: Rohan McGovern
2011-05-19 14:54:16 +10:00
Jason McDonald
e3dddbbd2e Improve coding style of qdatastream test
Expand literal tabs and format switch statements in accordance with the
Qt Coding Style.

Change-Id: I64e638b730f4be2bc707136b1b7e5585d6808731
Reviewed-by: Rohan McGovern
2011-05-19 14:40:37 +10:00
Jason McDonald
65feb28928 Don't use Qt3Support in arthur test suite.
Change-Id: I5acc05aeb7db5aedbbe35594f46d614319a299b2
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-19 14:34:08 +10:00
Jason McDonald
cbb5d693c8 Remove Qt3Support code from QMenuBar autotest
Change-Id: I63677bfe56ec92c1c96e2df5619ee434bdc91fdb
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-19 14:03:52 +10:00
Jason McDonald
b68511b6ea Remove Qt3Support code from QSplitter autotest
Note that the functions suffixed with a 3 were actually the Qt4
versions, which is why this patch looks strange.

Change-Id: Iec874153248f57b8696a289cb13eb60fecc5699c
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-19 14:02:32 +10:00
Jason McDonald
cb1be7a4f6 Remove Qt3Support code from QSharedPointer autotest
Change-Id: I1bb3752e3a5101e4a2990d0cac01406e6023ee2e
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-19 14:01:23 +10:00
Jason McDonald
f075a7afec Remove Qt3Support code from QComboBox autotest
This commit removes the second-last column of test data
(labeled testQt3Support) of the insertItem test function.

Change-Id: I2158bdb5a77c9eaf1424998f51fb03a8df934490
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-19 14:00:16 +10:00
Jason McDonald
4a52cc3ac0 Remove Qt3Support test code from accessibility autotest
Change-Id: Id31836ea52da71b40c0bcbb67d9beffc70b90400
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-19 13:59:04 +10:00
Qt Continuous Integration System
6772f8802d Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove Qt3Support code from QDataStream autotest.
2011-05-19 13:42:59 +10:00
Jason McDonald
c2eb7bb080 Remove Qt3Support code from QDataStream autotest.
QWMatrix and QColorGroup were Qt 3 classes and QPalette is substantially
different in Qt 3 and Qt 4.

Change-Id: Iee176fcf237c3f9ac2ffd7f1fd9e4963dc4df39c
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-19 13:34:10 +10:00
Qt Continuous Integration System
4299467335 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tests: fixed compilation of tst_qtextstream
  QUiLoader, QAbstractFormBuilder: Introduce errorString().
  Enable configuration for Xcb
  Fall back to using paths for large fonts in drawStaticText()
  Add ability to work around non-standard GLES implementations
  Fix broken drawing with large fonts using QStaticText and FreeType
  Remove Q_ASSERT's from qdbustype autotest
  Remove autotest code for Qt3Support library.
2011-05-19 10:07:06 +10:00
Rohan McGovern
9a6a58a95a tests: fixed compilation of tst_qtextstream
Compilation of this autotest was broken by a strange qmake bug,
QTBUG-19393.  Work around it by putting a space between two string
literals.

Change-Id: I494c486dd11858eeaf98d7a04021c74fcf3cbba7
2011-05-19 10:00:47 +10:00
Olivier Goffart
b57a7e6994 QT_USE_QSTRINGBUILDER to fix source compatibility
In 4.8 we added support for using StringBuilder with QByteArray.
But this is breaking source compatibility for people that used
QT_USE_FAST_OPERATOR_PLUS in Qt 4.7. So we introduce a new macro

Notice that QT_USE_FAST_CONCATENATION was not working without
QT_USE_FAST_OPERATOR_PLUS, so we remove the checking of that macro.

Reviewed-by: joao
(cherry picked from commit 8447f5616be731d78081f326bb9cb3f5aa9087a4)
2011-05-18 15:17:17 +02:00
Jason McDonald
871e8fe8dc Remove Q_ASSERT's from qdbustype autotest
Change-Id: I276750d8acda3744ee8a9c424b2da0a08e8c7461
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
2011-05-18 16:11:33 +10:00
Jason McDonald
49babe02f0 Remove autotest code for Qt3Support library.
This commit deals with the simple cases -- mostly just removing blocks
of code enclosed in #ifdef QT3_SUPPORT.  Later commits will deal with
the trickier cases.

Change-Id: I280dea25b3754be175efe62fc7e5e4e7c304e658
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-18 16:09:29 +10:00
Jason McDonald
0cd93933d8 Make QDataStream test compile and re-enable it
This test can't use svg files as QtSvg is a separate module, on which
qtbase does not depend.  This commit changes the test to use a pixmap
that was already present in the test.

Change-Id: Iab4ce70aa376a7d2985b69816bd251ce4f5d46cf
Task-number: QTBUG-19244
Reviewed-by: Rohan McGovern
2011-05-18 11:25:17 +10:00
Rohan McGovern
6e50394c4e Reduce usage of Q_ASSERT in autotests.
Using Q_ASSERT does nothing in release-mode builds, and in debug builds
it causes tests to terminate prematurely.  It is much better to use
QVERIFY or QCOMPARE.

Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 3475168550c1a804f04f2a4edfeb30c04cd36551)

Change-Id: Ic39972b685ca35a9a71d9c8d03e8dae31481fb19
2011-05-18 10:57:56 +10:00
Rohan McGovern
b8af05d3e2 Fixed license header.
(cherry picked from commit 2caea6081fc46217636f0ab70d09891efd2d2864)

Change-Id: I086c8cb2d0ccc691d8af68804132f048bee7fa4b
2011-05-18 10:57:51 +10:00
Jason McDonald
1661205dd7 Remove Q_ASSERT's from qsharedmemory autotest
Report a fatal error rather than ignoring the error in non-debug builds.

Change-Id: Ib6ef993e6e0c65bd9adea994ea7b454cc147f3d4
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 637456edef085d1825f15429cd921f2f0d4bd6a2)
2011-05-18 10:46:48 +10:00
Jason McDonald
719ba0ea3a Remove Q_ASSERT's from QNetworkReply autotest
Rather than aborting in debug builds and failing mysteriously in release
builds, report fatal errors in all builds.

Change-Id: I020b06e19b7ffc8ae4413e1756259f4ca608f253
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit bbfefe1b764cd41b7e677f26621fb6e76a67f9d7)
2011-05-18 10:46:48 +10:00
Jason McDonald
5f88d1fd08 Remove Q_ASSERT from QXmlStream autotest
Report a meaningful fatal error if an unknown token type is encountered
rather than ignoring the error in non-debug builds and reporting an
uninformative message in debug builds.

Change-Id: Id219f3c7cbd4ba3e9875cb81f833720d5d153132
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 1c85fc559ee456a165527d23cb1b7dc237f5504b)
2011-05-18 10:46:48 +10:00
Jason McDonald
d35fcd3053 Remove Q_ASSERT's from QXmlStream autotest
Report fatal errors rather than ignoring them in non-debug builds.

Change-Id: I62dd177e2f391e64c12314bf224f8952ed6f3144
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 4793c3bd1dfddcc98eae12e5caf29ff6aabd31b2)
2011-05-18 10:46:47 +10:00
Jason McDonald
fa42ba9b62 Remove Q_ASSERT from QItemModel autotest
If populateTestData() would return an invalid model index, report a
meaningful fatal error rather than failing silently in a release build
and aborting with an uninformative error message in a debug build.

Change-Id: I96820429a25ce5c4eb375d50e7e1f672851e26e6
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 984a72a8bbf853059f0eb7e1054538b48d5f3bc8)
2011-05-18 10:46:47 +10:00
Jason McDonald
65833e7d9e Remove Q_ASSERT's from QXmlStream autotest
Report fatal errors rather than ignoring them in non-debug builds.

Change-Id: Ieafc58f3603fa953f4a963394039e613dcd442fb
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 6e3fcd6ff50e6435fd90629ed695196d25312ffc)
2011-05-18 10:46:47 +10:00
Jason McDonald
c04abc3fb4 Remove Q_ASSERT from QVariant autotest
I missed one Q_ASSERT in the previous commit.  Also changing to use
Q_FUNC_INFO instead of hard-coded function names in the warning
messages.

Change-Id: I0ff5b2b2cda02597836beb5d2811fa8dd2a344ab
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 74a4aad171b39018d596b99684286b9426a091a5)
2011-05-18 10:46:47 +10:00
Jason McDonald
77ff187b92 Remove Q_ASSERT's from QTreeView autotest
Report fatal errors instead of failing silently in non-debug builds.

Change-Id: Ieaff30b71dba2a385a5fffc93d2a8c0f5864aa18
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit e12b912de89088a307c3519a01198a5314b8dd1a)
2011-05-18 10:46:47 +10:00
Jason McDonald
17bf9b17e7 Remove Q_ASSERT from qtesselator autotest
Report a fatal error rather than failing silently in non-debug builds.

Change-Id: I625c5aa6f86a5764cd8f078baa074d6475a67736
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit c0c7e04c9248ce38278aceefeb527f29149cfb4e)
2011-05-18 10:46:47 +10:00
Jason McDonald
e540e41130 Remove unused function from qtessellator autotest
Change-Id: I24c1db8392370d19970421a014f7bb6c4bc7c6e8
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 224050aae75fd5b1d6c57909d894a3eba7ac43fc)
2011-05-18 10:46:47 +10:00
Jason McDonald
8094e93e08 Remove Q_ASSERT's from qreadwritelock autotest
The tryWriteLock testfunction didn't do anything useful in non-debug
builds, due to the thread having the important code inside Q_ASSERT's,
which are no-ops in non-debug builds.  This commit removes the
Q_ASSERT's, counts the number of failures in the thread and fails the
test if there are any failures recorded.

Change-Id: I4750f66eeba22ab51ba348ebc06704052421f1ae
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 00f724c943b83f10f9ca9475570708536947538e)
2011-05-18 10:46:47 +10:00
Jason McDonald
1799546675 Remove Q_ASSERT's from QObject autotest
Rather than aborting in debug builds and failing silently in release
builds, report a fatal error in all builds if the helper class
methods are called more than once.

Change-Id: Id1fda8dc7caf008bbc8f6ae6384abee1aa8f50eb
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 0c157af3e5aa7c56c53b9eabe1510cc639610969)
2011-05-18 10:46:47 +10:00
Jason McDonald
9e31e99a13 Remove Q_ASSERT's from QObject autotest
Rather than aborting in debug builds and failing silently in release
builds, report a meaningful fatal error in all builds.

Change-Id: I3b874f187d482e9785a839cab1a3855b631404c3
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 844906474dd6905d36003143a03a2fbccf0ad0dd)
2011-05-18 10:46:46 +10:00
Jason McDonald
f6cbfff326 Remove Q_ASSERT's from QNetworkReply autotest
Rather than aborting in debug builds and ignoring the failure in release
builds, report a fatal error in all builds.

Change-Id: I1fb8e692c65cf23cf5d2453173db742260ddca48
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 136f39bbb63706819eb18d000f305edbe1cc6a81)
2011-05-18 10:46:46 +10:00
Jason McDonald
eeebb27650 Remove Q_ASSERT from qitemmodel autotest
Don't perform actions needed for the test inside Q_ASSERT, because these
actions won't happen in a non-debug build.

Change-Id: I0758e9f29f38c1a83a1501357286877f05beb6c8
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit b7d421da6d5e945b74ffbc3a7aa635a6ce63ebda)
2011-05-18 10:46:46 +10:00
Jason McDonald
f872c1a065 Remove Q_ASSERT's from QMutex autotest
Don't perform actions needed for the test inside Q_ASSERT, because these
actions won't happen in a non-debug build. Instead count the number of
failures and verify that the count is zero at the end of the test.

Change-Id: Ibe0d194111e5247118d59a7760f0946d2c44faf9
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 8d2127d44e6c8af6b041688376de0e5747a1810a)
2011-05-18 10:46:46 +10:00
Jason McDonald
e3ee32848d Remove Q_ASSERT from QMetaType autotest
Replace Q_ASSERT in helper class with code to count failures and report
meaningful warnings.  The test function then fails the test if any
failures were recorded.

Change-Id: I0d6650e6036c8e45729c16d1dbb7543b4fb42553
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 8512dc16553ecf511c40a2ba7a815f777d7d5c59)
2011-05-18 10:46:46 +10:00
Jason McDonald
175bb0eac6 Remove Q_ASSERT's in qitemview autotest
Rather than aborting in debug builds and failing silently in release
builds, report a meaningful warning message and return an appropriate
value to indicate the error.

Change-Id: I0ceb0a0bfaef34cc6127d768cc75ecfc5a24e3c9
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 7cb0a3baeb361c9909e8ab2caf436e8e44b6a3b6)
2011-05-18 10:46:46 +10:00
Jason McDonald
6354d890f3 Remove Q_ASSERT from qitemmodel autotest
If populateTestData() is passed an unknown type of model, report a
meaningful fatal error rather than failing silently in a release build
and aborting with an uninformative error message in a debug build.

Change-Id: I7ee8d1262bbced304f9f24c2ec9b40a38704d982
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 6b2e89843a573cd7c143bca17cec8e69209d2fbd)
2011-05-18 10:46:46 +10:00
Jason McDonald
72fb879764 Remove Q_ASSERT from algorithms autotest
Report a meaningful warning message rather than aborting in a debug
build and failing silently in a release build.

Change-Id: Ic77589143ff0d22c95c7b10f2e511f68b3da4d86
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 75767c69fbba3149a4505287ed441886188a9fd3)
2011-05-18 10:46:46 +10:00
Jason McDonald
51b23f75df Remove Q_ASSERT's from qabstractfileengine test
Rather than aborting in debug builds and failing silently in release
builds, report a meaningful warning message and skip setting the
filename, which should cause a subsequent test failure.

Change-Id: I3ae4f4de7b02bf2194019047fa87d8ae06d95634
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit e6f7509f18ae88069373d59073cbdcda88fd19c8)
2011-05-18 10:46:46 +10:00
Jason McDonald
97e0db61c7 Remove Q_ASSERT's from modeltest
Rather than aborting in debug builds and ignoring the failures in
release builds, report specific warnings on each failure, count the
failures, and fail the test if the failure counts are non-zero at the
end of the test.

The same change is also made for a QCOMPARE that appeared
inappropriately inside a helper class.  QCOMPARE may only appear
directly in a test function.

Change-Id: I81f0ce80512fa72c67f5aa72c0511a4b650d5d20
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 11254ff409395b67cb28453b3c069860bc28c14d)
2011-05-18 10:46:46 +10:00
Jason McDonald
16c866533b Remove Q_ASSERT from modeltest
Report an informative fatal error if passed a null model, rather than
aborting in a debug build and giving a bunch of signal connection errors
in a release build.

Change-Id: Ia240e741b9d6ec03fd5ed3a14cf4fa44b55af911
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 841cc610df61a266ebcca2bfef2542a7d4fea68d)
2011-05-18 10:46:45 +10:00
Jason McDonald
3fee47be4c Remove Q_ASSERT's from modeltest
Report a fatal error in all builds, not just in debug builds.

Change-Id: Ia9e265b2082b55fbac18ca046e586de863ac0623
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 22e99d92a71645d643ebd54c6209bced80f7c5b8)
2011-05-18 10:46:45 +10:00
Jason McDonald
8e9644a67e Remove Q_ASSERT's from QAbstractFileEngine autotest
Rather than aborting in debug builds and ignoring failures in release
builds, report meaningful warnings into the test output and return
sentinel values that will cause QVERIFY/QCOMPARE of the returned values
to fail the test.

Change-Id: I2c5a820637337d0762c71db10a4f270d36b31662
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 524bd6b7120f70a178b03bc6d337e08abd327076)
2011-05-18 10:46:45 +10:00
Jason McDonald
6aca191e10 Remove Q_ASSERT's from QTextEdit autotest
Convert Q_ASSERT to QCOMPARE and remove mention of Q_ASSERT in comments
to make it easier to check for unwanted Q_ASSERT's in the future.

Change-Id: I7ae250428d4d5682806e724a7207523e65cd9851
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 3290dd0d3563310f6bdbabf74105367bd8c611d3)
2011-05-18 10:46:45 +10:00
Jason McDonald
7bd778117c Remove Q_ASSERT's from large file autotest.
These assertions were made obsolete by the previous change to this test.

Change-Id: I3156b273a727f753a6c093c8fc7453b694c777ee
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 57f6ed6664f55ccee62b81750a2b3520249503fd)
2011-05-18 10:46:45 +10:00
Jason McDonald
3aa7455eab Remove Q_ASSERT from QMutex autotest
Rather than aborting in debug mode and doing nothing in release mode
when the invariant is violated, count the failures and fail the test
gracefully.

Change-Id: Ie193460c478ddde540b6b15aafdce32f471b4b2b
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit f18e0e01468899731bc3777649d69fd6d0041012)
2011-05-18 10:46:45 +10:00
Jason McDonald
83fcb8023a Remove Q_ASSERT from qtesselator autotest
If the test data is incorrect, print a meaningful warning into the test
output.

Change-Id: Ibfe64ef41a0ff3eb47c2385d1c31191334a675a8
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 28ccfa472991c0480e67b5f204a567c4023ba6d4)
2011-05-18 10:46:45 +10:00
Jason McDonald
9329ee1c27 Remove Q_ASSERT's from exceptionsafety_objects test
Report a fatal error in all builds, not just in debug builds.

Change-Id: Iad990e2d3b29a55e995254d466e967a4a722bb23
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a212b402da4b4af9d453fa96dbfa2d32271e857d)
2011-05-18 10:46:45 +10:00
Jason McDonald
d9d1e72d76 Remove Q_ASSERT in gestures autotest
Rather than aborting on a bad gesture event in debug builds and ignoring
the error in release builds, record a count of bad events and fail the
test if the count is non-zero at the end of the test function.

Change-Id: I6ddd46a5a656185c13eae4bbbb496b986a0c92f6
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 5953d930bc07fa6734a11d053d26a3f80e9c1e89)
2011-05-18 10:46:45 +10:00
Jason McDonald
80384827e0 Remove Q_ASSERT's from QTreeView autotest
Issue a meaningful fatal error in preference to aborting in debug mode
builds and crashing in release mode builds.

Change-Id: I7bb04e1e222fd6167be19b5d88caac27b43d88df
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit cb126ff7ad08e9801e2911511aa9aeb728faa8f3)
2011-05-18 10:46:44 +10:00
Jason McDonald
aa004ff76d Remove Q_ASSERT from qtesselator autotest
If the test data is incorrect, print a meaningful error message into the
test output.

Change-Id: I505a86b4411619d3c3be9541c96c082f92589ff7
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 8e12d9e322ec7d8f7eece09b6f15cba640615f9e)
2011-05-18 10:46:44 +10:00
Jason McDonald
c631c05819 Remove mention of Q_ASSERT in QTableView test.
Change-Id: If27cb7031cdde222d1dd988188569dca4b1fb6d9
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 324b9db856f00a82d7fd3426d9b698211290efaa)
2011-05-18 10:46:44 +10:00
Jason McDonald
6fe7053d53 Remove Q_ASSERT's from QXmlStream autotest.
Report a fatal error in all builds rather than only in debug mode
builds.

Change-Id: I6b3a999dd3ccf00ae66a86b43c125d7082cf0ae5
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit c183540c6c244f327ebd834167799072dcc3b72d)
2011-05-18 10:46:44 +10:00
Jason McDonald
b1b8d03054 Remove Q_ASSERT's from qtestlib selftests
Report a fatal error in all builds rather than just in debug mode
builds.

Change-Id: Ie54e55ea2dd13bbb12e4265278db832ac1297c28
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 8a1279b0ae180fae94d3da1a4eeb20df5a748d33)
2011-05-18 10:46:44 +10:00
Jason McDonald
48ab5a8d25 Remove unused code from QXmlStream autotest
Change-Id: I719e502ef14848a22d41de71245fe6b6758c8d6b
Reviewed-by: Rohan McGovern
(cherry picked from commit 614474fb3d440eabd3ba7e381d246064ce39f4fa)
2011-05-18 10:46:44 +10:00
Jason McDonald
8c191084a8 Remove Q_ASSERT from qxmlsimplereader autotest
Verify the success of setting the document content in the test function
rather than using Q_ASSERT.

Change-Id: I25e017e7f92803867a998b4f09ad9f717212a9bc
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit d7453aef14b80a5972909ed99f1b4c765b7436a5)
2011-05-18 10:46:44 +10:00
Jason McDonald
803f6117ca Remove Q_ASSERT from QXmlInputSource autotest
Report a fatal error in all builds rather than aborting in debug mode
builds only.

Change-Id: I53b348f077c6533433e32bbebd159066a2bc2c37
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 4f818b8bcf51cf9c654edbf319d90f6c77a09b3e)
2011-05-18 10:46:44 +10:00
Jason McDonald
f5662adb03 Remove Q_ASSERT from QLibrary autotest
Report a regular test failure rather than aborting when an unknown
operation is requested.

Change-Id: I3678f42f9e9f895d8d0d49a768d4c8b575d1863f
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 22aa68ecec96da4d14a4c9fe2f6e4a337b13b4a3)
2011-05-18 10:46:44 +10:00
Jason McDonald
42d6820c7c Remove Q_ASSERT from QSharedPointer autotest
Report a meaningful fatal error instead of aborting in debug mode builds
and failing silently in release mode builds.

Change-Id: I0f939dc40810f072a3e24aeba085191793c49ef3
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit b988b2f9f04ac0ebce7a779cd9bd5d394bfa1c95)
2011-05-18 10:46:43 +10:00
Jason McDonald
ab6c90367d Remove Q_ASSERT from QThread autotest
Report a meaningful fatal error instead of aborting in debug mode builds
and failing silently in release mode builds.

Change-Id: If9a6c0655e021b3bb6b7d894aefd9bbcc58e4605
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit fed42f25e129af1f4f2c03a075530ad7111d2fdd)
2011-05-18 10:46:43 +10:00
Jason McDonald
affdd6283c Remove Q_ASSERT's from QWizard autotest
Combine the two checking functions (check and checkInvariant) and have
the resulting check function return a bool instead of asserting so that
the test function can QVERIFY and fail gracefully.

Change-Id: Ib069b5424483ba6ffb9caf75036c4f325e9dba51
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a54900d2227bfb2021c5d1255817824aff11cf32)
2011-05-18 10:46:43 +10:00
Jason McDonald
079dde144f Remove mention of Q_ASSERT in comments
This will make it easier to check for stray Q_ASSERT's in the future.

Change-Id: I5ddafe1bf26819566460920deae8ff448008c93f
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit b2db13f245f09f1d14af64d2199284c78cbb5b6e)
2011-05-18 10:46:43 +10:00
Jason McDonald
dffae678dd Remove Q_ASSERT's from QVariant autotest.
Print a meaningful warning message instead of aborting in debug
mode builds and failing silently in release mode builds.

Change-Id: I44143c5fbe6b6af87bdf5bd231cfaf9a3c9c33f8
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a8dc321b6669dd263a25a0cb5766e5b7150c6e20)
2011-05-18 10:46:43 +10:00
Jason McDonald
fd714ec5aa Remove Q_ASSERT from QTextOdfWriter autotest
If the <dummy> tag can't be found in the data, return an empty string
rather than asserting, so that the test fails gracefully.

Change-Id: I536f08c9c3e942817680849d96d035999d4994db
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a88dd1c5f62b5ded8ea0d76d185127ef28549c72)
2011-05-18 10:46:43 +10:00
Jason McDonald
c0372871f8 Remove Q_ASSERT from qtesselator autotest
If the test data is incorrect, print a meaningful warning into the test
output instead of deferencing an iterator beyond the last element in
the list.

Change-Id: I7be4f282639453de6d8240a2f17253025b415337
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit f01e2a5024db69913aed016e2854b2589ca85080)
2011-05-18 10:46:43 +10:00
Rohan McGovern
d7e10b2a71 Remove Q_ASSERT from qsslsocket autotest.
Make the server thread exit early if the socket is invalid.  This will
make the test fail gracefully instead of crashing.

Change-Id: Ia9564c94dd32d65e6e9bdb4a2410f1512409546c
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit b9b3ced2eafe13e491d5af5ad7432733941bfd8d)

Conflicts:

	tests/auto/qsslsocket/tst_qsslsocket.cpp
2011-05-18 10:46:43 +10:00
Jason McDonald
44bb3c62cb Remove Q_ASSERT's from qsharedpointer autotest
Report a meaningful warning message into the test output rather than
aborting in debug mode and doing nothing in release mode.

Change-Id: I6883fccbce0139c763f36f6839bb3452d8f69c1c
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 5b86c4abc676b36d60e6625e89535e7f4907d2b3)
2011-05-18 10:46:43 +10:00
Jason McDonald
982405f2d0 Remove Q_ASSERT's from QObject autotest.
The Receiver class has two slots that aren't meant to get called during
the test (they're there to catch broken parsing of slot names).  Rather
than asserting when one of them gets called, which does nothing in a
release mode build, this commit makes the slots record the number of
times they were called (as for the other slots in the test) and fails
the test gracefully if either of those slots was called.

Change-Id: Ia0393026cb96ffdc6190b5e7bd951f75d231b11e
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 7bd6ca895e5fa4de197d9d7bf2e7b578c01c3c2a)
2011-05-18 10:46:42 +10:00
Jason McDonald
d0d393d86f Remove Q_ASSERT's from QMetaType autotest.
Instead of asserting in debug mode and doing nothing in release mode,
put specific warnings in the test output and fail the test gracefully.

Change-Id: I453a0ab7ddef5b2acf55f77f71a59a940d93ae54
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a3b2fa3f1beffa7709c11522d4e2db9ec8f952e0)
2011-05-18 10:46:42 +10:00
Jason McDonald
4bf7ac3968 Remove Q_ASSERT from QMetaObject autotest.
Issue a helpful warning rather than ignoring the error in release mode
builds.

Change-Id: Iea7bf4d63f8227abaf7dcf1700c5fef62763afad
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 6f082a3fdd368cd7a969b7f324354583d081da82)
2011-05-18 10:46:42 +10:00
Jason McDonald
e415182a14 Change Q_ASSERT to QVERIFY in QMenu test.
Change-Id: Ifc08d4eabd8565cfd242ec2e70cf597e92f28fe3
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 291f04a4a7be4a975c6b8eaeeed4e0c196e23128)
2011-05-18 10:46:42 +10:00
Jason McDonald
b0da433436 Remove Q_ASSERT from qitemview autotest
Allow createView() to return a null view on failure (which it already
did in release mode builds), but fail the test gracefully instead of
crashing when a null view is returned.  Also reordered the code slightly
to put all the QFETCH's together.

Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern

Change-Id: I3a41c738cb0e4e860db2342b30817a804b20f30d
(cherry picked from commit 51b1d8dc20a2557d2002550b03e5b9f37f425fb4)
2011-05-18 10:46:42 +10:00
Jason McDonald
7c8c84d92b Remove Q_ASSERT from qitemmodel autotest
Allow createModel() to return a null model on failure (which it already
did in release mode builds), but fail the test gracefully instead of
crashing when a null model is returned.

Change-Id: Iaa0ec31183e0c90fcea512223d01e07ed188a380
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 0d773d839e39f4f4bfd0bf9d652e4f2650adfcb0)
2011-05-18 10:46:42 +10:00
Jason McDonald
35b01c1733 Remove mention of Q_ASSERT from qheaderview autotest
Change-Id: I3a97411c0b53345bffbadb60a3e7caabfb0441d2
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a388e104febb131cd35438bbb1397eeab41d3ab8)
2011-05-18 10:46:42 +10:00
Jason McDonald
98f9513b6b Remove dead code from qgraphicsgridlayout autotest
Change-Id: I230d1ec9dfd5df2a0fac161a03090308b7f07a1e
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 012b2d8198b8cfe39a66025334ed9ae2a045a68c)
2011-05-18 10:46:42 +10:00
Jason McDonald
319197880e Remove Q_ASSERT from qgraphicsanchorlayout test
Q_ASSERT will only catch a violation of the precondition of the
checkReverseDirection function in a debug build.  This commit replaces
the Q_ASSERT with QVERIFY'ing the precondition (that the widget has a
layout) before calling the function.

Change-Id: Ibaa2b52b7d67fa20784e0df022e8c8169da0e50e
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit d1011fc9328fa335bc69a065b29e77ce60608c55)
2011-05-18 10:46:42 +10:00
Jason McDonald
5bdf574941 Remove Q_ASSERTs from qgraphicsanchorlayout1 test
Sanity-check the test data when using it rather than when creating it.

Change-Id: Ie5d5e1ff3fc439d196096f17cb6f97680927a90c
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 2c64404e2edd3b792b8a1d04c773860d40c04c4c)
2011-05-18 10:46:41 +10:00
Jason McDonald
46412f7128 Only ignore warning when it can actually be produced.
Fix regression introduced in 3ca51d87296bcb3098d7de14294fef9294fd5ed4.
The warning is only generated in builds where QT_NO_DEBUG is not
defined *and* the target is not Mac OS X.

Change-Id: I7245f2eab8ea47ab7495fef874b2f8a29186b659
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 60e5ed805af1e11aaec426b823df209b4c895c29)
2011-05-18 10:46:41 +10:00
Jason McDonald
0ea9ffef43 Use meaningful variable names
Make the meaning of the code more obvious and avoid a compiler
warning about the variable "w" being overridden.

Change-Id: Ib76d3aa1cae46e263b2ab61b675d9ef74032aacc
Reviewed-by: Rohan McGovern
(cherry picked from commit 59634e825f1efa6f32befc8767cafedfeb9b7d59)
2011-05-18 10:46:41 +10:00
Jason McDonald
9e0049f656 Fix logic error in large file autotest
The function generating data blocks was filling the block to 16 bytes
short of the blockSize, then appending three 8 byte values, causing the
block to grow 8 bytes beyond blockSize and then truncating it back to
blockSize.

This commit makes the code fill the block to 24 bytes short of the
blockSize, so that the block will always end up at the correct size and
truncation is not needed.

Change-Id: I9fe6e6d6cf7bc445513b53e0a910d205c4c8002f
Reviewed-by: Rohan McGovern
(cherry picked from commit b1eb564830ff1b754de14919ce5c1547e9758f7c)
2011-05-18 10:46:41 +10:00
Jason McDonald
2d471a2bef Remove Q_ASSERT from QDom autotest
The Q_ASSERT here should really be a QVERIFY.  Expanded the trivial
helper function to make it more obvious what the test does.

Change-Id: Ia6017fe820a83b4d6101e5edcfcb68993eef233a
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 6181805f9ea66b37ee164bd67bdac2ac9d53fb65)
2011-05-18 10:46:41 +10:00
Jason McDonald
20d16d3f8b Remove Q_ASSERT from datetimeedit autotest
The assert and the last four parameters of makeList() are not needed.
The function is always used to make lists of three integers and the data
are all >= 0.

Change-Id: I93ae5a5f541cde2ff61bd9dd21164ed4a9b57403
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit e754832eff8e1a35fc2681ae69b6e3b1ad666ddb)
2011-05-18 10:46:41 +10:00
Jason McDonald
847ee01953 Remove Q_ASSERT from qcopchannel autotest
This code would assert in a debug build and potentially crash in a
release build. (The behaviour of QStringList::at() with an out-of-bounds
index is undefined.) This commit makes the program exit with a useful
error message in all builds.

Change-Id: Ia57a2e5693eb25d3eb0b9ba701ed485dfbc1e846
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 5a530f6171a9569d1a35cd8cd1015ec796b048cc)
2011-05-18 10:46:41 +10:00
Jason McDonald
e1f2211188 Remove Q_ASSERT from QCompleter autotest
If a combobox had no completer, this test would assert in a debug build
and crash in a release build.  This commit makes the test report a test
failure and avoid terminating in all builds.

Change-Id: Ib2924412e3d55f10875675cb65079259cd4ef552
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a5bd4abed834ce3670b2f28d4f932d612a033b36)
2011-05-18 10:46:41 +10:00
Jason McDonald
50fd0092db Only ignore warning when it can actually be produced.
Fix regression introduced in 3ca51d87296bcb3098d7de14294fef9294fd5ed4.
The warning is only generated in builds where QT_NO_DEBUG is not
defined.

Change-Id: I9aa3db369094f4046062b5dc1dc694342208ee45
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 67bc4990f7541cca089882a8c3be1b2b8d98cd4c)
2011-05-18 10:46:41 +10:00
Jason McDonald
8ccb06a718 Remove Q_ASSERT from qcompleter autotest.
Replace obscure failure on bad test data in debug builds with an
informative warning in all builds.

Change-Id: I9001820f34de2f78bf296a2f0e095ce73d9ac4bd
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 34c077faae538adc12d4aa28113640570dfc8728)
2011-05-18 10:46:41 +10:00
Jason McDonald
94a7d439f2 Remove Q_ASSERT from qatomicint/pointer autotests
Some code in these tests is not intended to be executed, but rather to
detect compiler warnings.  Instead of having an obscure fatal error if
this code is run in a debug build, it now has a clear fatal error if run
in any build.

Change-Id: I1c9d27bb14ebf3313865b68e3e57668ba1d14e25
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 70f42ced8e01ddf0098b143e5804c22d55ebf16f)
2011-05-18 10:46:40 +10:00
Jason McDonald
3ac241a1d5 Fix remaining warnings in accessibility autotest
Prevent warnings about unhandled accessibility events by managing object
lifetimes appropriately.

Change-Id: If72a2a6a76527ff746b99634c2d0895354570724
Reviewed-by: Rohan McGovern
(cherry picked from commit bf1d860143ff40330c6e8f3e2872f2ae812adaa7)
2011-05-18 10:46:40 +10:00
Jason McDonald
782cd3241d Ignore expected warning in accessibility autotest
Change-Id: I4b614766d2451dde51ab1207267301a2fe7dd0f6
Reviewed-by: Rohan McGovern
(cherry picked from commit 3ca51d87296bcb3098d7de14294fef9294fd5ed4)
2011-05-18 10:46:40 +10:00
Rohan McGovern
089ad37751 If accessibility isn't built, don't try to test it
Only build the autotest when the feature to be tested is in the Qt
build.  This is better than building and running an empty test.

Change-Id: I67721f5f48296afcca64f761d12325f8e040f2d8
Reviewed-by: Rohan McGovern
(cherry picked from commit cf911bc0d297ed30e615fd115b0d3ae574cb2412)

Conflicts:

	tests/auto/qaccessibility/tst_qaccessibility.cpp
2011-05-18 10:46:40 +10:00
Jason McDonald
7ef434c3a0 Remove unused function.
Change-Id: I197ca88e04a68dca0ea819d6e335a02607e597aa
Reviewed-by: Trust Me
(cherry picked from commit 1a98c473fbcbb6a9edf1b7e42babbad7d901edb4)
2011-05-18 10:46:40 +10:00