aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest
Commit message (Collapse)AuthorAgeFilesLines
* qmltest: Count passes, fails and skips consistently.Jason McDonald2012-02-133-20/+12
| | | | | | | | | | | | | | | | | | | | | This commit changes qmltest to count one pass per data row, rather than a single pass for an entire data-driven test function. This makes counting of passes consistent with counting of fails and skips which were already counted once per data row. This change also means that the plain-text, xml and light-xml output formats will now show one result per data row, so that every data row executed will be shown in the test output with either a pass, fail or skip result. Previously data rows that passed were not shown in the output, preventing analysis of total number of tests runs, pass-rates, and various other metrics. This commit corresponds to (and depends on) a commit in the qtbase module which changes the behaviour of qtestlib in the same way. Task-number: QTBUG-21848 Task-number: QTBUG-22124 Change-Id: I3c1f0e68bdff4087b9ccfc80a3f96f4541335b6f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove code related to test location.Jason McDonald2012-02-093-29/+1
| | | | | | | | | Testlib no longer does anything with the test location and neither do any of Qt's tests, so this code is no longer needed. Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* qmltest: Perform extra checks after each data row is executed.Jason McDonald2012-02-093-0/+7
| | | | | | | | | Add calls to the new function QTestResult::finishedCurrentTestData() to verify that expected failures and expected messages have been produced. Change-Id: Ia139a962c705a5f47be992b7f2e81775aa2e2f28 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* CodeCoverage: Fix wrong type passed to saveCoverageTool.Caroline Chao2012-02-081-1/+1
| | | | | | | Passing a bool as appropriate. Change-Id: I0dcca8d30c6d75e7fcddcf7047e1dd1c572ec6ea Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-033-66/+10
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-308-8/+8
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QT_LICENSED_MODULE macroLars Knoll2012-01-251-1/+0
| | | | | | | | The macro was used to check for valid commercial licenses, and recently removed from qglobal.h Change-Id: I20a2e02d0986429120ba2c083f9b50b1a23062f5 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add dummy test column for data driven test in qmltestCharles Yin2012-01-251-0/+3
| | | | | | | | | | | | Normally, data driven test with QTest requires add columns before adding new data rows, otherwise QTest might results into warning or error. However, qmltest does the data driven test in its own way so no columns info needed. So add a dummy column here to make QTest happy. Task-number:QTBUG-23845 Change-Id: I1bfed663fa7b58d71e0cf898db6bd8ae61dae46b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Call new pass/fail/skip count function in QTestLog.Jason McDonald2012-01-241-4/+4
| | | | | | | | The passCount, failCount and skipCount functions have moved from QTestResult to QTestLog. Change-Id: I0dbf8b43521f81dc29e20bb7547ff9f213487007 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Avoid using QTestResult::ignoreMessage().Jason McDonald2012-01-241-1/+1
| | | | | | | | | QTestResult::ignoreMessage() is just a wrapper around QTestLog::ignoreMessage(). Both are private API, so just call the latter directly so that the former can be removed from the API. Change-Id: Icf77e2bf656afc556205ddf0dda5bb48fdbdfbbf Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-238-8/+8
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-201-1/+0
| | | | | Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-177-7/+7
| | | | | | | | Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't delete global appCharles Yin2012-01-131-1/+4
| | | | | | | | Sometimes delete the global GUI app causes crash, this is a work around fix. Change-Id: Ic2406e7a085483de5d96321de8257663925b7e5e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* QMLTest: Fix output of file names, make output more verbose.Friedemann Kleint2012-01-113-72/+107
| | | | | | | | | | | | | | | - Check command line arguments thoroughly. - Change all QuickTestResult functions taking file names to accept QUrls and format them using QUrl::toLocalFile() in case of local file names in order to display Windows drive letters correctly. - Introduce a template function (for QDeclarativeView, QQuickView) that dumps out all available information when compilation goes wrong. - Skip 'Debug', 'Release' folders for Windows builds. Change-Id: Ibdd92867870a2b05494de8a0adbe0910d4897ba2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Integrate testcocoon support into QtQuickTest.Caroline Chao2011-12-091-0/+33
| | | | | | | | Add support to install and save coverage data when a test is run using quick_test_main. Change-Id: I39ddd678d748979c335139b3f8bda43b3d05720d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fix qmltestrunner crash bug when report filename and line numberCharles Yin2011-11-091-1/+2
| | | | | | | | | | The HandleScpe is not needed here. Also for each test file, the rootObj should reset its internal states properly, otherwise the following test cases are polluted by the previous tests. Task-number:QTBUG-22620 Change-Id: I1e4869070b8712e5a6c755461d52bd12d1f03160 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Declarative: Fix gcc 4.6 warnings about assigned/unused variables.Friedemann Kleint2011-11-012-2/+1
| | | | | | Change-Id: Iac4bb4a6b1aa4071a239bb25f25f01b71e36868b Reviewed-by: Alexis Menard <alexis.menard@openbossa.org> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Add I18N support to qmltestrunnerCharles Yin2011-10-281-0/+15
| | | | | | | | | | Add a new command line option "-translation file" to handle translation files to qmltestrunner. Task-number:QTBUG-22390 Change-Id: I351ed41734c79a51e00aeef551af642482bf36f2 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove Q_WS_*, symbian and maemo code in QtDeclarativeDamian Jansen2011-10-262-11/+1
| | | | | Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add QT_BEGIN_HEADER/QT_END_HEADER macrosSergio Ahumada2011-10-252-0/+8
| | | | | | | | | Fixing `macros' function test of `tst_headers' Task-number: QTQAINFRA-324 Change-Id: I0cd3ea6ee631c3e19078eda2104c78803d77939d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Fix qmltestrunner hang bug when no TestCase itemCharles Yin2011-10-241-4/+12
| | | | | | | | | | | Add a hasTestCase property to the global qtest object, set it to true in each TestCase's onCompleted handler. qmltestrunner only enter the event loop if this property is true to avoid infinite waiting. Task-number:QTBUG-22281 Change-Id: Id609432210ae795d8c128901e64ba0aef4551f01 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-212-8/+8
| | | | | | | | | | | | | | | | | | | | | | The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add file and lineno parameters to warn() methodCharles Yin2011-10-212-3/+3
| | | | | Change-Id: I1ddfd4793a26a16bf85b72c50d84080cd0b26a87 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove SkipMode from qtestlib API.Jason McDonald2011-10-212-10/+2
| | | | | | | | | | The SkipMode parameter to QSKIP has been removed in qtbase, therefore it must also be removed here. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I8016f8c28338b1b532bdb593c796d699b99250dc Reviewed-by: Charles Yin <charles.yin@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* only use one QSGView instance for all qml test casesCharles Yin2011-10-141-13/+14
| | | | | | Change-Id: I9296e30d216b57d8cf2a11e94030781f03594aa6 Reviewed-on: http://codereview.qt-project.org/6646 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* make it possible to run single qml test case file by passing a tst_*.qml ↵Charles Yin2011-10-101-9/+14
| | | | | | | | | file to -input option Change-Id: I8376ca0ae23d4366d69e0e7f3c95593ba54fc71d Reviewed-on: http://codereview.qt-project.org/6273 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Catch up with API change to QTestLog::qWarn().Jason McDonald2011-09-291-1/+1
| | | | | | | Change-Id: I2db27f473a0f35530961fa70e35eb552be02e890 Reviewed-on: http://codereview.qt-project.org/5695 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Call QWARN() instead of QTest::qWarn().Jason McDonald2011-09-261-1/+1
| | | | | | | | | | | The QWARN macro wraps QTest::qWarn(), but the former is the public API and the latter is merely an implementation detail that is subject to change. Change-Id: I02ae5ea384875afb7f235ef8dff0768a56afaa53 Reviewed-on: http://codereview.qt-project.org/5486 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Wheel event support in qmltestlib + few fixes.juhvu2011-09-222-8/+63
| | | | | | | | | | added unit test and orientaion support for mouseWheel Change-Id: I9c26dc762281bc32965769c151414ac0e177ad0f Reviewed-on: http://codereview.qt-project.org/5272 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-121-37/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * make the testcase name the same in both plain text and xml/xunit logs for ↵Charles Yin2011-09-091-37/+3
| | | | | | | | | | | | | | | | | | | | qmltest Change-Id: I911b3c7ba698b6c94aaa712eeaa917301c651e64 Reviewed-on: http://codereview.qt-project.org/4112 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | make quicktest build and modify to use qwindowMatthew Cattell2011-09-094-36/+37
| | | | | | | | | | | | Change-Id: Idebb00b828307421bcbd89d8abaa9ea1d903af47 Reviewed-on: http://codereview.qt-project.org/4542 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-313-12/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
| * Fix build break introduced by changes in QTestLog.Xizhi Zhu2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | The mode parameter of QTestLog::addSkip() has been removed, more details at: http://codereview.qt.nokia.com/3547 Change-Id: Id5428a506d177ae9d4480a522ee492672048dad7 Reviewed-on: http://codereview.qt.nokia.com/3735 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
| * Deprecate QDeclarativeDebugHelper classKai Koehne2011-08-262-10/+1
| | | | | | | | | | | | | | | | | | | | This was a helper class for enable debugging in 4.7. Since Qt 4.8 you should just say CONFIG += declarative_debug Change-Id: I51dabaec36e175a097721570061aad38c3f828d1 Reviewed-on: http://codereview.qt.nokia.com/3507 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* | Get declarative running on new gui/opengl stack.Samuel Rødal2011-08-292-4/+4
| | | | | | | | | | | | | | | | | | Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc. Change-Id: I08379029d756e28b20ae141ca30ed801626b513d Reviewed-on: http://codereview.qt.nokia.com/3711 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-251-4/+9
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
| * parse args earlierCharles Yin2011-08-081-3/+4
| | | | | | | | | | | | | | Change-Id: Ie0869d3f70d1e898a9b0635e28bcad2e92fa607c Reviewed-on: http://codereview.qt.nokia.com/2718 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * don't create QApplication if there is already one thereCharles Yin2011-08-081-1/+5
| | | | | | | | | | | | Change-Id: Iaf9ebf6855992962abfb3452dc398149af15bbbc Reviewed-on: http://codereview.qt.nokia.com/2711 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-112-5/+4
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/declarative.pro src/imports/gestures/gestures.pro src/imports/inputcontext/inputcontext.pro src/qtquick1/graphicsitems/qdeclarativeitem.cpp src/qtquick1/qtquick1.pro Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
| * Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-292-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Build against refactor.Samuel Rødal2011-07-292-2/+2
|/ | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-123-4/+4
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'v8'Aaron Kennedy2011-07-081-18/+0
|\ | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
| * get the caller file & line number from v8 stack trace.Charles Yin2011-06-231-18/+0
| | | | | | | | Change-Id: I0ffebd2d22702bc14e1629b8bc0455a9cf8ea416
* | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-088-136/+136
|/ | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Fix missing include->load conversion of qbase.priMarius Storm-Olsen2011-06-071-1/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 16:08:39 +0000