summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove obsolete test dataJason McDonald2011-05-20980-408/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove test data for Qt3Support functions from the QTextStream autotest. The code that used this data was removed in an earlier commit. Change-Id: I26e34cdefd47287c6992cf1d31276a40994c607c Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | Remove Qt3Support code from QMenuBar test, part 2.Jason McDonald2011-05-201-93/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-2036-47/+71
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Tests: Fix some compile warnings.
| * | Tests: Fix some compile warnings.Friedemann Kleint2011-05-1936-47/+71
| | | | | | | | | | | | As they are now compiled by default.
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-191-2/+0
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove warning from QColor::setNamedColor().
| * | Remove warning from QColor::setNamedColor().Samuel Rødal2011-05-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-198-2684/+534
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| * | Compile IPC tests.Friedemann Kleint2011-05-191-0/+1
| | |
| * | Improve coding style of qdatastream testJason McDonald2011-05-191-525/+520
| | | | | | | | | | | | | | | | | | | | | | | | Expand literal tabs and format switch statements in accordance with the Qt Coding Style. Change-Id: I64e638b730f4be2bc707136b1b7e5585d6808731 Reviewed-by: Rohan McGovern
| * | Remove Qt3Support code from QMenuBar autotestJason McDonald2011-05-191-465/+0
| | | | | | | | | | | | | | | | | | Change-Id: I63677bfe56ec92c1c96e2df5619ee434bdc91fdb Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | Remove Qt3Support code from QSplitter autotestJason McDonald2011-05-191-657/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Remove Qt3Support code from QSharedPointer autotestJason McDonald2011-05-192-11/+6
| | | | | | | | | | | | | | | | | | Change-Id: I1bb3752e3a5101e4a2990d0cac01406e6023ee2e Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | Remove Qt3Support code from QComboBox autotestJason McDonald2011-05-191-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Remove Qt3Support test code from accessibility autotestJason McDonald2011-05-191-1007/+0
| | | | | | | | | | | | | | | | | | Change-Id: Id31836ea52da71b40c0bcbb67d9beffc70b90400 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-191-293/+9
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove Qt3Support code from QDataStream autotest.
| * | Remove Qt3Support code from QDataStream autotest.Jason McDonald2011-05-191-293/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1938-3944/+50
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | * '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.
| * tests: fixed compilation of tst_qtextstreamRohan McGovern2011-05-191-1/+1
| | | | | | | | | | | | | | | | 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
| * Remove Q_ASSERT's from qdbustype autotestJason McDonald2011-05-181-4/+4
| | | | | | | | | | | | Change-Id: I276750d8acda3744ee8a9c424b2da0a08e8c7461 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| * Remove autotest code for Qt3Support library.Jason McDonald2011-05-1837-3939/+45
| | | | | | | | | | | | | | | | | | | | 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
* | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-184-8/+4
|/ | | | | | | | | | | | 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)
* Make QDataStream test compile and re-enable itJason McDonald2011-05-185-8399/+9
| | | | | | | | | | 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
* Reduce usage of Q_ASSERT in autotests.Rohan McGovern2011-05-1822-172/+160
| | | | | | | | | | | | 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
* Fixed license header.Rohan McGovern2011-05-181-0/+42
| | | | | | (cherry picked from commit 2caea6081fc46217636f0ab70d09891efd2d2864) Change-Id: I086c8cb2d0ccc691d8af68804132f048bee7fa4b
* Remove Q_ASSERT's from qsharedmemory autotestJason McDonald2011-05-182-2/+4
| | | | | | | | | 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)
* Remove Q_ASSERT's from QNetworkReply autotestJason McDonald2011-05-181-7/+11
| | | | | | | | | | 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)
* Remove Q_ASSERT from QXmlStream autotestJason McDonald2011-05-181-3/+3
| | | | | | | | | | | 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)
* Remove Q_ASSERT's from QXmlStream autotestJason McDonald2011-05-181-5/+10
| | | | | | | | | 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)
* Remove Q_ASSERT from QItemModel autotestJason McDonald2011-05-181-1/+2
| | | | | | | | | | | 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)
* Remove Q_ASSERT's from QXmlStream autotestJason McDonald2011-05-181-6/+8
| | | | | | | | | 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)
* Remove Q_ASSERT from QVariant autotestJason McDonald2011-05-181-6/+9
| | | | | | | | | | | 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)
* Remove Q_ASSERT's from QTreeView autotestJason McDonald2011-05-181-2/+4
| | | | | | | | | 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)
* Remove Q_ASSERT from qtesselator autotestJason McDonald2011-05-181-1/+2
| | | | | | | | | 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)
* Remove unused function from qtessellator autotestJason McDonald2011-05-181-13/+0
| | | | | | | Change-Id: I24c1db8392370d19970421a014f7bb6c4bc7c6e8 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 224050aae75fd5b1d6c57909d894a3eba7ac43fc)
* Remove Q_ASSERT's from qreadwritelock autotestJason McDonald2011-05-181-8/+21
| | | | | | | | | | | | | 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)
* Remove Q_ASSERT's from QObject autotestJason McDonald2011-05-181-3/+6
| | | | | | | | | | | 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)
* Remove Q_ASSERT's from QObject autotestJason McDonald2011-05-181-3/+6
| | | | | | | | | | 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)
* Remove Q_ASSERT's from QNetworkReply autotestJason McDonald2011-05-181-2/+7
| | | | | | | | | | 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)
* Remove Q_ASSERT from qitemmodel autotestJason McDonald2011-05-181-7/+22
| | | | | | | | | | 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)
* Remove Q_ASSERT's from QMutex autotestJason McDonald2011-05-181-4/+7
| | | | | | | | | | | 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)
* Remove Q_ASSERT from QMetaType autotestJason McDonald2011-05-181-1/+10
| | | | | | | | | | | 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)
* Remove Q_ASSERT's in qitemview autotestJason McDonald2011-05-181-12/+53
| | | | | | | | | | | 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)
* Remove Q_ASSERT from qitemmodel autotestJason McDonald2011-05-181-1/+1
| | | | | | | | | | | 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)
* Remove Q_ASSERT from algorithms autotestJason McDonald2011-05-181-1/+2
| | | | | | | | | | 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)
* Remove Q_ASSERT's from qabstractfileengine testJason McDonald2011-05-181-4/+4
| | | | | | | | | | | 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)
* Remove Q_ASSERT's from modeltestJason McDonald2011-05-181-10/+42
| | | | | | | | | | | | | | | | 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)
* Remove Q_ASSERT from modeltestJason McDonald2011-05-181-1/+2
| | | | | | | | | | | 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)
* Remove Q_ASSERT's from modeltestJason McDonald2011-05-181-3/+7
| | | | | | | | | 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)
* Remove Q_ASSERT's from QAbstractFileEngine autotestJason McDonald2011-05-181-10/+39
| | | | | | | | | | | | 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)
* Remove Q_ASSERT's from QTextEdit autotestJason McDonald2011-05-181-3/+3
| | | | | | | | | | 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)