aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/debugger/shared/debugutil.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Tests: rename connect -> connectToTim Jenssen2020-02-031-1/+1
| | | | | | | avoids strange compiler errors if a QObject::connect is used Change-Id: Ib9f5fc4114a06f7f1d1a0b9a142a15ce19270cec Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QML Profiler: Test that only one Complete message is sent per sessionUlf Hermann2018-07-101-0/+9
| | | | | | Task-number: QTBUG-65767 Change-Id: I0485092f9a36da73e9e86ef8216be736b6560ec1 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* QmlDebug tests: Return the right value from connect(...)Ulf Hermann2018-06-221-32/+53
| | | | | | | | | | | | If the process terminates shortly after connecting, we would return the wrong value because the services would be NotConnected again, due to the timeout mechanism we used to detect this. Instead, rather directly react to the stateChanged signals and return as soon as all services are in the correct state (or if the debug connection is dropped before, or on timeout, which are failures). Change-Id: I3f0c1c8519fc450627a803c76ec9b0a703104022 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-261-5/+11
|\ | | | | | | | | | | | | | | Conflicts: src/imports/imports.pro src/src.pro Change-Id: Icdc39b6169d15b2102acd0e4d550a8d91e4b0744
| * Make the shared test code independent of QtQmlUlf Hermann2018-04-241-5/+11
| | | | | | | | | | | | | | | | | | This enables us to drop the QML dependency from a number of tests. This is desirable because we want to test that we didn't do any incompatible changes to the debug framework. Change-Id: I937dd45d3079eac15c200c9d68bb4c911f61afc0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQmlDebugClient: Make stateChanged a signalUlf Hermann2018-03-201-6/+3
| | | | | | | | | | | | | | | | | | | | | | This way we can observe it from the outside and drop all the code that genrated extra signals from the virtual method. Also drop the unused QQmlDebugTestService::stateHasChanged signal to reduce the confusion. Change-Id: Ia37c1eaf8b392e594b0931694f43f84fe09b000c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQmlDebugProcess: Add a method to return the ProcessStateUlf Hermann2018-03-201-1/+1
|/ | | | | | | | | We want a simple way to query the process state, without parsing the state string. Rename the old state() method to stateString() to make space for the new state() method. Change-Id: I493b769a4ab31148f654c1b67bd95d93e3e3cba7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Move QQmlDebugProcess into its own header and source filesUlf Hermann2017-09-061-192/+3
| | | | | | | This way we can easily extract it and test it separately. Change-Id: I05e78ac705a5b52ee978947f3e0aed596e0a03a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-08-231-1/+4
|\ | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp Change-Id: I31375151eb239f348bec988d2d0506c2b4d9604c
| * Make sure QQmlDebugProcess correctly reports session as startedUlf Hermann2017-08-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | If the "Waiting" output appears before we wait, the event loop could run forever. Also, the timeout of 5s was too low. We increase it to 15s. Remove the blacklists and other workarounds in turn. Task-number: QTQAINFRA-1334 Change-Id: Ib1032a8e57ab8dada3e56163ebab1523a7357aeb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Tests: Unify debugger tests' connection mechanismsUlf Hermann2017-08-181-0/+112
|/ | | | | | | | | | | | | | | All the tests do pretty much the same thing in their init() or connect() methods: Create a process, create a debug connection, create some clients and make sure they're all running. We can deduplicate the code by moving all this into a common base class. Furthermore, the QSKIP in the qqmlenginedebuginspectorintegration test was obviously done because the BLACKLIST mechanism doesn't cover failures from internally called methods. As we don't have that problem anymore now, we can use BLACKLIST instead. Change-Id: I6d45d3b4e9645558ecc783a81fd740b00235cdc1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Updated license headersJani Heikkinen2016-01-201-17/+12
| | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Make environment for QQmlDebugProcess usefulUlf Hermann2016-01-111-3/+3
| | | | | | | We don't want to replace the system environment, but rather add to it. Change-Id: I0a498682f8f70dc349c529fa4fc3d76ccb815af8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Move QQmlDebugClient into separate static libraryUlf Hermann2015-10-301-4/+46
| | | | | Change-Id: Ib3daf9da2cf6798bd022cfcf54d11e565c9cb4ca Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Adapt to deprecation of QProcess::error(...) signalUlf Hermann2015-07-151-1/+1
| | | | | Change-Id: Icf708af4ab968c6592f78f90c3758e30dbe9195d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-121-7/+7
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* QmlDebug: Allow tests to ignore a number of bind errorsUlf Hermann2014-12-051-4/+14
| | | | | | | | Like this we can effectively test the port range feature of the debug server. Change-Id: Id0d0b47525177f0cfbb8c35a267962a82338f047 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Add the features of QLoggingCategory to QML's debugging methods.Giorgos Tsiapaliokas2014-03-071-3/+0
| | | | | | | | | | It is now possible to modify the output of QML's debugging methods. Also the prefix of "qml" makes it possible to capture the output from the QML files using qInstallMessageHandler. This commit depends on qtbase/4967c7106568d5df0be4d40bf793583c7c6bdb69 Change-Id: I2c7a2cb96a0b91fd3249dc2dacbab63e6ac68243 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Improve output of test caseKai Koehne2013-10-161-1/+21
| | | | | Change-Id: Ib36583120ca42835534f0f8494637aeb9618f317 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Add qml toolAlan Alpert2013-09-171-0/+16
| | | | | | | | | | | | | | | | | | | This tool simply runs QML files using a QQmlApplicationEngine. It is configurable so as to behave, by default, like qmlscene in that it will automatically place non-Window QtQuick 2 Items inside a QQuickWindow with the size of the root item. The configuration is extensible so that other GUI scenes can also use it by altering the configuration files in their installation. On OS X, it is an app bundle, and handles the QFileOpenEvent so that it can be the tool with which qml files are usually launched by double-clicking. (This does not break the ability to use it on the command line too: the options still work, you just have to give the path to the executable inside the bundle.) Change-Id: I6bac813ce188be54842a78d7b532fcf2d54dc443 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Debugger: Fix crash when app exits while debuggingKai Koehne2013-08-211-0/+10
| | | | | | | | Make sure we don't access an already deleted v8engine any more. Task-number: QTBUG-33100 Change-Id: Ic517577ae30b41375cbf9f787cfe0a29121171e2 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* QmlProfiler: Pixmap CacheChristiaan Janssen2013-04-301-0/+8
| | | | | Change-Id: Ibc237bb162c24030438b89d54fa8802ee66b080a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Debugger: Accepts port range as argumentsAurindam Jana2013-04-021-1/+10
| | | | | | | | | | Allow a port range to pass on command line, and try to listen on any of the ports in the range. (Re)using the ',' separator allows for backwards compatibility, that is, also Qt 4 will accept a -qmljsdebugger=port:1000,1010 argument, but will only try to listen on port 1000. Change-Id: Ic03fe20e4aee9ecdea86651f46f1df5cb19bd75c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix warning about adding int to a QString (CLANG).Friedemann Kleint2013-03-111-1/+1
| | | | | | Change-Id: Ibc84dcbe5ca4519bb1ac25e5d5463ef58c48190e Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* When declarative debug tests fail in CI, confirm timeout as reasonShawn Rutledge2012-11-081-0/+2
| | | | | | | | | Hope to correct errors like FAIL! : tst_QQmlInspector::reloadQml() 'QQmlDebugTest::waitForSignal( m_client, SIGNAL(responseReceived()))' returned FALSE. () Change-Id: Iebf29d4de0bc19396041565e5a4cd32561345235 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Allow QQmlDebugProcess to be child of other qobjects.Frederik Gladhorn2012-10-231-2/+3
| | | | | | | | | | | Some tests when failing would leave the process running. For example on my machine tst_qqmlinspector would hang and restarting it would not work because the before started process was still blocking the port. Change-Id: I32dfb4874b18d7dcf34d0f40819b17dedd794ff3 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Allow tests to run despite custom message patterns.Frederik Gladhorn2012-10-231-1/+1
| | | | | | | With QT_MESSAGE_PATTERN some tests would not run without explanation. Change-Id: I68a9eda08fe56508ffaaef209a1f236621aa932e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Debugger: Improve output of autotestsKai Koehne2012-04-251-3/+28
| | | | | Change-Id: Ib938d2f39d8a0928c257ef923df5d5fcfa85c4cf Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Improve autotest output on failureKai Koehne2012-04-201-4/+14
| | | | | Change-Id: Ia463b198b5d6dac8e480d141412cb4475e54d204 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* irrelevant qDebug removedSimjees Abraham2012-03-301-3/+0
| | | | | | | | syncing debugutil with the change done to remove the irrelevant qDebug at stat of debug session. Change-Id: I17520319684e6e213037b09550d1a97b493150cd Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Fix v8profiler failures on macKai Koehne2012-03-301-1/+1
| | | | | | | Make the test more robust. Change-Id: Id4e5d25e9f9cb0bdbe14670a060d7348bceeb823 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlDebuggingTests: Separate out public and private testsAurindam Jana2012-03-191-17/+0
| | | | | | | | | Remove dependencies on quick-private from all possible debugging auto tests and list them under public tests. Change-Id: I688b5b36fdf3d6fbcb6cef2a975ecd1bf679af2b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Remove QQmlDebugClientAurindam Jana2012-03-091-3/+0
| | | | | | | | Remove QQmlDebugClient and relevant classes from the library and move to client code. Change-Id: I6f526b3f0c92970dcad5e5abd8585bb9b406349e Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QML Debugger: Change prefix of warningsKai Koehne2012-03-071-3/+3
| | | | | | | | | Since we've been changing from QtDeclarativeDebugServer to QQmlDebugServer anyway, we might as well change it to the more readable "QML Debugger:" prefix. Change-Id: I852577233d7cdb1f57adc43ec1b85a14d212574d Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-0/+190
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>